From 43a346598425b8dc95ca10ab7c486283ee8ec3f2 Mon Sep 17 00:00:00 2001 From: AAA <35992542+TNTcraftHIM@users.noreply.github.com> Date: Sat, 22 Aug 2026 12:57:02 +0800 Subject: [PATCH] docs: record canonical workspace cleanup (#194) Record the completed canonical-main restoration, audited D cleanup, retained workspace state, and explicit user stop gates. --- AGENTS.md | 4 +-- docs/project-memory.md | 2 +- docs/status.md | 9 +++--- docs/todo-audit-hold.md | 8 ++--- docs/workspace-disposition.md | 57 ++++++++++++++++++++++++++++++----- 5 files changed, 60 insertions(+), 20 deletions(-) diff --git a/AGENTS.md b/AGENTS.md index 8d0db56..83a0ad2 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -14,8 +14,8 @@ - `docs/todo-audit-hold.md` is the execution quarantine while the 2026-08-22 truth audit is open. An unchecked box, old branch, agent proposal, experiment, review suggestion, or post-boundary follow-up is not an authorized TODO unless that ledger marks it `CONFIRMED` or the user explicitly reauthorizes it after the audit boundary. - `AUDIT-HOLD` means preserve and inspect, not delete, revert, continue, merge, deploy, or use as current product truth. `EVIDENCE-ONLY` results may inform a later decision but must not become a release gate by themselves. - The older Browser1 and global-SFU-root-two assumptions are disputed and must not drive implementation during the audit. The currently confirmed endpoint-cap intent is one server-authoritative value for every non-server endpoint: default `2`, configurable as `1`, `2`, or `3`, with upstream receive excluded. The exact SFU publication/subscription model is still under holistic routing review. -- Execute this audit in order: first reconcile TODO provenance and current truth owners; second produce the archive/worktree/branch/folder disposition schedule; third merge the audit-guard truth and restore the canonical `main` workspace; fourth produce the holistic routing model as a held proposal without implementation. Later phases must not run ahead merely because parallel capacity is available. -- Then stop and reconcile the canonical state, routing proposal, and remaining TODOs with the user. Do not accept the final routing semantics or create/resume remaining-TODO implementation worktrees before that explicit confirmation. Afterward, update and merge the accepted owning truth into canonical `main` first; only then create high-confidence parallel worktrees from that exact newer `main` SHA. +- Execute this audit in order: first reconcile TODO provenance and current truth owners; second produce the archive/worktree/branch/folder disposition schedule; third merge the audit-guard truth, restore canonical `main`, and execute only approved cleanup; fourth stop and reconcile that organized state and the TODO classifications with the user. Later phases must not run ahead merely because parallel capacity is available. +- Only after that checkpoint is confirmed, produce the holistic routing model as a held proposal without implementation, then stop again for route-semantics confirmation. Do not create or resume remaining-TODO implementation worktrees before the accepted owning truth is merged into canonical `main`; only then create high-confidence worktrees from that exact newer SHA. ## Product Direction diff --git a/docs/project-memory.md b/docs/project-memory.md index 007f065..f02c3b7 100644 --- a/docs/project-memory.md +++ b/docs/project-memory.md @@ -38,7 +38,7 @@ Last updated: 2026-08-22 - Durable truth precedes action: reconcile each discussion or correction against the whole product model, challenge conflicts, update all affected owning truth and current snapshots, and create a Git checkpoint before implementation or implementation sub-agents begin. Unresolved semantics enter a truth hold instead of code. - While the 2026-08-22 truth audit is open, load [the TODO audit hold](./todo-audit-hold.md) before selecting work. Old checkboxes, branch names, agent suggestions, experiments, and post-boundary follow-ups are inputs, not authorization. -- Current phase order is fixed: reconcile TODO provenance/current truth; schedule archives and workspace disposition; merge the audit guard and restore canonical `main`; then produce a holistic routing held proposal. Report that organized state and proposal to the user before accepting route semantics or resuming any remaining TODO. +- TODO provenance/current truth, the workspace schedule, the audit-guard merge, canonical-root restoration, and approved D cleanup are complete. The current stop gate is the requested user report; do not start another TODO cleanup, route model, or implementation before that checkpoint is explicitly confirmed. A later holistic route model remains a held proposal until its own user reconciliation and owning-truth merge. ## Current Implementation diff --git a/docs/status.md b/docs/status.md index 913d16f..ee39c84 100644 --- a/docs/status.md +++ b/docs/status.md @@ -31,11 +31,10 @@ The route-capacity, SFU-root, publication-accounting, and selected-lease stateme ## Active Milestone -1. Reconcile TODO provenance and every current truth owner; distinguish accepted requirements, disputed holds, deployed facts, historical evidence, and conditional research. -2. Produce the document/archive and worktree/branch/folder disposition schedule without deleting, rebasing, merging, or moving held material. -3. Merge the audit-guard truth, restore the canonical repository root to exact latest `main`, and execute only the approved workspace cleanup schedule. -4. Produce the holistic routing model from that canonical truth as a held proposal without implementation. -5. Report the organized canonical root/main, retained/cleaned workspace, routing proposal, held candidates, and proposed remaining TODOs to the user and wait for explicit confirmation. Only then accept final route semantics, update their owning truth, and merge that truth into canonical `main`; only from that exact newer SHA may other TODOs be resumed, parked, superseded, or cleaned. Previous audio, route-canary, SFU-shaping, Native, mobile, and scale items remain preserved in their owners but are not the active execution order. +1. TODO provenance/current-truth reconciliation, the archive/workspace disposition schedule, the audit-guard merge, canonical-root restoration, and the approved D cleanup are complete. See [workspace disposition](./workspace-disposition.md) for the executed checkpoint and retained material. +2. Stop at the requested user checkpoint and report the TODO classifications, durable truth changes, canonical `main`, and retained/removed workspace state. Do not start another TODO cleanup, routing implementation, or feature work. +3. After explicit user confirmation, produce the holistic routing model as a held proposal from exact canonical `main`; it remains analysis, not accepted architecture or implementation authorization. +4. Stop again for route-semantics confirmation before updating their owning truth. Only after that truth is merged may new implementation worktrees start from the exact newer canonical-main SHA and retained candidates be resumed, parked, superseded, or cleaned one at a time. Previous audio, route-canary, SFU-shaping, Native, mobile, and scale items remain preserved in their owners but are not the active execution order. ## Decisions And Blockers diff --git a/docs/todo-audit-hold.md b/docs/todo-audit-hold.md index 61d663f..6952d3d 100644 --- a/docs/todo-audit-hold.md +++ b/docs/todo-audit-hold.md @@ -21,8 +21,9 @@ Latest direct user decisions override contradictory older text during this audit 1. Reconcile TODO provenance and the current truth set. Classify contradictions and holds without implementing them. 2. Produce the documentation/archive and worktree/branch/folder disposition schedule. Preserve all disputed or unknown material; do not delete, move, rebase, or merge it yet. 3. Merge this audit-guard truth, restore the canonical root to exact current `main`, and execute only the approved workspace cleanup schedule. -4. Produce the holistic routing model from those reconciled inputs as a held proposal; do not implement or silently accept disputed semantics. -5. Stop and reconcile the organized canonical state, routing proposal, and proposed remaining TODOs with the user. Only after explicit confirmation may the final owning route truth be accepted, high-confidence worktrees start from exact canonical `main`, or other TODOs be resumed, parked, superseded, or cleaned from the reviewed ledger. +4. Stop and reconcile the organized canonical state and TODO classifications with the user before route modeling or another cleanup pass. +5. After explicit confirmation, produce the holistic routing model from those reconciled inputs as a held proposal; do not implement or silently accept disputed semantics. +6. Stop again for route-semantics confirmation. Only after accepted owning truth is merged may high-confidence worktrees start from that exact newer canonical `main`, or other TODOs be resumed, parked, superseded, or cleaned from the reviewed ledger. Parallel work may accelerate one active phase, but it must not start a later phase early. @@ -99,7 +100,6 @@ The range begins at PR #164. A merged or deployed item can still be under audit; | `docs/resource-matrix-gate@140dd00` | `EVIDENCE-ONLY` | Preserve the short-run data; do not merge old Browser1 policy text. | | `test/real-relay-canary@f135302` | `EVIDENCE-ONLY` | One-line #191 report correction may still be useful even though the later local canary helper also contains it. | | `docs/routing-algorithm-convergence@43b1f46` | `AUDIT-HOLD` | Historical design input only; it contains stale capacity assumptions. | -| `fix/connection-details-stability@55f4cbc` | `SUPERSEDED` | Design input superseded by #187; retain until cleanup audit. | ## Unresolved Routing Inputs @@ -115,4 +115,4 @@ The preferred simplicity test is one Host screen lineage, at most one canonical For each held item, record: original user requirement or lack of one; current consumer; behavior and rollback cost; security/privacy/resource boundary; conflicting facts; and a keep, revise, park, or remove decision. Only then update the owning requirement/ADR/research/status text in place. Do not use this temporary file as permanent architecture documentation. -Merge this audit-guard truth first; that merge does not accept a final routing model. Then preserve any root user changes, release `main` from auxiliary worktrees, and restore the canonical repository root to the exact latest `main`. Complete only the approved workspace cleanup, produce the holistic routing proposal as a held document, report the organized state and proposal, and wait for explicit user confirmation. Only afterward may accepted route semantics be written into their owning truth and merged into `main`; retained candidates or remaining TODOs may be rebuilt or resumed only from that newer exact canonical-main commit. Candidate-era truth files must never overwrite it. +Merge this audit-guard truth first; that merge does not accept a final routing model. Then preserve any root user changes, release `main` from auxiliary worktrees, restore the canonical repository root to the exact latest `main`, and complete only the approved workspace cleanup. Report that organized state and the TODO classifications, then wait for explicit user confirmation before producing the holistic routing proposal as a held document. Stop again for route-semantics confirmation. Only afterward may accepted route semantics be written into their owning truth and merged into `main`; retained candidates or remaining TODOs may be rebuilt or resumed only from that newer exact canonical-main commit. Candidate-era truth files must never overwrite it. diff --git a/docs/workspace-disposition.md b/docs/workspace-disposition.md index e8fcfd4..c8eaf6f 100644 --- a/docs/workspace-disposition.md +++ b/docs/workspace-disposition.md @@ -1,16 +1,56 @@ # Workspace Disposition -Last sampled: 2026-08-22 11:42 HKT +Last sampled: 2026-08-22 after the approved cleanup pass This is the demand-loaded schedule for restoring one canonical repository root and disposing of auxiliary work safely. It is not permission to delete, merge, rebase, or resume a TODO. Shared state is dynamic, so every action must re-sample Git status, refs, PRs, and links immediately before execution. +## Executed Cleanup Checkpoint + +The detailed tables below retain the pre-execution 30-worktree snapshot so the +disposition evidence is reviewable. This checkpoint supersedes those counts: + +- The canonical root `Screener` was restored to clean `main@5bb54b0`, equal to + `origin/main` and GitHub `main` before this docs-only record. The two staged + user `AGENTS.md` rules are present in that mainline truth; their recovery copy + remains in `stash@{0}` through the user checkpoint. +- After this record branch is merged and removed, 26 registered worktrees and + 29 local branches remain. Five worktrees are dirty; only + `Screener-local-oneclick` has nonignored untracked files, exactly five. Every + dirty, held, unknown, evidence-only, archive, and open-stack item was + preserved. +- The clean auxiliary-main, current-routing-truth, + connection-details-stability, and detached current-route-canary worktrees + were removed after exact status and non-following link checks. Their eligible + local branches were removed together with the merged-equivalent + `feat/viewer-presence-polish`, `feat/room-viewer-access-merge-history`, and + main-ancestor `fix/ice-status-wording` refs. +- Fifteen merged remote heads were deleted only after exact PR-head equality, + merge ancestry, and open head/base checks. Ten remote branches remain: + `main`, open PR #192, the six open Native stack refs, held + `test/native-two-viewer-fanout`, and closed-unmerged + `feat/screen-audio-stereo`. +- The signaling-canary junction and both junction-only unregistered shells were + unlinked without following their targets. The only known registered-worktree + junction left is the preserved configurable-cap `node_modules` link to the + canonical dependency directory. +- Four approved empty/junction-only sibling directories were removed. The empty + `Screener-android-pilot-apk` directory remains because Windows reports an + external open handle; no process was killed and no forced recursive deletion + was attempted. Deployment archives, extracted artifacts, the independent + audio acceptance clone, and all uncertain directories remain retained. +- `feat/sfu-media-mode` remains local because it is closed-unmerged and not + commit-equivalent to main. Apparent semantic supersession was not used as + permission to destroy its recovery input. + +No routing implementation or remaining TODO resumed during this cleanup pass. + ## Canonical Target And Stop Gate - The canonical repository root is the registered worktree whose sibling-directory name is `Screener`; all other `Screener-*` worktrees are auxiliary. - Its required terminal state is a clean, exact latest `main`. An auxiliary worktree must not retain `main` afterward. - The audit-guard truth checkpoint merges first; it does not accept a final routing model. The root's staged user rules must be proved present in that updated `main` or explicitly preserved before its index changes. -- After truth integration, canonical-root restoration, and the approved workspace cleanup below, produce the holistic routing model as a held proposal from canonical `main`. Then report the main SHA, dirty/untracked count, retained worktrees/branches, route proposal, held candidates, and proposed high-confidence TODOs to the user. -- Do not create or resume a remaining-TODO implementation worktree until that checkpoint is explicitly confirmed. After confirmation, every new branch/worktree starts from the exact canonical `main` SHA. +- After truth integration, canonical-root restoration, and the approved workspace cleanup below, report the main SHA, dirty/untracked count, retained worktrees/branches, held candidates, and TODO classifications to the user before producing the holistic route proposal or resuming cleanup. +- After that checkpoint is explicitly confirmed, produce the holistic routing model as a held proposal from exact canonical `main`, then stop again for route-semantics confirmation. Do not create or resume an implementation worktree until the accepted owning truth is merged; every later worktree starts from that exact newer `main` SHA. ## Disposition Classes @@ -20,7 +60,7 @@ This is the demand-loaded schedule for restoring one canonical repository root a - `D CLEANUP`: eligible only after semantic disposition, integration/equivalence, clean-tree, open-reference, and non-following link checks all pass. - `E RETAIN`: active stack, external evidence, archive, or unknown provenance; keep until a separate reviewed decision. -## Registered Worktrees +## Registered Worktrees (Pre-Execution Snapshot) The snapshot contains 30 registered worktrees. Seven are dirty. Only `Screener-local-oneclick` has nonignored untracked files: five unique project @@ -100,7 +140,8 @@ Never recursively remove a containing directory while one of these links remains 4. Handle the signaling-canary junction without following it. Recheck the auxiliary-main worktree is clean, untracked-free, and at exact latest `main`, then release it. 5. Make the canonical root clean without losing unmatched user work, switch it to exact latest `main`, and verify path, branch, HEAD, dirty/untracked state, and GitHub main equality. 6. Execute only already-approved `D` cleanup items, one exact target at a time, after semantic/equivalence/open-reference/link checks. Preserve all `A`, `B`, and `E` items. -7. From exact canonical `main`, produce only the holistic routing held proposal; do not implement it or resume another TODO. -8. Stop and obtain user confirmation of the organized canonical state, routing proposal, and proposed remaining TODO list. -9. Only after confirmation, update accepted owning truth and merge that truth into canonical `main`. Then create new implementation worktrees from that exact newer canonical-main commit and reconcile `B` candidates one at a time. Old branch truth files never win conflicts. -10. Process independent archives and deployment artifacts last, with checksum and retention evidence. +7. Stop and obtain user confirmation of the organized canonical state, retained material, and TODO classifications before route modeling or another cleanup pass. +8. After that confirmation, produce only the holistic routing held proposal from exact canonical `main`; do not implement it or resume another TODO. +9. Stop again and obtain explicit route-semantics confirmation. +10. Only after confirmation, update accepted owning truth and merge that truth into canonical `main`. Then create new implementation worktrees from that exact newer canonical-main commit and reconcile `B` candidates one at a time. Old branch truth files never win conflicts. +11. Process independent archives and deployment artifacts last, with checksum and retention evidence.