fix(orchestrate): ORCH_DIR path token, watch-status stall gating + reason surfacing, merge-on-approval (#87–#90) by choiyounggi · Pull Request #102 · choiyounggi/dev-loop

choiyounggi · 2026-08-14T07:42:41Z

Summary

Three parallel worker tasks (orchestrate run i8790) closing four field-reported defects from real orchestration runs:

orchestrate: worker worktrees have no .orchestration/, so the templates' relative brief/plan paths cannot resolve #87 — {ORCH_DIR} token (4e76e1e): worker-facing templates referenced .orchestration/briefs|plans|reviews/... as bare relative paths, which resolve to nothing inside a worker worktree. All such references now use the {ORCH_DIR} absolute-path token (substituted at prompt composition, like {STATUS_DIR}); the $(dirname {STATUS_DIR}) ad-hoc form in §3/§O3 is gone. Documented convention: orchestration artifacts absolute, repo files worktree-relative.
watch-status.sh: a worker that reached the watched phase and is awaiting review is reported as stalled (exit 7 false positive) #88 + watch-status.sh: surface the usage-limit reset time (and chooser-pending state) instead of a bare 'worker stalled' #89 — watch-status.sh (b89d84a): a task at/above the watched target phase is no longer stall-checked (its silence is prompt-ordered; the dead-worker check still applies), and a genuine exit-7 stall message now surfaces the machine-readable reason from the pane scrollback (capture-pane -S -1000): usage limit · resets <time> (extendable via LO_LIMIT_EXTRA) or chooser pending. Annotations use octal escapes — dash's printf does not interpret \xNN (caught in review r1, pinned by dash-invoked regression tests).
orchestrate: deps gate on approval, but a dependent task's worktree never contains its dependencies' code #90 — merge-on-approval (27dae2c): documented that deps deliver signatures, not merged code; on approval a task's branch is merged into the integration branch (ff via git fetch . :<integ>, else safe-cleanup.sh merge) and verified with git merge-base --is-ancestor before dependents dispatch; worktrees are created at dispatch time from the current tip, and setup-worktrees.sh now prints base=<hash>. This run itself exercised the pattern (t90's worktree contained t87's merged code).

Tests

42 new BATS cases (negative gates with negative controls, real git fixtures, dash portability regressions). Integration suite on this branch: 557 pass / 1 fail — the single failure is the pre-existing squash-anchor test tracked as #99, red on main before this branch.

Related issues filed during the run

orchestrate-review-pass.bats: 'commit that added this file' scope-purity test is red on main after any squash merge #99 — scope-purity guard tests broken by squash merges (pre-existing, untouched here)
launch-session.bats: 6 tests fail when run inside an orchestrate worker session (ambient LO_* env not isolated) #100 — LO_* ambient env leaks into worker-run test suites and can contaminate live run state (untouched here)

Closes#87
Closes#88
Closes#89
Closes#90

🤖 Generated with Claude Code

https://claude.ai/code/session_01TmjpSq96p3LFaMsNJM4eAF

…chestration artifacts (#87) Worker-facing templates referenced briefs/plans/reviews via bare `.orchestration/...` relative paths, which resolve to nothing once a worker's cwd is its own worktree. Introduce {ORCH_DIR} (substituted like {STATUS_DIR}) and convert every such reference in session-prompt.md (§1-§4, §O1-§O4) and brief.md to it, including the ad-hoc `$(dirname {STATUS_DIR})/reviews/...` form in §3/§O3. Document the two-convention rule (orchestration artifacts absolute, repo files relative) in SKILL.md next to the brief/plan composition text. Bump the pinned Orca-block cksum in tests/send-prompt.bats to match, per that test's own same-commit-update convention.

…eason surfacing (#88, #89) A worker already at/above the watched target phase was still stall-checked and could false-report exit 7 even though its silence was exactly what the session prompt ordered. The stall check now gates on rank < target_rank; the dead-worker/liveness check is unchanged and still applies. When a genuine stall IS reported, classify_stall() reads the pane scrollback (capture-pane -S -1000) and enriches the exit-7 message with a usage-limit reset time or chooser-pending state, falling back to the bare message otherwise. LO_LIMIT_EXTRA additively extends the usage-limit pattern. Annotations use octal printf escapes (\302\267, \342\200\224) rather than \xNN hex escapes, since dash (ubuntu CI's /bin/sh) does not interpret \x.

…ee base (#90) A dependent task's worktree previously only received its dependencies' signatures (Phase 3 step 0 injection), never their merged code, because merging happened only at Phase 6. Document the gap, adopt merge-on-approval (merge before returning to ready-set on approval, verified via git merge-base --is-ancestor) as the dispatch-loop contract, and print each new worktree's base commit from setup-worktrees.sh so it's checkable.

… for the Phase 4 mechanics assertion tests/orchestrate-review-pass.bats asserts the phrase as a single substring; the merge-on-approval edit (#90) wrapped it across two lines, which fails on ubuntu bash while macOS bash 3.2 under BATS eval false-passes — the same platform class PR #94 hit in §O3. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01TmjpSq96p3LFaMsNJM4eAF

… gating, four-lens review, wiki gap seeds (#109) Rolls up everything merged since 1.6.0: - #94: review-time wiki routing, four-lens Phase 4 pass, insight emission, socratic rework, failure-class pages - #93: enforceable prohibition lint rule, disjoint routing scopes, flush concurrency - #102 (#87–#90): {ORCH_DIR} path token, watch-status stall gating + reason surfacing, merge-on-approval - #105 (#99, #100): stale scope-purity guards deleted, launch-session suite isolated from ambient LO_*/GROUNDWORK_* env - #108 (#96, #97, #38): cmd_send [Pasted text] guard with bounded Enter retry, $TMUX-gated status-update session resolution + failed-phase reset playbook, wiki gap seed pages G1–G6 Version bump propagates the send-prompt.sh delivery-confirmation fix to plugin consumers (groundwork references dev-loop by URL; the cache updates on version change). Claude-Session: https://claude.ai/code/session_014PCWX9umAP1CLZJnaGPV7Q Co-authored-by: dch0202 <dch0202@infobank.net> Co-authored-by: Claude Fable 5 <noreply@anthropic.com>

choiyounggi · 2026-08-14T07:42:41Z

Summary

Three parallel worker tasks (orchestrate run i8790) closing four field-reported defects from real orchestration runs:

orchestrate: worker worktrees have no .orchestration/, so the templates' relative brief/plan paths cannot resolve #87 — {ORCH_DIR} token (4e76e1e): worker-facing templates referenced .orchestration/briefs|plans|reviews/... as bare relative paths, which resolve to nothing inside a worker worktree. All such references now use the {ORCH_DIR} absolute-path token (substituted at prompt composition, like {STATUS_DIR}); the $(dirname {STATUS_DIR}) ad-hoc form in §3/§O3 is gone. Documented convention: orchestration artifacts absolute, repo files worktree-relative.
watch-status.sh: a worker that reached the watched phase and is awaiting review is reported as stalled (exit 7 false positive) #88 + watch-status.sh: surface the usage-limit reset time (and chooser-pending state) instead of a bare 'worker stalled' #89 — watch-status.sh (b89d84a): a task at/above the watched target phase is no longer stall-checked (its silence is prompt-ordered; the dead-worker check still applies), and a genuine exit-7 stall message now surfaces the machine-readable reason from the pane scrollback (capture-pane -S -1000): usage limit · resets <time> (extendable via LO_LIMIT_EXTRA) or chooser pending. Annotations use octal escapes — dash's printf does not interpret \xNN (caught in review r1, pinned by dash-invoked regression tests).
orchestrate: deps gate on approval, but a dependent task's worktree never contains its dependencies' code #90 — merge-on-approval (27dae2c): documented that deps deliver signatures, not merged code; on approval a task's branch is merged into the integration branch (ff via git fetch . :<integ>, else safe-cleanup.sh merge) and verified with git merge-base --is-ancestor before dependents dispatch; worktrees are created at dispatch time from the current tip, and setup-worktrees.sh now prints base=<hash>. This run itself exercised the pattern (t90's worktree contained t87's merged code).

Tests

42 new BATS cases (negative gates with negative controls, real git fixtures, dash portability regressions). Integration suite on this branch: 557 pass / 1 fail — the single failure is the pre-existing squash-anchor test tracked as #99, red on main before this branch.

Related issues filed during the run

orchestrate-review-pass.bats: 'commit that added this file' scope-purity test is red on main after any squash merge #99 — scope-purity guard tests broken by squash merges (pre-existing, untouched here)
launch-session.bats: 6 tests fail when run inside an orchestrate worker session (ambient LO_* env not isolated) #100 — LO_* ambient env leaks into worker-run test suites and can contaminate live run state (untouched here)

Closes#87
Closes#88
Closes#89
Closes#90

🤖 Generated with Claude Code

https://claude.ai/code/session_01TmjpSq96p3LFaMsNJM4eAF

…chestration artifacts (#87) Worker-facing templates referenced briefs/plans/reviews via bare `.orchestration/...` relative paths, which resolve to nothing once a worker's cwd is its own worktree. Introduce {ORCH_DIR} (substituted like {STATUS_DIR}) and convert every such reference in session-prompt.md (§1-§4, §O1-§O4) and brief.md to it, including the ad-hoc `$(dirname {STATUS_DIR})/reviews/...` form in §3/§O3. Document the two-convention rule (orchestration artifacts absolute, repo files relative) in SKILL.md next to the brief/plan composition text. Bump the pinned Orca-block cksum in tests/send-prompt.bats to match, per that test's own same-commit-update convention.

…eason surfacing (#88, #89) A worker already at/above the watched target phase was still stall-checked and could false-report exit 7 even though its silence was exactly what the session prompt ordered. The stall check now gates on rank < target_rank; the dead-worker/liveness check is unchanged and still applies. When a genuine stall IS reported, classify_stall() reads the pane scrollback (capture-pane -S -1000) and enriches the exit-7 message with a usage-limit reset time or chooser-pending state, falling back to the bare message otherwise. LO_LIMIT_EXTRA additively extends the usage-limit pattern. Annotations use octal printf escapes (\302\267, \342\200\224) rather than \xNN hex escapes, since dash (ubuntu CI's /bin/sh) does not interpret \x.

…ee base (#90) A dependent task's worktree previously only received its dependencies' signatures (Phase 3 step 0 injection), never their merged code, because merging happened only at Phase 6. Document the gap, adopt merge-on-approval (merge before returning to ready-set on approval, verified via git merge-base --is-ancestor) as the dispatch-loop contract, and print each new worktree's base commit from setup-worktrees.sh so it's checkable.

… for the Phase 4 mechanics assertion tests/orchestrate-review-pass.bats asserts the phrase as a single substring; the merge-on-approval edit (#90) wrapped it across two lines, which fails on ubuntu bash while macOS bash 3.2 under BATS eval false-passes — the same platform class PR #94 hit in §O3. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01TmjpSq96p3LFaMsNJM4eAF

… gating, four-lens review, wiki gap seeds (#109) Rolls up everything merged since 1.6.0: - #94: review-time wiki routing, four-lens Phase 4 pass, insight emission, socratic rework, failure-class pages - #93: enforceable prohibition lint rule, disjoint routing scopes, flush concurrency - #102 (#87–#90): {ORCH_DIR} path token, watch-status stall gating + reason surfacing, merge-on-approval - #105 (#99, #100): stale scope-purity guards deleted, launch-session suite isolated from ambient LO_*/GROUNDWORK_* env - #108 (#96, #97, #38): cmd_send [Pasted text] guard with bounded Enter retry, $TMUX-gated status-update session resolution + failed-phase reset playbook, wiki gap seed pages G1–G6 Version bump propagates the send-prompt.sh delivery-confirmation fix to plugin consumers (groundwork references dev-loop by URL; the cache updates on version change). Claude-Session: https://claude.ai/code/session_014PCWX9umAP1CLZJnaGPV7Q Co-authored-by: dch0202 <dch0202@infobank.net> Co-authored-by: Claude Fable 5 <noreply@anthropic.com>

choiyounggi · 2026-08-14T07:42:41Z

Summary

Three parallel worker tasks (orchestrate run i8790) closing four field-reported defects from real orchestration runs:

orchestrate: worker worktrees have no .orchestration/, so the templates' relative brief/plan paths cannot resolve #87 — {ORCH_DIR} token (4e76e1e): worker-facing templates referenced .orchestration/briefs|plans|reviews/... as bare relative paths, which resolve to nothing inside a worker worktree. All such references now use the {ORCH_DIR} absolute-path token (substituted at prompt composition, like {STATUS_DIR}); the $(dirname {STATUS_DIR}) ad-hoc form in §3/§O3 is gone. Documented convention: orchestration artifacts absolute, repo files worktree-relative.
watch-status.sh: a worker that reached the watched phase and is awaiting review is reported as stalled (exit 7 false positive) #88 + watch-status.sh: surface the usage-limit reset time (and chooser-pending state) instead of a bare 'worker stalled' #89 — watch-status.sh (b89d84a): a task at/above the watched target phase is no longer stall-checked (its silence is prompt-ordered; the dead-worker check still applies), and a genuine exit-7 stall message now surfaces the machine-readable reason from the pane scrollback (capture-pane -S -1000): usage limit · resets <time> (extendable via LO_LIMIT_EXTRA) or chooser pending. Annotations use octal escapes — dash's printf does not interpret \xNN (caught in review r1, pinned by dash-invoked regression tests).
orchestrate: deps gate on approval, but a dependent task's worktree never contains its dependencies' code #90 — merge-on-approval (27dae2c): documented that deps deliver signatures, not merged code; on approval a task's branch is merged into the integration branch (ff via git fetch . :<integ>, else safe-cleanup.sh merge) and verified with git merge-base --is-ancestor before dependents dispatch; worktrees are created at dispatch time from the current tip, and setup-worktrees.sh now prints base=<hash>. This run itself exercised the pattern (t90's worktree contained t87's merged code).

Tests

42 new BATS cases (negative gates with negative controls, real git fixtures, dash portability regressions). Integration suite on this branch: 557 pass / 1 fail — the single failure is the pre-existing squash-anchor test tracked as #99, red on main before this branch.

Related issues filed during the run

orchestrate-review-pass.bats: 'commit that added this file' scope-purity test is red on main after any squash merge #99 — scope-purity guard tests broken by squash merges (pre-existing, untouched here)
launch-session.bats: 6 tests fail when run inside an orchestrate worker session (ambient LO_* env not isolated) #100 — LO_* ambient env leaks into worker-run test suites and can contaminate live run state (untouched here)

Closes#87
Closes#88
Closes#89
Closes#90

🤖 Generated with Claude Code

https://claude.ai/code/session_01TmjpSq96p3LFaMsNJM4eAF

…chestration artifacts (#87) Worker-facing templates referenced briefs/plans/reviews via bare `.orchestration/...` relative paths, which resolve to nothing once a worker's cwd is its own worktree. Introduce {ORCH_DIR} (substituted like {STATUS_DIR}) and convert every such reference in session-prompt.md (§1-§4, §O1-§O4) and brief.md to it, including the ad-hoc `$(dirname {STATUS_DIR})/reviews/...` form in §3/§O3. Document the two-convention rule (orchestration artifacts absolute, repo files relative) in SKILL.md next to the brief/plan composition text. Bump the pinned Orca-block cksum in tests/send-prompt.bats to match, per that test's own same-commit-update convention.

…eason surfacing (#88, #89) A worker already at/above the watched target phase was still stall-checked and could false-report exit 7 even though its silence was exactly what the session prompt ordered. The stall check now gates on rank < target_rank; the dead-worker/liveness check is unchanged and still applies. When a genuine stall IS reported, classify_stall() reads the pane scrollback (capture-pane -S -1000) and enriches the exit-7 message with a usage-limit reset time or chooser-pending state, falling back to the bare message otherwise. LO_LIMIT_EXTRA additively extends the usage-limit pattern. Annotations use octal printf escapes (\302\267, \342\200\224) rather than \xNN hex escapes, since dash (ubuntu CI's /bin/sh) does not interpret \x.

…ee base (#90) A dependent task's worktree previously only received its dependencies' signatures (Phase 3 step 0 injection), never their merged code, because merging happened only at Phase 6. Document the gap, adopt merge-on-approval (merge before returning to ready-set on approval, verified via git merge-base --is-ancestor) as the dispatch-loop contract, and print each new worktree's base commit from setup-worktrees.sh so it's checkable.

… for the Phase 4 mechanics assertion tests/orchestrate-review-pass.bats asserts the phrase as a single substring; the merge-on-approval edit (#90) wrapped it across two lines, which fails on ubuntu bash while macOS bash 3.2 under BATS eval false-passes — the same platform class PR #94 hit in §O3. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01TmjpSq96p3LFaMsNJM4eAF

… gating, four-lens review, wiki gap seeds (#109) Rolls up everything merged since 1.6.0: - #94: review-time wiki routing, four-lens Phase 4 pass, insight emission, socratic rework, failure-class pages - #93: enforceable prohibition lint rule, disjoint routing scopes, flush concurrency - #102 (#87–#90): {ORCH_DIR} path token, watch-status stall gating + reason surfacing, merge-on-approval - #105 (#99, #100): stale scope-purity guards deleted, launch-session suite isolated from ambient LO_*/GROUNDWORK_* env - #108 (#96, #97, #38): cmd_send [Pasted text] guard with bounded Enter retry, $TMUX-gated status-update session resolution + failed-phase reset playbook, wiki gap seed pages G1–G6 Version bump propagates the send-prompt.sh delivery-confirmation fix to plugin consumers (groundwork references dev-loop by URL; the cache updates on version change). Claude-Session: https://claude.ai/code/session_014PCWX9umAP1CLZJnaGPV7Q Co-authored-by: dch0202 <dch0202@infobank.net> Co-authored-by: Claude Fable 5 <noreply@anthropic.com>

choiyounggi · 2026-08-14T07:42:41Z

Summary

Three parallel worker tasks (orchestrate run i8790) closing four field-reported defects from real orchestration runs:

orchestrate: worker worktrees have no .orchestration/, so the templates' relative brief/plan paths cannot resolve #87 — {ORCH_DIR} token (4e76e1e): worker-facing templates referenced .orchestration/briefs|plans|reviews/... as bare relative paths, which resolve to nothing inside a worker worktree. All such references now use the {ORCH_DIR} absolute-path token (substituted at prompt composition, like {STATUS_DIR}); the $(dirname {STATUS_DIR}) ad-hoc form in §3/§O3 is gone. Documented convention: orchestration artifacts absolute, repo files worktree-relative.
watch-status.sh: a worker that reached the watched phase and is awaiting review is reported as stalled (exit 7 false positive) #88 + watch-status.sh: surface the usage-limit reset time (and chooser-pending state) instead of a bare 'worker stalled' #89 — watch-status.sh (b89d84a): a task at/above the watched target phase is no longer stall-checked (its silence is prompt-ordered; the dead-worker check still applies), and a genuine exit-7 stall message now surfaces the machine-readable reason from the pane scrollback (capture-pane -S -1000): usage limit · resets <time> (extendable via LO_LIMIT_EXTRA) or chooser pending. Annotations use octal escapes — dash's printf does not interpret \xNN (caught in review r1, pinned by dash-invoked regression tests).
orchestrate: deps gate on approval, but a dependent task's worktree never contains its dependencies' code #90 — merge-on-approval (27dae2c): documented that deps deliver signatures, not merged code; on approval a task's branch is merged into the integration branch (ff via git fetch . :<integ>, else safe-cleanup.sh merge) and verified with git merge-base --is-ancestor before dependents dispatch; worktrees are created at dispatch time from the current tip, and setup-worktrees.sh now prints base=<hash>. This run itself exercised the pattern (t90's worktree contained t87's merged code).

Tests

42 new BATS cases (negative gates with negative controls, real git fixtures, dash portability regressions). Integration suite on this branch: 557 pass / 1 fail — the single failure is the pre-existing squash-anchor test tracked as #99, red on main before this branch.

Related issues filed during the run

orchestrate-review-pass.bats: 'commit that added this file' scope-purity test is red on main after any squash merge #99 — scope-purity guard tests broken by squash merges (pre-existing, untouched here)
launch-session.bats: 6 tests fail when run inside an orchestrate worker session (ambient LO_* env not isolated) #100 — LO_* ambient env leaks into worker-run test suites and can contaminate live run state (untouched here)

Closes#87
Closes#88
Closes#89
Closes#90

🤖 Generated with Claude Code

https://claude.ai/code/session_01TmjpSq96p3LFaMsNJM4eAF

…chestration artifacts (#87) Worker-facing templates referenced briefs/plans/reviews via bare `.orchestration/...` relative paths, which resolve to nothing once a worker's cwd is its own worktree. Introduce {ORCH_DIR} (substituted like {STATUS_DIR}) and convert every such reference in session-prompt.md (§1-§4, §O1-§O4) and brief.md to it, including the ad-hoc `$(dirname {STATUS_DIR})/reviews/...` form in §3/§O3. Document the two-convention rule (orchestration artifacts absolute, repo files relative) in SKILL.md next to the brief/plan composition text. Bump the pinned Orca-block cksum in tests/send-prompt.bats to match, per that test's own same-commit-update convention.

…eason surfacing (#88, #89) A worker already at/above the watched target phase was still stall-checked and could false-report exit 7 even though its silence was exactly what the session prompt ordered. The stall check now gates on rank < target_rank; the dead-worker/liveness check is unchanged and still applies. When a genuine stall IS reported, classify_stall() reads the pane scrollback (capture-pane -S -1000) and enriches the exit-7 message with a usage-limit reset time or chooser-pending state, falling back to the bare message otherwise. LO_LIMIT_EXTRA additively extends the usage-limit pattern. Annotations use octal printf escapes (\302\267, \342\200\224) rather than \xNN hex escapes, since dash (ubuntu CI's /bin/sh) does not interpret \x.

…ee base (#90) A dependent task's worktree previously only received its dependencies' signatures (Phase 3 step 0 injection), never their merged code, because merging happened only at Phase 6. Document the gap, adopt merge-on-approval (merge before returning to ready-set on approval, verified via git merge-base --is-ancestor) as the dispatch-loop contract, and print each new worktree's base commit from setup-worktrees.sh so it's checkable.

… for the Phase 4 mechanics assertion tests/orchestrate-review-pass.bats asserts the phrase as a single substring; the merge-on-approval edit (#90) wrapped it across two lines, which fails on ubuntu bash while macOS bash 3.2 under BATS eval false-passes — the same platform class PR #94 hit in §O3. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01TmjpSq96p3LFaMsNJM4eAF

… gating, four-lens review, wiki gap seeds (#109) Rolls up everything merged since 1.6.0: - #94: review-time wiki routing, four-lens Phase 4 pass, insight emission, socratic rework, failure-class pages - #93: enforceable prohibition lint rule, disjoint routing scopes, flush concurrency - #102 (#87–#90): {ORCH_DIR} path token, watch-status stall gating + reason surfacing, merge-on-approval - #105 (#99, #100): stale scope-purity guards deleted, launch-session suite isolated from ambient LO_*/GROUNDWORK_* env - #108 (#96, #97, #38): cmd_send [Pasted text] guard with bounded Enter retry, $TMUX-gated status-update session resolution + failed-phase reset playbook, wiki gap seed pages G1–G6 Version bump propagates the send-prompt.sh delivery-confirmation fix to plugin consumers (groundwork references dev-loop by URL; the cache updates on version change). Claude-Session: https://claude.ai/code/session_014PCWX9umAP1CLZJnaGPV7Q Co-authored-by: dch0202 <dch0202@infobank.net> Co-authored-by: Claude Fable 5 <noreply@anthropic.com>

choiyounggi · 2026-08-14T07:42:41Z

Summary

Three parallel worker tasks (orchestrate run i8790) closing four field-reported defects from real orchestration runs:

orchestrate: worker worktrees have no .orchestration/, so the templates' relative brief/plan paths cannot resolve #87 — {ORCH_DIR} token (4e76e1e): worker-facing templates referenced .orchestration/briefs|plans|reviews/... as bare relative paths, which resolve to nothing inside a worker worktree. All such references now use the {ORCH_DIR} absolute-path token (substituted at prompt composition, like {STATUS_DIR}); the $(dirname {STATUS_DIR}) ad-hoc form in §3/§O3 is gone. Documented convention: orchestration artifacts absolute, repo files worktree-relative.
watch-status.sh: a worker that reached the watched phase and is awaiting review is reported as stalled (exit 7 false positive) #88 + watch-status.sh: surface the usage-limit reset time (and chooser-pending state) instead of a bare 'worker stalled' #89 — watch-status.sh (b89d84a): a task at/above the watched target phase is no longer stall-checked (its silence is prompt-ordered; the dead-worker check still applies), and a genuine exit-7 stall message now surfaces the machine-readable reason from the pane scrollback (capture-pane -S -1000): usage limit · resets <time> (extendable via LO_LIMIT_EXTRA) or chooser pending. Annotations use octal escapes — dash's printf does not interpret \xNN (caught in review r1, pinned by dash-invoked regression tests).
orchestrate: deps gate on approval, but a dependent task's worktree never contains its dependencies' code #90 — merge-on-approval (27dae2c): documented that deps deliver signatures, not merged code; on approval a task's branch is merged into the integration branch (ff via git fetch . :<integ>, else safe-cleanup.sh merge) and verified with git merge-base --is-ancestor before dependents dispatch; worktrees are created at dispatch time from the current tip, and setup-worktrees.sh now prints base=<hash>. This run itself exercised the pattern (t90's worktree contained t87's merged code).

Tests

42 new BATS cases (negative gates with negative controls, real git fixtures, dash portability regressions). Integration suite on this branch: 557 pass / 1 fail — the single failure is the pre-existing squash-anchor test tracked as #99, red on main before this branch.

Related issues filed during the run

orchestrate-review-pass.bats: 'commit that added this file' scope-purity test is red on main after any squash merge #99 — scope-purity guard tests broken by squash merges (pre-existing, untouched here)
launch-session.bats: 6 tests fail when run inside an orchestrate worker session (ambient LO_* env not isolated) #100 — LO_* ambient env leaks into worker-run test suites and can contaminate live run state (untouched here)

Closes#87
Closes#88
Closes#89
Closes#90

🤖 Generated with Claude Code

https://claude.ai/code/session_01TmjpSq96p3LFaMsNJM4eAF

…chestration artifacts (#87) Worker-facing templates referenced briefs/plans/reviews via bare `.orchestration/...` relative paths, which resolve to nothing once a worker's cwd is its own worktree. Introduce {ORCH_DIR} (substituted like {STATUS_DIR}) and convert every such reference in session-prompt.md (§1-§4, §O1-§O4) and brief.md to it, including the ad-hoc `$(dirname {STATUS_DIR})/reviews/...` form in §3/§O3. Document the two-convention rule (orchestration artifacts absolute, repo files relative) in SKILL.md next to the brief/plan composition text. Bump the pinned Orca-block cksum in tests/send-prompt.bats to match, per that test's own same-commit-update convention.

…eason surfacing (#88, #89) A worker already at/above the watched target phase was still stall-checked and could false-report exit 7 even though its silence was exactly what the session prompt ordered. The stall check now gates on rank < target_rank; the dead-worker/liveness check is unchanged and still applies. When a genuine stall IS reported, classify_stall() reads the pane scrollback (capture-pane -S -1000) and enriches the exit-7 message with a usage-limit reset time or chooser-pending state, falling back to the bare message otherwise. LO_LIMIT_EXTRA additively extends the usage-limit pattern. Annotations use octal printf escapes (\302\267, \342\200\224) rather than \xNN hex escapes, since dash (ubuntu CI's /bin/sh) does not interpret \x.

…ee base (#90) A dependent task's worktree previously only received its dependencies' signatures (Phase 3 step 0 injection), never their merged code, because merging happened only at Phase 6. Document the gap, adopt merge-on-approval (merge before returning to ready-set on approval, verified via git merge-base --is-ancestor) as the dispatch-loop contract, and print each new worktree's base commit from setup-worktrees.sh so it's checkable.

… for the Phase 4 mechanics assertion tests/orchestrate-review-pass.bats asserts the phrase as a single substring; the merge-on-approval edit (#90) wrapped it across two lines, which fails on ubuntu bash while macOS bash 3.2 under BATS eval false-passes — the same platform class PR #94 hit in §O3. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01TmjpSq96p3LFaMsNJM4eAF

… gating, four-lens review, wiki gap seeds (#109) Rolls up everything merged since 1.6.0: - #94: review-time wiki routing, four-lens Phase 4 pass, insight emission, socratic rework, failure-class pages - #93: enforceable prohibition lint rule, disjoint routing scopes, flush concurrency - #102 (#87–#90): {ORCH_DIR} path token, watch-status stall gating + reason surfacing, merge-on-approval - #105 (#99, #100): stale scope-purity guards deleted, launch-session suite isolated from ambient LO_*/GROUNDWORK_* env - #108 (#96, #97, #38): cmd_send [Pasted text] guard with bounded Enter retry, $TMUX-gated status-update session resolution + failed-phase reset playbook, wiki gap seed pages G1–G6 Version bump propagates the send-prompt.sh delivery-confirmation fix to plugin consumers (groundwork references dev-loop by URL; the cache updates on version change). Claude-Session: https://claude.ai/code/session_014PCWX9umAP1CLZJnaGPV7Q Co-authored-by: dch0202 <dch0202@infobank.net> Co-authored-by: Claude Fable 5 <noreply@anthropic.com>

choiyounggi · 2026-08-14T07:42:41Z

Summary

Three parallel worker tasks (orchestrate run i8790) closing four field-reported defects from real orchestration runs:

orchestrate: worker worktrees have no .orchestration/, so the templates' relative brief/plan paths cannot resolve #87 — {ORCH_DIR} token (4e76e1e): worker-facing templates referenced .orchestration/briefs|plans|reviews/... as bare relative paths, which resolve to nothing inside a worker worktree. All such references now use the {ORCH_DIR} absolute-path token (substituted at prompt composition, like {STATUS_DIR}); the $(dirname {STATUS_DIR}) ad-hoc form in §3/§O3 is gone. Documented convention: orchestration artifacts absolute, repo files worktree-relative.
watch-status.sh: a worker that reached the watched phase and is awaiting review is reported as stalled (exit 7 false positive) #88 + watch-status.sh: surface the usage-limit reset time (and chooser-pending state) instead of a bare 'worker stalled' #89 — watch-status.sh (b89d84a): a task at/above the watched target phase is no longer stall-checked (its silence is prompt-ordered; the dead-worker check still applies), and a genuine exit-7 stall message now surfaces the machine-readable reason from the pane scrollback (capture-pane -S -1000): usage limit · resets <time> (extendable via LO_LIMIT_EXTRA) or chooser pending. Annotations use octal escapes — dash's printf does not interpret \xNN (caught in review r1, pinned by dash-invoked regression tests).
orchestrate: deps gate on approval, but a dependent task's worktree never contains its dependencies' code #90 — merge-on-approval (27dae2c): documented that deps deliver signatures, not merged code; on approval a task's branch is merged into the integration branch (ff via git fetch . :<integ>, else safe-cleanup.sh merge) and verified with git merge-base --is-ancestor before dependents dispatch; worktrees are created at dispatch time from the current tip, and setup-worktrees.sh now prints base=<hash>. This run itself exercised the pattern (t90's worktree contained t87's merged code).

Tests

42 new BATS cases (negative gates with negative controls, real git fixtures, dash portability regressions). Integration suite on this branch: 557 pass / 1 fail — the single failure is the pre-existing squash-anchor test tracked as #99, red on main before this branch.

Related issues filed during the run

orchestrate-review-pass.bats: 'commit that added this file' scope-purity test is red on main after any squash merge #99 — scope-purity guard tests broken by squash merges (pre-existing, untouched here)
launch-session.bats: 6 tests fail when run inside an orchestrate worker session (ambient LO_* env not isolated) #100 — LO_* ambient env leaks into worker-run test suites and can contaminate live run state (untouched here)

Closes#87
Closes#88
Closes#89
Closes#90

🤖 Generated with Claude Code

https://claude.ai/code/session_01TmjpSq96p3LFaMsNJM4eAF

…chestration artifacts (#87) Worker-facing templates referenced briefs/plans/reviews via bare `.orchestration/...` relative paths, which resolve to nothing once a worker's cwd is its own worktree. Introduce {ORCH_DIR} (substituted like {STATUS_DIR}) and convert every such reference in session-prompt.md (§1-§4, §O1-§O4) and brief.md to it, including the ad-hoc `$(dirname {STATUS_DIR})/reviews/...` form in §3/§O3. Document the two-convention rule (orchestration artifacts absolute, repo files relative) in SKILL.md next to the brief/plan composition text. Bump the pinned Orca-block cksum in tests/send-prompt.bats to match, per that test's own same-commit-update convention.

…eason surfacing (#88, #89) A worker already at/above the watched target phase was still stall-checked and could false-report exit 7 even though its silence was exactly what the session prompt ordered. The stall check now gates on rank < target_rank; the dead-worker/liveness check is unchanged and still applies. When a genuine stall IS reported, classify_stall() reads the pane scrollback (capture-pane -S -1000) and enriches the exit-7 message with a usage-limit reset time or chooser-pending state, falling back to the bare message otherwise. LO_LIMIT_EXTRA additively extends the usage-limit pattern. Annotations use octal printf escapes (\302\267, \342\200\224) rather than \xNN hex escapes, since dash (ubuntu CI's /bin/sh) does not interpret \x.

…ee base (#90) A dependent task's worktree previously only received its dependencies' signatures (Phase 3 step 0 injection), never their merged code, because merging happened only at Phase 6. Document the gap, adopt merge-on-approval (merge before returning to ready-set on approval, verified via git merge-base --is-ancestor) as the dispatch-loop contract, and print each new worktree's base commit from setup-worktrees.sh so it's checkable.

… for the Phase 4 mechanics assertion tests/orchestrate-review-pass.bats asserts the phrase as a single substring; the merge-on-approval edit (#90) wrapped it across two lines, which fails on ubuntu bash while macOS bash 3.2 under BATS eval false-passes — the same platform class PR #94 hit in §O3. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01TmjpSq96p3LFaMsNJM4eAF

… gating, four-lens review, wiki gap seeds (#109) Rolls up everything merged since 1.6.0: - #94: review-time wiki routing, four-lens Phase 4 pass, insight emission, socratic rework, failure-class pages - #93: enforceable prohibition lint rule, disjoint routing scopes, flush concurrency - #102 (#87–#90): {ORCH_DIR} path token, watch-status stall gating + reason surfacing, merge-on-approval - #105 (#99, #100): stale scope-purity guards deleted, launch-session suite isolated from ambient LO_*/GROUNDWORK_* env - #108 (#96, #97, #38): cmd_send [Pasted text] guard with bounded Enter retry, $TMUX-gated status-update session resolution + failed-phase reset playbook, wiki gap seed pages G1–G6 Version bump propagates the send-prompt.sh delivery-confirmation fix to plugin consumers (groundwork references dev-loop by URL; the cache updates on version change). Claude-Session: https://claude.ai/code/session_014PCWX9umAP1CLZJnaGPV7Q Co-authored-by: dch0202 <dch0202@infobank.net> Co-authored-by: Claude Fable 5 <noreply@anthropic.com>

choiyounggi · 2026-08-14T07:42:41Z

Summary

Three parallel worker tasks (orchestrate run i8790) closing four field-reported defects from real orchestration runs:

orchestrate: worker worktrees have no .orchestration/, so the templates' relative brief/plan paths cannot resolve #87 — {ORCH_DIR} token (4e76e1e): worker-facing templates referenced .orchestration/briefs|plans|reviews/... as bare relative paths, which resolve to nothing inside a worker worktree. All such references now use the {ORCH_DIR} absolute-path token (substituted at prompt composition, like {STATUS_DIR}); the $(dirname {STATUS_DIR}) ad-hoc form in §3/§O3 is gone. Documented convention: orchestration artifacts absolute, repo files worktree-relative.
watch-status.sh: a worker that reached the watched phase and is awaiting review is reported as stalled (exit 7 false positive) #88 + watch-status.sh: surface the usage-limit reset time (and chooser-pending state) instead of a bare 'worker stalled' #89 — watch-status.sh (b89d84a): a task at/above the watched target phase is no longer stall-checked (its silence is prompt-ordered; the dead-worker check still applies), and a genuine exit-7 stall message now surfaces the machine-readable reason from the pane scrollback (capture-pane -S -1000): usage limit · resets <time> (extendable via LO_LIMIT_EXTRA) or chooser pending. Annotations use octal escapes — dash's printf does not interpret \xNN (caught in review r1, pinned by dash-invoked regression tests).
orchestrate: deps gate on approval, but a dependent task's worktree never contains its dependencies' code #90 — merge-on-approval (27dae2c): documented that deps deliver signatures, not merged code; on approval a task's branch is merged into the integration branch (ff via git fetch . :<integ>, else safe-cleanup.sh merge) and verified with git merge-base --is-ancestor before dependents dispatch; worktrees are created at dispatch time from the current tip, and setup-worktrees.sh now prints base=<hash>. This run itself exercised the pattern (t90's worktree contained t87's merged code).

Tests

42 new BATS cases (negative gates with negative controls, real git fixtures, dash portability regressions). Integration suite on this branch: 557 pass / 1 fail — the single failure is the pre-existing squash-anchor test tracked as #99, red on main before this branch.

Related issues filed during the run

orchestrate-review-pass.bats: 'commit that added this file' scope-purity test is red on main after any squash merge #99 — scope-purity guard tests broken by squash merges (pre-existing, untouched here)
launch-session.bats: 6 tests fail when run inside an orchestrate worker session (ambient LO_* env not isolated) #100 — LO_* ambient env leaks into worker-run test suites and can contaminate live run state (untouched here)

Closes#87
Closes#88
Closes#89
Closes#90

🤖 Generated with Claude Code

https://claude.ai/code/session_01TmjpSq96p3LFaMsNJM4eAF

…chestration artifacts (#87) Worker-facing templates referenced briefs/plans/reviews via bare `.orchestration/...` relative paths, which resolve to nothing once a worker's cwd is its own worktree. Introduce {ORCH_DIR} (substituted like {STATUS_DIR}) and convert every such reference in session-prompt.md (§1-§4, §O1-§O4) and brief.md to it, including the ad-hoc `$(dirname {STATUS_DIR})/reviews/...` form in §3/§O3. Document the two-convention rule (orchestration artifacts absolute, repo files relative) in SKILL.md next to the brief/plan composition text. Bump the pinned Orca-block cksum in tests/send-prompt.bats to match, per that test's own same-commit-update convention.

…eason surfacing (#88, #89) A worker already at/above the watched target phase was still stall-checked and could false-report exit 7 even though its silence was exactly what the session prompt ordered. The stall check now gates on rank < target_rank; the dead-worker/liveness check is unchanged and still applies. When a genuine stall IS reported, classify_stall() reads the pane scrollback (capture-pane -S -1000) and enriches the exit-7 message with a usage-limit reset time or chooser-pending state, falling back to the bare message otherwise. LO_LIMIT_EXTRA additively extends the usage-limit pattern. Annotations use octal printf escapes (\302\267, \342\200\224) rather than \xNN hex escapes, since dash (ubuntu CI's /bin/sh) does not interpret \x.

…ee base (#90) A dependent task's worktree previously only received its dependencies' signatures (Phase 3 step 0 injection), never their merged code, because merging happened only at Phase 6. Document the gap, adopt merge-on-approval (merge before returning to ready-set on approval, verified via git merge-base --is-ancestor) as the dispatch-loop contract, and print each new worktree's base commit from setup-worktrees.sh so it's checkable.

… for the Phase 4 mechanics assertion tests/orchestrate-review-pass.bats asserts the phrase as a single substring; the merge-on-approval edit (#90) wrapped it across two lines, which fails on ubuntu bash while macOS bash 3.2 under BATS eval false-passes — the same platform class PR #94 hit in §O3. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01TmjpSq96p3LFaMsNJM4eAF

… gating, four-lens review, wiki gap seeds (#109) Rolls up everything merged since 1.6.0: - #94: review-time wiki routing, four-lens Phase 4 pass, insight emission, socratic rework, failure-class pages - #93: enforceable prohibition lint rule, disjoint routing scopes, flush concurrency - #102 (#87–#90): {ORCH_DIR} path token, watch-status stall gating + reason surfacing, merge-on-approval - #105 (#99, #100): stale scope-purity guards deleted, launch-session suite isolated from ambient LO_*/GROUNDWORK_* env - #108 (#96, #97, #38): cmd_send [Pasted text] guard with bounded Enter retry, $TMUX-gated status-update session resolution + failed-phase reset playbook, wiki gap seed pages G1–G6 Version bump propagates the send-prompt.sh delivery-confirmation fix to plugin consumers (groundwork references dev-loop by URL; the cache updates on version change). Claude-Session: https://claude.ai/code/session_014PCWX9umAP1CLZJnaGPV7Q Co-authored-by: dch0202 <dch0202@infobank.net> Co-authored-by: Claude Fable 5 <noreply@anthropic.com>

choiyounggi · 2026-08-14T07:42:41Z

Summary

Three parallel worker tasks (orchestrate run i8790) closing four field-reported defects from real orchestration runs:

orchestrate: worker worktrees have no .orchestration/, so the templates' relative brief/plan paths cannot resolve #87 — {ORCH_DIR} token (4e76e1e): worker-facing templates referenced .orchestration/briefs|plans|reviews/... as bare relative paths, which resolve to nothing inside a worker worktree. All such references now use the {ORCH_DIR} absolute-path token (substituted at prompt composition, like {STATUS_DIR}); the $(dirname {STATUS_DIR}) ad-hoc form in §3/§O3 is gone. Documented convention: orchestration artifacts absolute, repo files worktree-relative.
watch-status.sh: a worker that reached the watched phase and is awaiting review is reported as stalled (exit 7 false positive) #88 + watch-status.sh: surface the usage-limit reset time (and chooser-pending state) instead of a bare 'worker stalled' #89 — watch-status.sh (b89d84a): a task at/above the watched target phase is no longer stall-checked (its silence is prompt-ordered; the dead-worker check still applies), and a genuine exit-7 stall message now surfaces the machine-readable reason from the pane scrollback (capture-pane -S -1000): usage limit · resets <time> (extendable via LO_LIMIT_EXTRA) or chooser pending. Annotations use octal escapes — dash's printf does not interpret \xNN (caught in review r1, pinned by dash-invoked regression tests).
orchestrate: deps gate on approval, but a dependent task's worktree never contains its dependencies' code #90 — merge-on-approval (27dae2c): documented that deps deliver signatures, not merged code; on approval a task's branch is merged into the integration branch (ff via git fetch . :<integ>, else safe-cleanup.sh merge) and verified with git merge-base --is-ancestor before dependents dispatch; worktrees are created at dispatch time from the current tip, and setup-worktrees.sh now prints base=<hash>. This run itself exercised the pattern (t90's worktree contained t87's merged code).

Tests

42 new BATS cases (negative gates with negative controls, real git fixtures, dash portability regressions). Integration suite on this branch: 557 pass / 1 fail — the single failure is the pre-existing squash-anchor test tracked as #99, red on main before this branch.

Related issues filed during the run

orchestrate-review-pass.bats: 'commit that added this file' scope-purity test is red on main after any squash merge #99 — scope-purity guard tests broken by squash merges (pre-existing, untouched here)
launch-session.bats: 6 tests fail when run inside an orchestrate worker session (ambient LO_* env not isolated) #100 — LO_* ambient env leaks into worker-run test suites and can contaminate live run state (untouched here)

Closes#87
Closes#88
Closes#89
Closes#90

🤖 Generated with Claude Code

https://claude.ai/code/session_01TmjpSq96p3LFaMsNJM4eAF

…chestration artifacts (#87) Worker-facing templates referenced briefs/plans/reviews via bare `.orchestration/...` relative paths, which resolve to nothing once a worker's cwd is its own worktree. Introduce {ORCH_DIR} (substituted like {STATUS_DIR}) and convert every such reference in session-prompt.md (§1-§4, §O1-§O4) and brief.md to it, including the ad-hoc `$(dirname {STATUS_DIR})/reviews/...` form in §3/§O3. Document the two-convention rule (orchestration artifacts absolute, repo files relative) in SKILL.md next to the brief/plan composition text. Bump the pinned Orca-block cksum in tests/send-prompt.bats to match, per that test's own same-commit-update convention.

…eason surfacing (#88, #89) A worker already at/above the watched target phase was still stall-checked and could false-report exit 7 even though its silence was exactly what the session prompt ordered. The stall check now gates on rank < target_rank; the dead-worker/liveness check is unchanged and still applies. When a genuine stall IS reported, classify_stall() reads the pane scrollback (capture-pane -S -1000) and enriches the exit-7 message with a usage-limit reset time or chooser-pending state, falling back to the bare message otherwise. LO_LIMIT_EXTRA additively extends the usage-limit pattern. Annotations use octal printf escapes (\302\267, \342\200\224) rather than \xNN hex escapes, since dash (ubuntu CI's /bin/sh) does not interpret \x.

…ee base (#90) A dependent task's worktree previously only received its dependencies' signatures (Phase 3 step 0 injection), never their merged code, because merging happened only at Phase 6. Document the gap, adopt merge-on-approval (merge before returning to ready-set on approval, verified via git merge-base --is-ancestor) as the dispatch-loop contract, and print each new worktree's base commit from setup-worktrees.sh so it's checkable.

… for the Phase 4 mechanics assertion tests/orchestrate-review-pass.bats asserts the phrase as a single substring; the merge-on-approval edit (#90) wrapped it across two lines, which fails on ubuntu bash while macOS bash 3.2 under BATS eval false-passes — the same platform class PR #94 hit in §O3. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01TmjpSq96p3LFaMsNJM4eAF

… gating, four-lens review, wiki gap seeds (#109) Rolls up everything merged since 1.6.0: - #94: review-time wiki routing, four-lens Phase 4 pass, insight emission, socratic rework, failure-class pages - #93: enforceable prohibition lint rule, disjoint routing scopes, flush concurrency - #102 (#87–#90): {ORCH_DIR} path token, watch-status stall gating + reason surfacing, merge-on-approval - #105 (#99, #100): stale scope-purity guards deleted, launch-session suite isolated from ambient LO_*/GROUNDWORK_* env - #108 (#96, #97, #38): cmd_send [Pasted text] guard with bounded Enter retry, $TMUX-gated status-update session resolution + failed-phase reset playbook, wiki gap seed pages G1–G6 Version bump propagates the send-prompt.sh delivery-confirmation fix to plugin consumers (groundwork references dev-loop by URL; the cache updates on version change). Claude-Session: https://claude.ai/code/session_014PCWX9umAP1CLZJnaGPV7Q Co-authored-by: dch0202 <dch0202@infobank.net> Co-authored-by: Claude Fable 5 <noreply@anthropic.com>

dch0202and others added 6 commits August 14, 2026 15:56