Skip to content

fix: preserve frozen documents during process reconciliation - #50

Open
xLagerFeuer wants to merge 1 commit into
FonaTech:mainfrom
opensiro-contributions:opensiro/fix-frozen-process-reconciliation-20261111
Open

xLagerFeuer wants to merge 1 commit into
FonaTech:mainfrom
opensiro-contributions:opensiro/fix-frozen-process-reconciliation-20261111

Conversation

@xLagerFeuer

Copy link
Copy Markdown

Summary

  • Reject child-process overwrite/delete attempts against a frozen collaboration document even when the expected revision still matches.
  • Roll back the attempted reconciliation and restore the protected on-disk content, preserving the unresolved conflict for human review.
  • Keep the source-of-truth Clouds_Coder.py and the affected generated Code_Structure/collaboration/core.py in sync; add two deterministic native regressions.

Evidence and testing

  • Original FonaTech/Clouds-Coder main and direct working fork main: 6f187a3fe2e16c3ce8b8902e10206682fb07b8b7.
  • RED before fix: 2/2 new regression cases failed as expected for unguarded process write/delete. GREEN after fix: 2/2 passed; existing process delete and idempotent write controls passed.
  • python3 -m pytest -q tests/test_collaboration.py: 61/61 PASS (Python 3.12).
  • python3 -m unittest discover -s tests -p test_split_distribution.py -q: 6/6 PASS.
  • python3 -m compileall -q Clouds_Coder.py tests/test_collaboration.py Code_Structure and git diff --check: PASS.
  • Full repository pytest -q is NOT PASS: the diagnostic run encountered failures in other runtime/kernel paths, including sqlite3.OperationalError: no such table: runs, and was stopped. Do not count it as a successful full-suite run. The source project's Python 3.10 GitHub CI remains the authoritative additional check on this PR.

The original published test patch's hunk was stale against current main, so the exact two regression methods were rebased without changing their assertions. This PR contains three changed files only. Bulk generated line-number/comment churn and unrelated liquid_kernel artifacts were excluded after verifying the affected generated core and the split-distribution tests.

Scope: first-party conflict/freeze semantics only; no external provider or LLM invocation, no Index grade change, and no deployed benefit or maintainer adoption claimed. Related internal evidence: Upstream batch 15 and source-native receipt.

AI-assisted contribution disclosure

VSM assessment: Current record · Snapshot used for this PR

Assessment date: 2026-11-07 (reviewed_at) · Assessed source revision: 83a0d25aa59ef1bc8e295ec45104a9c7f0819c83

This PR was prepared and published through the OpenSiro Upstream Contributions AI-agent workflow under the owner's standing publication mandate, without a separate human approval of this PR. Technical analysis, code changes and reported checks were agent-driven; no independent human code review or correctness certification is claimed. Agent-generated changes may be incomplete or incorrect. Please review the diff and reproducible evidence independently.

The linked VSM assessment describes the assessed source revision on the stated date, not a guarantee about this PR or later upstream code. Maintainers and their agents can compare the current record with the snapshot and reassess if the source or evidence has changed. The external maintainers alone decide whether to accept or merge this contribution.

This branch has not been deployed

No deployments
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant