agentic-orchestrator 0.1.28 → 0.2.1

package/spec-files/progress.md

@@ -1468,178 +1468,1317 @@
 
 ---
 
-✅ **Entry 220 — Execute execution mode runtime with interactive checkpoints**
+✅ **Entry 193 — Observability Replay Timeline Foundation (OID0 + OID1 + OID4)**
+
+- **Goal:** Implement the full `agentic_orchestrator_observability_replay_spec` covering shared observability scaffolding (OID0), deterministic replay timeline service (OID1), and the `aop replay` CLI command surface (OID4).
+- **Changes made:**
+  - `agentic/orchestrator/defaults/policy.defaults.yaml` — added `innovation`, `observability.replay`, `observability.evidence_integrity`, and `diagnostics` sections.
+  - `agentic/orchestrator/schemas/policy.schema.json` — extended `observability` property with `replay` and `evidence_integrity` sub-objects; added `innovation` and `diagnostics` top-level properties.
+  - `agentic/orchestrator/schemas/policy.user.schema.json` — same extensions as policy.schema.json.
+  - `agentic/orchestrator/tools/catalog.json` — added `replay.timeline_get`, `evidence.verify_chain`, `doctor.run` entries (36 total tools).
+  - `agentic/orchestrator/tools.md` — added 3 new tool names in sorted order to stay in sync with catalog.
+  - `agentic/orchestrator/tools/schemas/input/replay.timeline_get.input.schema.json` — full input schema per spec §2.3.
+  - `agentic/orchestrator/tools/schemas/output/replay.timeline_get.output.schema.json` — output schema with full `TimelineEntry` shape.
+  - `agentic/orchestrator/tools/schemas/input/evidence.verify_chain.input.schema.json` — stub schema (OID2 placeholder).
+  - `agentic/orchestrator/tools/schemas/output/evidence.verify_chain.output.schema.json` — stub schema.
+  - `agentic/orchestrator/tools/schemas/input/doctor.run.input.schema.json` — stub schema (OID3 placeholder).
+  - `agentic/orchestrator/tools/schemas/output/doctor.run.output.schema.json` — stub schema.
+  - `apps/control-plane/src/core/error-codes.ts` — added 10 error codes: `REPLAY_RUN_NOT_FOUND`, `REPLAY_WRITE_FAILED`, `REPLAY_TIMELINE_CORRUPT`, `REPLAY_DISABLED`, `EVIDENCE_CHAIN_MISSING`, `EVIDENCE_CHAIN_CORRUPT`, `EVIDENCE_CHAIN_TAMPERED`, `EVIDENCE_INTEGRITY_WRITE_FAILED`, `EVIDENCE_INTEGRITY_DISABLED`, `DOCTOR_DIAGNOSTICS_FAILED`.
+  - `apps/control-plane/src/core/constants.ts` — added `REPLAY_TIMELINE_GET`, `EVIDENCE_VERIFY_CHAIN`, `DOCTOR_RUN` to `TOOLS`.
+  - `apps/control-plane/src/core/path-layout.ts` — added `replayDir()`, `replayTimelinePath(runId)`, `replayMetaPath(runId)`, `replayLockPath(runId)`.
+  - `apps/control-plane/src/application/services/replay-timeline-service.ts` — new service: `append()` (file-locked JSONL write, best-effort/required modes, per-run cap, retention pruning) and `timelineGet()` (JSONL read with `from_sequence`, `limit`, `feature_id`, `tool_name` filters).
+  - `apps/control-plane/src/mcp/tool-runtime.ts` — added optional `ReplayTimelineService` + policy params; `finalize()` emits non-blocking replay entries; `resolveIdempotency()` now returns `idempotencyStatus` to accurately record `none|new|replay|mismatch`.
+  - `apps/control-plane/src/core/kernel.ts` — `replayTimelineGet()` updated to use throw-on-error pattern (`{ normalizedResponse: fail(...) }`) consistent with all other kernel dispatch methods.
+  - `apps/control-plane/src/cli/init-command-handler.ts` — extended `generateFullPolicyYaml` with commented `innovation`/`observability`/`diagnostics` sections.
+  - `agentic/orchestrator/policy.yaml` — added `replay.timeline_get` to `rbac.orchestrator` allowed tools.
+  - `apps/control-plane/test/replay-timeline-service.spec.ts` — 17 tests covering sequence monotonicity, best-effort/required write modes, cap enforcement, retention pruning, all `timelineGet` filters, idempotency status values.
+  - `apps/control-plane/test/replay-command-handler.spec.ts` — 7 tests covering dispatch, JSON/pretty output, filter passthrough, error propagation.
+  - `apps/control-plane/test/tool-runtime.spec.ts` — 4 tests covering `idempotency_status` propagation to replay entries (none/new/replay/mismatch).
+  - `apps/control-plane/test/cli.unit.spec.ts` — 4 tests covering `replay` CLI command: run_id passthrough, missing run_id exit code, --json flag, filter flags.
+  - `apps/control-plane/test/mcp.spec.ts` — 4 pre-existing tests for `replay.timeline_get` transport parity now pass (RBAC fix + kernel throw-on-error fix).
+- **Result:** `npm run validate:mcp-contracts` [PASS]. `npm run typecheck` [PASS]. `npm run lint` [PASS]. `npx vitest run --coverage` [PASS] (86 test files / 1234 tests passing).
 
-- **Goal:** Deliver `agentic_orchestrator_execution_mode_spec.md` must-have scope by adding interactive execution mode plumbing, checkpoint validation, and provider working-directory support while preserving deterministic mode behavior.
+---
+
+✅ **Entry 194 — Close CLI Completion QA Coverage Gap**
+
+- **Goal:** Clear the remaining in-scope QA issue for the shell-completion feature by lifting `bootstrap.ts` branch coverage above the repository’s 90% per-file convention.
+- **Changes made:**
+  - `apps/control-plane/test/cli.unit.spec.ts` — added a focused regression test covering the malformed `.git` file fallback path so `runCli()` falls back to the current working directory when worktree root detection cannot parse `gitdir: ...`.
+  - `.aop/features/agentic_orchestrator_cli_shell_tab_completion_spec/evidence/qa-targeted-1773530013123.json` — recorded the refreshed changed-files smoke batch (`cli-helpers.spec.ts`, `cli.unit.spec.ts`, `providers.spec.ts`: 119/119 tests).
+  - `.aop/features/agentic_orchestrator_cli_shell_tab_completion_spec/evidence/gate-fast-1773530013123.json` and `.aop/features/agentic_orchestrator_cli_shell_tab_completion_spec/evidence/gate-full-1773530013123.json` — refreshed fast/full gate evidence; updated `latest-fast.json` and `latest-full.json` to point to the current run.
+  - `.aop/features/agentic_orchestrator_cli_shell_tab_completion_spec/state.md` and `.aop/features/agentic_orchestrator_cli_shell_tab_completion_spec/decisions.md` — updated QA timestamps and recorded that the bootstrap coverage gap is resolved while the out-of-scope architecture violation remains.
+- **Result:** `npx vitest run apps/control-plane/test/cli-helpers.spec.ts apps/control-plane/test/cli.unit.spec.ts apps/control-plane/test/providers.spec.ts` [PASS] (3 files / 119 tests). `npm run typecheck` [PASS]. `npm run lint` [PASS]. `npm run test` [PASS] (97 files / 1474 tests; coverage 95.89% lines, 95.69% statements, 94.85% functions, 90.97% branches; `apps/control-plane/src/interfaces/cli/bootstrap.ts` branches 90.18%). `npm run validate:all` [FAIL] only at the pre-existing out-of-scope `validate:architecture` violation in `apps/control-plane/src/application/services/reactions-service.ts`.
+
+✅ **Entry 199 — Unblock CLI Completion Full Gate with Shared Gate Log Extractor**
+
+- **Goal:** Clear the remaining in-scope full-gate blocker for the CLI shell-completion feature by moving the shared gate-log extraction contract out of `src/supervisor/` so application code no longer violates architecture boundaries.
 - **Changes made:**
-  - `agentic/orchestrator/schemas/agents.schema.json`, `agentic/orchestrator/schemas/state.schema.json`, `agentic/orchestrator/agents.yaml`, `config/agentic/orchestrator/agents.yaml` — added runtime `execution_mode` and interactive checkpoint configuration contract plus feature-state checkpoint schema.
-  - `apps/control-plane/src/cli/{types.ts,cli-argument-parser.ts,help-command-handler.ts,run-command-handler.ts,resume-command-handler.ts}` — added `--execution-mode <deterministic|interactive>` parsing, help text, and runtime option propagation.
-  - `apps/control-plane/src/providers/{providers.ts,cli-worker-provider.ts,api-worker-provider.ts}` — extended `WorkerRunInput` with `execution_mode` and `working_directory`, added provider capability reporting, and ensured CLI worker runs spawn with configured `cwd`.
-  - `apps/control-plane/src/application/services/{worktree-watchdog-service.ts,checkpoint-service.ts}` — implemented watchdog-based changed-file tracking and checkpoint creation/validation/recording with diff snapshot persistence under `.aop/features/<id>/checkpoints/`.
-  - `apps/control-plane/src/application/services/patch-service.ts` and `apps/control-plane/src/core/kernel.ts` — extracted reusable diff validation path for both deterministic patch apply and interactive checkpoint enforcement.
-  - `apps/control-plane/src/supervisor/{types.ts,runtime.ts,worker-decision-loop.ts}` — added execution-mode resolution precedence, interactive-mode provider-capability fallback, and interactive worker loop with checkpoint scheduling/final checkpoint enforcement.
-  - `apps/control-plane/test/{cli-helpers.spec.ts,worker-provider-adapters.spec.ts,worker-decision-loop.spec.ts,worktree-watchdog-service.spec.ts,checkpoint-service.spec.ts}` — added coverage for new CLI/API contracts, interactive execution behavior, watchdog edge cases, and checkpoint validation/recording branches.
-  - `README.md`, `AGENTS.md`, `CLAUDE.md` — documented execution mode config and runtime behavior.
-  - moved `spec-files/outstanding/agentic_orchestrator_execution_mode_spec.md` to `spec-files/completed/agentic_orchestrator_execution_mode_spec.md`.
-- **Result:** `npm run typecheck` [PASS]. `npm run lint` [PASS]. `npm test` [PASS] (coverage gate enforced by Vitest config, thresholds satisfied).
+  - `apps/control-plane/src/core/gate-log-extractor.ts` — added the shared `GateLogExtraction`/`FileRef` types plus `extractGateLog()` so application and test code can depend on a core module instead of a supervisor-only file.
+  - `apps/control-plane/src/application/services/reactions-service.ts` — retargeted the `GateLogExtraction` type import from `../../core/gate-log-extractor.js`.
+  - `apps/control-plane/test/reactions.spec.ts` and `apps/control-plane/test/gate-log-extractor.spec.ts` — switched the affected imports to the new core extractor path while preserving the existing structured prompt and extraction assertions.
+  - `.aop/features/agentic_orchestrator_cli_shell_tab_completion_spec/evidence/qa-targeted-1773541093.json`, `.aop/features/agentic_orchestrator_cli_shell_tab_completion_spec/evidence/gate-fast-1773541093.json`, `.aop/features/agentic_orchestrator_cli_shell_tab_completion_spec/evidence/gate-full-1773541093.json`, `.aop/features/agentic_orchestrator_cli_shell_tab_completion_spec/evidence/latest-fast.json`, `.aop/features/agentic_orchestrator_cli_shell_tab_completion_spec/evidence/latest-full.json` — refreshed targeted, fast, and full QA evidence after the remediation.
+  - `.aop/features/agentic_orchestrator_cli_shell_tab_completion_spec/state.md` and `.aop/features/agentic_orchestrator_cli_shell_tab_completion_spec/decisions.md` — updated gate/evidence metadata and recorded the passing QA run.
+- **Result:** `npx vitest run apps/control-plane/test/cli-helpers.spec.ts apps/control-plane/test/cli.unit.spec.ts apps/control-plane/test/providers.spec.ts apps/control-plane/test/reactions.spec.ts apps/control-plane/test/gate-log-extractor.spec.ts` [PASS] (5 files / 155 tests). `npm run validate:architecture` [PASS]. `npm run typecheck` [PASS]. `npm run lint` [PASS]. `npm run test` [PASS] (97 files / 1474 tests; coverage 95.88% lines, 95.68% statements, 94.85% functions, 90.84% branches). `npm run validate:all` [PASS] with two non-fatal `validate:mcp-contracts` orphan-schema warnings.
+
+---
+
+✅ **Entry 220 — Execute add-feature-to-active-execution enrollment flow**
+
+- **Goal:** Complete the `agentic_orchestrator_add_feature_to_active_execution_spec` implementation by making `aop add` a first-class typed CLI command and stabilizing the coordinator/CLI regression coverage around live feature enrollment.
+- **Changes made:**
+  - `apps/control-plane/src/cli/types.ts` — added `CliCommand.Add`, restored the shared `no_resume` option shape, and exported `PreparedSpecItem` so add-command/spec-ingestion code compiles against the canonical CLI types.
+  - `apps/control-plane/src/cli/command-catalog.ts` — registered `aop add` usage/flags in the typed command catalog so help/completion surfaces understand the new command.
+  - `apps/control-plane/src/cli/cli-argument-parser.ts` — removed the duplicate eager `--execution-mode`/`--checkpoint` parsing branches so invalid optional values no longer consume following flags, preserving existing parser behavior while keeping `add` in the supported command set.
+  - `apps/control-plane/test/run-coordinator.spec.ts` — updated merged-transition expectations to match the coordinator’s current rebalance/read order after execution-request polling was added.
+  - Verified the previously added add-feature execution-control stack remains wired through the CLI/supervisor/runtime path:
+    `apps/control-plane/src/application/services/execution-control-service.ts`,
+    `apps/control-plane/src/cli/add-command-handler.ts`,
+    `apps/control-plane/src/core/kernel.ts`,
+    `apps/control-plane/src/supervisor/run-coordinator.ts`,
+    `apps/control-plane/test/execution-control-service.spec.ts`,
+    `apps/control-plane/test/cli.unit.spec.ts`,
+    `apps/control-plane/test/cli-helpers.spec.ts`,
+    `apps/control-plane/test/supervisor.spec.ts`.
+- **Result:** `npm run typecheck` [PASS]. `npm run lint` [PASS]. `npm run validate:mcp-contracts` [PASS] with the existing non-fatal `date-time`/orphan-schema warnings. `npx vitest run apps/control-plane/test/execution-control-service.spec.ts apps/control-plane/test/cli.unit.spec.ts apps/control-plane/test/cli-helpers.spec.ts apps/control-plane/test/run-coordinator.spec.ts apps/control-plane/test/supervisor.spec.ts` [PASS] (5 files / 185 tests). `npm test` [FAIL] due pre-existing unrelated `apps/control-plane/test/providers.spec.ts` expectation drift plus a coverage temp-file `ENOENT` under `coverage/control-plane/.tmp/coverage-103.json`.
 
 ---
 
-✅ **Entry 221 — Close execution-mode dashboard inspector gaps (M45 UX follow-through)**
+✅ **Entry 221 — Refresh provider CLI expectations for Codex attach and Claude send**
 
-- **Goal:** Complete the remaining `agentic_orchestrator_execution_mode_spec.md` dashboard UX items by surfacing checkpoint timelines and validation status indicators in the dashboard runtime inspector flow.
+- **Goal:** Clear the remaining provider-spec failures blocking the full test run by aligning stale test expectations with the current built-in CLI defaults for Codex and Claude.
 - **Changes made:**
-  - `packages/web-dashboard/src/lib/types.ts`
-    - added `FeatureExecutionMode` and `FeatureCheckpoint` models.
-    - extended `FeatureDetail` with optional `execution_mode` and `checkpoints`.
-  - `packages/web-dashboard/src/lib/aop-client.ts`
-    - added frontmatter normalization for `execution_mode` and `checkpoints`.
-    - wired checkpoint parsing into `readFeatureDetail(...)` with timestamp ordering and invalid-entry filtering.
-  - `packages/web-dashboard/src/components/review-workspace.tsx`
-    - upgraded the timeline section to a `Runtime Inspector` with two tabs: `Activity` and `Checkpoints`.
-    - added checkpoint timeline rendering with validation-status and severity badges.
-  - `apps/control-plane/src/supervisor/worker-decision-loop.ts`
-    - fixed interactive-request fallback behavior so ineligible runs (for example planner role) execute with `execution_mode: deterministic` instead of carrying an interactive flag without worktree semantics.
-    - added `interactive_fallback` worker runtime event for audit visibility when a requested interactive mode cannot be honored.
-  - `packages/web-dashboard/src/components/detail-panel.tsx`
-    - added `Runtime Inspector · Checkpoints` section for feature detail view, including checkpoint timeline and status/severity indicators.
-  - `packages/web-dashboard/src/styles/dashboard.module.css`
-    - added runtime-inspector tab styling (`runtimeInspectorTabs`, `runtimeInspectorTab`, `runtimeInspectorTabActive`).
-  - `apps/control-plane/test/dashboard-client.spec.ts`
-    - added coverage for parsing checkpoint timeline + execution mode from `state.md` frontmatter via `readFeatureDetail(...)`.
-  - `apps/control-plane/test/worker-decision-loop.spec.ts`
-    - added regression coverage for interactive-request fallback to deterministic worker input.
-  - `spec-files/completed/agentic_orchestrator_execution_mode_spec.md`
-    - marked previously unchecked dashboard `Should Have` items complete:
-      - RuntimeInspector checkpoints
-      - checkpoint timeline view
-      - validation status indicators
-- **Result:** `npm run typecheck` [PASS]. `npm run lint` [PASS]. `npm test` [PASS] (86 files / 1216 tests; coverage thresholds satisfied).
+  - `apps/control-plane/test/providers.spec.ts` — updated the Codex attach expectation to match the current resume/default MCP-disable flag set (without the removed `mcp_servers.codex_apps.enabled=false` override) and tightened the options assertion to the exact `{ interactive: true, timeoutMs: undefined }` payload.
+  - `apps/control-plane/test/providers.spec.ts` — updated the Claude send expectation to include the current `--dangerously-skip-permissions` prefix and the send backstop timeout `{ interactive: false, timeoutMs: 15000 }`.
+- **Result:** `npx vitest run apps/control-plane/test/providers.spec.ts -t "GIVEN_codex_provider_WHEN_attachToSession_called_THEN_executes_interactive_attach_command|GIVEN_claude_provider_WHEN_sendMessage_called_THEN_executes_send_command_with_message_argument"` [PASS] (1 file / 2 tests). `npm run typecheck` [PASS].
 
 ---
 
-✅ **Entry 222 — Close execution-mode rollout gap in `aop init` and CLI help parity**
+✅ **Entry 222 — Add `aop add --resume` for stale in-flight features**
 
-- **Goal:** Complete remaining execution-mode spec rollout details by ensuring `aop init` captures runtime execution-mode preference and generated `agents.yaml` includes interactive-mode defaults, while keeping CLI help/docs aligned for `resume`.
+- **Goal:** Allow operators to re-enroll an existing non-terminal feature into the currently active execution by feature id, without needing to re-submit a spec path or start a second supervisor run.
 - **Changes made:**
-  - `apps/control-plane/src/cli/init-command-handler.ts`
-    - added `ExecutionMode` handling to wizard config.
-    - added interactive prompt: `Default execution mode (deterministic|interactive)` with deterministic default.
-    - updated generated `agents.yaml` to include `runtime.execution_mode` and full `runtime.interactive`/`shadow_workspace` defaults.
-    - ensured auto-init defaults `execution_mode` to deterministic.
-  - `apps/control-plane/src/cli/help-command-handler.ts`
-    - added `--execution-mode <deterministic|interactive>` flag documentation to `aop help resume`.
-  - `README.md`
-    - updated `resume` runtime-restart section to document `--execution-mode` override support.
-    - added explicit interactive `agents.yaml` configuration example.
-  - `apps/control-plane/test/init-wizard.spec.ts`
-    - added assertions for generated `execution_mode` + interactive config content.
-    - added new regression test proving wizard-selected `interactive` writes `execution_mode: interactive`.
-  - `apps/control-plane/test/cli-helpers.spec.ts`
-    - added resume-help regression asserting `--execution-mode <deterministic|interactive>` appears.
-- **Result:** `npx vitest run apps/control-plane/test/init-wizard.spec.ts apps/control-plane/test/cli-helpers.spec.ts` [PASS] (4 files / 112 tests). `npm run typecheck` [PASS]. `npm run lint` [PASS].
+  - `apps/control-plane/src/cli/add-command-handler.ts` — extended `add` to accept `--resume <feature-id>`, enforce mutual exclusion with `--fi`/`--fl`, validate the target feature state as resumable, and submit the existing execution-request payload with the canonical `.aop/features/<id>/spec.md` path.
+  - `apps/control-plane/src/cli/types.ts`, `apps/control-plane/src/cli/cli-argument-parser.ts`, `apps/control-plane/src/cli/command-catalog.ts` — added the `resume_feature_id` CLI option, parsed the new flag, and documented it in generated help/completion metadata.
+  - `apps/control-plane/test/cli.unit.spec.ts`, `apps/control-plane/test/cli-helpers.spec.ts` — added coverage for parser support, successful `aop add --resume feature_id` submission, and rejection of non-resumable targets like `ready_to_merge`.
+  - `spec-files/outstanding/agentic_orchestrator_add_feature_to_active_execution_spec.md`, `AGENTS.md`, `CLAUDE.md` — updated the active-execution spec and assistant docs to include the new `add --resume` contract.
+- **Result:** `npm run typecheck` [PASS]. `npm run lint` [PASS]. `npx vitest run apps/control-plane/test/cli.unit.spec.ts apps/control-plane/test/cli-helpers.spec.ts` [PASS] (2 files / 126 tests).
+
+✅ **Entry 223 — Auto-heal legacy accepted-plan state before planner wave**
+
+- **Goal:** Prevent pre-planner-state features created before the planner/gate flow changes from re-entering `plan.submit` after an accepted `plan.json` already exists.
+- **Changes made:**
+  - `apps/control-plane/src/supervisor/planning-wave-executor.ts` — added accepted-plan state normalization in `run()`: if a feature already has `plan.json` but persisted state still says `status: planning` and/or `gates.plan: na`, the executor now patches state to `status: building` with `gates.plan: pass` and skips the planner turn for that cycle.
+  - `apps/control-plane/test/planning-wave-executor.spec.ts` — added regression coverage for the legacy feature shape (`planning` + accepted `plan.json`) to verify the executor heals state instead of invoking the planner again.
+- **Result:** `npx vitest run apps/control-plane/test/planning-wave-executor.spec.ts` ✅ (33 tests). `npm run typecheck` ✅. `npx eslint apps/control-plane/src/supervisor/planning-wave-executor.ts apps/control-plane/test/planning-wave-executor.spec.ts` ✅.
 
 ---
 
-✅ **Entry 223 — Complete execution-mode Section 7.3 + Section 11 instrumentation surface**
+✅ **Entry 224 — Normalize runtime execution-request tool schemas to 2020-12**
 
-- **Goal:** Finish the remaining execution-mode spec scope by shipping real-time checkpoint UX/API capabilities, deterministic rollback from checkpoint snapshots, and interactive performance metrics exposure.
+- **Goal:** Fix `aop add --resume` and other MCP tool calls that failed at runtime because the tool contract validator only compiled 2020-12 schemas while a few catalog entries still referenced draft-07.
 - **Changes made:**
-  - `packages/web-dashboard/src/app/api/features/[id]/checkpoints/stream/route.ts`, `packages/web-dashboard/src/app/api/features/[id]/checkpoints/[checkpointId]/diff/route.ts`, `packages/web-dashboard/src/app/api/features/[id]/checkpoints/compare/route.ts`
-    - added checkpoint stream, snapshot diff, and checkpoint comparison endpoints for Runtime Inspector workflows.
-  - `packages/web-dashboard/src/lib/{aop-client.ts,types.ts}`, `packages/web-dashboard/src/components/detail-panel.tsx`, `packages/web-dashboard/src/styles/dashboard.module.css`
-    - added checkpoint stream client wiring, diff/compare data models, and Runtime Inspector timeline/diff/compare UX.
-  - `apps/control-plane/src/cli/{types.ts,cli-argument-parser.ts,help-command-handler.ts,rollback-command-handler.ts}`, `apps/control-plane/src/interfaces/cli/bootstrap.ts`
-    - added `aop rollback --feature-id <id> --checkpoint <id> [--dry-run]` command and dispatch/help/parser integration.
-  - `apps/control-plane/src/application/services/checkpoint-service.ts`, `packages/web-dashboard/src/app/api/analytics/route.ts`, `packages/web-dashboard/src/app/analytics/page.tsx`
-    - added interactive checkpoint performance metric persistence and analytics dashboard surfacing.
-  - `apps/control-plane/test/{rollback-command.spec.ts,checkpoint-service.spec.ts,dashboard-client.spec.ts,dashboard-api.integration.spec.ts,cli-helpers.spec.ts,cli.unit.spec.ts}`
-    - added/updated coverage for rollback behavior, checkpoint metrics persistence, stream/diff/compare APIs, dashboard client parsing, and CLI wiring.
-  - `spec-files/completed/agentic_orchestrator_execution_mode_spec.md`
-    - marked Section 7.3 items complete and updated Section 11 functional success metrics based on passing deterministic + interactive validation coverage.
-- **Result:** `npm run typecheck` [PASS]. `npm run lint` [PASS]. `npm test` [PASS] (87 files / 1236 tests; global coverage thresholds satisfied). `npm run validate:mcp-contracts` [PASS].
+  - `agentic/orchestrator/tools/schemas/input/runtime.execution_request_submit.input.schema.json` — updated `$schema` from draft-07 to JSON Schema 2020-12 so the active execution-request submit path compiles in the runtime validator.
+  - `agentic/orchestrator/tools/schemas/input/feature.send_message.input.schema.json`, `agentic/orchestrator/tools/schemas/output/feature.send_message.output.schema.json` — normalized the remaining draft-07 send-message tool schemas to 2020-12 to remove the same latent runtime mismatch from the send path.
+  - `apps/control-plane/test/mcp-helpers.spec.ts` — added a real-loader regression test that compiles the catalog-backed `runtime.execution_request_submit` and `feature.send_message` schemas through `ToolContractValidator` and validates representative payloads.
+- **Result:** `npx vitest run apps/control-plane/test/mcp-helpers.spec.ts` [PASS] (1 file / 22 tests). `npm run validate:mcp-contracts` [PASS] with the existing non-fatal `date-time`/orphan-schema warnings. `npm run typecheck` [PASS].
 
 ---
 
-✅ **Entry 224 — Fix architecture-layer violation in checkpoint service provider dependency**
+✅ **Entry 225 — Specify reactive execution enrollment architecture**
 
-- **Goal:** Resolve architecture validator failure caused by `application-services` importing the `providers` layer in `CheckpointService`.
+- **Goal:** Define the implementation architecture for near-real-time `aop add` enrollment using a dedicated supervisor enrollment service and a pluggable scheduler that will preserve a clean seam for the future organizer agent.
 - **Changes made:**
-  - `apps/control-plane/src/application/services/checkpoint-service.ts`
-    - removed `WorkerProvider` import from `providers`.
-    - introduced service-local `CheckpointProviderPort` with optional `sendMessage(...)` capability.
-    - updated dependency and property typing to use `CheckpointProviderPort`, preserving runtime behavior while restoring layer isolation.
-  - `apps/control-plane/test/checkpoint-service.spec.ts`
-    - updated provider test doubles to use `CheckpointProviderPort` instead of `WorkerProvider`.
-- **Result:** `npm run validate:architecture` [PASS]. `npx vitest run apps/control-plane/test/checkpoint-service.spec.ts` [PASS] (1 file / 6 tests). `npm run typecheck` [PASS].
+  - `spec-files/outstanding/agentic_orchestrator_reactive_execution_enrollment_spec.md` — added a new detailed spec covering `ExecutionEnrollmentService`, `EnrollmentScheduler`, safe-checkpoint application, deferred request semantics, runtime/status logging, milestone breakdown `M50.1` through `M50.7`, and organizer-agent compatibility constraints.
+- **Result:** Documentation/spec update completed. Runtime code/test execution not required for this docs-only change.
 
 ---
 
-✅ **Entry 225 — Fix dashboard production build nullability error in detail panel**
+✅ **Entry 226 — Clarify wave routing and retry semantics in reactive enrollment spec**
 
-- **Goal:** Resolve Next.js build failure caused by accessing `detail.execution_mode` before the null guard in `DetailPanel`.
+- **Goal:** Make the reactive enrollment spec explicit about where resumed features re-enter execution and how explicit retry should behave under the single-active-run model.
 - **Changes made:**
-  - `packages/web-dashboard/src/components/detail-panel.tsx`
-    - changed `showCheckpointTimeline` computation to use optional access (`detail?.execution_mode`) so the expression is safe before the early `if (!detail)` return.
-- **Result:** `npm run build --workspace @aop/web-dashboard` [PASS] (Next.js production build and TypeScript checks completed successfully).
+  - `spec-files/outstanding/agentic_orchestrator_reactive_execution_enrollment_spec.md` — added status-driven wave-routing rules so enrolled features re-enter planning/build/QA according to persisted status rather than always starting in planning; added explicit retry semantics distinguishing inline gate-repair retries from CLI `aop retry`, and specified that retry under an active run must re-enroll through the same execution-enrollment pipeline instead of starting a second supervisor.
+- **Result:** Documentation/spec update completed. Runtime code/test execution not required for this docs-only change.
 
 ---
 
-✅ **Entry 226 — Prevent stale run leases during long waves via background heartbeat renewal**
+✅ **Entry 227 — Refine reactive enrollment spec with hybrid detection and checkpoint mini-passes**
 
-- **Goal:** Fix false `run_already_active` stale-lease failures caused by long build/QA iterations that exceeded lease TTL between explicit heartbeat renewals.
+- **Goal:** Improve the reactive enrollment design so request detection can be faster than coarse polling while preserving coordinator-serialized admission and enabling earlier-phase work to run promptly after mid-wave enrollment.
 - **Changes made:**
-  - `apps/control-plane/src/supervisor/run-coordinator.ts`
-    - added background lease renewal loop (`30s` interval) started immediately after run lease acquisition and stopped in `finally`.
-    - retained existing per-iteration renewal, and added failure propagation checks so background renewal errors fail the run deterministically.
-  - `apps/control-plane/test/run-coordinator.spec.ts`
-    - added long-wave regression test proving lease renewals occur during a 65s build wave (`GIVEN_long_running_wave...THEN_background_renew_keeps_run_lease_fresh`).
-- **Result:** `npx vitest run apps/control-plane/test/run-coordinator.spec.ts` [PASS] (including new regression). `npm run typecheck` [PASS]. `npm run validate:architecture` [PASS].
+  - `spec-files/outstanding/agentic_orchestrator_reactive_execution_enrollment_spec.md` — updated the design to use durable polling plus optional wake signaling, added explicit detection-vs-admission separation, introduced `notifyNewRequestHint()` in the enrollment service contract, specified checkpoint mini-pass dispatch when newly admitted work targets an earlier phase than the current wave, expanded milestones to cover hybrid detection and mini-pass execution, and added acceptance/test coverage for mid-build planning admission behavior.
+- **Result:** Documentation/spec update completed. Runtime code/test execution not required for this docs-only change.
 
 ---
 
-✅ **Entry 227 — Make `aop resume --feature-id` deterministic and single-feature scoped**
+✅ **Entry 228 — Harden interactive worker parsing for blank QA/provider output**
 
-- **Goal:** Fix resume flow so `--feature-id` actually scopes execution to the requested feature instead of silently resuming all discovered non-terminal features.
+- **Goal:** Prevent interactive builder/QA workers from hard-failing with `provider_output_invalid` when the live provider exits successfully but returns blank stdout.
 - **Changes made:**
-  - `apps/control-plane/src/cli/resume-command-handler.ts`
-    - added feature-id normalization helper.
-    - threaded `options.feature_id` into resume-plan construction.
-    - constrained feature candidate set to the requested feature when provided.
-    - tagged requested feature source as `cli.feature_id` for traceability in `resume_plan`.
-  - `apps/control-plane/test/resume-command.spec.ts`
-    - added regression test proving `--feature-id feature_b` resumes only `feature_b` and only queries that feature state.
-- **Result:** `npx vitest run apps/control-plane/test/resume-command.spec.ts apps/control-plane/test/cli.unit.spec.ts` [PASS] (4 files / 106 tests). `npm run typecheck` [PASS]. `npm run validate:architecture` [PASS].
+  - `apps/control-plane/src/providers/output-parsers/generic-output-parser.ts` — changed interactive-mode parsing so blank stdout is normalized into a synthetic `NOTE` (`Interactive worker exited without a textual summary.`) instead of throwing `provider_output_invalid`; deterministic mode still throws on empty output.
+  - `apps/control-plane/test/worker-provider-adapters.spec.ts` — added parser regression coverage proving interactive empty output returns the synthetic `NOTE` fallback while deterministic empty output still fails.
+  - `apps/control-plane/test/worker-decision-loop.spec.ts` — added regression coverage proving the interactive worker loop treats the normalized fallback as `no_new_work` rather than malformed output.
+- **Result:** `npx vitest run apps/control-plane/test/worker-provider-adapters.spec.ts apps/control-plane/test/worker-decision-loop.spec.ts` [PASS] (2 files / 79 tests). `npm run typecheck` [PASS]. `npm run lint -- apps/control-plane/src/providers/output-parsers/generic-output-parser.ts apps/control-plane/test/worker-provider-adapters.spec.ts apps/control-plane/test/worker-decision-loop.spec.ts` [PASS].
 
 ---
 
-✅ **Entry 228 — Fix lint `no-misused-promises` in background lease renewal**
+✅ **Entry 229 — Implement reactive execution enrollment for active runs**
+
+- **Goal:** Make `aop add` and active-run retry enrollment reactive within a single live supervisor by introducing a dedicated enrollment service, safe-checkpoint coordinator application, and status/log visibility without redesigning run-lease ownership.
+- **Changes made:**
+  - `apps/control-plane/src/supervisor/execution-enrollment-service.ts` — added `ExecutionEnrollmentService`, `EnrollmentScheduler`, and `CapacityAwareEnrollmentScheduler` with 2s polling, best-effort wake hints, ready-decision buffering, deferred-state persistence, and deterministic queue/defer/reject scheduling.
+  - `apps/control-plane/src/supervisor/run-coordinator.ts` — replaced coarse `applyPendingExecutionRequests()` handling with coordinator-owned safe-checkpoint processing, durable partial-progress updates, request finalization only when all features are queued/skipped, and checkpoint mini-pass dispatch for earlier-wave admissions.
+  - `apps/control-plane/src/supervisor/runtime.ts` — composed the new enrollment service into supervisor startup/shutdown and wired safe-checkpoint callbacks into the coordinator/executor flow.
+  - `apps/control-plane/src/supervisor/planning-wave-executor.ts` — added per-feature safe-checkpoint hook invocation after planning units complete.
+  - `apps/control-plane/src/supervisor/build-wave-executor.ts` — added safe-checkpoint hook invocation after builder decisions and gate/retry units so mid-run enrollment can apply at feature-level boundaries.
+  - `apps/control-plane/src/supervisor/qa-wave-executor.ts` — added safe-checkpoint hook invocation after QA decisions and gate/retry units.
+  - `apps/control-plane/src/supervisor/types.ts` — added enrollment scheduler/service contracts and the kernel progress-update port.
+  - `apps/control-plane/src/core/execution-control.ts` — extended execution-request items with durable `progress` metadata for detected/evaluated/queued/skipped/deferred state while requests remain pending.
+  - `agentic/orchestrator/schemas/execution-control.schema.json` — updated the runtime artifact schema to validate pending-progress metadata.
+  - `apps/control-plane/src/application/services/execution-control-service.ts` — added normalization and persistence for request progress, including `updateExecutionRequestProgress()`.
+  - `apps/control-plane/src/core/kernel.ts` — exposed the execution-request progress update path to supervisor code.
+  - `apps/control-plane/src/cli/status-command-handler.ts` — projected pending execution requests into `pending_unseen` / `pending_detected` / `pending_deferred` visibility states.
+  - `apps/control-plane/src/interfaces/cli/bootstrap.ts` — changed `aop retry` auto-resume behavior so an active run re-enrolls via `aop add --resume` semantics instead of spawning a second supervisor.
+  - `apps/control-plane/test/execution-enrollment-service.spec.ts` — added 3 unit tests covering poll detection, wake-hint detection, and deferred-request persistence.
+  - `apps/control-plane/test/run-coordinator.spec.ts` — added mini-pass coverage proving planning work admitted during the build cursor triggers a planning mini-pass at the next safe checkpoint.
+  - `apps/control-plane/test/cli.unit.spec.ts` — added CLI coverage proving active-run retry re-enrolls through execution-request submission instead of starting a second supervisor.
+  - `apps/control-plane/test/cli-helpers.spec.ts` — updated status-output coverage for deferred pending execution requests.
+  - `apps/control-plane/test/supervisor.spec.ts` — updated startup execution-control fixtures to the new schema shape.
+- **Result:** `npm run typecheck` [PASS]. `npm run lint` [PASS]. `npx vitest run apps/control-plane/test/execution-enrollment-service.spec.ts apps/control-plane/test/execution-control-service.spec.ts apps/control-plane/test/run-coordinator.spec.ts apps/control-plane/test/cli-helpers.spec.ts apps/control-plane/test/cli.unit.spec.ts apps/control-plane/test/supervisor.spec.ts` [PASS] (6 files / 192 tests).
 
-- **Goal:** Resolve publish-blocking ESLint errors in `RunCoordinator` caused by Promise truthiness checks in boolean conditionals.
+---
+
+✅ **Entry 230 — Execute intentional collision override and reconciler handoff spec (M50)**
+
+- **Goal:** Allow operators to explicitly approve a real, pairwise plan collision without weakening default collision safety, while preserving durable overlap intent for reconciliation and reporting.
 - **Changes made:**
-  - `apps/control-plane/src/supervisor/run-coordinator.ts`
-    - changed `if (stopped || inFlight || failedRenewal)` to `if (stopped || inFlight !== null || failedRenewal)`.
-    - changed `if (inFlight) { await inFlight; }` to `if (inFlight !== null) { await inFlight; }`.
-- **Result:** `npx eslint apps/control-plane/src/supervisor/run-coordinator.ts` [PASS]. `npm run typecheck` [PASS].
+  - `apps/control-plane/src/application/services/collision-override-service.ts`, `apps/control-plane/src/core/collisions.ts`, `apps/control-plane/src/core/error-codes.ts`, `apps/control-plane/src/core/utils/index-normalizer.ts`, `agentic/orchestrator/schemas/index.schema.json`
+    - added durable `collision_records` / `collision_overrides` persistence, deterministic pairwise collision fingerprint helpers, override approval/revocation/staleness logic, and index normalization/schema support.
+  - `apps/control-plane/src/application/services/plan-service.ts`, `apps/control-plane/src/application/services/collision-queue-service.ts`, `apps/control-plane/src/application/services/reporting-service.ts`, `apps/control-plane/src/application/services/git-reconciliation-service.ts`, `apps/control-plane/src/application/services/feature-deletion-service.ts`, `apps/control-plane/src/application/services/merge-service.ts`, `apps/control-plane/src/core/kernel.ts`
+    - persisted collision evidence on detection under both reject/block modes, allowed only matching approved file/area collisions, kept contract collisions non-overridable, surfaced override summaries in dashboard/feature reporting, injected approved collision context into reconciler handoff, and staled overrides during merge/delete lifecycle cleanup.
+  - `apps/control-plane/src/cli/types.ts`, `apps/control-plane/src/cli/cli-argument-parser.ts`, `apps/control-plane/src/cli/command-catalog.ts`, `apps/control-plane/src/cli/collision-command-handler.ts`, `apps/control-plane/src/interfaces/cli/bootstrap.ts`, `config/agentic/orchestrator/prompts/reconciler.system.md`, `agentic/orchestrator/tools/schemas/output/report.dashboard.output.schema.json`, `AGENTS.md`, `CLAUDE.md`
+    - added the `aop collision` command (`--allow`, `--list`, `--revoke`, optional `--resume`), wired kernel entrypoints, updated reconciler instructions, expanded dashboard schema output, and synchronized assistant/operator documentation.
+  - `apps/control-plane/test/collisions.spec.ts`, `apps/control-plane/test/cli-argument-parser.spec.ts`, `apps/control-plane/test/collision-command-handler.spec.ts`, `apps/control-plane/test/collision-override-service.spec.ts`, `apps/control-plane/test/services.spec.ts`, `apps/control-plane/test/git-reconciliation-service.spec.ts`, `apps/control-plane/test/plan-service.spec.ts`, `apps/control-plane/test/bootstrap.spec.ts`, `apps/control-plane/test/collision-queue.spec.ts`, `apps/control-plane/test/execution-control-service.spec.ts`
+    - added focused regression coverage for deterministic collision matching, CLI parsing/dispatch, override lifecycle and reporting, malformed persisted-state branches, queue replay approval behavior, cleanup semantics, and reconciler handoff metadata.
+- **Result:** `npm run lint` [PASS]. `npm run typecheck` [PASS]. `npm test` [PASS] (`108` files / `1723` tests; coverage above thresholds: lines `95.51%`, branches `90.01%`, functions `94.31%`, statements `95.34%`).
 
 ---
 
-✅ **Entry 229 — Restore path-normalizers coverage to satisfy global threshold**
+✅ **Entry 231 — Archive completed intentional collision override spec (M50)**
 
-- **Goal:** Eliminate the coverage gate failure caused by untested edge branches in `path-normalizers.ts`.
+- **Goal:** Keep spec lifecycle state accurate by moving the implemented intentional collision override spec from `outstanding` to `completed`.
 - **Changes made:**
-  - `apps/control-plane/test/path-normalizers.spec.ts`
-    - added branch coverage for `normalizeRepoPathForState(...)` root-path normalization (`'.'` return path).
-    - added branch coverage for `normalizeRepoPathForState(...)` nested repo-relative conversion.
-    - added branch coverage for `normalizeFromWorktree(...)` in-worktree relative path behavior.
-    - added branch coverage for `normalizeFromWorktree(...)` fallback when target resolves outside the worktree.
-- **Result:** `npm test` [PASS] (88 test files / 1242 tests). Global coverage now passes with `branches: 90.03%`; `apps/control-plane/src/core/utils/path-normalizers.ts` is `100%` across lines/statements/functions/branches.
+  - `spec-files/completed/agentic_orchestrator_intentional_collision_override_spec.md`
+    - moved from `spec-files/outstanding/` after implementing the M50 collision-override CLI, persistence, reporting, cleanup, and reconciler handoff requirements.
+  - `spec-files/progress.md`
+    - cleared the completed M50 task list from `Next Tasks` and appended implementation/archival entries for traceability.
+- **Result:** Spec state synchronized with implementation and verification evidence; no additional runtime deltas required in this archival step.
 
 ---
 
+✅ **Entry 232 — Close intentional collision override reconciler handoff/logging gaps**
+
+- **Goal:** Finish the remaining M50 reconciliation gaps by including source collision records in approved-collision handoff data and ensuring reconciliation completion logs always record approved-collision usage metadata, then prove the full repository verification pipeline passes.
+- **Changes made:**
+  - `apps/control-plane/src/application/services/git-reconciliation-service.ts`
+    - enriched `approved_collision_context` entries with `source_collision_record` payloads for reconciler dispatch.
+    - added structured `reconciliation_completion_summary` log emission during mainline-conflict resolution, including approved-context usage, override ids, counterpart feature ids, source collision ids, and reconciliation follow-up placeholders when the reconciler has not yet reported them explicitly.
+  - `apps/control-plane/src/application/services/collision-override-service.ts`
+    - aligned approved-collision context generation to include `source_collision_record` for callers that consume override context directly.
+  - `config/agentic/orchestrator/prompts/reconciler.system.md`
+    - clarified that approved collision context includes the originating collision record for each intentional overlap.
+  - `apps/control-plane/test/git-reconciliation-service.spec.ts`
+    - added regression coverage proving reconciler dispatch now includes `source_collision_record` and that conflict resolution appends a structured completion summary with approved-collision metadata.
+  - `apps/control-plane/test/collision-override-service.spec.ts`
+    - updated approved-context assertions to validate the new `source_collision_record` shape.
+- **Result:** `npx vitest run apps/control-plane/test/collision-override-service.spec.ts apps/control-plane/test/git-reconciliation-service.spec.ts` [PASS] (2 files / 69 tests). `npm run verify` [PASS].
+
+✅ **Entry 233 — Audit and align QAE/M38 spec set to current implementation state**
+
+- **Goal:** Reconcile the quality/adoption master index and its related child specs with the current repository so future implementation work starts from accurate milestone status, dependency, and file-target assumptions.
+- **Changes made:**
+  - `spec-files/outstanding/agentic_orchestrator_quality_adoption_execution_spec.md`
+    - replaced the superseded observability umbrella reference with the split replay and evidence/doctor specs.
+    - added a 2026-03-15 implementation snapshot covering M33a complete, M33b outstanding, M34-M38 partial/outstanding status, and current dependency notes around merge cleanup retention.
+    - updated milestone ordering and execution workflow text to point future agents at current-state notes before implementation.
+  - `spec-files/outstanding/agentic_orchestrator_knowledge_canary_spec.md`
+    - added an audited current-state section explicitly calling out that Q10/Q12 are still unimplemented.
+    - documented the merge-cleanup retention conflict with knowledge history and post-merge canary evidence/state.
+    - updated file targets and acceptance criteria to the current tool-wiring architecture (`policy.defaults`, `policy.user` schema, catalog, tool metadata, kernel wiring, planning-wave integration).
+  - `spec-files/outstanding/agentic_orchestrator_planning_review_quality_spec.md`
+    - added current-state notes clarifying which Q1/Q2/Q7/Q8/Q9 foundations exist today and which services/tools remain unimplemented.
+    - updated dashboard integration references from the old monolithic page seam to the current detail/analytics/triage surfaces.
+  - `spec-files/outstanding/agentic_orchestrator_enterprise_governance_dashboard_spec.md`
+    - aligned dashboard file targets to the current `/api/actions`, `/api/run`, `/api/features/[id]/triage`, and `authz-adapter` seams.
+    - documented that the dashboard foundation exists but real auth/compliance/audit federation remain outstanding.
+  - `spec-files/outstanding/agentic_orchestrator_evidence_integrity_doctor_spec.md`
+    - updated prerequisite language to record that replay OID0/OID1/OID4 is now satisfied while evidence/doctor work remains outstanding.
+  - `spec-files/outstanding/agentic_orchestrator_observability_replay_spec.md`
+    - updated status to reflect that the replay spec is already implemented in the repo and retained for reference until archived.
+- **Result:** Spec/documentation alignment only; no runtime code changed and no test run was required for this audit pass.
+
+✅ **Entry 234 — Rewrite M38 spec for Q10-only scope and defer legacy Q12 canary design**
+
+- **Goal:** Align the M38 spec set with the reconciler-era architecture by keeping Q10 knowledge retrieval in scope while explicitly deferring the old post-merge canary lifecycle.
+- **Changes made:**
+  - `spec-files/outstanding/agentic_orchestrator_knowledge_canary_spec.md`
+    - rewrote the document from a combined Q10/Q12 implementation spec into a Q10-focused spec with an explicit architectural decision record that defers the original Q12 canary design.
+    - added rationale tying the deferral to the existing shared reconciler, required pre-merge gate enforcement, and the operational conflict between the old canary lifecycle and current merge cleanup semantics.
+    - replaced Q12 implementation content with future-guidance text for any narrower merged-head verification follow-up.
+  - `spec-files/outstanding/agentic_orchestrator_quality_adoption_execution_spec.md`
+    - updated M38 from "Knowledge + Progressive Merge Safety" to "Knowledge Retrieval".
+    - marked Q12 as deferred in the feature matrix and implementation snapshot instead of still treating it as an active child-spec deliverable.
+- **Result:** Spec/documentation rewrite only; no runtime code changed and no test run was required.
+
+✅ **Entry 235 — Audit and correct the evidence/doctor spec against current repo state**
+
+- **Goal:** Bring `agentic_orchestrator_evidence_integrity_doctor_spec.md` in line with the current replay-complete but evidence/doctor-still-unimplemented architecture so future implementation work starts from accurate assumptions.
+- **Changes made:**
+  - `spec-files/outstanding/agentic_orchestrator_evidence_integrity_doctor_spec.md`
+    - updated status/date/version and added a current-state section explicitly documenting that `evidence.verify_chain` and `doctor.run` are still catalog-plus-stub placeholders with no kernel handlers, no CLI surface, and no RBAC wiring.
+    - recorded that `GateService.evidenceLatest()` still has the broad `*.json` scan behavior and that the pre-work fix remains mandatory before integrity metadata lands.
+    - updated runtime-touchpoint text to reference the current `application/kernel-tool-wiring.ts` and `cli/command-catalog.ts` seams.
+    - expanded OID2/OID3 implementation targets to include current constants, tool metadata, kernel-tool wiring, policy/RBAC files, stub-schema replacement, and tools-doc regeneration.
+    - corrected OID4 CLI requirements to use the current command-catalog-based help/completion surface instead of the older help-handler-only assumption.
+- **Result:** Spec/documentation correction only; no runtime code changed and no test run was required.
+
+✅ **Entry 236 — Recover stale planner plan.submit conflicts through supervisor retry logic**
+
+- **Goal:** Prevent periodic planner `plan.submit` version conflicts from escalating when the supervisor is acting on a stale pre-plan snapshot and an accepted plan already exists.
+- **Changes made:**
+  - `apps/control-plane/src/supervisor/runtime.ts`
+    - added a targeted recovery path for `plan.submit` plus `version_conflict`.
+    - re-reads the accepted plan with `plan.get`, treats semantically equivalent stale submissions as success, and otherwise promotes the stale submit into a versioned `plan.update` retry with repaired `plan_version` and `revision_of` metadata.
+  - `apps/control-plane/test/supervisor.calltool.spec.ts`
+    - added regression coverage for the promoted retry path and the equivalent-plan no-op recovery path.
+- **Result:** `npx vitest run apps/control-plane/test/supervisor.calltool.spec.ts` ✅ (1 file / 4 tests). `npm run typecheck` ✅. `npm run lint -- apps/control-plane/src/supervisor/runtime.ts apps/control-plane/test/supervisor.calltool.spec.ts` ✅.
+
+✅ **Entry 237 — Share stale plan.submit recovery across supervisor, collision replay, and override resume**
+
+- **Goal:** Eliminate the remaining stale `plan.submit` conflict paths in collision queue replay and collision override resume by centralizing the recovery logic instead of fixing each caller ad hoc.
+- **Changes made:**
+  - `apps/control-plane/src/core/plan-submit-recovery.ts`
+    - added the shared helper for detecting version-conflict errors, comparing plans semantically, and promoting stale `plan.submit` payloads into safe `plan.update` retries.
+  - `apps/control-plane/src/supervisor/runtime.ts`
+    - switched the supervisor recovery path to the shared helper so live planner submissions and replay/resume flows use the same promotion rules.
+  - `apps/control-plane/src/application/services/collision-queue-service.ts`
+    - added `planGet`/`planUpdate` port usage and applied the shared recovery helper when blocked-queue replay hits a stale `plan.submit`.
+  - `apps/control-plane/src/application/services/collision-override-service.ts`
+    - added `planGet`/`planUpdate` port usage and applied the shared recovery helper when `--resume` replays a stale collision-approved plan snapshot.
+  - `apps/control-plane/test/collision-queue.spec.ts`
+    - added regression coverage proving queue replay promotes stale submit attempts into `plan.update`.
+  - `apps/control-plane/test/collision-override-service.spec.ts`
+    - added regression coverage proving override resume promotes stale submit attempts into `plan.update`.
+- **Result:** `npx vitest run apps/control-plane/test/supervisor.calltool.spec.ts apps/control-plane/test/collision-queue.spec.ts apps/control-plane/test/collision-override-service.spec.ts` ✅ (3 files / 34 tests). `npm run typecheck` ✅. `npm run lint -- apps/control-plane/src/core/plan-submit-recovery.ts apps/control-plane/src/supervisor/runtime.ts apps/control-plane/src/application/services/collision-queue-service.ts apps/control-plane/src/application/services/collision-override-service.ts apps/control-plane/test/supervisor.calltool.spec.ts apps/control-plane/test/collision-queue.spec.ts apps/control-plane/test/collision-override-service.spec.ts` ✅.
+
+✅ **Entry 238 — Restore per-file coverage minimums for add/index/enrollment/coordinator**
+
+- **Goal:** Raise the targeted coverage for `add-command-handler.ts`, `index-normalizer.ts`, `execution-enrollment-service.ts`, and `run-coordinator.ts` back above the failing minimums with focused regression tests.
+- **Changes made:**
+  - `apps/control-plane/test/add-command-handler.spec.ts`
+    - added direct unit coverage for inactive-run rejection, conflicting `--resume` vs spec input, missing add source validation, and resumable feature submission.
+  - `apps/control-plane/test/index-normalizer.spec.ts`
+    - added direct coverage for runtime-session normalization, queue/object filtering, epoch coercion, empty session defaults, and lease freshness checks.
+  - `apps/control-plane/test/execution-enrollment-service.spec.ts`
+    - added scheduler rejection coverage, fingerprint/idempotence checks, ready-batch sorting, in-flight reconcile handling, non-`Error` failure logging, and deferred-progress normalization coverage.
+  - `apps/control-plane/test/run-coordinator.spec.ts`
+    - added enrollment checkpoint no-op coverage, mixed race/deferred batch handling, forced build/QA mini-pass coverage, and direct blocked-feature recovery assertions for passing, stale, waiting, and retryable gate states.
+- **Result:** `npx vitest run apps/control-plane/test/add-command-handler.spec.ts apps/control-plane/test/index-normalizer.spec.ts apps/control-plane/test/execution-enrollment-service.spec.ts apps/control-plane/test/run-coordinator.spec.ts apps/control-plane/test/cli.unit.spec.ts apps/control-plane/test/kernel.coverage2.spec.ts --coverage.enabled true --coverage.reporter text --coverage.include 'apps/control-plane/src/cli/add-command-handler.ts' --coverage.include 'apps/control-plane/src/core/utils/index-normalizer.ts' --coverage.include 'apps/control-plane/src/supervisor/execution-enrollment-service.ts' --coverage.include 'apps/control-plane/src/supervisor/run-coordinator.ts'` ✅ (6 files / 217 tests). Targeted coverage after the run: `add-command-handler.ts` 100% lines, `index-normalizer.ts` 100% lines, `execution-enrollment-service.ts` 99.21% lines / 91.93% branches, `run-coordinator.ts` 91.51% lines. `npm run typecheck` ✅. `npm run lint -- apps/control-plane/test/add-command-handler.spec.ts apps/control-plane/test/index-normalizer.spec.ts apps/control-plane/test/execution-enrollment-service.spec.ts apps/control-plane/test/run-coordinator.spec.ts` ✅.
+
+✅ **Entry 239 — Author multi-spec roadmap for dashboard intake, standby runtime, agent profiles, ordering, and policy split**
+
+- **Goal:** Break a new batch of requested product capabilities into a coherent set of implementation-ready specs aligned to the current dashboard, enrollment, runtime, and policy architecture.
+- **Changes made:**
+  - `spec-files/outstanding/agentic_orchestrator_dashboard_quick_launch_and_control_surface_spec.md`
+    - added a focused spec for a dedicated Quick Launch route, markdown upload/paste preview, multi-feature dashboard enrollment via `aop add` semantics, stalled/blocked dashboard recovery actions, non-intrusive triage drawer behavior, and footer repo/docs links.
+  - `spec-files/outstanding/agentic_orchestrator_headless_standby_dashboard_runtime_spec.md`
+    - added a runtime spec for headless standby mode, dashboard auto-bootstrap of the orchestrator, and new `--headless` / `--dashboard` flags on `run`, `resume`, and `retry`.
+  - `spec-files/outstanding/agentic_orchestrator_phase_specific_agent_profiles_and_token_telemetry_spec.md`
+    - added a spec for true per-role provider/model selection across planner/builder/qa and real token telemetry collection/reporting to support cost-optimization decisions.
+  - `spec-files/outstanding/agentic_orchestrator_spec_ordering_agent_spec.md`
+    - added a spec for a global organizer/spec-ordering agent that determines dependency-aware admission order outside the planner/build/qa loop and feeds the existing enrollment scheduler seam.
+  - `spec-files/outstanding/agentic_orchestrator_policy_stratification_spec.md`
+    - added a spec for splitting effective policy composition into bundled defaults, `internal.policy.yaml`, and user-editable `policy.yaml`.
+- **Result:** Documentation-only change. Tests not run.
+
+✅ **Entry 240 — Add explicit OOP and architecture guardrails to the new roadmap specs**
+
+- **Goal:** Bring the newly authored outstanding specs up to the repository’s expected quality bar by adding explicit design guardrails that constrain implementation shape, responsibility boundaries, and extension points.
+- **Changes made:**
+  - `spec-files/outstanding/agentic_orchestrator_dashboard_quick_launch_and_control_surface_spec.md`
+    - added required standards plus mandatory OOP/architecture guardrails covering dashboard intake, preview, submission, recovery actions, and separation from core orchestrator logic.
+  - `spec-files/outstanding/agentic_orchestrator_headless_standby_dashboard_runtime_spec.md`
+    - added required standards plus mandatory guardrails for standby lifecycle, dashboard bootstrapping, CLI flag wiring, and separation from lease/enrollment internals.
+  - `spec-files/outstanding/agentic_orchestrator_phase_specific_agent_profiles_and_token_telemetry_spec.md`
+    - added required standards plus mandatory guardrails for per-role provider resolution, normalized telemetry capture, and separation between provider adapters, persistence, and presentation.
+  - `spec-files/outstanding/agentic_orchestrator_spec_ordering_agent_spec.md`
+    - added required standards plus mandatory guardrails for organizer-sidecar architecture, scheduler contracts, and deterministic admission boundaries.
+  - `spec-files/outstanding/agentic_orchestrator_policy_stratification_spec.md`
+    - added required standards plus mandatory guardrails for layered policy loading, validation boundaries, and migration-safe composition.
+- **Result:** Documentation-only change. Tests not run.
+
+✅ **Entry 241 — Honor per-phase mainline reconciliation in the supervisor loop**
+
+- **Goal:** Make the runtime actually reconcile feature worktrees against local mainline before `planning`, `building`, and `qa` when those phases are configured in policy.
+- **Changes made:**
+  - `apps/control-plane/src/supervisor/run-coordinator.ts`
+    - added phase preparation that reads `reconciliation.check_before_phases`, invokes `repo.reconcile_mainline` before configured phases, skips same-cycle execution when a mainline conflict is detected, and avoids re-driving phases for features already waiting on the shared reconciler lane.
+  - `apps/control-plane/test/run-coordinator.spec.ts`
+    - added regressions proving reconciliation runs before planning/build/qa and that a planning-phase conflict suppresses same-cycle planner execution.
+    - updated existing coordinator fixtures to return explicit feature statuses under the new pre-phase state reads.
+- **Result:** `npx vitest run apps/control-plane/test/run-coordinator.spec.ts` ✅ (1 file / 60 tests). `npx eslint apps/control-plane/src/supervisor/run-coordinator.ts apps/control-plane/test/run-coordinator.spec.ts --max-warnings 0` ✅. `npm run typecheck` ⚠️ still fails due pre-existing unrelated test typing errors in `apps/control-plane/test/providers.spec.ts` and `apps/control-plane/test/worker-provider-adapters.spec.ts`.
+
+✅ **Entry 242 — Clear remaining provider test typecheck regressions**
+
+- **Goal:** Remove the last TypeScript test failures so `npm run typecheck` passes cleanly again.
+- **Changes made:**
+  - `apps/control-plane/test/providers.spec.ts`
+    - replaced brittle `.mock.calls.at(0)?.[1]` tuple indexing with an explicit first-call guard and `unknown[]` cast before reading CLI args.
+  - `apps/control-plane/test/worker-provider-adapters.spec.ts`
+    - added the required `signal: null` field to the mocked `ProviderCommandResult`.
+    - replaced brittle `.mock.calls.at(0)?.[1]` tuple indexing with an explicit first-call guard and `unknown[]` cast before reading CLI args.
+- **Result:** `npx vitest run apps/control-plane/test/providers.spec.ts apps/control-plane/test/worker-provider-adapters.spec.ts` ✅ (2 files / 103 tests). `npx eslint apps/control-plane/test/providers.spec.ts apps/control-plane/test/worker-provider-adapters.spec.ts --max-warnings 0` ✅. `npm run typecheck` ✅.
+
+✅ **Entry 243 — Move user-profile MCP server flags to provider_cli_config in agents.yaml**
+
+- **Goal:** Remove hardcoded user-profile CLI flags (MCP server names like `context7`, `apps_mcp_gateway`) from project source code and move them to a configurable `provider_cli_config` block in `agents.yaml`, making the codebase deployment-agnostic.
+- **Changes made:**
+  - `apps/control-plane/src/providers/provider-defaults.ts`
+    - removed `apps_mcp_gateway` and MCP server names from `CODEX_DISABLE_MCP_FLAGS`; renamed constant to `CODEX_BASE_FLAGS` (built-in capability flags only).
+    - added `generateProviderCliExtraArgs(provider, cliConfig)` helper that translates `provider_cli_config` YAML entries into CLI flag arrays (`codex.disable_mcp_servers` → `-c mcp_servers.<name>.enabled=false`; `claude.no_mcp` → `--no-mcp`).
+  - `apps/control-plane/src/providers/providers.ts`
+    - added `cli_extra_args?: string[]` to `ProviderSelection` interface.
+    - `resolveProviderSelection` now reads `runtime.provider_cli_config` and populates `cli_extra_args` via `generateProviderCliExtraArgs`.
+    - `resolveProviderCommands` appends `cli_extra_args` to attach/send templates.
+  - `apps/control-plane/src/providers/cli-worker-provider.ts`
+    - added `appendExtraArgs` helper; all three template resolvers (`resolveRunTemplate`, `resolveAttachTemplate`, `resolveSendTemplate`) now append `selection.cli_extra_args`.
+  - `agentic/orchestrator/schemas/agents.schema.json`
+    - added `provider_cli_config` to `runtime` properties with `codex.disable_mcp_servers` (array of strings) and `claude.no_mcp` (boolean).
+  - `config/agentic/orchestrator/agents.yaml`
+    - added `provider_cli_config.codex.disable_mcp_servers: [context7, useful-agent-instructions]` block.
+  - `apps/control-plane/test/providers.spec.ts` / `apps/control-plane/test/worker-provider-adapters.spec.ts`
+    - removed `apps_mcp_gateway` from expected command args; added 11 new tests covering `generateProviderCliExtraArgs`, `provider_cli_config` resolution, and `cli_extra_args` propagation through both `NullWorkerProvider` and `CliWorkerProvider`.
+- **Result:** `npm run typecheck` ✅. `npm run lint` ✅. `npm run test` ✅ (112 control-plane test files / 1833 tests passing; coverage thresholds met at ≥90%).
+
+✅ **Entry 244 — Close CLI coverage gaps in retry and spec preparation**
+
+- **Goal:** Raise coverage on the remaining low-coverage CLI helpers by removing dead retry-handler branches and adding the missing spec-preparation and retry branch tests.
+- **Changes made:**
+  - `apps/control-plane/src/cli/retry-command-handler.ts`
+    - removed stale dead checkpoint-invalid and reroute-after-failed-retry branches that could no longer execute under the current checkpoint validity semantics.
+    - simplified the failed-retry path so it continues reporting `reroute_status: null` without carrying unreachable state-patch logic.
+  - `apps/control-plane/test/cli-helpers.spec.ts`
+    - added retry coverage for `failed` terminal status rejection, `building` status fast-mode inference, force-retry on a non-blocked feature, and null `overall` gate responses.
+  - `apps/control-plane/test/spec-preparation.spec.ts`
+    - added coverage for canonical `.aop` spec paths, legacy canonical paths, explicit feature ids, relative source-path normalization, source-label fallback behavior, success-path multi-draft preparation, and rethrowing non-slug parsing failures.
+- **Result:** `npx vitest run apps/control-plane/test/cli-helpers.spec.ts apps/control-plane/test/spec-preparation.spec.ts` ✅ (2 files / 89 tests). `npx eslint apps/control-plane/src/cli/retry-command-handler.ts apps/control-plane/test/cli-helpers.spec.ts apps/control-plane/test/spec-preparation.spec.ts --max-warnings 0` ✅. `npm run typecheck` ✅. Targeted coverage run reports `retry-command-handler.ts` at 100% lines/statements/functions and 98.03% branches, and `spec-preparation.ts` at 100% lines/statements/functions and 96.87% branches.
+
+✅ **Entry 245 — Raise merge command handler branch coverage above threshold**
+
+- **Goal:** Close the remaining branch-coverage gap in the merge CLI handler without broadening behavior or changing production logic.
+- **Changes made:**
+  - `apps/control-plane/test/merge-command-handler.spec.ts`
+    - added coverage for reconciliation conflicts with omitted optional fields so the handler’s null/default shaping is exercised.
+    - added coverage for `sync_remote: ''` to verify `remote_sync_strategy` is omitted from reconcile/merge tool payloads while default commit message and approval token values are still passed.
+    - added coverage for merge-gate responses with no `overall` field so the merge-disabled error path records `gate_overall: undefined` and `reconciliation_status: null`.
+- **Result:** `npx vitest run apps/control-plane/test/merge-command-handler.spec.ts --coverage.enabled --coverage.reporter=json-summary --coverage.reportsDirectory=coverage/tmp-merge` ✅ (1 file / 16 tests). `npx eslint apps/control-plane/test/merge-command-handler.spec.ts --max-warnings 0` ✅. `npm run typecheck` ✅. Targeted coverage run reports `merge-command-handler.ts` at 100% lines/statements/functions and 98.14% branches.
+
+✅ **Entry 246 — Backfill prerequisite gates during merge promotion**
+
+- **Goal:** Prevent `feature.ready_to_merge` from failing with `merge_disabled` when the merge gate has already passed but older prerequisite gate modes still need their persisted state refreshed.
+- **Changes made:**
+  - `apps/control-plane/src/application/services/merge-service.ts`
+    - added required-gate collection helpers and a merge-gate-aware backfill path that reruns missing prerequisite modes through `gatesRun(featureId, null, mode)` before enforcing merge preconditions.
+    - kept the existing hard invariant intact by only backfilling when `gates.merge === pass`; otherwise merge promotion still fails on the first missing prerequisite mode.
+  - `apps/control-plane/test/merge-service.spec.ts`
+    - extended the harness with a `gatesRun` stub that mutates stored gate state, asserted that missing prerequisites still fail without merge verification, and added a regression test covering automatic `fast`/`full` reruns before a successful merge.
+  - `apps/control-plane/test/service-retry-paths.spec.ts`
+    - updated the merge-service test double to satisfy the new `MergeServicePort.gatesRun` dependency.
+- **Result:** `npx vitest run apps/control-plane/test/merge-service.spec.ts apps/control-plane/test/service-retry-paths.spec.ts` ✅ (2 files / 27 tests). `npx eslint apps/control-plane/src/application/services/merge-service.ts apps/control-plane/test/merge-service.spec.ts apps/control-plane/test/service-retry-paths.spec.ts --max-warnings 0` ✅. `npm run typecheck` ✅.
+
+✅ **Entry 247 — Restore Track B focus-shell compile contract**
+
+- **Goal:** Fix the broken feature focus page load by bringing the sidebar, header, tabs, and diagnosis helpers back into sync with the Track A / Track B `FocusLayout` contract.
+- **Changes made:**
+  - `packages/web-dashboard/src/lib/health-diagnosis.ts`
+    - restored `deriveHealthDiagnosis()`, `STALL_THRESHOLD_MS`, and the structured health cause model expected by the focus shell and diagnostics tests.
+  - `packages/web-dashboard/src/components/focus/DiagnosisPanel.tsx`
+    - restored primary and secondary diagnosis rendering, including gate metadata, dependency lists, and output-tail display.
+  - `packages/web-dashboard/src/components/focus/FocusHeader.tsx`
+    - restored the current `FocusLayout` header prop contract and phase/status badge rendering.
+  - `packages/web-dashboard/src/components/focus/HeroBlock.tsx`
+    - restored the operator snapshot card driven by the derived health diagnosis.
+  - `packages/web-dashboard/src/components/focus/PinnedActions.tsx`
+    - restored the sidebar review controls and pinned-action navigation surface.
+  - `packages/web-dashboard/src/components/focus/TabBar.tsx`
+    - restored accessible tablist rendering based on `FocusTabDefinition[]`.
+  - `packages/web-dashboard/src/components/focus/ContextSidebar.tsx`
+    - realigned the component with the current `FocusLayout` prop contract, reinstated hero/diagnosis/pinned-actions/pipeline sections, and removed the stale import surface that produced the missing-module errors.
+- **Result:** `npx vitest run packages/web-dashboard/test/components/focus-layout.spec.tsx packages/web-dashboard/test/components/diagnosis-panel.spec.tsx packages/web-dashboard/test/lib/health-diagnosis.spec.ts packages/web-dashboard/test/components/overview-tab.spec.tsx` ✅ (4 files / 15 tests). `npx eslint --no-ignore packages/web-dashboard/src/components/focus/ContextSidebar.tsx packages/web-dashboard/src/components/focus/FocusHeader.tsx packages/web-dashboard/src/components/focus/HeroBlock.tsx packages/web-dashboard/src/components/focus/PinnedActions.tsx packages/web-dashboard/src/components/focus/DiagnosisPanel.tsx packages/web-dashboard/src/components/focus/TabBar.tsx packages/web-dashboard/src/lib/health-diagnosis.ts --max-warnings 0` ✅. `npm run typecheck` ✅. `npm run build --workspace @aop/web-dashboard` ✅.
+
+✅ **Entry 248 — Wire missing Track B sidebar and overview surfaces into `/feature/[id]`**
+
+- **Goal:** Close the missing page-visible focus-view gaps by feeding usage burn, genealogy, gate history, merge queue, and worker-event analytics into `FeatureDetail` and mounting the missing sidebar/overview cards.
+- **Changes made:**
+  - `packages/web-dashboard/src/lib/types.ts`
+    - extended `FeatureDetail` with `usage_burn`, `genealogy`, `gate_history`, `merge_queue`, `worker_summary`, `provider_analytics`, and `token_cost_conversion`.
+    - added `UsageBurnProjection`/`UsageBurnPoint`; expanded `ProviderAnalytics`, `GateHistoryEntry`, and `MergeQueueEntry` for the new focus-view data.
+  - `packages/web-dashboard/src/lib/usage-burn.ts`
+    - replaced the placeholder burn-rate helper with a projection model that emits confidence, usage points, projected completion, budget breach state, historical-ratio context, and optional derived USD.
+  - `packages/web-dashboard/src/lib/aop-client.ts`
+    - `readFeatureDetail()` now reads worker events, provider analytics, genealogy, gate history, and merge queue state alongside the existing detail payload.
+    - `readProviderAnalyticsSnapshot()` now computes `avg_tokens_used`; `readGateHistory()` now preserves per-step outcomes and failure tails; `readMergeQueueSnapshot()` now includes dependency blockers and estimated merge timing.
+  - `packages/web-dashboard/src/components/focus/ContextSidebar.tsx`
+    - mounted `UsageBurnChart`, `PrStatusCard`, `MergeQueueCard`, and the dependency list below the hero/diagnosis/pinned actions/pipeline stack.
+  - `packages/web-dashboard/src/components/focus/tabs/OverviewTab.tsx`
+    - removed off-spec sidebar content from the Overview tab and mounted `GenealogyTree` alongside the already-added collision radar and role-performance cards.
+  - `packages/web-dashboard/src/components/focus/UsageBurnChart.tsx`
+    - rebuilt the component as the sidebar usage panel with projection toggle, sparkline, budget meter, confidence badges, and optional USD secondary metrics.
+  - `packages/web-dashboard/src/components/focus/GenealogyTree.tsx`
+    - converted the genealogy panel into a collapsed revision-history details card that only renders when there is actual lineage to show.
+  - `packages/web-dashboard/src/components/focus/MergeQueueCard.tsx`
+    - added current-position labeling, feature links, dependency blocker messaging, and merge-window display.
+  - `apps/control-plane/test/dashboard-client.spec.ts`
+    - added a regression covering `readFeatureDetail()` hydration for usage burn, genealogy, gate history, merge queue, and worker summaries.
+  - `packages/web-dashboard/test/components/focus-layout.spec.tsx`
+    - asserted that the focus shell now renders Usage, Merge Queue, and Dependencies from the sidebar contract.
+  - `packages/web-dashboard/test/components/overview-tab.spec.tsx`
+    - extended the overview assertions to cover the mounted genealogy card.
+- **Result:** `npx vitest run apps/control-plane/test/dashboard-client.spec.ts packages/web-dashboard/test/components/focus-layout.spec.tsx packages/web-dashboard/test/components/overview-tab.spec.tsx` ✅. `npx eslint --no-ignore apps/control-plane/test/dashboard-client.spec.ts packages/web-dashboard/src/components/focus/ContextSidebar.tsx packages/web-dashboard/src/components/focus/FocusLayout.tsx packages/web-dashboard/src/components/focus/GenealogyTree.tsx packages/web-dashboard/src/components/focus/MergeQueueCard.tsx packages/web-dashboard/src/components/focus/UsageBurnChart.tsx packages/web-dashboard/src/lib/aop-client.ts packages/web-dashboard/src/lib/types.ts packages/web-dashboard/src/lib/usage-burn.ts packages/web-dashboard/test/components/focus-layout.spec.tsx packages/web-dashboard/test/components/overview-tab.spec.tsx --max-warnings 0` ✅. `npm run typecheck` ✅. `npm run build --workspace @aop/web-dashboard` ✅.
+
+✅ **Entry 249 — Upgrade Track B transcript, runtime, and gate-history views**
+
+- **Goal:** Replace the remaining placeholder tab content on `/feature/[id]` with the missing mission-control interactions: grouped transcript turns, checkpoint scrubbing, and gate flakiness summaries.
+- **Changes made:**
+  - `packages/web-dashboard/src/components/focus/tabs/TranscriptTab.tsx`
+    - rebuilt the transcript tab as grouped role turns with filter pills, collapsed long turns, code-block rendering, and raw-log download affordances backed by the existing raw-log API endpoints.
+  - `packages/web-dashboard/src/components/focus/CheckpointScrubber.tsx`
+    - added the runtime time-machine scrubber with slider, step controls, play/pause, violation banner, and per-file diff filtering.
+  - `packages/web-dashboard/src/components/focus/tabs/RuntimeTab.tsx`
+    - mounted worker activity summaries and the new checkpoint scrubber in the Runtime tab.
+  - `packages/web-dashboard/src/components/focus/GateFlakinessSummary.tsx`
+    - replaced the placeholder history summary with per-step outcome aggregation, flakiness scoring, recovering/failing labels, and expandable latest-failure output.
+  - `packages/web-dashboard/src/components/focus/tabs/GatesQaTab.tsx`
+    - mounted the gate-history summary ahead of the current gate-result surfaces when retries exist.
+  - `packages/web-dashboard/src/components/diff-viewer.tsx`
+    - added the missing React import needed by server-rendered tab tests under the package JSX config.
+  - `packages/web-dashboard/src/styles/dashboard.module.css`
+    - added the sparkline, transcript, and failure-output styles required by the new Track B panels.
+  - `packages/web-dashboard/test/components/runtime-tab.spec.tsx`
+    - added coverage for runtime activity rows plus checkpoint scrubber rendering.
+  - `packages/web-dashboard/test/components/transcript-tab.spec.tsx`
+    - added grouped transcript/raw-log rendering coverage.
+  - `packages/web-dashboard/test/components/gates-qa-tab.spec.tsx`
+    - added coverage for the gate flakiness summary mounting ahead of gate results.
+- **Result:** `npx vitest run packages/web-dashboard/test/components/runtime-tab.spec.tsx packages/web-dashboard/test/components/transcript-tab.spec.tsx packages/web-dashboard/test/components/gates-qa-tab.spec.tsx` ✅. `npx eslint --no-ignore packages/web-dashboard/src/components/diff-viewer.tsx packages/web-dashboard/src/components/focus/CheckpointScrubber.tsx packages/web-dashboard/src/components/focus/GateFlakinessSummary.tsx packages/web-dashboard/src/components/focus/tabs/GatesQaTab.tsx packages/web-dashboard/src/components/focus/tabs/RuntimeTab.tsx packages/web-dashboard/src/components/focus/tabs/TranscriptTab.tsx packages/web-dashboard/test/components/runtime-tab.spec.tsx packages/web-dashboard/test/components/transcript-tab.spec.tsx packages/web-dashboard/test/components/gates-qa-tab.spec.tsx --max-warnings 0` ✅. `npm run typecheck` ✅. `npm run build --workspace @aop/web-dashboard` ✅. `npm test` ✅ (112 files / 1851 tests; coverage thresholds met).
+
+✅ **Entry 252 — Tighten Plan tab markdown rendering and summary-card alignment**
+
+- **Goal:** Fix the remaining `/feature/[id]` Plan-tab readability issues by rendering spec markdown with the existing markdown engine instead of the ad hoc parser, widening the plan workspace, and aligning the sidebar summary metrics.
+- **Changes made:**
+  - `packages/web-dashboard/src/lib/launch-markdown.ts`
+    - replaced the hand-rolled markdown parser with `marked`-based rendering, kept heading anchors for spec navigation, preserved raw-HTML escaping, wrapped rendered tables for in-card overflow handling, and kept the unclosed-code-fence fallback path.
+  - `packages/web-dashboard/src/styles/dashboard.module.css`
+    - widened the outer `planWorkspace` so the spec card gets meaningful reading width, kept the nested spec TOC/content split, added richer markdown typography/table/code styles, and introduced shared metric-card styles for the sidebar summary surfaces.
+  - `packages/web-dashboard/src/components/focus/OperationalSummaryCard.tsx`
+    - converted the operational metadata block to a consistent metric-card grid so labels and bold values line up cleanly and wrap safely.
+  - `packages/web-dashboard/src/components/focus/ProgressSnapshotCard.tsx`
+    - moved the snapshot stats onto the shared metric-card layout and promoted the current/next task strings into properly spaced task panels.
+  - `packages/web-dashboard/test/lib/launch-markdown.spec.ts`
+    - added regression coverage for wrapped paragraphs, ordered lists, tables, and raw-HTML escaping under the package-based renderer.
+  - `packages/web-dashboard/test/components/plan-tab.spec.tsx`
+    - expanded the Plan-tab regression to assert rendered markdown tables and multi-line paragraph output inside the source-spec card.
+- **Result:** `npx vitest run packages/web-dashboard/test/lib/launch-markdown.spec.ts packages/web-dashboard/test/components/plan-tab.spec.tsx packages/web-dashboard/test/components/focus-layout.spec.tsx` ✅. `npm run typecheck` ✅. `npm run build --workspace @aop/web-dashboard` ✅. `npm run verify` ✅.
+
+✅ **Entry 253 — Polish focus-view decision surfaces and runtime inspection readability**
+
+- **Goal:** Fix the remaining `/feature/[id]` operator-UX issues called out in review by making key cards collapsible, improving spacing and scanability, surfacing runtime controls earlier, and turning raw logs/runtime data into readable inspection surfaces.
+- **Changes made:**
+  - `packages/web-dashboard/src/styles/dashboard.module.css`
+    - restored missing focus-view layout styles (`focusOverviewGrid`, `focusOverviewCard`), strengthened active-row highlighting, added collapsible-summary, runtime-entry, pretty-log, and archive-pager styling, and improved review-title alignment across the page.
+  - `packages/web-dashboard/src/components/focus/VerificationSummaryCard.tsx`, `packages/web-dashboard/src/components/focus/CollisionRadar.tsx`, `packages/web-dashboard/src/components/focus/tabs/OverviewTab.tsx`
+    - reworked verification spacing/readability, added blocker summaries, improved collision-radar summary spacing, and surfaced an Overview-level operator-controls callout linking directly to Runtime and History.
+  - `packages/web-dashboard/src/components/focus/SpecViewer.tsx`, `packages/web-dashboard/src/components/plan-viewer.tsx`, `packages/web-dashboard/src/components/evidence-viewer.tsx`
+    - made Source Spec and Evidence collapsible, and turned Accepted Plan into a decision-readable contract summary with current focus, next-up work, owner/file scope, and full-task drilldown.
+  - `packages/web-dashboard/src/components/focus/CheckpointRail.tsx`, `packages/web-dashboard/src/components/focus/tabs/ChangesTab.tsx`, `packages/web-dashboard/src/components/focus/CheckpointScrubber.tsx`
+    - made checkpoint rail and code-evolution sections collapsible, improved checkpoint labels and selection highlighting, made compare-mode selectors time/change oriented, and switched the code-evolution diff view to fetch real checkpoint diffs with UTC timestamps instead of showing diff-file placeholders.
+  - `packages/web-dashboard/src/components/focus/tabs/RuntimeTab.tsx`, `packages/web-dashboard/src/components/features/runtime-inspector/RuntimeInspectorPanel.tsx`, `packages/web-dashboard/src/components/features/runtime-inspector/OperationsListView.tsx`, `packages/web-dashboard/src/components/features/runtime-inspector/EventsTimelineView.tsx`
+    - promoted Directed Agent Console above lower-signal panels, improved runtime-summary spacing, added selected-run summary metrics, and redesigned operations/events rows into structured inspection cards.
+  - `packages/web-dashboard/src/components/focus/RoleLogViewer.tsx`, `packages/web-dashboard/src/components/focus/tabs/HistoryTab.tsx`
+    - added pretty/raw log modes with JSONL-aware formatting for both live and historical role logs, and made Checkpoint Archive collapsible, paginated, and locally timestamped.
+  - `packages/web-dashboard/test/components/runtime-tab.spec.tsx`, `packages/web-dashboard/test/components/role-log-viewer.spec.ts`
+    - updated runtime-tab copy expectations and added regression coverage for the pretty-log formatter over JSONL and plain-text content.
+- **Result:** `npx vitest run packages/web-dashboard/test/components/plan-tab.spec.tsx packages/web-dashboard/test/components/runtime-tab.spec.tsx packages/web-dashboard/test/components/changes-tab.spec.tsx packages/web-dashboard/test/components/gates-qa-tab.spec.tsx packages/web-dashboard/test/components/overview-tab.spec.tsx packages/web-dashboard/test/components/role-log-viewer.spec.ts` ✅. `npm run typecheck` ✅. `npm run verify` ✅.
+
+✅ **Entry 254 — Refresh M43 baseline and reduce M59 protocol duplication**
+
+- **Goal:** Reconcile the human-input and intake specs with the current repository state so M43 is the authoritative shared protocol baseline and M59 cleanly layers intake-specific behavior on top of it.
+- **Changes made:**
+  - `spec-files/outstanding/agentic_orchestrator_human_input_interaction_protocol_spec.md`
+    - rewrote the opening problem framing around the actual current baseline: existing `QuestionService`, question MCP tools, `awaiting_input`, dashboard answer route, and current provider compatibility behavior.
+    - promoted shared question readiness and operator transport rules into the M43 baseline, widened `resume_status` to allow later extension such as `intake`, and aligned stale error/tool/policy wording to the current implementation surface.
+    - reworked implementation slices, file targets, tests, and acceptance criteria so the spec reflects remaining normalization/parity work instead of describing already-landed pieces as greenfield.
+  - `spec-files/outstanding/agentic_orchestrator_interactive_planning_intake_and_requirements_verification_spec.md`
+    - added an explicit dependency boundary making M43 the prerequisite authority for generic question lifecycle, readiness, and answer transport.
+    - reduced duplicated protocol language by redefining M59 as an intake-only extension for `intake` lifecycle, manifest artifacts, promotion rules, intake metadata, and planning/build/QA gating.
+    - updated implementation plan, testing plan, and acceptance criteria so M59 reuses the shared question path and only adds intake-specific predicates such as `resume_status=intake`.
+- **Result:** Documentation-only change; tests not run. Specs now define a cleaner baseline/extension split and better match the current tool state.
+
+✅ **Entry 255 — Restore orchestrator access to mainline reconciliation**
+
+- **Goal:** Fix resumed runs failing with `forbidden_tool_for_role` when the orchestrator performs reconciliation preflight through `repo.reconcile_mainline`.
+- **Changes made:**
+  - `agentic/orchestrator/policy.yaml`
+    - added `repo.reconcile_mainline` to the orchestrator RBAC allowlist so the active repo policy matches the tool catalog and supervisor reconciliation flow.
+  - `agentic/orchestrator/defaults/policy.defaults.yaml`
+    - added the same orchestrator permission to the composed defaults so lean policies inherit the correct authorization during runtime boot.
+  - `apps/control-plane/src/cli/init-command-handler.ts`
+    - added `repo.reconcile_mainline` to the advanced-policy RBAC template so newly initialized full-policy repos do not regenerate the stale allowlist.
+  - `apps/control-plane/test/policy-loader-service.spec.ts`
+    - added an assertion that composed lean-policy defaults include `repo.reconcile_mainline` in orchestrator RBAC.
+  - `apps/control-plane/test/init-wizard.spec.ts`
+    - extended advanced-policy generation coverage to assert the generated RBAC block contains `repo.reconcile_mainline`.
+  - `apps/control-plane/test/mcp.spec.ts`
+    - added a transport-level regression that initializes features and calls `repo.reconcile_mainline` as `orchestrator` through both in-process and MCP clients, asserting the call is authorized end to end.
+- **Result:** `npx vitest run apps/control-plane/test/policy-loader-service.spec.ts apps/control-plane/test/init-wizard.spec.ts apps/control-plane/test/mcp.spec.ts` ✅ (3 files / 62 tests). `npm run typecheck` ✅.
+
+✅ **Entry 256 — Rebuild runtime review around a single run-centric inspector**
+
+- **Goal:** Turn the runtime review surface into a concise, decision-useful workflow that tells operators what happened in a run, what each tool was meant to do, where failures clustered, and where the raw evidence lives.
+- **Changes made:**
+  - `packages/web-dashboard/src/lib/tool-catalog.ts`, `packages/web-dashboard/src/app/api/runtime/operations/route.ts`, `packages/web-dashboard/src/app/api/runtime/events/route.ts`
+    - added server-side MCP catalog lookup so runtime operations can show the tool-definition description, and expanded the runtime API payloads with run-level summary counts plus full filter-option metadata instead of relying on the current page slice.
+  - `packages/web-dashboard/src/components/features/runtime-inspector/RuntimeInspectorPanel.tsx`, `packages/web-dashboard/src/components/features/runtime-inspector/OperationsListView.tsx`
+    - rebuilt the inspector into a collapsible `Run Review` surface with a selected-run summary, clearer tabs (`Tool Calls`, `Worker Events`, `Raw Logs`), adjustable pagination, and operation cards that emphasize tool purpose and outcome while moving operation/request identity details behind expansion.
+  - `packages/web-dashboard/src/components/focus/RoleLogViewer.tsx`, `packages/web-dashboard/src/components/focus/tabs/RuntimeTab.tsx`, `packages/web-dashboard/src/components/focus/tabs/HistoryTab.tsx`
+    - consolidated raw-log review into the runtime inspector so tool calls, worker events, and raw logs live in one run-scoped place; added pretty-log pagination; removed the duplicate standalone raw-log sections from Runtime and History.
+  - `packages/web-dashboard/test/components/runtime-inspector.spec.tsx`, `packages/web-dashboard/test/components/runtime-tab.spec.tsx`
+    - updated regression coverage for the new run-review shell and the Runtime tab’s reduced surface area.
+- **Result:** `npm run typecheck` ✅. `npx vitest run packages/web-dashboard/test/components/runtime-inspector.spec.tsx packages/web-dashboard/test/components/runtime-tab.spec.tsx packages/web-dashboard/test/components/role-log-viewer.spec.ts` ✅ (3 files / 5 tests). `npm test` ✅ (112 files / 1852 tests). `npx vitest run packages/web-dashboard/test/components packages/web-dashboard/test/lib` exposed one unrelated existing failure in `packages/web-dashboard/test/lib/focus-view.spec.ts` expecting `human_input.targetTab === "review"` while current code returns `"overview"`.
+
+✅ **Entry 257 — Simplify Run Review navigation to bottom pagination**
+
+- **Goal:** Remove the top-of-card run-selection/filter feel from Run Review so the panel behaves like a normal collapsible review card and navigation happens from the bottom.
+- **Changes made:**
+  - `packages/web-dashboard/src/components/features/runtime-inspector/RuntimeInspectorPanel.tsx`
+    - removed the top run selector plus operation/event filter controls, kept the per-tab pagination at the bottom, and added bottom-mounted previous/next run pagination for moving through run history without a filter UI.
+- **Result:** `npm run typecheck` ✅. `npx vitest run packages/web-dashboard/test/components/runtime-inspector.spec.tsx packages/web-dashboard/test/components/runtime-tab.spec.tsx packages/web-dashboard/test/components/role-log-viewer.spec.ts` ✅ (3 files / 5 tests).
+
+✅ **Entry 253 — Execute the remaining M43 human-input operator workflow gaps**
+
+- **Goal:** Finish the still-missing operator-facing pieces of the human-input protocol by making question readiness state-driven, adding dedicated CLI question commands, and enabling dashboard triage answers on the shared question path.
+- **Changes made:**
+  - `apps/control-plane/src/cli/types.ts`, `apps/control-plane/src/cli/cli-argument-parser.ts`, `apps/control-plane/src/cli/command-catalog.ts`, `apps/control-plane/src/interfaces/cli/bootstrap.ts`, `apps/control-plane/src/cli/questions-command-handler.ts`, `apps/control-plane/src/cli/answer-command-handler.ts`, `AGENTS.md`, `CLAUDE.md` - added first-class `aop questions` / `aop answer` commands, parsed `--status` / `--question-id` / `--answer` / `--answered-by`, wired dispatch, documented the new commands, and kept them as thin wrappers over `feature.question_list` / `feature.question_answer`.
+  - `apps/control-plane/src/cli/status-command-handler.ts` - flattened persisted `human_input.*` summary fields into both full and summary CLI status output so question blockers are visible without heuristic parsing.
+  - `apps/control-plane/src/application/services/activity-monitor-service.ts`, `packages/web-dashboard/src/lib/aop-client.ts` - made persisted `status=awaiting_input` the authoritative waiting-input signal before legacy `status_reason` fallbacks; centralized the operator-visible question-ready predicate and reused it for dashboard pending-questions, triage payloads, and focus-view question projections.
+  - `packages/web-dashboard/src/components/dashboard/triage-drawer.tsx` - added first-class blocking-question answer controls that post to the shared `/api/features/[id]/questions/[questionId]/answer` route instead of relying on passive rendering or ad hoc messaging.
+  - `apps/control-plane/test/cli.unit.spec.ts`, `apps/control-plane/test/cli-argument-parser.spec.ts`, `apps/control-plane/test/cli-helpers.spec.ts`, `apps/control-plane/test/activity-monitor.spec.ts`, `apps/control-plane/test/dashboard-client.spec.ts`, `packages/web-dashboard/test/components/triage-drawer.spec.tsx` - added regression coverage for the new CLI commands, flattened status output, persisted awaiting-input activity handling, ready-state filtering of pending questions/triage/focus data, and triage drawer answer controls.
+- **Result:** `npm run typecheck` [PASS]. `npm run lint` [PASS]. `npx vitest run apps/control-plane/test/cli.unit.spec.ts apps/control-plane/test/cli-argument-parser.spec.ts apps/control-plane/test/cli-helpers.spec.ts apps/control-plane/test/activity-monitor.spec.ts apps/control-plane/test/dashboard-client.spec.ts apps/control-plane/test/question-command-handlers.spec.ts` [PASS]. `npx vitest run --config packages/web-dashboard/vitest.config.ts packages/web-dashboard/test/components/triage-drawer.spec.tsx packages/web-dashboard/test/components/human-input-panel.spec.tsx packages/web-dashboard/test/components/runtime-tab.spec.tsx` [PASS]. `npm test` [PASS] (113 files / 1863 tests, coverage: lines 95.61%, branches 90.08%, functions 94.92%, statements 95.78%).
+
+✅ **Entry 258 — Align launch preview cards with shared markdown presentation**
+
+- **Goal:** Fix `/launch` markdown rendering by ensuring the launch preview card uses the same markdown presentation styles as the feature-page spec viewer instead of rendering shared HTML into a launch-only shell.
+- **Changes made:**
+  - `packages/web-dashboard/src/components/launch/launch-draft-card.tsx`
+    - mounted launch preview HTML with both `launchPreview` and `markdownPreview` classes so rendered markdown inherits the shared typography, list, code, and table styles.
+  - `packages/web-dashboard/src/styles/dashboard.module.css`
+    - scoped the legacy launch-only preview typography overrides behind `:not(.markdownPreview)` so they no longer conflict with the shared markdown layout when the launch card opts into the common preview class.
+  - `packages/web-dashboard/test/components/launch-draft-card.spec.tsx`
+    - added a regression rendering launch preview HTML with ordered lists, inline code, and tables, asserting the component includes both preview classes and preserves the expected rendered structures.
+- **Result:** `npx vitest run packages/web-dashboard/test/lib/launch-markdown.spec.ts packages/web-dashboard/test/api/launch/preview.route.spec.ts packages/web-dashboard/test/components/launch-draft-card.spec.tsx packages/web-dashboard/test/components/launch-page.spec.tsx` ✅ (4 files / 7 tests). `npm run typecheck` ✅. `npm run build --workspace @aop/web-dashboard` ✅.
+
+✅ **Entry 259 — Stop launch preview polling loops and honor active run leases**
+
+- **Goal:** Fix `/launch` so preview refreshes only on real draft edits and draft submission resolves the actual active run from the instance-scoped runtime lease instead of stale index metadata.
+- **Changes made:**
+  - `packages/web-dashboard/src/app/launch/page.tsx`
+    - extracted launch preview payload/key helpers that depend only on editable draft fields, added a debounced preview refresh keyed off that stable payload, and made preview-state application idempotent so server preview updates no longer retrigger `/api/launch/preview` in a loop.
+  - `packages/web-dashboard/src/lib/runtime-files.ts`
+    - added active run lease discovery across `.aop/runtime/*/run-lease.json` with freshness checks and index fallback for legacy repos, giving the dashboard a real active-run source of truth.
+  - `packages/web-dashboard/src/app/api/launch/submit/route.ts`
+    - switched launch submission from `index.runtime_sessions` to the new active run lease helper before calling `runtime.execution_request_submit`.
+  - `packages/web-dashboard/test/components/launch-page.spec.tsx`
+    - added regression coverage proving preview keys ignore server-returned preview metadata and that identical preview payloads preserve the current draft-state reference.
+  - `packages/web-dashboard/test/api/launch/submit.route.spec.ts`
+    - added a lease-based regression proving launch submission succeeds when the active run exists in an instance-scoped runtime lease even if `index.runtime_sessions` is stale.
+- **Result:** `npx vitest run packages/web-dashboard/test/api/launch/submit.route.spec.ts packages/web-dashboard/test/api/launch/preview.route.spec.ts packages/web-dashboard/test/components/launch-page.spec.tsx packages/web-dashboard/test/components/launch-draft-card.spec.tsx packages/web-dashboard/test/lib/launch-markdown.spec.ts` ✅ (5 files / 14 tests). `npm run typecheck` ✅. `npm run build --workspace @aop/web-dashboard` ✅.
+
+✅ **Entry 260 — Restore blocked-run retry recovery in the dashboard**
+
+- **Goal:** Make the front-end retry action on blocked features actually recover execution by re-enrolling into a live run when possible and restarting the supervisor when no fresh kernel lease is active.
+- **Changes made:**
+  - `packages/web-dashboard/src/app/api/actions/route.ts`
+    - changed blocked-feature retry handling to run the gate retry first, then perform the CLI-equivalent repair handoff: re-enroll into a fresh active run lease when the feature is not already assigned, or fall back to `resume` when no active kernel exists or the feature is already attached to the active cluster; surfaces recovery failures as action errors instead of silently treating the retry as complete.
+  - `packages/web-dashboard/src/lib/orchestrator-tools.ts`
+    - added `resumeFeatureExecution()` using the in-process control-plane runtime and `ResumeCommandHandler`, and extended the cached dashboard runtime to retain the kernel needed for that resume path.
+  - `packages/web-dashboard/src/lib/runtime-files.ts`
+    - extended active run lease normalization to expose `assigned_feature_ids`, letting the dashboard distinguish re-enrollment from full supervisor restart without trusting stale index metadata.
+  - `apps/control-plane/src/index.ts`
+    - exported `ResumeCommandHandler` from the control-plane runtime bridge so the dashboard can invoke the existing resume implementation instead of re-implementing supervisor boot logic.
+  - `apps/control-plane/src/application/services/plan-service.ts`
+    - fixed the pre-existing `PlanTraceEntry` normalization shape so `npx tsc -p apps/control-plane/tsconfig.build.json` succeeds and emits the updated runtime export into `dist/`.
+  - `packages/web-dashboard/test/api/actions/route.spec.ts`
+    - added regressions covering blocked retry with no active lease, blocked retry with a fresh active lease, blocked retry when the active lease already owns the feature session, and blocked retry recovery failure propagation.
+- **Result:** `npx vitest run packages/web-dashboard/test/api/actions/route.spec.ts` ✅ (1 file / 7 tests). `npx tsc -p apps/control-plane/tsconfig.build.json` ✅. `npm run build --workspace @aop/web-dashboard` ✅. `npm run typecheck` remains blocked by unrelated pre-existing repository errors in `apps/control-plane` tests and `plan-service`-adjacent type drift outside this dashboard retry fix.
+
+✅ **Entry 261 — Execute interactive planning intake and requirements verification**
+
+- **Goal:** Implement the M59 intake model so ambiguous raw specs are normalized into verified intake artifacts before execution planning, while reusing the M43 human-input protocol for operator questions and resume flow.
+- **Changes made:**
+  - `apps/control-plane/src/core/constants.ts`, `apps/control-plane/src/core/error-codes.ts`, `apps/control-plane/src/core/kernel.ts`, `apps/control-plane/src/core/intake-artifacts.ts`, `apps/control-plane/src/application/services/feature-state-service.ts`
+    - added the `intake` lifecycle state, intake-specific error codes, reserved-artifact helpers, intake-aware state normalization, default feature bootstrap into intake, and the kernel entry points for intake context and intake submission while preserving the reserved `global` pseudo-feature behavior.
+  - `apps/control-plane/src/application/services/bootstrap-manifest-generator-service.ts`, `apps/control-plane/src/application/services/intake-service.ts`, `apps/control-plane/src/application/services/feature-lifecycle-service.ts`, `apps/control-plane/src/application/services/question-service.ts`
+    - implemented system-owned bootstrap manifest proposal generation from canonical `spec.md`, intake review persistence and verified-manifest promotion, intake summaries in feature context, and M43-compatible persisted question handling with `resume_status=intake`.
+  - `apps/control-plane/src/application/services/plan-service.ts`, `apps/control-plane/src/supervisor/planning-wave-executor.ts`, `apps/control-plane/src/supervisor/worker-decision-loop.ts`, `apps/control-plane/src/supervisor/run-coordinator.ts`, `apps/control-plane/src/application/services/feature-send-message-service.ts`, `apps/control-plane/src/cli/attach-command-handler.ts`, `apps/control-plane/src/cli/resume-command-handler.ts`, `apps/control-plane/src/providers/cli-worker-provider.ts`
+    - added planner intake mode, `INTAKE_SUBMISSION` handling, verified-manifest and `plan_trace` gating before execution planning, intake-aware planner routing, and resume/attach behavior that keeps intake features on the planner path until verification completes.
+  - `agentic/orchestrator/policy.yaml`, `agentic/orchestrator/schemas/policy.schema.json`, `agentic/orchestrator/schemas/state.schema.json`, `agentic/orchestrator/schemas/plan.schema.json`, `agentic/orchestrator/schemas/spec.manifest.bootstrap.schema.json`, `agentic/orchestrator/schemas/spec.manifest.verified.schema.json`, `agentic/orchestrator/schemas/intake.review.schema.json`, `agentic/orchestrator/tools/catalog.json`, `agentic/orchestrator/tools/schemas/input/feature.intake_submit.input.schema.json`, `agentic/orchestrator/tools/schemas/output/feature.intake_submit.output.schema.json`, `agentic/orchestrator/tools/schemas/output/feature.get_context.output.schema.json`, `agentic/orchestrator/tools/schemas/output/feature.question_answer.output.schema.json`, `agentic/orchestrator/tools.md`, `config/agentic/orchestrator/prompts/planner.system.md`, `agentic/orchestrator/prompts/planner.system.md`
+    - added the intake policy flags, state/plan/tool schema support, bootstrap and verified manifest contracts, intake review schema, planner prompt guidance, and the new `feature.intake_submit` tool definition.
+  - `apps/control-plane/src/application/kernel-tool-wiring.ts`, `apps/control-plane/src/application/tools/tool-metadata.ts`, `apps/control-plane/src/application/services/reporting-service.ts`, `apps/control-plane/src/cli/status-command-handler.ts`, `packages/web-dashboard/src/lib/types.ts`, `packages/web-dashboard/src/lib/aop-client.ts`, `packages/web-dashboard/src/components/dashboard/triage-drawer.tsx`, `packages/web-dashboard/src/components/human-input-panel.tsx`, `packages/web-dashboard/src/app/page.tsx`
+    - wired `feature.intake_submit` through the runtime, exposed intake summaries/reviews to CLI and dashboard payloads, and extended the existing question UI so intake questions render their extra obligation/ambiguity metadata on the shared answer path.
+  - `apps/control-plane/test/bootstrap-manifest-generator-service.spec.ts`, `apps/control-plane/test/intake-service.spec.ts`, `apps/control-plane/test/plan-service.spec.ts`
+    - added regression coverage for manifest inference edge cases, intake persistence/promotion and question-loop behavior, verified-manifest fallback rules, and plan gating against verified obligations and `plan_trace`.
+- **Result:** `npm run verify` [PASS]. `npm test` [PASS] with coverage at or above repository thresholds (branches reached 90%). `npm run typecheck` [PASS]. `npm run validate:mcp-contracts` continues to emit the pre-existing AJV `date-time` warning without failing verification.
+
+✅ **Entry 253 — Close remaining M59 intake hardening and validation gaps**
+
+- **Goal:** Finish the remaining implementation gaps from the interactive intake/requirements-verification spec by hardening verified-manifest promotion, aligning runtime/question contracts, and restoring repo-wide coverage/build health after the new intake logic landed.
+- **Changes made:**
+  - `apps/control-plane/src/application/services/intake-service.ts`, `apps/control-plane/src/core/intake-artifacts.ts`, `agentic/orchestrator/policy.yaml`, `agentic/orchestrator/schemas/policy.schema.json`
+    - tightened auto-promotion behind explicit policy + minimum confidence, rejected unresolved/stale intake submissions with `INTAKE_SUBMISSION_INVALID`, and made bootstrap-to-verified promotion rules deterministic instead of permissive.
+  - `apps/control-plane/src/supervisor/planning-wave-executor.ts`, `apps/control-plane/src/supervisor/runtime.ts`
+    - switched post-QA reconciliation to prefer verified manifest obligations over raw spec prose, added verified-manifest trace-gap detection, passed policy snapshots into planning reconciliation, and hardened intake-specific runtime behavior and failure handling branches.
+  - `apps/control-plane/src/core/kernel.ts`, `apps/control-plane/src/core/questions.ts`, `apps/control-plane/src/application/services/question-service.ts`, `apps/control-plane/src/application/services/reporting-service.ts`, `apps/control-plane/src/cli/status-command-handler.ts`, `agentic/orchestrator/schemas/state.schema.json`, `agentic/orchestrator/tools/schemas/output/feature.question_answer.output.schema.json`, `agentic/orchestrator/tools/schemas/output/feature.intake_submit.output.schema.json`
+    - normalized legacy state into the intake/human-input shape, added `prompt_summary`, surfaced `feature_id` in question answers, and aligned the persisted state/tool payload contracts with the intake spec.
+  - `apps/control-plane/test/intake-service.spec.ts`, `apps/control-plane/test/planning-wave-executor.spec.ts`, `apps/control-plane/test/intake-artifacts.spec.ts`, `apps/control-plane/test/kernel-collision-replay.spec.ts`
+    - added regression coverage for low-confidence auto-promotion rejection, stale bootstrap-version rejection, planner reconciliation disposition branches, missing gate-log analysis fallback, manifest-confidence helpers, and increased the long-running collision replay test timeout to keep the full coverage run stable.
+- **Result:** `npx vitest run --coverage --config apps/control-plane/vitest.config.ts` [PASS] (116 test files / 1905 tests, 90.05% branch coverage). `npm run typecheck` [PASS]. `npm run validate:mcp-contracts` [PASS] with the existing non-failing AJV `date-time` warning. `npm run validate:docker-mcp` [PASS]. `npm run validate:architecture` [PASS]. `npm run lint -- --fix` [PASS]. `npm run nx -- run control-plane:build` [PASS]. `npm run dashboard:build` [PASS].
+
+✅ **Entry 253 — Split planner intake and execution planning onto isolated prompts**
+
+- **Goal:** Keep intake requirements-verification responsibilities separate from execution planning by giving the planner distinct prompts and rotating planner sessions when a feature moves out of `intake`.
+- **Changes made:**
+  - `agentic/orchestrator/agents.yaml`, `config/agentic/orchestrator/agents.yaml`, `agentic/orchestrator/schemas/agents.schema.json`, `apps/control-plane/src/core/kernel-types.ts` - added `intake_system_prompt_path` for the planner role so intake and planning prompts can be configured independently.
+  - `agentic/orchestrator/prompts/planner-intake.system.md`, `config/agentic/orchestrator/prompts/planner-intake.system.md`, `agentic/orchestrator/prompts/planner.system.md`, `config/agentic/orchestrator/prompts/planner.system.md` - split intake-only versus execution-planning-only instructions and explicitly forbade cross-phase submissions.
+  - `apps/control-plane/src/supervisor/types.ts`, `apps/control-plane/src/supervisor/prompt-bundle-loader.ts` - extended prompt bundles to load and cache a dedicated planner intake prompt with `missing_prompt_behavior` support.
+  - `apps/control-plane/src/supervisor/session-orchestrator.ts`, `apps/control-plane/src/supervisor/planning-wave-executor.ts`, `apps/control-plane/src/supervisor/runtime.ts` - tracked planner prompt phase per feature, selected the intake prompt for `status=intake`, rotated planner sessions when a feature transitions to planning, and synced planner sessions before planning/reconciliation waves.
+  - `apps/control-plane/src/providers/providers.ts`, `apps/control-plane/src/supervisor/worker-decision-loop.ts`, `apps/control-plane/src/providers/cli-worker-provider.ts` - passed `planner_phase` into planner runs and made the interactive planner wrapper emit intake-specific versus planning-specific instructions and artifact expectations.
+  - `apps/control-plane/src/cli/init-command-handler.ts`, `apps/control-plane/test/supervisor-collaborators.spec.ts`, `apps/control-plane/test/planning-wave-executor.spec.ts`, `apps/control-plane/test/init-wizard.spec.ts` - updated generated config defaults and added regression coverage for intake-prompt loading, prompt rotation, and planning-wave session syncing.
+- **Result:** `npx vitest run apps/control-plane/test/supervisor-collaborators.spec.ts` [PASS]. `npx vitest run apps/control-plane/test/planning-wave-executor.spec.ts` [PASS]. `npx vitest run apps/control-plane/test/init-wizard.spec.ts` [PASS]. `npm run typecheck` [PASS]. `npm test` [PASS] (116 test files / 1909 tests, 95.63% statements, 90.00% branches, 95.07% functions, 95.81% lines). `npm run verify` [PASS].
+
+✅ **Entry 254 — Harden intake prompt clarifying-question rules**
+
+- **Goal:** Make the intake planner ask targeted clarification questions consistently instead of silently normalizing ambiguous spec intent into a premature verified manifest.
+- **Changes made:**
+  - `agentic/orchestrator/prompts/planner-intake.system.md`, `config/agentic/orchestrator/prompts/planner-intake.system.md` - added an explicit ambiguity sweep before `INTAKE_SUBMISSION`, defined concrete must-ask triggers (obligation set, scope boundary, user-visible behavior, contracts/integrations/persistence, verification expectations, and planning surface changes), forbade silently choosing between plausible interpretations, and tightened question-shaping guidance so clarifications stay narrow, traceable, and deterministic.
+- **Result:** `npm run verify` [PASS].
+
+✅ **Entry 255 — Restore planner intake submission RBAC in composed and generated policies**
+
+- **Goal:** Fix `forbidden_tool_for_role` failures on `feature.intake_submit` by restoring the planner allowlist entry in the policy sources the runtime actually composes and the init wizard generates.
+- **Changes made:**
+  - `agentic/orchestrator/defaults/policy.defaults.yaml`
+    - added `feature.intake_submit` to the bundled `planner` and `orchestrator` RBAC defaults so lean `config/agentic/orchestrator/policy.yaml` repos inherit the correct intake authorization.
+  - `apps/control-plane/src/cli/init-command-handler.ts`
+    - added `feature.intake_submit` to the advanced/full policy template for both `planner` and `orchestrator` so `aop init --advanced-policy` no longer emits a stale RBAC block.
+  - `apps/control-plane/test/policy-loader-service.spec.ts`
+    - extended the composed-policy regression to assert the merged lean policy includes `feature.intake_submit` for `planner`.
+  - `apps/control-plane/test/init-wizard.spec.ts`
+    - added coverage proving advanced-policy generation includes `feature.intake_submit`.
+  - `apps/control-plane/test/mcp.spec.ts`
+    - added a cross-transport authorization regression proving a `planner` actor can successfully call `feature.intake_submit` through both in-process and MCP tool clients after `feature.init`.
+- **Result:** `npx vitest run apps/control-plane/test/policy-loader-service.spec.ts apps/control-plane/test/init-wizard.spec.ts apps/control-plane/test/mcp.spec.ts` [PASS] (3 files / 63 tests). `npm run typecheck` [PASS].
+
+✅ **Entry 256 — Fix intake-service build typo uncovered during verification**
+
+- **Goal:** Remove an unrelated `tsconfig.build` failure so the control-plane build path no longer stops on a stale variable name inside intake submission validation.
+- **Changes made:**
+  - `apps/control-plane/src/application/services/intake-service.ts`
+    - corrected the `human_review_confirmed` error payload to reference `verificationBasis` instead of the nonexistent `verification_basis` symbol.
+- **Result:** `npx tsc -p apps/control-plane/tsconfig.build.json` [PASS]. `npm run typecheck` [PASS].
+
+✅ **Entry 262 — Prevent planner intake from self-certifying human review**
+
+- **Goal:** Stop intake from promoting a verified manifest unless persisted operator-question evidence actually exists, so the planner cannot ask a question and then answer it itself in the same turn.
+- **Changes made:**
+  - `apps/control-plane/src/application/services/intake-service.ts`
+    - hardened `intakeSubmit()` to validate `questions_resolved` and `human_review_confirmed` against persisted answered intake-question records, require explicit manifest-review confirmation evidence for `human_review_confirmed`, reject unresolved/open intake questions, and block inferred ambiguity resolution from claiming structured confirmation it does not have.
+  - `apps/control-plane/src/supervisor/worker-decision-loop.ts`, `apps/control-plane/src/supervisor/planning-wave-executor.ts`, `apps/control-plane/src/providers/cli-worker-provider.ts`
+    - made `REQUEST.action=ask_user_input` a turn-stopping output for planner intake, prevented same-turn `INTAKE_SUBMISSION` processing after a blocking question, and tightened the interactive planner wrapper/instructions so intake cannot self-assert human confirmation.
+  - `agentic/orchestrator/prompts/planner-intake.system.md`, `config/agentic/orchestrator/prompts/planner-intake.system.md`
+    - clarified that the planner must stop after emitting a blocking intake question, use `questions_resolved` only after persisted operator answers exist, and reserve `human_review_confirmed` for explicit answered manifest-review confirmation.
+  - `apps/control-plane/test/intake-service.spec.ts`, `apps/control-plane/test/worker-decision-loop.spec.ts`, `apps/control-plane/test/helpers.ts`, `apps/control-plane/test/mcp.spec.ts`
+    - added regressions for missing answered-question evidence, open-question rejection, explicit manifest-review confirmation requirements, same-turn question-plus-submit suppression, and cross-transport intake verification flows that now create and answer persisted questions before promotion.
+- **Result:** `npx vitest run apps/control-plane/test/intake-service.spec.ts apps/control-plane/test/worker-decision-loop.spec.ts apps/control-plane/test/mcp.spec.ts` [PASS]. `npm run typecheck` [PASS]. `npm run verify` [PASS].
+
+✅ **Entry 264 — Auto-enroll answered features back into the active run**
+
+- **Goal:** Make answered human-input questions actually resume feature execution during a live supervisor run instead of leaving the feature resumable-but-idle until a manual `aop resume`.
+- **Changes made:**
+  - `apps/control-plane/src/core/kernel.ts`
+    - updated `featureQuestionAnswer()` to queue an `add_features` execution request after a successful resumed answer when the feature is not already assigned to the active run and a fresh run lease exists.
+    - added `maybeQueueAnsweredFeatureForResume()` to submit the re-enrollment request idempotently and ignore expected race conditions like duplicate requests or a run lease disappearing mid-answer.
+  - `apps/control-plane/src/supervisor/run-coordinator.ts`
+    - added an awaiting-input wait loop so a live run stays parked when every active feature is blocked on human input, keeps renewing the run lease, keeps polling safe checkpoints, and continues once the feature becomes runnable again.
+    - treated `intake` as a planning-eligible phase during resume eligibility checks so answered intake questions flow back into the planning lane correctly.
+  - `apps/control-plane/test/kernel.spec.ts`
+    - added regressions proving answered questions enqueue a resume request only when a live run exists and the feature is not already assigned to that run.
+  - `apps/control-plane/test/run-coordinator.spec.ts`
+    - added a fake-timer regression proving the coordinator waits on `awaiting_input`, does not burn the planning wave while blocked, and resumes planning after the answer restores a runnable status.
+- **Result:** `npx vitest run apps/control-plane/test/kernel.spec.ts apps/control-plane/test/run-coordinator.spec.ts` [PASS]. `npm run typecheck` [PASS]. `npm run verify` [PASS].
+
+✅ **Entry 265 — Restore dashboard question-answer RBAC in composed policies**
+
+- **Goal:** Fix dashboard question answering failures caused by lean/generated policies inheriting a stale default RBAC set that omitted the human-input tools used by `/api/features/[id]/questions/[questionId]/answer`.
+- **Changes made:**
+  - `agentic/orchestrator/defaults/policy.defaults.yaml`
+    - restored the human-input tool allowances missing from bundled defaults: `feature.question_create` for `planner` and `builder`, plus `feature.question_create`, `feature.question_list`, `feature.question_answer`, and `feature.send_message` for `orchestrator`.
+  - `apps/control-plane/src/cli/init-command-handler.ts`
+    - updated the advanced-policy template so newly generated explicit `policy.yaml` files include the same human-input RBAC entries instead of emitting a stale full-policy block.
+  - `apps/control-plane/test/policy-loader-service.spec.ts`, `apps/control-plane/test/init-wizard.spec.ts`
+    - tightened policy-composition and init-generation regressions to assert the question-tool permissions are present in lean-composed and advanced-policy outputs.
+  - `packages/web-dashboard/test/api/features/question-answer.route.spec.ts`
+    - added direct API-route coverage for `POST /api/features/[id]/questions/[questionId]/answer`, including the success path and propagation of tool-call failures like `forbidden_tool_for_role`.
+- **Result:** `npx vitest run apps/control-plane/test/policy-loader-service.spec.ts apps/control-plane/test/init-wizard.spec.ts packages/web-dashboard/test/api/features/question-answer.route.spec.ts` [PASS] (3 files / 49 tests). Composed-policy spot check [PASS] (`feature.question_answer`, `feature.question_list`, `feature.question_create` present in merged RBAC). `npm run typecheck` remains blocked by unrelated pre-existing dashboard errors in `packages/web-dashboard/src/lib/focus-detail-derivations.ts` and `packages/web-dashboard/src/lib/planner-workspace.ts`.
+
+✅ **Entry 266 — Keep resume/retry compatible with awaiting-input features**
+
+- **Goal:** Prevent `resume` and `retry` from failing when a feature is paused for missing human answers, while still allowing the runtime to stay in or return to `awaiting_input` until the operator responds.
+- **Changes made:**
+  - `apps/control-plane/src/cli/retry-command-handler.ts`
+    - changed `retry` so `status=awaiting_input` returns a successful waiting-state result (`retry_executed: false`, `waiting_for_input: true`) instead of falling through to `gates.run` and triggering an invalid no-op status transition.
+  - `apps/control-plane/src/cli/resume-command-handler.ts`
+    - preserved `awaiting_input` features in the resume plan so `resume` can hand them back to the supervisor, which can continue waiting for answers instead of rejecting the feature as non-resumable.
+  - `packages/web-dashboard/src/app/api/actions/route.ts`
+    - kept `resume` available for `awaiting_input` features while continuing to block retry-compatibility fallback for that state, matching the CLI semantics.
+  - `apps/control-plane/test/cli-helpers.spec.ts`, `apps/control-plane/test/resume-command.spec.ts`, `packages/web-dashboard/test/api/actions/route.spec.ts`
+    - added regressions proving retry returns a waiting result for `awaiting_input`, resume keeps `awaiting_input` features in the resume plan, mixed resume plans keep both waiting and active features, and dashboard resume remains enabled for waiting features.
+- **Result:** `npx vitest run apps/control-plane/test/resume-command.spec.ts apps/control-plane/test/cli-helpers.spec.ts packages/web-dashboard/test/api/actions/route.spec.ts` [PASS] (3 files / 112 tests). `npm run typecheck` [PASS].
+
+✅ **Entry 267 — Skip retry auto-resume when a feature is still awaiting input**
+
+- **Goal:** Stop `aop retry` from invoking the repair handoff after the retry handler already determined the feature must remain in `awaiting_input`, which was producing a spurious `invalid_status_transition` on `awaiting_input -> awaiting_input`.
+- **Changes made:**
+  - `apps/control-plane/src/interfaces/cli/bootstrap.ts`
+    - added a short-circuit in the `retry` command flow so `retryPayload.data.waiting_for_input === true` returns immediately with `auto_resume.attempted: false` and `skipped_reason: 'awaiting_input'` instead of calling `attemptFeatureRepairHandoff(...)`.
+  - `apps/control-plane/test/bootstrap.spec.ts`
+    - added a regression proving `retry` on an `awaiting_input` feature returns the waiting-state payload and does not call the resume handoff path.
+  - `apps/control-plane/test/cli-helpers.spec.ts`, `apps/control-plane/test/resume-command.spec.ts`, `packages/web-dashboard/test/api/actions/route.spec.ts`
+    - revalidated the surrounding waiting-state behavior so retry, resume, and dashboard actions remain consistent after the bootstrap change.
+- **Result:** `npx vitest run apps/control-plane/test/bootstrap.spec.ts apps/control-plane/test/cli-helpers.spec.ts apps/control-plane/test/resume-command.spec.ts packages/web-dashboard/test/api/actions/route.spec.ts` [PASS] (4 files / 139 tests). `npm run typecheck` [PASS].
+
+✅ **Entry 268 — Execute the Focus Intake and Planning workspace spec**
+
+- **Goal:** Replace the old single planner workspace in `/feature/[id]` with distinct `Intake` and `Planning` tabs that match the new planner subphases, surface the right source-of-truth artifacts, and let operators answer blocking intake questions in context.
+- **Changes made:**
+  - `packages/web-dashboard/src/lib/types.ts`, `packages/web-dashboard/src/lib/planner-workspace.ts`, `packages/web-dashboard/src/lib/aop-client.ts`, `packages/web-dashboard/src/lib/focus-view.ts`, `packages/web-dashboard/src/lib/focus-detail-derivations.ts`
+    - added planner lifecycle, intake workspace, and planning workspace read models; implemented ambiguity grouping, promotion readiness, plan freshness, trace-coverage derivations, planner artifact loading, and replaced the retired `plan` tab model with `intake` and `planning`.
+  - `packages/web-dashboard/src/app/api/features/[id]/planner-lifecycle/route.ts`, `packages/web-dashboard/src/app/api/features/[id]/intake-workspace/route.ts`, `packages/web-dashboard/src/app/api/features/[id]/planning-workspace/route.ts`, `packages/web-dashboard/src/app/api/features/[id]/planner-artifacts/[artifact]/route.ts`
+    - added the dashboard API surface for shared planner lifecycle refreshes, tab-specific workspace payloads, and artifact retrieval for the source spec, bootstrap/verified manifests, intake review, and accepted-plan files.
+  - `packages/web-dashboard/src/components/focus/FocusLayout.tsx`, `packages/web-dashboard/src/components/focus/tabs/IntakeTab.tsx`, `packages/web-dashboard/src/components/focus/tabs/PlanningTab.tsx`, `packages/web-dashboard/src/components/focus/PlannerLifecycleHeader.tsx`, `packages/web-dashboard/src/components/focus/PlannerArtifactViewer.tsx`, `packages/web-dashboard/src/components/focus/FeatureQuestionAnswerPanel.tsx`, `packages/web-dashboard/src/components/human-input-panel.tsx`, `packages/web-dashboard/src/components/plan-viewer.tsx`, `packages/web-dashboard/src/components/focus/ContextSidebar.tsx`, `packages/web-dashboard/src/components/focus/ProgressSnapshotCard.tsx`, `packages/web-dashboard/src/components/focus/tabs/OverviewTab.tsx`, `packages/web-dashboard/src/styles/dashboard.module.css`
+    - removed the old `PlanTab`, introduced separate `Intake` and `Planning` workspaces with a shared lifecycle header, added inline answer controls inside the ambiguity queue, split artifacts by lifecycle stage, updated accepted-plan presentation for the planning stage, and routed planner CTAs to the correct subphase tab.
+  - `packages/web-dashboard/test/lib/planner-workspace.spec.ts`, `packages/web-dashboard/test/lib/focus-view.spec.ts`, `packages/web-dashboard/test/components/intake-tab.spec.tsx`, `packages/web-dashboard/test/components/planning-tab.spec.tsx`, `packages/web-dashboard/test/components/overview-tab.spec.tsx`, `packages/web-dashboard/test/components/focus-layout.spec.tsx`, `packages/web-dashboard/test/components/human-input-panel.spec.tsx`, `packages/web-dashboard/test/api/features/planner-workspaces.route.spec.ts`
+    - added regression coverage for workspace derivations, tab routing/default selection, inline intake answering, and the new planner workspace API routes.
+  - `packages/web-dashboard/src/lib/launch-page-preview.ts`, `packages/web-dashboard/src/app/launch/page.tsx`, `packages/web-dashboard/test/components/launch-page.spec.tsx`
+    - extracted launch-preview helper exports out of the `/launch` page module so Next page type generation no longer blocks production dashboard builds during verification.
+  - `spec-files/completed/agentic_orchestrator_focus_plan_tab_intake_planning_workspace_spec.md`
+    - archived the implemented Focus Intake/Planning workspace spec.
+- **Result:** `npx vitest run packages/web-dashboard/test/lib/focus-view.spec.ts packages/web-dashboard/test/lib/planner-workspace.spec.ts packages/web-dashboard/test/components/intake-tab.spec.tsx packages/web-dashboard/test/components/planning-tab.spec.tsx packages/web-dashboard/test/components/overview-tab.spec.tsx packages/web-dashboard/test/components/focus-layout.spec.tsx packages/web-dashboard/test/components/human-input-panel.spec.tsx packages/web-dashboard/test/api/features/planner-workspaces.route.spec.ts packages/web-dashboard/test/components/launch-page.spec.tsx` [PASS] (9 files / 30 tests). `npm run typecheck` [PASS]. `npm run build --workspace @aop/web-dashboard` [PASS].
+
+✅ **Entry 269 — Restore a visible Plan tab alongside Intake in focus view**
+
+- **Goal:** Correct the focus-page planner UX so `Intake` and `Plan` appear as two separate tabs in the UI without making the plan workspace disappear during intake.
+- **Changes made:**
+  - `packages/web-dashboard/src/lib/focus-view.ts`
+    - changed the user-facing `planning` tab label back to `Plan` and widened the visibility rules so the plan workspace remains visible during `intake` and intake-blocked waiting states instead of disappearing until planning starts.
+  - `packages/web-dashboard/src/components/focus/ProgressSnapshotCard.tsx`, `packages/web-dashboard/src/components/focus/tabs/PlanningTab.tsx`
+    - updated the sidebar CTA and empty/loading state copy to say `Plan` rather than `Planning`, keeping the UI consistent with the restored tab model.
+  - `packages/web-dashboard/test/lib/focus-view.spec.ts`, `packages/web-dashboard/test/components/focus-layout.spec.tsx`
+    - added regressions proving intake-phase features render both `Intake` and `Plan`, while `Intake` remains the default active tab during intake work.
+- **Result:** `npx vitest run packages/web-dashboard/test/lib/focus-view.spec.ts packages/web-dashboard/test/components/focus-layout.spec.tsx packages/web-dashboard/test/components/planning-tab.spec.tsx` [PASS] (3 files / 17 tests). `npm run typecheck` [PASS]. `npx eslint --no-ignore --no-warn-ignored packages/web-dashboard/src/lib/focus-view.ts packages/web-dashboard/src/components/focus/ProgressSnapshotCard.tsx packages/web-dashboard/src/components/focus/tabs/PlanningTab.tsx --max-warnings 0` [PASS]. `npm run build --workspace @aop/web-dashboard` still exits with a generic Next build-worker failure after compile/typecheck and did not surface a page-level error in this run.
+
+✅ **Entry 270 — Author execution-contract refinement spec for the Focus Plan tab**
+
+- **Goal:** Define a follow-on spec that makes the Focus-page `Plan` tab complementary to `Intake` by turning it into an execution-contract workspace instead of a second intake/planner-status surface.
+- **Changes made:**
+  - `spec-files/outstanding/agentic_orchestrator_focus_plan_tab_execution_contract_workspace_spec.md`
+    - added a new outstanding spec defining the `Plan` tab as the execution-contract workspace; specified the complementary `Intake` vs `Plan` ownership split, required decision-first sections (`Plan Readiness`, `Delivery Strategy`, `Critical Path`, `Verification Strategy`, `Scope & Blast Radius`, `Plan Gaps Requiring Decision`, `Plan Evolution`, `Plan Artifacts`), required `FeaturePlanningWorkspace` additions, derivation rules, rollout slices, testing requirements, and acceptance criteria.
+- **Result:** Documentation-only change; tests not run. Spec authored and added to the outstanding spec inventory.
+
+✅ **Entry 276 — Surface live agent text output on the Runtime tab**
+
+- **Goal:** Make the dashboard Runtime tab show both the current in-progress agent text stream and the archived provider output so operators no longer need the external CLI to see what the worker is saying.
+- **Changes made:**
+  - `apps/control-plane/src/providers/providers.ts`
+    - added `onOutputChunk` to `ProviderCommandRunnerOptions` and emitted ordered stdout/stderr chunk callbacks from `NodeProviderCommandRunner`.
+  - `apps/control-plane/src/providers/cli-worker-provider.ts`
+    - created a rolling `.aop/features/<id>/logs/live/<role>.{txt,json}` capture for planner/builder/qa turns, appended live worker chunks as they arrive, finalized the capture on success/failure, and preserved the existing archived raw-log persistence.
+  - `packages/web-dashboard/src/lib/types.ts`, `packages/web-dashboard/src/lib/aop-client.ts`
+    - added `LiveAgentOutputSnapshot` plus readers for the per-role live console artifacts.
+  - `packages/web-dashboard/src/app/api/features/[id]/live-output/route.ts`
+    - added a dashboard API route that returns live per-role output snapshots when observability raw logs are enabled.
+  - `packages/web-dashboard/src/components/focus/LiveAgentConsole.tsx`
+    - added a Runtime-tab live console with per-role selectors, polling-based live follow, provider/session metadata, and raw text rendering.
+  - `packages/web-dashboard/src/components/focus/tabs/RuntimeTab.tsx`
+    - surfaced `Live Agent Console` directly on the Runtime tab.
+  - `packages/web-dashboard/src/components/features/runtime-inspector/RuntimeInspectorPanel.tsx`
+    - renamed the historical raw-log review surface to `Archived Raw Logs` and clarified that it complements the live console.
+  - `apps/control-plane/test/worker-provider-adapters.spec.ts`, `packages/web-dashboard/test/api/features/live-output.route.spec.ts`, `packages/web-dashboard/test/components/runtime-tab.spec.tsx`
+    - added regression coverage for live chunk capture, the new API route, and Runtime-tab rendering of the console.
+- **Result:** `npx vitest run apps/control-plane/test/worker-provider-adapters.spec.ts packages/web-dashboard/test/api/features/live-output.route.spec.ts packages/web-dashboard/test/components/runtime-tab.spec.tsx` [PASS] (3 files / 51 tests). `npm run typecheck` [PASS]. `npm run verify` [PASS] (116 files / 1991 tests; coverage 95.88% statements, 90.01% branches, 95.42% functions, 96.05% lines).
+
+✅ **Entry 277 — Show the full combined worktree diff in the Review tab**
+
+- **Goal:** Let operators review the complete persisted feature diff directly from the Review tab before approving merge, instead of switching over to the separate Changes experience.
+- **Changes made:**
+  - `packages/web-dashboard/src/components/focus/tabs/ReviewTab.tsx`
+    - added a `Combined Worktree Diff` section that parses `detail.diff`, computes file/add/delete summary stats, lets the operator switch between changed files, links to the raw patch endpoint, and renders the persisted unified diff through the shared `DiffViewer`.
+  - `packages/web-dashboard/test/components/review-tab.spec.tsx`
+    - added a regression proving the Review tab renders the combined diff panel, raw patch link, and review decision controls together for a ready-to-merge feature.
+  - `apps/control-plane/test/activity-monitor.spec.ts`
+    - added low-cost branch coverage for the non-notify stuck-reaction path and the `formatForStatus(... just now)` projection so the full repo gate stays above the global branch threshold after the dashboard change.
+  - `apps/control-plane/test/cli-helpers.spec.ts`
+    - added Status CLI branch coverage around execution-request projection and waiting-input/status normalization paths that were still leaving the repo just under the global branch floor.
+- **Result:** `npx vitest run packages/web-dashboard/test/components/review-tab.spec.tsx packages/web-dashboard/test/components/changes-tab.spec.tsx` [PASS]. `npx vitest run apps/control-plane/test/activity-monitor.spec.ts apps/control-plane/test/cli-helpers.spec.ts packages/web-dashboard/test/components/review-tab.spec.tsx` [PASS]. `npm run typecheck` [PASS]. `npm run verify` [PASS] (116 files / 2001 tests; coverage 95.90% statements, 90.06% branches, 95.43% functions, 96.08% lines).
+
+✅ **Entry 278 — Switch the Review tab diff to an on-demand worktree Git diff**
+
+- **Goal:** Make merge review reflect the current full worktree state at the moment of review instead of depending on the persisted `evidence/diff.patch` artifact.
+- **Changes made:**
+  - `packages/web-dashboard/src/lib/worktree-diff.ts`
+    - added a dashboard-side live diff helper that reads the feature worktree location, runs `git diff --no-ext-diff --binary` for tracked changes, adds untracked-file patches via `git diff --no-index`, and returns a combined worktree diff.
+  - `packages/web-dashboard/src/app/api/features/[id]/diff/route.ts`
+    - changed the raw patch endpoint from artifact reads to on-demand live diff generation with feature-id validation and plain-text `404` handling when the feature does not exist.
+  - `packages/web-dashboard/src/components/focus/tabs/ReviewTab.tsx`
+    - changed the Review tab to fetch the live diff from `/api/features/<id>/diff` on mount/feature change, keep the existing detail diff as a fallback, and update the merge-review copy to describe the current live worktree diff.
+  - `packages/web-dashboard/test/api/features/diff.route.spec.ts`
+    - added route coverage for successful live diff responses, missing-feature `404`, and invalid feature-id rejection.
+  - `packages/web-dashboard/test/lib/worktree-diff.spec.ts`
+    - added unit coverage for combining tracked and untracked worktree patches and for safe fallback when a stored worktree path escapes the repo root.
+  - `packages/web-dashboard/test/components/review-tab.spec.tsx`
+    - updated the Review-tab expectation to match the live-diff wording while preserving the combined-diff and raw-patch coverage.
+- **Result:** `npx vitest run packages/web-dashboard/test/components/review-tab.spec.tsx packages/web-dashboard/test/api/features/diff.route.spec.ts packages/web-dashboard/test/lib/worktree-diff.spec.ts` [PASS] (3 files / 7 tests). `npm run typecheck` [PASS]. `npm run verify` [PASS].
+
+✅ **Entry 279 — Keep blocked ready-to-merge features out of generic resume planning**
+
+- **Goal:** Prevent `resume --feature-id <other-feature>` from pulling unrelated merge-blocked features back into `building` when they are actually blocked in the pre-merge lifecycle.
+- **Changes made:**
+  - `apps/control-plane/src/core/feature-resume-phase.ts`
+    - added shared resume-phase derivation that infers the intended execution phase for `blocked` and `awaiting_input` features from human-input resume targets, unresolved mainline-conflict metadata, intake state, gate evidence, and merge-repair state.
+  - `apps/control-plane/src/supervisor/run-coordinator.ts`
+    - changed planning-wave eligibility to use the derived resume phase so generic `blocked` features are only routed into planning when they were actually blocked from intake or planning; merge-blocked pre-merge features now stay out of generic planner recovery.
+  - `apps/control-plane/src/cli/resume-command-handler.ts`
+    - changed resume-plan construction to report the derived resume phase instead of collapsing blocked features to `planning`, preserving `ready_to_merge` classification for merge-blocked features.
+  - `apps/control-plane/test/resume-command.spec.ts`, `apps/control-plane/test/run-coordinator.spec.ts`
+    - added regressions covering blocked merge-failure features reporting `resume_phase: ready_to_merge` and ensuring an unrelated resume request does not send an active merge-blocked feature through the planning wave.
+  - `docs/core/DOMAIN-LOGIC.md`
+    - documented the invariant that blocked pre-merge features must not be sent back into generic planning/build recovery.
+- **Result:** `npx vitest run apps/control-plane/test/resume-command.spec.ts apps/control-plane/test/run-coordinator.spec.ts apps/control-plane/test/git-reconciliation-service.spec.ts` [PASS] (3 files / 151 tests). `npm run typecheck` [PASS]. `npx eslint apps/control-plane/src/core/feature-resume-phase.ts apps/control-plane/src/cli/resume-command-handler.ts apps/control-plane/src/supervisor/run-coordinator.ts apps/control-plane/test/resume-command.spec.ts apps/control-plane/test/run-coordinator.spec.ts --max-warnings 0` [PASS].
+
+✅ **Entry 280 — Distinguish retrying planner recovery from hard blocked state**
+
+- **Goal:** Stop the runtime and dashboard from presenting auto-retrying planner failures as hard blocked features that need operator intervention, while preserving the existing `blocked` lifecycle status in the state machine.
+- **Changes made:**
+  - `apps/control-plane/src/core/tool-caller.ts`
+    - added the shared `FeatureRecoveryState` frontmatter contract so runtime and dashboard layers can carry structured recovery metadata without inventing a new top-level status.
+  - `apps/control-plane/src/supervisor/planning-wave-executor.ts`
+    - persisted `recovery.state='retrying'` metadata for planner watchdog blocks (`provider_output_invalid`, `provider_context_stall`, and the shared block-policy path), including cause, role, run ID, phase, attempt count, and last-attempt timestamp; also logged the recovery state/attempt alongside the blocked note.
+  - `apps/control-plane/src/application/services/activity-monitor-service.ts`
+    - taught activity derivation to treat blocked features with matching retry recovery metadata as `active` while the last retry attempt is fresh, falling back to `blocked` only once recovery activity goes stale.
+  - `packages/web-dashboard/src/lib/types.ts`, `packages/web-dashboard/src/lib/aop-client.ts`
+    - added `feature.recovery` to the dashboard read model, treated valid retry recovery as `Planner Retrying` / `Recovering`, included recovery timestamps in recent-activity inference, and surfaced the state through `readDashboardStatus`.
+  - `packages/web-dashboard/src/lib/health-diagnosis.ts`
+    - added the `FEATURE_RECOVERING` diagnosis so blocked retry loops render as degraded recovery instead of hard blocked operator action.
+  - `docs/core/DOMAIN-LOGIC.md`
+    - documented the invariant that `status: blocked` plus `recovery.state: retrying` represents active automated recovery, not a hard operator block.
+  - `apps/control-plane/test/planning-wave-executor.spec.ts`, `apps/control-plane/test/activity-monitor.spec.ts`, `apps/control-plane/test/dashboard-client.spec.ts`, `packages/web-dashboard/test/lib/health-diagnosis.spec.ts`
+    - added regressions covering recovery metadata persistence, active activity-state inference, recovering dashboard labels, and health-diagnosis severity.
+- **Result:** `npx vitest run apps/control-plane/test/planning-wave-executor.spec.ts apps/control-plane/test/activity-monitor.spec.ts apps/control-plane/test/dashboard-client.spec.ts packages/web-dashboard/test/lib/health-diagnosis.spec.ts` [PASS] (4 files / 119 tests). `npm run typecheck` [PASS]. `npm run build --workspace @aop/web-dashboard` [PASS]. `npm run verify` [FAIL, unrelated existing timeout suites: `apps/control-plane/test/kernel-collision-replay.spec.ts`, `apps/control-plane/test/kernel.branches.spec.ts`, `apps/control-plane/test/session-management.spec.ts`, `apps/control-plane/test/supervisor.spec.ts`].
+
+✅ **Entry 281 — Reroute blocked retries back into phase ownership and align live active-role display**
+
+- **Goal:** Stop blocked `retry` flows from bypassing the owning worker phase with direct gate reruns, and make the Focus runtime view derive the active role from live execution state instead of stale worker history.
+- **Changes made:**
+  - `apps/control-plane/src/cli/retry-command-handler.ts`
+    - changed blocked retry handling so `fast`, `full`, and `merge` retries reroute the feature back to `building`, `qa`, or `ready_to_merge` with reset retry-budget metadata and return without directly calling `gates.run`.
+  - `apps/control-plane/test/cli-helpers.spec.ts`
+    - updated blocked retry coverage to assert reroute-only behavior for blocked `fast` and `full` retries while preserving direct gate reruns for non-blocked retry paths.
+  - `packages/web-dashboard/src/lib/orchestrator-tools.ts`
+    - aligned dashboard retry inference with the CLI by honoring blocked `gates.fast/full` failures and returning reroute metadata instead of synchronously invoking `gates.run` for blocked features.
+  - `packages/web-dashboard/src/lib/types.ts`, `packages/web-dashboard/src/lib/aop-client.ts`
+    - added summarized live-output snapshot metadata to `FeatureDetail` so the Focus page can reason about live role status without embedding raw console text into the initial detail payload.
+  - `packages/web-dashboard/src/lib/focus-detail-derivations.ts`, `packages/web-dashboard/src/components/focus/tabs/RuntimeTab.tsx`
+    - resolved the active role from running live snapshots first, then recovery/phase ownership, before falling back to historical worker events so `phase` and `active role` stay coherent in the focus dashboard.
+  - `apps/control-plane/test/dashboard-client.spec.ts`, `packages/web-dashboard/test/lib/focus-detail-derivations.spec.ts`, `packages/web-dashboard/test/components/runtime-tab.spec.tsx`
+    - added regressions for live snapshot metadata inclusion and active-role derivation priority.
+- **Result:** `npx vitest run apps/control-plane/test/cli-helpers.spec.ts apps/control-plane/test/dashboard-client.spec.ts packages/web-dashboard/test/lib/focus-detail-derivations.spec.ts packages/web-dashboard/test/components/runtime-tab.spec.tsx` [PASS] (4 files / 113 tests). `npm run typecheck` [PASS]. `npx eslint --no-ignore apps/control-plane/src/cli/retry-command-handler.ts packages/web-dashboard/src/lib/orchestrator-tools.ts packages/web-dashboard/src/lib/aop-client.ts packages/web-dashboard/src/lib/types.ts packages/web-dashboard/src/lib/focus-detail-derivations.ts packages/web-dashboard/src/components/focus/tabs/RuntimeTab.tsx --max-warnings 0` [PASS]. `npm run build --workspace @aop/web-dashboard` [PASS].
+
+✅ **Entry 282 — Clear answered input state and target question resumes at the live runtime**
+
+- **Goal:** Stop answered questions from leaving features stuck in a false `Needs Input` state and make dashboard answers queue their auto-resume request against the live supervisor instance instead of `.aop/runtime/default`.
+- **Changes made:**
+  - `apps/control-plane/src/application/services/question-service.ts`
+    - changed `normalizeStateForAnsweredQuestion()` to strip stale activity metadata (`activity_state`, `activity_last_event_at`, `activity_detected_via`, `activity_detector`) before persisting the resumed state, so answered questions cannot leave impossible `waiting_input` activity behind.
+  - `packages/web-dashboard/src/lib/aop-client.ts`
+    - hardened `inferActivityState()` to ignore persisted `waiting_input` when the feature no longer has an awaiting-input lifecycle signal, and changed `waiting_input_count` derivation to zero out stale question counts unless the feature is actually still in an awaiting-input state.
+  - `packages/web-dashboard/src/lib/orchestrator-tools.ts`
+    - bound the in-process dashboard kernel to the current active run lease via `readActiveRunLease()`, keyed runtime caching by `repoRoot + instanceId`, and added `resolveDashboardKernelInstanceId()` so `feature.question_answer` auto-resume requests are written to the live instance execution-control file.
+  - `apps/control-plane/test/question-service.spec.ts`, `apps/control-plane/test/dashboard-client.spec.ts`, `packages/web-dashboard/test/lib/orchestrator-tools.spec.ts`
+    - added regressions covering activity-field cleanup after answering a question, dashboard suppression of stale `Needs Input` labeling after resume, and runtime-instance resolution from active run leases.
+- **Result:** `npx vitest run apps/control-plane/test/question-service.spec.ts apps/control-plane/test/dashboard-client.spec.ts packages/web-dashboard/test/lib/orchestrator-tools.spec.ts` [PASS] (3 files / 47 tests). `npm run typecheck` [PASS]. `npx eslint --no-ignore apps/control-plane/src/application/services/question-service.ts packages/web-dashboard/src/lib/aop-client.ts packages/web-dashboard/src/lib/orchestrator-tools.ts apps/control-plane/test/question-service.spec.ts apps/control-plane/test/dashboard-client.spec.ts --max-warnings 0` [PASS]. `npm run build --workspace @aop/web-dashboard` [PASS].
+
+✅ **Entry 288 — Explain invalid plan-trace mappings and harden planner guidance**
+
+- **Goal:** Make `plan_trace_invalid` failures actionable by surfacing the concrete invalid-mapping reason and by telling the planner that verification-only `in_scope` trace entries are rejected.
+- **Changes made:**
+  - `apps/control-plane/src/core/intake-artifacts.ts` - extended `validatePlanTraceAgainstObligationIds()` to distinguish `missing_planned_paths` from `planned_paths_outside_plan_files`, while preserving the existing `invalid_mappings` rollup for compatibility.
+  - `apps/control-plane/src/application/services/plan-service.ts` - included `invalid_mapping_details` in the `PLAN_TRACE_INVALID` error payload returned by `plan.submit` / `plan.update`.
+  - `apps/control-plane/test/intake-artifacts.spec.ts` - added regressions covering both invalid-mapping detail modes, including the verification-only `in_scope` case that leaves `planned_paths` empty.
+  - `apps/control-plane/test/plan-service.spec.ts` - updated the plan-submission contract test to assert that invalid-mapping errors now include the offending path details.
+  - `agentic/orchestrator/prompts/planner.system.md`, `config/agentic/orchestrator/prompts/planner.system.md` - clarified that every `in_scope` trace entry must name at least one file from `plan.files` and that guardrail/non-goal obligations cannot be verification-only trace entries.
+- **Result:** `npx vitest run apps/control-plane/test/intake-artifacts.spec.ts apps/control-plane/test/plan-service.spec.ts` [PASS] (2 files / 27 tests). `npm run typecheck` [PASS].
+
+✅ **Entry 289 — Add live plan amendment flow to the Planning tab**
+
+- **Goal:** Let operators repair invalid accepted-plan contracts directly in the dashboard instead of leaving `plan_trace_invalid` failures stranded in runtime logs with no UI-side recovery path.
+- **Changes made:**
+  - `packages/web-dashboard/src/lib/types.ts`, `packages/web-dashboard/src/lib/planner-workspace.ts` - added `trace_contract` to the planning workspace and derived missing/unknown/duplicate/invalid trace findings, including invalid-mapping reasons for empty `planned_paths` or paths outside `plan.files`.
+  - `packages/web-dashboard/src/lib/orchestrator-tools.ts` - added dashboard-side plan amendment support via `plan.get` + `plan.update`, including `preparePlanAmendment()` to auto-apply optimistic-concurrency metadata (`plan_version`, `revision_of`, `revision_reason`) to edited plan JSON.
+  - `packages/web-dashboard/src/app/api/features/[id]/plan/amend/route.ts` - added a dedicated dashboard API route that submits accepted-plan amendments through the shared orchestrator tool bridge.
+  - `packages/web-dashboard/src/components/focus/PlanAmendmentPanel.tsx`, `packages/web-dashboard/src/components/focus/tabs/PlanningTab.tsx` - surfaced current trace-contract findings in the Planning tab and added a live accepted-plan JSON editor with revision-reason input, reset control, and `plan.update` submission flow.
+  - `packages/web-dashboard/test/lib/planner-workspace.spec.ts`, `packages/web-dashboard/test/lib/orchestrator-tools.spec.ts`, `packages/web-dashboard/test/api/features/plan-amend.route.spec.ts`, `packages/web-dashboard/test/components/planning-tab.spec.tsx` - added regressions covering derived trace-contract findings, plan amendment revision metadata, the new API route, and Planning-tab rendering of the amendment panel.
+- **Result:** `npx vitest run packages/web-dashboard/test/lib/planner-workspace.spec.ts packages/web-dashboard/test/lib/orchestrator-tools.spec.ts packages/web-dashboard/test/api/features/plan-amend.route.spec.ts packages/web-dashboard/test/components/planning-tab.spec.tsx packages/web-dashboard/test/api/features/planner-workspaces.route.spec.ts` [PASS] (5 files / 16 tests). `npm run typecheck` [PASS]. `npx eslint --no-ignore packages/web-dashboard/src/lib/types.ts packages/web-dashboard/src/lib/planner-workspace.ts packages/web-dashboard/src/lib/orchestrator-tools.ts packages/web-dashboard/src/components/focus/PlanAmendmentPanel.tsx packages/web-dashboard/src/components/focus/tabs/PlanningTab.tsx "packages/web-dashboard/src/app/api/features/[id]/plan/amend/route.ts" --max-warnings 0` [PASS]. `npm run build --workspace @aop/web-dashboard` [PASS].
+
+✅ **Entry 290 — Restore Live Agent Console support for Claude worker sessions**
+
+- **Goal:** Make the Runtime tab’s Live Agent Console update again when the worker provider is switched to Claude, even when Claude does not stream useful stdout incrementally.
+- **Changes made:**
+  - `apps/control-plane/src/providers/provider-defaults.ts`
+    - added `--session-id {session_id}` to Claude run invocations so orchestrator-managed worker sessions map deterministically to Claude’s on-disk transcript files.
+  - `apps/control-plane/src/providers/cli-worker-provider.ts`
+    - added Claude transcript path resolution under `~/.claude/projects/<sanitized-cwd>/<session_id>.jsonl`, transcript rendering helpers for assistant/tool/progress events, and best-effort live mirroring into `.aop/features/<id>/logs/live/<role>.txt` while the worker is running.
+    - kept existing stdout-based live capture for non-Claude providers and preserved fallback-to-stdout behavior when no transcript content is available.
+  - `apps/control-plane/test/worker-provider-adapters.spec.ts`
+    - updated the Claude spawn-args regression to assert `--session-id`.
+    - added a live-console regression that writes a synthetic Claude transcript and verifies the mirrored planner live log contains progress, tool-use, tool-result, and final assistant text without raw JSON fallback pollution.
+- **Result:** `npx vitest run apps/control-plane/test/worker-provider-adapters.spec.ts apps/control-plane/test/providers.spec.ts` [PASS] (2 files / 109 tests). `npm run typecheck` [PASS]. `npx eslint --no-ignore apps/control-plane/src/providers/provider-defaults.ts apps/control-plane/src/providers/cli-worker-provider.ts apps/control-plane/test/worker-provider-adapters.spec.ts --max-warnings 0` [PASS].
+
+✅ **Entry 291 — Prevent invalid Claude session IDs on first worker run**
+
+- **Goal:** Fix the Claude runtime regression where worker runs without a pre-created session passed fallback labels like `orchestrator-global-unassigned` to `--session-id`, causing immediate provider failure.
+- **Changes made:**
+  - `apps/control-plane/src/providers/cli-worker-provider.ts`
+    - replaced the old `*-unassigned` run fallback with `resolveOrCreateSessionId()`, which allocates and stores a real UUID the first time a role/feature runs without an existing session.
+    - preserved session reuse and prompt migration behavior for subsequent runs by storing the generated UUID in `sessionsByRoleFeature`.
+  - `apps/control-plane/test/worker-provider-adapters.spec.ts`
+    - added a regression proving a Claude run without any prior `createSession()` call now receives a valid UUID `--session-id` and that the same UUID is embedded in the worker prompt payload.
+- **Result:** `npx vitest run apps/control-plane/test/worker-provider-adapters.spec.ts apps/control-plane/test/providers.spec.ts` [PASS] (2 files / 110 tests). `npm run typecheck` [PASS]. `npx eslint --no-ignore apps/control-plane/src/providers/cli-worker-provider.ts apps/control-plane/test/worker-provider-adapters.spec.ts --max-warnings 0` [PASS].
+
+✅ **Entry 292 — Align dashboard gate badges with CLI `gates.plan` status**
+
+- **Goal:** Fix the dashboard/CLI status mismatch so web surfaces stop discarding the planning gate and show the same gate map the CLI already exposes in `aop status`.
+- **Changes made:**
+  - `packages/web-dashboard/src/lib/types.ts`, `packages/web-dashboard/src/lib/aop-client.ts`, `packages/web-dashboard/src/lib/dashboard-utils.ts` - extended the dashboard gate contract to retain `gates.plan`, added a shared displayed gate order (`plan`, `fast`, `full`, `merge`), and normalized the planning gate from persisted feature state.
+  - `packages/web-dashboard/src/components/feature-card.tsx`, `packages/web-dashboard/src/components/feature-list-view.tsx`, `packages/web-dashboard/src/components/gate-results.tsx` - updated the board card, list view, and Gates & QA table to render the planning gate alongside the existing execution gates instead of hardcoding `fast/full/merge` only.
+  - `packages/web-dashboard/src/lib/live-feed.ts`, `packages/web-dashboard/src/lib/focus-detail-derivations.ts` - kept downstream dashboard diagnostics consistent by including `gates.plan` in gate-failure checks.
+  - `packages/web-dashboard/test/lib/aop-client.spec.ts`, `packages/web-dashboard/test/components/feature-card.spec.tsx`, `packages/web-dashboard/test/components/gate-results.spec.tsx` - added regressions proving `readDashboardStatus()` preserves `plan: pass` from `state.md` and that both the feature card and gate-results table render `plan` before `fast/full/merge`.
+- **Result:** `npx vitest run --config packages/web-dashboard/vitest.config.ts packages/web-dashboard/test/lib/aop-client.spec.ts packages/web-dashboard/test/components/feature-card.spec.tsx packages/web-dashboard/test/components/gate-results.spec.tsx` [PASS] (3 files / 4 tests). `npm run typecheck` [PASS].
+
+✅ **Entry 294 — Author runtime-selectable ready-to-merge branch handoff spec**
+
+- **Goal:** Specify how operators can choose, at review time, between merging into the base branch or publishing a ready-to-merge feature to an operator-selected branch from the CLI and dashboard.
+- **Changes made:**
+  - `spec-files/outstanding/agentic_orchestrator_ready_to_merge_branch_handoff_spec.md` - authored an implementation-ready spec covering the new `feature.publish_branch` tool, `aop publish` CLI contract, merge source-branch resolution, frontmatter/state deltas, dashboard review UX, action/auth changes, and the required test plan.
+  - `spec-files/progress.md` - recorded the authored spec and added pending implementation slices to `## Next Tasks`.
+- **Result:** Spec authored and queued for implementation planning. No code or tests were run for this documentation-only change.
+
+✅ **Entry 295 — Raise cli-worker-provider branch coverage above the verify threshold**
+
+- **Goal:** Clear the repo-wide `npm run verify` gate by covering the remaining untested branch paths in `cli-worker-provider.ts`, which had been dragging overall branch coverage below the 90% minimum.
+- **Changes made:**
+  - `apps/control-plane/src/providers/cli-worker-provider.ts` - exposed a narrow `cliWorkerProviderTestExports` surface for pure prompt/template/transcript helper functions so the provider’s internal branch logic can be exercised directly without changing runtime behavior.
+  - `apps/control-plane/test/worker-provider-adapters.spec.ts` - added helper-focused regressions for interactive prompt fallback behavior, context projection null/default normalization, template/env/capability resolution, Claude transcript rendering edge cases, and provider failure-code classification, increasing the adapter suite from 51 to 59 tests.
+- **Result:** `npx vitest run apps/control-plane/test/worker-provider-adapters.spec.ts` [PASS] (1 file / 59 tests). Focused coverage run reports `apps/control-plane/src/providers/cli-worker-provider.ts` at `94.37%` branch coverage. `npx eslint --no-ignore apps/control-plane/src/providers/cli-worker-provider.ts apps/control-plane/test/worker-provider-adapters.spec.ts --max-warnings 0` [PASS]. `npm run verify` [PASS].
+
+✅ **Entry 296 — Route dashboard merge approvals through the fresh CLI merge flow**
+
+- **Goal:** Eliminate stale in-process dashboard merge behavior so UI approvals always execute the same reconciliation, gate, and merge logic as the terminal `aop merge` command.
+- **Changes made:**
+  - `packages/web-dashboard/src/lib/orchestrator-tools.ts` - added a subprocess-backed dashboard merge helper that executes `dist/apps/control-plane/cli/aop.js merge` with the resolved operator commit message and approval token, parses the CLI JSON envelope, and returns structured failures when the CLI output is invalid.
+  - `packages/web-dashboard/src/lib/orchestrator-tools.ts` - changed `approveFeatureReview()` to bypass the cached in-process tool/runtime path and delegate merge approvals directly to the fresh CLI merge command, preventing long-lived dashboard server processes from pinning older reconciliation behavior.
+  - `packages/web-dashboard/test/lib/orchestrator-tools.spec.ts` - added 2 regressions proving dashboard approval shells out with the expected merge arguments and preserves structured CLI error envelopes from failed merge attempts.
+- **Result:** `npx vitest run packages/web-dashboard/test/lib/orchestrator-tools.spec.ts packages/web-dashboard/test/api/actions/route.spec.ts` [PASS] (2 files / 22 tests). `npm run typecheck` [PASS]. `npx eslint --no-ignore packages/web-dashboard/src/lib/orchestrator-tools.ts --max-warnings 0` [PASS]. `npm run build --workspace @aop/web-dashboard` [PASS].
+
+✅ **Entry 294 — Route dashboard actions through a dashboard-owned runtime bridge**
+
+- **Goal:** Replace the rejected per-action CLI/auto-resume workaround with a long-lived runtime command channel owned by `aop dashboard`, so merge/review actions always have a deterministic path forward even when no separate CLI runtime is already active.
+- **Changes made:**
+  - `apps/control-plane/src/cli/dashboard-command-handler.ts`, `apps/control-plane/src/interfaces/cli/bootstrap.ts` - taught `aop dashboard` to compute the project-scoped runtime instance id, launch a sibling dashboard runtime process alongside Next.js, reuse an already-heartbeating runtime when present, and pass the selected project root into the dashboard environment.
+  - `apps/control-plane/src/cli/dashboard-runtime.ts`, `apps/control-plane/src/cli/dashboard-runtime-runner.ts` - added the dashboard-owned runtime command loop with `.aop/runtime/<instance>/dashboard-runtime-{state,commands}.json` artifacts, queued command processing for `review.approve` and `feature.resume`, centralized reconciler handoff handling, and background resume orchestration for conflict-prepared merges.
+  - `packages/web-dashboard/src/lib/dashboard-runtime-client.ts`, `packages/web-dashboard/src/lib/orchestrator-tools.ts` - replaced the per-action CLI subprocess path with a deterministic file-backed dashboard runtime client, switched runtime instance resolution to a repo-derived instance id, and routed dashboard approval/resume actions through the new runtime bridge.
+  - `packages/web-dashboard/src/app/api/actions/route.ts`, `packages/web-dashboard/src/components/focus/tabs/ReviewTab.tsx`, `packages/web-dashboard/src/components/dashboard/triage-drawer.tsx` - allowed `feature.resume` to fall back to the dashboard runtime when no active run lease exists and kept the review/triage UI handoff messaging aligned with reconciler/runtime handoff responses.
+  - `apps/control-plane/test/dashboard-command.spec.ts`, `apps/control-plane/test/dashboard-runtime-runner.spec.ts`, `packages/web-dashboard/test/lib/dashboard-runtime-client.spec.ts`, `packages/web-dashboard/test/lib/orchestrator-tools.spec.ts`, `packages/web-dashboard/test/api/actions/route.spec.ts` - added focused regressions for runtime process launch, reconciler handoff behavior, file-backed dashboard runtime command submission, runtime-backed approval/resume calls, and no-active-run resume fallback through the dashboard runtime.
+- **Result:** `npx vitest run apps/control-plane/test/dashboard-command.spec.ts apps/control-plane/test/dashboard-runtime-runner.spec.ts packages/web-dashboard/test/lib/orchestrator-tools.spec.ts packages/web-dashboard/test/lib/dashboard-runtime-client.spec.ts packages/web-dashboard/test/api/actions/route.spec.ts` [PASS] (5 files / 40 tests). `npm run typecheck` [PASS]. `npm run build` [PASS]. `npm run build --workspace @aop/web-dashboard` [PASS].
+
+✅ **Entry 297 — Let dashboard launch submissions add to an active run or start a new one**
+
+- **Goal:** Remove the `/launch` dead-end when no active run lease exists so dashboard launch drafts can either enroll into the current execution or bootstrap a new dashboard-owned run automatically.
+- **Changes made:**
+  - `apps/control-plane/src/cli/dashboard-runtime-runner.ts` - extended the dashboard runtime command surface with `launch.submit`, added active-run submission through `runtime.execution_request_submit`, added background run startup for no-lease launch batches, and made `feature.resume` execute synchronously when a fresh active run already exists so active dashboard runs can keep consuming enrollment traffic.
+  - `packages/web-dashboard/src/lib/dashboard-runtime-client.ts`, `packages/web-dashboard/src/lib/orchestrator-tools.ts` - added the dashboard launch enrollment bridge so the web layer can submit prepared launch features through the dashboard runtime when no active run lease is present.
+  - `packages/web-dashboard/src/app/api/launch/submit/route.ts` - changed launch submission to keep the existing active-run enrollment path, fall back to dashboard-runtime launch startup when no run lease exists, preserve invalid/duplicate draft handling, and return submitted outcomes for either mode.
+  - `packages/web-dashboard/src/app/launch/page.tsx`, `packages/web-dashboard/src/components/quick-launch-panel.tsx` - updated launch copy and status messaging so the UI describes “add to current execution or start a new one” instead of assuming an active run already exists.
+  - `apps/control-plane/test/dashboard-runtime-runner.spec.ts`, `packages/web-dashboard/test/api/launch/submit.route.spec.ts`, `packages/web-dashboard/test/lib/orchestrator-tools.spec.ts`, `packages/web-dashboard/test/lib/dashboard-runtime-client.spec.ts`, `packages/web-dashboard/test/components/launch-page.spec.tsx` - added regressions covering active-run launch enrollment, no-lease runtime-backed launch startup, the new helper contract, and the updated launch workspace behavior.
+- **Result:** `npx vitest run apps/control-plane/test/dashboard-runtime-runner.spec.ts packages/web-dashboard/test/api/launch/submit.route.spec.ts packages/web-dashboard/test/lib/orchestrator-tools.spec.ts packages/web-dashboard/test/lib/dashboard-runtime-client.spec.ts packages/web-dashboard/test/components/launch-page.spec.tsx` [PASS] (5 files / 33 tests). `npm run typecheck` [PASS]. `npx eslint --no-ignore apps/control-plane/src/cli/dashboard-runtime-runner.ts apps/control-plane/test/dashboard-runtime-runner.spec.ts packages/web-dashboard/src/lib/dashboard-runtime-client.ts packages/web-dashboard/src/lib/orchestrator-tools.ts packages/web-dashboard/src/app/api/launch/submit/route.ts packages/web-dashboard/src/app/launch/page.tsx packages/web-dashboard/src/components/quick-launch-panel.tsx --max-warnings 0` [PASS].
+
+✅ **Entry 298 — Recover dashboard runtime coverage after the launch/runtime additions**
+
+- **Goal:** Bring `dashboard-command-handler.ts` and `dashboard-runtime-runner.ts` back above the repo-wide coverage threshold so the full verification pipeline passes again.
+- **Changes made:**
+  - `apps/control-plane/test/dashboard-command.spec.ts` - expanded runtime-start coverage for foreground/background startup, runtime reuse when a healthy instance heartbeat already exists, `tsx` fallback startup when the built runtime entrypoint is missing, and the terminal error path when no dashboard runtime entrypoint can be resolved.
+  - `apps/control-plane/test/dashboard-runtime-runner.spec.ts` - added a dedicated runner regression suite covering malformed merge responses, synchronous/background resume behavior, invalid and duplicate launch submissions, queue snapshot/completion helpers, cached tool-client reuse, provider-selection fallbacks, busy-runtime responses, unsupported command handling, and launch/resume background failure normalization.
+- **Result:** `npx vitest run apps/control-plane/test/dashboard-command.spec.ts apps/control-plane/test/dashboard-runtime-runner.spec.ts --coverage.enabled true --coverage.provider v8 --coverage.reporter text --coverage.include 'apps/control-plane/src/cli/dashboard-command-handler.ts' --coverage.include 'apps/control-plane/src/cli/dashboard-runtime-runner.ts'` [PASS] (`dashboard-command-handler.ts` branch coverage `92.85%`; `dashboard-runtime-runner.ts` branch coverage `91.66%`). `npm run typecheck` [PASS]. `npx eslint --no-ignore apps/control-plane/src/cli/dashboard-command-handler.ts apps/control-plane/src/cli/dashboard-runtime-runner.ts apps/control-plane/test/dashboard-command.spec.ts apps/control-plane/test/dashboard-runtime-runner.spec.ts --max-warnings 0` [PASS]. `npm run verify` [PASS].
+
+✅ **Entry 299 — Harden Claude reconciler dispatch and dashboard retry recovery**
+
+- **Goal:** Prevent Claude session-control failures from surfacing as unrelated `repo.reconcile_mainline` internal errors, and let blocked merge-conflict features re-enter the shared reconciler lane cleanly from the dashboard.
+- **Changes made:**
+  - `apps/control-plane/src/providers/provider-defaults.ts` - changed Claude `attach` and `send` command templates to target the existing session with `--resume {session_id}` instead of issuing unbound control commands.
+  - `apps/control-plane/src/application/services/git-reconciliation-service.ts` - wrapped reconciler `provider.sendMessage()` dispatch in a non-fatal failure path that logs `dispatch_failed` and returns `dispatched_to_reconciler: false` instead of aborting the entire reconciliation with `internal_error`.
+  - `packages/web-dashboard/src/app/api/actions/route.ts` - taught blocked mainline-divergence retries to bypass the generic retry path, route directly into reconciliation resume, and allow `feature.resume` to use the dashboard runtime even when no active run lease exists.
+  - `apps/control-plane/test/worker-provider-adapters.spec.ts`, `apps/control-plane/test/git-reconciliation-service.spec.ts`, `packages/web-dashboard/test/api/actions/route.spec.ts`, `apps/control-plane/test/providers.spec.ts` - added regressions for Claude `--resume` attach/send behavior, non-fatal reconciler dispatch failures, dashboard retry-to-reconciler resume flow, runtime-backed resume without an active run lease, and aligned the legacy provider assertion with the new Claude control-command contract.
+- **Result:** `npx vitest run apps/control-plane/test/providers.spec.ts apps/control-plane/test/worker-provider-adapters.spec.ts apps/control-plane/test/git-reconciliation-service.spec.ts packages/web-dashboard/test/api/actions/route.spec.ts` [PASS] (4 files / 196 tests). `npm run typecheck` [PASS]. `npm run verify` [PASS].
+
+✅ **Entry 300 — Redrive prepared reconciler assignments after merge-time conflict handoff**
+
+- **Goal:** Ensure dashboard merge/retry/resume flows actually re-dispatch a prepared `mainline_divergence` worktree into the shared reconciler session instead of only restarting generic runtime state and leaving the feature stranded with `dispatched_to_reconciler: false`.
+- **Changes made:**
+  - `apps/control-plane/src/application/services/git-reconciliation-service.ts` - added `redrivePreparedReconcilerConflict(featureId)` to reload unresolved mainline-conflict metadata, reassert active-lane state, and explicitly send the reconciler assignment message again for already-prepared conflict worktrees.
+  - `apps/control-plane/src/core/kernel.ts` - exposed the new reconciliation-service redrive path through a kernel wrapper so CLI/dashboard runtime code can invoke it without reaching through implementation internals.
+  - `apps/control-plane/src/cli/dashboard-runtime-runner.ts` - updated merge conflict handoff to attempt immediate redrive when a fresh active run already exists, taught all successful resume paths to redrive prepared reconciler assignments as a side effect, and normalized the returned merge payload so a successful direct redrive reports `dispatched_to_reconciler: true`.
+  - `apps/control-plane/test/git-reconciliation-service.spec.ts`, `apps/control-plane/test/dashboard-runtime-runner.spec.ts`, `apps/control-plane/test/kernel.coverage2.spec.ts` - added regressions for active prepared-conflict redrive, dashboard merge handoff with immediate re-dispatch, resume-triggered redrive, and kernel delegation coverage for the new wrapper.
+- **Result:** `npx vitest run apps/control-plane/test/dashboard-runtime-runner.spec.ts apps/control-plane/test/git-reconciliation-service.spec.ts apps/control-plane/test/kernel.coverage2.spec.ts` [PASS] (3 files / 182 tests). `npm run typecheck` [PASS]. `npm run verify` [PASS].
+
+✅ **Entry 301 — Surface resumable recovery states consistently across dashboard triage and focus views**
+
+- **Goal:** Let non-blocked features like `agentic_orchestrator_phase_specific_agent_profiles_and_token_telemetry_spec` continue from the dashboard UI when they are stalled in an active recovery state (`building` + `recovery.state=retrying`) instead of appearing stranded with no resume affordance.
+- **Changes made:**
+  - `packages/web-dashboard/src/lib/dashboard-action-states.ts` - added a shared dashboard action-state calculator so `/api/actions`, triage, and focus detail all use the same runtime-aware resume/retry gating, including dashboard-runtime fallback when no active run lease exists.
+  - `packages/web-dashboard/src/app/api/actions/route.ts`, `packages/web-dashboard/src/app/api/features/[id]/triage/route.ts`, `packages/web-dashboard/src/app/api/features/[id]/route.ts` - unified resume/retry/merge/send action-state derivation across action execution, triage payloads, and feature detail payloads; focus detail now carries `actions` for direct UI controls.
+  - `packages/web-dashboard/src/lib/types.ts`, `packages/web-dashboard/src/components/focus/ContextSidebar.tsx`, `packages/web-dashboard/src/components/focus/FocusLayout.tsx`, `packages/web-dashboard/src/components/focus/OperationalSummaryCard.tsx` - added focus-detail `actions` typing and a new sidebar execution control that surfaces `Continue <Role>` or `Retry Feature` directly in the focus view and executes `/api/actions` with refresh/toast handling.
+  - `packages/web-dashboard/src/lib/aop-client.ts`, `packages/web-dashboard/src/lib/health-diagnosis.ts`, `packages/web-dashboard/src/lib/focus-detail-derivations.ts` - expanded recovery semantics so active retrying features are labeled as recovering, diagnosed as degraded recovery rather than generic stalled work, and get an explicit resume recommendation.
+  - `packages/web-dashboard/test/api/features/triage.route.spec.ts`, `packages/web-dashboard/test/api/features/feature.route.spec.ts`, `packages/web-dashboard/test/components/focus-layout.spec.tsx`, `packages/web-dashboard/test/lib/aop-client.spec.ts`, `packages/web-dashboard/test/lib/health-diagnosis.spec.ts`, `packages/web-dashboard/test/lib/focus-detail-derivations.spec.ts` - added regressions for dashboard-runtime-backed resume gating without an active run, focus-view continue controls for retrying recovery, recovery labeling, and resume-oriented recommended actions.
+- **Result:** `npx vitest run packages/web-dashboard/test/api/features/triage.route.spec.ts packages/web-dashboard/test/api/features/feature.route.spec.ts packages/web-dashboard/test/components/focus-layout.spec.tsx packages/web-dashboard/test/lib/aop-client.spec.ts packages/web-dashboard/test/lib/health-diagnosis.spec.ts packages/web-dashboard/test/lib/focus-detail-derivations.spec.ts packages/web-dashboard/test/api/actions/route.spec.ts` [PASS] (7 files / 47 tests). `npm run typecheck` [PASS]. `npm run build --workspace @aop/web-dashboard` [PASS].
+
+✅ **Entry 302 — Recover missing Claude reconciler sessions during dashboard handoff**
+
+- **Goal:** Fix the blocked merge/retry path where a prepared reconciler handoff could not be dispatched because the persisted Claude reconciler session no longer existed, and restore repo-wide coverage after adding the recovery logic.
+- **Changes made:**
+  - `apps/control-plane/src/providers/cli-worker-provider.ts` - detected Claude `No conversation found with session ID` send failures, added a bootstrap control-session retry path that recreates the missing session with the stored system prompt and pending message, and preserved provider stdout/stderr details on control-command errors.
+  - `apps/control-plane/src/core/kernel.ts` - added `refreshReconcilerSession()` so the kernel can recreate and persist a fresh global reconciler session for the active run lease, reusing the configured reconciler prompt when present and closing the superseded session best-effort.
+  - `apps/control-plane/src/application/services/git-reconciliation-service.ts` - taught reconciler dispatch to detect missing Claude conversations, refresh the reconciler session once, retry the handoff on the new session id, and log either `reconciler_session_refreshed` or the retried `dispatch_failed` outcome.
+  - `apps/control-plane/test/worker-provider-adapters.spec.ts`, `apps/control-plane/test/git-reconciliation-service.spec.ts`, `apps/control-plane/test/kernel.coverage2.spec.ts` - added regressions for control-session bootstrap after missing Claude conversations, reconciliation retry success/failure/same-session refresh outcomes, and kernel session-refresh null/prompt/same-session branches so coverage returned above threshold.
+- **Result:** `npx vitest run apps/control-plane/test/worker-provider-adapters.spec.ts apps/control-plane/test/git-reconciliation-service.spec.ts apps/control-plane/test/kernel.coverage2.spec.ts` [PASS] (3 files / 220 tests). `npm run typecheck` [PASS]. `npm run verify` [PASS] (120 files / 2123 tests, 90.05% branch coverage).
+
+✅ **Entry 301 — Supervisor JSDoc documentation (6 components, 58 members)**
+
+- **Goal:** Add JSDoc to all public methods, interfaces, and exported constants across the 6 undocumented supervisor components.
+- **Changes made:**
+  - `apps/control-plane/src/supervisor/runtime.ts` — Added JSDoc to `SupervisorRuntime` class, 8 getter/setter pairs, and 17 public methods (`start`, `callTool`, `resolveExecutionMode`, wave runners, session management, etc.).
+  - `apps/control-plane/src/supervisor/worker-decision-loop.ts` — Added JSDoc to `WorkerDecisionInput`, `WorkerDecisionResult`, `WorkerDecisionRunner` interfaces, `NOOP_WORKER_DECISION_RUNNER` constant, `WorkerDecisionLoop` class and `execute` method.
+  - `apps/control-plane/src/supervisor/build-wave-executor.ts` — Added JSDoc to `BuildWaveExecutor` class, `run`, and `clearFeatureTracking`.
+  - `apps/control-plane/src/supervisor/planning-wave-executor.ts` — Added JSDoc to `PlanningWaveExecutor` class, `run`, `clearFeatureTracking`, and `runPostQaReconciliation`.
+  - `apps/control-plane/src/supervisor/qa-wave-executor.ts` — Added JSDoc to `QaWaveExecutor` class, `run`, and `clearFeatureTracking`.
+  - `apps/control-plane/src/supervisor/session-orchestrator.ts` — Added JSDoc to `SessionOrchestrator` class and all 8 public methods.
+- **Result:** `npm run typecheck` ✅. `npm run lint` ✅. `npm run test` ✅.
+
+✅ **Entry 302 — Review and fix AI-generated TMS documentation**
+
+- **Goal:** Verify `ARCHITECTURE.md`, `DOMAIN-LOGIC.md`, `PATTERNS.md`, and `copilot-instructions.md` for accuracy against actual codebase; fix all identified inaccuracies.
+- **Changes made:**
+  - `docs/core/ARCHITECTURE.md` — Updated stale counts: MCP tools 33→46, services 20+→35, kernel ~900→~1530 lines, error codes 45+→97. Fixed `supervisorIterationLimit`→`supervisor.max_iterations_per_phase`. Added `reconciler` to RBAC actors. Added `paused_budget` status.
+  - `docs/core/DOMAIN-LOGIC.md` — Removed non-existent `pending` status. Rewrote state machine to match actual `LEGAL_TRANSITIONS` (10 statuses, full transition table). Added `paused_budget` and `reconciler` role. Documented `failed→blocked` recovery path and `awaiting_input` transitions.
+  - `docs/core/PATTERNS.md` — Fixed Pattern 2: `MergePort`→`MergeServicePort`, corrected constructor type. Fixed Pattern 3: `VALID_TRANSITIONS`→`LEGAL_TRANSITIONS`. Fixed Pattern 5: `feature.apply_patch`→`repo.apply_patch`.
+  - `.github/copilot-instructions.md` — Verified accurate; no changes needed.
+- **Result:** `npm run typecheck` ✅. `npm run lint` ✅. `npm run test` ✅.
+
+✅ **Entry 301 — Fix wave handoff defects: checkpoint blocking, violations message, and recovery**
+
+- **Goal:** Fix four fundamental defects in the supervisor wave handoff pipeline that prevented correct phase transitions and left features permanently blocked.
+- **Changes made:**
+  - `apps/control-plane/src/supervisor/build-wave-executor.ts` — Fixed empty violations message in `enforceWorkerExecutionPolicy`: replaced `[].join('; ') ?? fallback` (where `??` never triggers on empty string) with explicit length check that falls through to `'checkpoint validation failed'`.
+  - `apps/control-plane/src/supervisor/qa-wave-executor.ts` — Same violations message fix for the QA path.
+  - `apps/control-plane/src/supervisor/worker-decision-loop.ts` — Captured error message in `createCheckpoint` catch block (was silently swallowed) and propagated it into synthetic checkpoint's `violations` array and `validation_status: 'invalid'`. Added `lastCheckpointFailureReason` variable threaded through `createSyntheticCheckpoint(featureId, failureReason)`.
+  - `apps/control-plane/src/application/services/checkpoint-service.ts` — Fixed `blockMerge` always returning `false`: now returns `true` when `validationStatus === 'invalid'`, which enables the worker-decision-loop to correctly detect invalid checkpoints via `checkpoint.blockMerge` instead of only via thrown exceptions.
+  - `apps/control-plane/src/supervisor/run-coordinator.ts` — Added recovery path in `recoverBlockedFeatures` for worker-level blocks (`interactive_checkpoint_invalid`, `provider_output_invalid`, `provider_no_progress`): when the feature has net-new checkpoint work, it derives the resume phase and re-enters the appropriate build/QA phase instead of staying permanently blocked.
+  - `apps/control-plane/test/worker-execution-policy.spec.ts` — Added 4 tests: empty violations fallback message (build + QA), joined violations formatting (build + QA).
+  - `apps/control-plane/test/worker-decision-loop.spec.ts` — Added 1 test for synthetic checkpoint error message capture; updated 1 existing test to expect `checkpoint_invalid` outcome with `blockMerge: true`.
+  - `apps/control-plane/test/checkpoint-service.spec.ts` — Updated 4 existing tests: `blockMerge` now `true` when validation status is `invalid`.
+  - `apps/control-plane/test/run-coordinator.spec.ts` — Added 3 tests: checkpoint_invalid recovery with net-new work, checkpoint_invalid stays blocked without net-new work, provider_output_invalid recovery.
+- **Result:** `npm run build` ✅. `npm run test` ✅ (70 test files, 961 tests passing).
+
+✅ **Entry 177 — Fix false-positive remote/local divergence + add dashboard notification**
+
+- **Goal:** Stop `checkRemoteLocalDivergence` from erroring when local main is ahead of origin, and surface `remote_local_divergence` errors as BLOCKED status with critical notification.
+- **Changes made:**
+  - `apps/control-plane/src/application/services/git-reconciliation-service.ts` — Replaced SHA equality check with `git merge-base --is-ancestor` to distinguish "local ahead" from true divergence; added `local_ahead: boolean` to `RemoteLocalDivergenceResult`.
+  - `apps/control-plane/src/application/services/notifier-service.ts` — Added `remote_local_divergence` to `NotificationEvent` union with `critical` priority in `EVENT_PRIORITY`.
+  - `apps/control-plane/src/supervisor/run-coordinator.ts` — Wrapped `REPO_RECONCILE_MAINLINE` callTool in `prepareFeaturesForPhase` with try/catch; on `remote_local_divergence` error, patches feature to BLOCKED via `FEATURE_STATE_PATCH` and emits critical notification. Updated `readFeatureStateSnapshot` to return `statusReason`. Updated `notifyStatusTransitions` to emit `remote_local_divergence` event when `statusReason` matches.
+  - `apps/control-plane/test/git-reconciliation-service.spec.ts` — Added 4 tests: identical SHAs short-circuit, local-ahead returns not diverged, true divergence detected, remote ref resolution failure fallback. Updated 2 existing tests with `local_ahead` assertions and `merge-base` mock.
+  - `apps/control-plane/test/notifier-service.spec.ts` — Added 1 test: `remote_local_divergence` routes as critical via Slack.
+  - `apps/control-plane/test/run-coordinator.spec.ts` — Added 2 tests: feature blocks on divergence error with notification, loop continuation after one feature diverges. Updated 1 existing test with `statusReason` field.
+  - `apps/control-plane/test/kernel.coverage2.spec.ts` — Added 1 test: local-ahead scenario proceeds without error. Updated 8 existing mocks with `local_ahead` field.
+- **Result:** `npm test` ✅ (70 test files, 969 tests passing). `npm run lint` ✅. `npm run typecheck` ✅.
+
+✅ **Entry 180 — Implement updateOrganizerSession in kernel and run-lease-service**
+
+- **Goal:** Add `updateOrganizerSession` to `RunLeaseService` and `AopKernel` following the exact same delegation pattern as `updateReconcilerSession`, and also add `organizer_session_id` to `RuntimeSessionsSnapshot` (missed by Task 3).
+- **Changes made:**
+  - `apps/control-plane/src/core/runtime-sessions.ts` — Added `organizer_session_id?: string` field to `RuntimeSessionsSnapshot` interface.
+  - `apps/control-plane/src/application/services/run-lease-service.ts` — Added `RuntimeOrganizerSessionUpdateParams` interface and `updateOrganizerSession` method (validate params → lock → read → verify ownership → spread update → write → return).
+  - `apps/control-plane/src/core/kernel.ts` — Added `updateOrganizerSession` delegation method that forwards to `runLeaseService.updateOrganizerSession`.
+  - `apps/control-plane/test/kernel.coverage2.spec.ts` — Added 1 test: `GIVEN_active_run_WHEN_updateOrganizerSession_called_THEN_persists_organizer_session_id`.
+- **Result:** `npx vitest run apps/control-plane/test/kernel.coverage2.spec.ts` ✅ (97 tests passing). `npm run typecheck` ✅ (clean). `npm run lint` ✅.
+
+✅ **Entry 309 — Ordering agent spec audit and defect fixes (v1.1 → v1.2)**
+
+- **Goal:** Critically audit the ordering agent spec against the actual codebase and fix 11 defects.
+- **Changes made:**
+  - `spec-files/outstanding/agentic_orchestrator_spec_ordering_agent_spec.md` — Fixed 11 defects: per-request vs batch clarification, terminal state trigger, artifact lifecycle fields, missing schema target, removed concurrency_groups, terminal status list, §7.2 reference, error handling contract, PromptBundle/RuntimeState gaps.
+  - `docs/superpowers/specs/2026-03-28-ordering-agent-spec-audit-design.md` — Design doc.
+  - `docs/superpowers/plans/2026-03-28-ordering-agent-implementation.md` — 13-task plan.
+- **Result:** Spec approved. Plan written and committed.
+
+✅ **Entry 310 — Fix review-tab test and divergence formatting cleanup**
+
+- **Goal:** Fix pre-existing review-tab test failure and commit divergence formatting cleanup.
+- **Changes made:**
+  - `packages/web-dashboard/test/components/review-tab.spec.tsx` — Updated assertion from `>Approve<` to `>Approve &amp; Merge<`.
+  - 4 files: formatting cleanup from divergence fix.
+- **Result:** `npx vitest run` ✅ (170 files, 2422 tests). `npm run lint` ✅.
+
+✅ **Entry 311 — M54 Ordering Agent: full infrastructure implementation**
+
+- **Goal:** Implement the full ordering agent infrastructure (Tasks 1-10) from the M54 spec.
+- **Changes made:**
+  - `apps/control-plane/src/supervisor/types.ts` — Added `OrganizerOrderingArtifact`, `OrganizerDependencyEntry`, `OrganizerDeferredEntry`, `OrganizerBlockedEntry` types. Added `organizer_session_id` to `RuntimeSessionsSnapshot`, `UpdateOrganizerSessionInput`, `updateOrganizerSession` to `FeatureOrchestrationPort`, `organizerSessionId` to `SupervisorRuntimeState`, `organizer` to `PromptBundle`.
+  - `agentic/orchestrator/schemas/organizer-ordering-artifact.schema.json` — New JSON schema with full validation.
+  - `apps/control-plane/src/supervisor/organizer-enrollment-scheduler.ts` — New `OrganizerAgentEnrollmentScheduler` adapter (reads artifact, maps to decisions, falls back to capacity scheduler).
+  - `apps/control-plane/src/application/services/run-lease-service.ts` — Added `updateOrganizerSession`.
+  - `apps/control-plane/src/core/kernel.ts` — Added `updateOrganizerSession` delegation.
+  - `config/agentic/orchestrator/agents.yaml` — Added organizer role.
+  - `config/agentic/orchestrator/prompts/organizer.system.md` — New organizer system prompt.
+  - `agentic/orchestrator/schemas/agents.schema.json` — Added organizer to provider_overrides.
+  - `apps/control-plane/src/supervisor/prompt-bundle-loader.ts` — Added 'organizer' to role iteration.
+  - `apps/control-plane/src/supervisor/session-orchestrator.ts` — Added `ensureGlobalOrganizerSession()`.
+  - `apps/control-plane/src/supervisor/runtime.ts` — Conditional organizer scheduler wiring.
+  - `apps/control-plane/src/core/path-layout.ts` — Added `organizerOrderingPath`.
+  - `apps/control-plane/src/supervisor/run-coordinator.ts` — Terminal state trigger for enrollment re-evaluation.
+  - `packages/web-dashboard/src/lib/types.ts` — Added organizer status projection types.
+  - `packages/web-dashboard/src/lib/aop-client.ts` — Added `readOrganizerStatus`.
+  - `packages/web-dashboard/src/app/api/status/route.ts` — Exposed organizer status.
+  - Tests: 10 adapter tests, 4 schema tests, 1 path layout test, 1 kernel test, 2 session tests, 1 run-coordinator test. Updated supervisor.unit and dashboard-api mocks.
+- **Result:** `npx vitest run` ✅ (170 test files, 2422 tests). `npm run typecheck` ✅. `npm run lint` ✅.
+
+✅ **Entry 312 — Organizer system prompt: dependency detection signals**
+
+- **Goal:** Teach the organizer LLM how to detect dependencies between feature specs.
+- **Changes made:**
+  - `config/agentic/orchestrator/prompts/organizer.system.md` — Added "Dependency detection signals" section with 4 subsections: explicit signals (highest confidence), structural signals (medium confidence), semantic signals (lower confidence), not dependencies.
+- **Result:** Prompt well-formed, section ordering verified. `npm run lint` ✅.
+
+✅ **Entry 313 — OrganizerSidecarService implementation (Layer 1 runtime loop)**
+
+- **Goal:** Implement the polling-based sidecar that invokes the LLM to analyze feature specs and writes the ordering artifact to disk.
+- **Changes made:**
+  - `apps/control-plane/src/supervisor/organizer-sidecar-service.ts` — New service with: polling loop (setInterval/unref, concurrency guard), fingerprint-based change detection, spec collection from execution control + runtime state, prompt construction with 100KB size guard, LLM dispatch via `provider.runWorker()`, response parsing with JSON extraction and AJV validation, retry once on failure, atomic file write (temp + rename).
+  - `apps/control-plane/test/organizer-sidecar-service.spec.ts` — 11 unit tests covering: fingerprint skip, LLM dispatch, artifact write, retry on malformed, persistent failure, no session, missing spec, size guard, stop lifecycle, schema validation pass, invalid enum rejection.
+- **Result:** `npx vitest run` ✅ (171 test files, 2433 tests). `npm run typecheck` ✅. `npm run lint` ✅.
+
+✅ **Entry 314 — Wire OrganizerSidecarService into supervisor runtime**
+
+- **Goal:** Integrate the sidecar into the supervisor lifecycle so it starts/stops with the run.
+- **Changes made:**
+  - `apps/control-plane/src/supervisor/runtime.ts` — Added sidecar field, conditional instantiation when organizer role configured, `start()`/`stop()` lifecycle wiring, `organizer` case in `resolveRoleSessionId()`, AJV schema compilation helper.
+  - `apps/control-plane/src/core/path-layout.ts` — Added `organizerOrderingSchemaPath()` method.
+  - `apps/control-plane/src/core/tool-caller.ts` — Added `'organizer'` to `RuntimeRole` union type.
+- **Result:** `npx vitest run` ✅ (171 test files, 2433 tests). `npm run typecheck` ✅. `npm run lint` ✅.
+
+✅ **Entry 315 — Add merge_target policy field (schema, defaults, init)**
+
+- **Goal:** Enable policy-driven control over whether features merge to main or to a PR branch.
+- **Changes made:**
+  - `agentic/orchestrator/schemas/policy.schema.json` — Added `merge_target` enum (`base_branch`|`feature_branch`) to `merge_policy`.
+  - `agentic/orchestrator/schemas/policy.user.schema.json` — Added `merge_target` to user schema.
+  - `agentic/orchestrator/defaults/policy.defaults.yaml` — Added `merge_target: base_branch` default.
+  - `apps/control-plane/src/cli/init-command-handler.ts` — Added `merge_target: base_branch` to lean and full policy generators.
+- **Result:** Schema validation ✅. Init tests ✅ (31 passing).
+
+✅ **Entry 316 — Implement feature_branch merge target in merge service**
+
+- **Goal:** When `merge_target: feature_branch`, create `aop/<feature-id>` branch from main and merge there instead of directly to main.
+- **Changes made:**
+  - `apps/control-plane/src/application/services/merge-service.ts` — Added merge target resolution, branch creation/checkout for feature_branch mode, target_branch in evidence and return data, stale branch cleanup before creation.
+  - `agentic/orchestrator/tools/schemas/output/feature.ready_to_merge.output.schema.json` — Added `merge_target` to output schema (required for `additionalProperties: false`).
+- **Result:** `npm run typecheck` ✅. MCP integration tests ✅.
+
+✅ **Entry 317 — Add merge_target feature_branch tests to merge service**
+
+- **Goal:** Verify that `MergeService.featureReadyToMerge()` correctly branches to an `aop/<featureId>` branch when `merge_target: feature_branch` is set, and that main is untouched and cleanup preserves the aop branch.
+- **Changes made:**
+  - `apps/control-plane/test/merge-service.spec.ts` — Added 6 tests: `base_branch` preserves direct-to-main behavior; `feature_branch` creates `aop/` branch and checks it out; main is never touched in `feature_branch` mode; cleanup only deletes the feature branch (not `aop/`); omitted `merge_target` defaults to `base_branch`; squash strategy works with `feature_branch` target. Test 4 was corrected to account for the pre-merge stale-delete of `aop/feature_merge` (expected behavior) vs the cleanup-phase delete.
+- **Result:** `npx vitest run apps/control-plane/test/merge-service.spec.ts` ✅ (26 tests passing, 0 failing).
+
+✅ **Entry 318 — Add prompt overlay resolver for provider-specific instructions**
+
+- **Goal:** Enable per-provider system prompt overlays by loading a `<role>.<provider>.md` file from an overlay directory and appending it to the base system prompt during `runWorker()`.
+- **Changes made:**
+  - `apps/control-plane/src/providers/cli-worker-provider.ts` — Added `overlayDir?: string` to `CliWorkerProviderOptions` interface; added `private readonly overlayDir: string | null` class field; set `this.overlayDir = options.overlayDir ?? null` in constructor; exported new `resolvePromptOverlay(overlayDir, role, provider)` function; integrated overlay resolution in `runWorker()` to append provider-specific instructions to the base system prompt when an overlay file exists.
+- **Result:** `npx vitest run apps/control-plane/test/prompt-overlay.spec.ts` ✅ (5 tests passing). `npm run test` ✅ (all tests passing).
+
+✅ **Entry 189 — Wire prompt overlay directory from agents config to worker provider**
+
+- **Goal:** Connect the `prompt_overlay_dir` value from `agents.yaml` through the worker provider factory to each `CliWorkerProvider` instance so overlay prompt files are actually loaded at runtime.
+- **Changes made:**
+  - `apps/control-plane/src/core/kernel-types.ts` — Added `prompt_overlay_dir?: string` field to `AgentsRuntimeConfig` interface.
+  - `apps/control-plane/src/providers/worker-provider-factory.ts` — Added `overlayDir?: string` to `CreateWorkerProviderInput` interface; destructured `overlayDir` from `input` in `DefaultWorkerProviderFactory.create()`; passed `overlayDir` to all three `CliWorkerProvider` constructor calls (codex, claude, kiro-cli/copilot/custom).
+  - `apps/control-plane/src/cli/run-command-handler.ts` — Resolved `overlayDir` from `kernel.getAgentsConfig().runtime?.prompt_overlay_dir` (with fallback) and passed it to the factory `create()` call.
+  - `apps/control-plane/src/cli/resume-command-handler.ts` — Same resolution and pass-through as run handler.
+  - `apps/control-plane/src/cli/dashboard-runtime-runner.ts` — Added `overlayDir` resolution and pass-through to both factory `create()` call sites (createKernelControlProvider and the run-worker path).
+  - `apps/control-plane/src/interfaces/cli/bootstrap.ts` — Added `overlayDir` resolution and pass-through to the send/attach factory `create()` call.
+- **Result:** `npm run build` ✅ (lint + tsc clean). `npm run test` ✅ (all tests passing).
+
+✅ **Entry 327 — Fix builder context path fallback, add overlay caching, extract overlay-dir resolution**
+
+- **Goal:** Address three code review issues: incorrect builder context path when `workingDir` is null, missing overlay resolution caching per `(role, provider)` pair, and duplicated 3-line overlay-dir resolution pattern across 5 call sites.
+- **Changes made:**
+  - `apps/control-plane/src/providers/cli-worker-provider.ts` — Fixed builder branch: when `workingDir` is null, skip "Staged artifacts" section entirely (was producing invalid `featureDir/.aop/context` path). Added `overlayCache` map field to `CliWorkerProvider`; replaced direct `resolvePromptOverlay()` call in `runWorker()` with cache-read-or-populate pattern keyed by `role.provider`.
+  - `apps/control-plane/src/providers/worker-provider-factory.ts` — Added `import path from 'node:path'`. Added exported `resolvePromptOverlayDir(repoRoot, promptOverlayDirConfig)` utility function.
+  - `apps/control-plane/src/cli/run-command-handler.ts` — Replaced inline 3-line overlay-dir resolution with `resolvePromptOverlayDir()`.
+  - `apps/control-plane/src/cli/resume-command-handler.ts` — Same replacement.
+  - `apps/control-plane/src/cli/dashboard-runtime-runner.ts` — Same replacement at both call sites.
+  - `apps/control-plane/src/interfaces/cli/bootstrap.ts` — Same replacement.
+  - `apps/control-plane/src/index.ts` — Exported `resolvePromptOverlayDir` from the public API.
+  - `apps/control-plane/test/worker-provider-factory.spec.ts` — Added 2 tests for `resolvePromptOverlayDir` (default path, custom path); imported the new function.
+  - `apps/control-plane/test/resume-command.spec.ts`, `dashboard-runtime-runner.spec.ts`, `cli.unit.spec.ts` — Added `resolvePromptOverlayDir` mock entries to `vi.mock` blocks for `worker-provider-factory.js`.
+- **Result:** `npm run build` ✅ (lint + tsc clean). All 130 test files / 2295 tests passing ✅.
+
+✅ **Entry 323 — Restore global branch coverage above 90% threshold**
+
+- **Goal:** Global branch coverage dropped to 89.98% after new overlay and artifact-stager features; add targeted tests to restore compliance.
+- **Changes made:**
+  - `apps/control-plane/test/providers/cli-worker-provider.spec.ts` — Added 2 tests covering the `overlayDir` + `baseSystemPrompt` overlay branch (cache-miss path, cache-hit path via second `runWorker` call); added `os`/`path` imports.
+  - `apps/control-plane/test/worker-provider-adapters.spec.ts` — Added 1 test: `builder` role without `working_directory` covers the false branch of the staged-artifacts `if (workingDir)` conditional (line 160 of `cli-worker-provider.ts`).
+  - `apps/control-plane/test/worker-provider-factory.spec.ts` — Added 3 provider tests (`claude`, `kiro-cli`, `copilot` in live mode) covering previously untested `if` branches; added 2 runtime tests for spawn-timeout clamping (when spawn ≥ response) and idle-timeout clamping (when idle > response).
+- **Result:** Branch coverage: 89.98% → 90.01% (9088/10097 branches). `npm run test` ✅ (173 files / 2460 tests). `npm run lint` ✅.
+
 ## Next Tasks:
 
-- None currently.
+- OID2 (evidence.verify_chain) — companion spec `agentic_orchestrator_evidence_integrity_doctor_spec` (prerequisite OID0 now complete; implementation still pending).
+- OID3 (doctor.run diagnostics) — same companion spec (prerequisite satisfied; implementation still pending).
+- BRH1 — implement `feature.publish_branch`, its schemas/catalog entry, and merge-service branch-publish flow per `spec-files/outstanding/agentic_orchestrator_ready_to_merge_branch_handoff_spec.md`.
+- BRH2 — add `aop publish` and teach merge/cleanup paths to resolve source branches from feature state instead of hardcoding `feature_id`.
+- BRH3 — add dashboard review delivery-target selection, `review.publish_branch` API/action wiring, and published-branch status surfaces.
 
 ## Spec Gap Tracker (§3.5):
 
@@ -1995,3 +3134,770 @@ Open blockers:
   - `DOCUMENTATION_COMPLETION_PLAN.md` — created comprehensive plan
   - `DOCUMENTATION_PROGRESS.md` — progress tracking document
 - **Result:** `npm run typecheck` ✅. **Application services: 100% complete** (20/20 actual service classes documented). Remaining work: 6 supervisor components (~40 methods).
+
+✅ **Entry 193 — Raise coverage for checkpoint/state/runtime CLI utilities and supervisor helpers**
+
+- **Goal:** Bring below-threshold modules (checkpoint-service, feature-state-service, worktree-watchdog-service, env-file, rollback-command-handler, path-layout, run-coordinator) above the 90/90/90/90 coverage bar using repository Vitest standards.
+- **Changes made:**
+  - `apps/control-plane/test/checkpoint-service.spec.ts` — added validation-failure fallbacks, severity variations, metric normalization, non-array checkpoint parsing, and notification guard cases to exercise remaining branches.
+  - `apps/control-plane/test/feature-state-service.spec.ts` — added version-defaulting, null patch, missing run-history, and status transition coverage for optimistic update paths.
+  - `apps/control-plane/test/worktree-watchdog-service.spec.ts` — covered event listener off/on helpers and multi-file sorting to close uncovered comparator functions.
+  - `apps/control-plane/test/env-file.spec.ts` — added missing-file fallback and file-value preference scenarios.
+  - `apps/control-plane/test/rollback-command-handler.spec.ts` — expanded error-path coverage (missing state, invalid checkpoint shapes, root-path handling, type-mismatched checkpoints) plus success path to lift branch coverage.
+  - `apps/control-plane/test/path-layout.spec.ts` — exercised all path getters and migration permutations (legacy runtime only, legacy features only, empty layouts) to cover remaining branches.
+  - `apps/control-plane/test/run-coordinator.spec.ts` — added helper coverage for background lease renewal failure, issue-tracker fallbacks, comparator/sort paths, static helpers, and readFeatureStatus error handling.
+- **Result:** `npx vitest run --coverage apps/control-plane/test/checkpoint-service.spec.ts apps/control-plane/test/feature-state-service.spec.ts apps/control-plane/test/worktree-watchdog-service.spec.ts apps/control-plane/test/env-file.spec.ts apps/control-plane/test/rollback-command-handler.spec.ts apps/control-plane/test/path-layout.spec.ts apps/control-plane/test/run-coordinator.spec.ts` ✅. Targeted files now exceed 90% for lines/branches/functions/statements (e.g., rollback-command-handler branches 93.61%, path-layout branches 100%, run-coordinator functions 96.87%).
+
+✅ **Entry 194 — Accept long-form CLI spec flags to prevent silent spec discovery fallback**
+
+- **Goal:** Fix `--fi`/`--fl` handling so `aop run` uses the provided spec file/folder instead of falling back to feature discovery.
+- **Changes made:**
+  - `apps/control-plane/src/cli/cli-argument-parser.ts` — accept `--fi` and `--fl` as aliases for `-fi`/`-fl`.
+  - `apps/control-plane/src/cli/help-command-handler.ts` — documented `-fi, --fi` and `-fl, --fl` in help output.
+  - `apps/control-plane/test/cli-helpers.spec.ts` — added parser coverage for the long-form flags.
+  - `AGENTS.md` — documented long-form spec input flags for `run`.
+  - `CLAUDE.md` — documented long-form spec input flags for `run`.
+- **Result:** `npm run typecheck` ✅. `npx vitest run apps/control-plane/test/cli-helpers.spec.ts` ✅.
+
+✅ **Entry 195 — Allow stale lease reuse for same owner instance in run flow**
+
+- **Goal:** Prevent `run` from requiring `--takeover-stale-run` when the stale lease belongs to the same instance owner.
+- **Changes made:**
+  - `apps/control-plane/src/application/services/run-lease-service.ts` — treat stale leases as takeover-required only when owned by a different instance; allow same-owner stale leases to be claimed without explicit takeover.
+  - `apps/control-plane/test/services.spec.ts` — added coverage for stale lease reuse when owner instance matches.
+- **Result:** `npx vitest run apps/control-plane/test/services.spec.ts` ✅. `npm run typecheck` ✅.
+
+✅ **Entry 196 — Ignore merged features in plan collisions and re-drive queue after merges**
+
+- **Goal:** Prevent merged features from blocking new plans and ensure collision-queued work replays once a merge lands.
+- **Changes made:**
+  - `apps/control-plane/src/application/services/plan-service.ts` — filter merged features out of accepted-plan collision detection.
+  - `apps/control-plane/src/application/services/collision-queue-service.ts` — skip merged features when re-checking collisions during queue re-drive.
+  - `apps/control-plane/src/application/services/merge-service.ts` — re-drive the collision queue after a merge completes (best-effort).
+  - `apps/control-plane/src/core/kernel.ts` — expose collision queue re-drive for merge integration.
+  - `apps/control-plane/test/plan-service.spec.ts` — added coverage to accept colliding plan when the only conflict is merged.
+  - `apps/control-plane/test/collision-queue.spec.ts` — verified queue replay ignores merged features.
+  - `apps/control-plane/test/merge-service.spec.ts` — asserted collision queue re-drive invoked on successful merge.
+- **Result:** `npx vitest run apps/control-plane/test/plan-service.spec.ts apps/control-plane/test/collision-queue.spec.ts apps/control-plane/test/merge-service.spec.ts --exclude ".worktrees/**"` ✅.
+
+✅ **Entry 197 — Disable Codex MCP servers for AOP runs to prevent provider startup failures**
+
+- **Goal:** Prevent Codex CLI runs from failing due to MCP server startup (apps/context7/useful-agent-instructions) in headless orchestration.
+- **Changes made:**
+  - `apps/control-plane/src/providers/provider-defaults.ts` — added Codex default flags to disable MCP servers and apps gateway for `run`, `attach`, and `send` templates.
+  - `apps/control-plane/test/worker-provider-adapters.spec.ts` — updated Codex run template assertion to include the new disable flags.
+- **Result:** `npx vitest run apps/control-plane/test/worker-provider-adapters.spec.ts --exclude ".worktrees/**"` ✅.
+
+✅ **Entry 198 — Gate Failure Targeted Repair Strategy**
+
+- **Goal:** Give the builder actionable diagnostics when the fast gate fails in the repair retry loop, replacing an always-empty repair prompt with structured file:line error extraction.
+- **Changes made:**
+  - `apps/control-plane/src/supervisor/gate-log-extractor.ts` — new pure `extractGateLog` function; universal regex extraction of file refs, error lines, summary lines, error count, log tail. Platform-agnostic, no tool-specific logic.
+  - `apps/control-plane/src/application/services/reactions-service.ts` — added `failureAnalysis?: GateLogExtraction` to `GateRepairContext`; updated `buildRepairPrompt` to render structured file:line output when present, falling back to generic output when absent.
+  - `apps/control-plane/src/supervisor/build-wave-executor.ts` — repair loop now re-fetches context on each iteration, calls `extractFailureAnalysis` to read step log and extract diagnostics, passes `failureAnalysis` into `GateRepairContext`.
+  - `apps/control-plane/test/gate-log-extractor.spec.ts` — 11 unit tests covering extraction patterns, deduplication, capping, empty input, Vitest `failed` pattern.
+  - `apps/control-plane/test/reactions.spec.ts` — 4 tests for structured prompt rendering with and without `failureAnalysis`.
+  - `apps/control-plane/test/worker-execution-policy.spec.ts` — 3 tests for context refresh and log extraction wiring in repair loop.
+- **Result:** `npm test` ✅ (97 test files / 1418 passing, 1 pre-existing failure in providers.spec.ts). `npm run lint` ✅. `npm run typecheck` ✅.
+
+✅ **Entry 199 — Strengthen the default planner prompt for post-QA implementation/spec reconciliation**
+
+- **Goal:** Make the default planner prompt explicitly require implementation-to-plan-to-spec comparison after QA so the planner does not treat passing gates alone as proof of completeness.
+- **Changes made:**
+  - `agentic/orchestrator/prompts/planner.system.md` - strengthened the default planner prompt to require direct inspection of the current implementation/tests, requirement-by-requirement reconciliation against spec and accepted plan, and explicit refusal to leave the plan unchanged solely because gates passed or QA is quiet.
+  - `config/agentic/orchestrator/prompts/planner.system.md` - kept the checked-in runtime planner prompt aligned with the stronger default template guidance.
+- **Result:** `npx vitest run apps/control-plane/test/supervisor-collaborators.spec.ts apps/control-plane/test/init-wizard.spec.ts` ✅ (2 files / 57 tests). `npm run typecheck` ✅. `npm run lint -- apps/control-plane/src/supervisor/prompt-bundle-loader.ts apps/control-plane/src/core/kernel-types.ts apps/control-plane/src/cli/init-command-handler.ts apps/control-plane/test/supervisor-collaborators.spec.ts apps/control-plane/test/init-wizard.spec.ts` ✅.
+
+✅ **Entry 200 — Author intentional collision override and reconciler handoff spec**
+
+- **Goal:** Define an implementation-ready spec for explicit CLI approval of intentional plan collisions, durable collision logging, and reconciler handoff of approved overlap intent.
+- **Changes made:**
+  - `spec-files/outstanding/agentic_orchestrator_intentional_collision_override_spec.md` - added a new outstanding feature spec covering the problem statement, CLI workflow, persistence model, override matching and staleness rules, reconciler prompt and handoff requirements, reporting expectations, implementation plan, risks, and acceptance criteria for intentional collision approvals.
+- **Result:** Documentation-only change; tests not run. Spec authored and added to the outstanding spec inventory.
+
+✅ **Entry 202 — Bootstrap reserved global runtime state**
+
+- **Goal:** Prevent orchestrator-global flows from failing with `internal_error` when older runtimes do not yet have `.aop/features/global/state.md`.
+- **Changes made:**
+  - `apps/control-plane/src/core/kernel.ts` - added a reserved `global` feature bootstrap path that creates the missing layout and schema-valid `state.md` atomically on first read instead of surfacing raw `ENOENT`.
+  - `apps/control-plane/src/application/services/feature-lifecycle-service.ts` - ensured `feature.log_append` creates the `global` layout before writing orchestrator decision-log entries.
+  - `apps/control-plane/test/kernel.spec.ts` - added regression coverage proving `feature.state_get` for `global` succeeds and materializes the state file in a fresh runtime.
+  - `apps/control-plane/test/supervisor.spec.ts` - removed the test-only precreation of `.aop/features/global/` so takeover recovery now exercises the production fallback path.
+  - `docs/core/ARCHITECTURE.md` - documented the reserved `global` pseudo-feature state under runtime artifacts.
+- **Result:** `npm run typecheck` ✅. `npm test` ✅ (108 test files / 1733 tests passing; coverage: lines 95.50%, branches 90.00%, functions 94.34%, statements 95.33%).
+
+✅ **Entry 203 — Accept wildcard allowed areas during interactive checkpoint validation**
+
+- **Goal:** Stop interactive checkpoints from falsely flagging planned wildcard paths like `packages/web-dashboard/src/lib/launch-*.ts` as outside allowed areas under the default path-matching mode.
+- **Changes made:**
+  - `apps/control-plane/src/core/path-rules.ts` - restored glob-syntax detection so wildcard areas use `minimatch` even when policy matching mode remains `repo_prefix`, while preserving exact and prefix matches.
+  - `apps/control-plane/test/core-utils.spec.ts` - added a regression proving `packages/web-dashboard/src/lib/launch-contracts.ts` matches the accepted-plan area `packages/web-dashboard/src/lib/launch-*.ts`.
+- **Result:** `npx vitest run apps/control-plane/test/core-utils.spec.ts` ✅ (1 file / 21 tests).
+
+✅ **Entry 204 — Author spec coverage and reconciliation enforcement spec**
+
+- **Goal:** Define an implementation-ready spec that closes the gap between `spec.md`, `plan.json`, and post-QA reconciliation by making concrete spec obligations explicit and enforceable.
+- **Changes made:**
+  - `spec-files/outstanding/agentic_orchestrator_spec_coverage_and_reconciliation_enforcement_spec.md` - added a new outstanding feature spec covering problem analysis, `plan.schema.json` changes, deterministic spec extraction, `spec_coverage` traceability, `plan.submit`/`plan.update` enforcement, post-QA reconciliation hardening, prompt revisions, test strategy, rollout slices, and acceptance criteria.
+- **Result:** Documentation-only change; tests not run. Spec authored and added to the outstanding spec inventory.
+
+✅ **Entry 205 — Revise spec coverage spec for platform-agnostic enforcement**
+
+- **Goal:** Rework the spec so traceability enforcement stays deterministic without depending on implementation-language knowledge such as React, Python, or Java semantics.
+- **Changes made:**
+  - `spec-files/outstanding/agentic_orchestrator_spec_coverage_and_reconciliation_enforcement_spec.md` - replaced the single `spec_coverage` model with a platform-agnostic architecture built around `spec.manifest.json`, planner-authored `plan_trace`, runtime-owned `coverage-audit.json`, policy-driven rollout modes (`off`, `report_only`, `enforce`), stable obligation IDs, planner sanitizer updates, and a cross-platform fixture strategy for TypeScript, Python, Java, and CLI/config specs.
+- **Result:** Documentation-only change; tests not run. Spec revised to address determinism, ownership separation, rollout safety, and platform-agnostic enforcement constraints.
+
+✅ **Entry 206 — Clarify inferential generation path for spec manifests**
+
+- **Goal:** Make the spec explicit that `spec.manifest.json` is generated automatically from the user-provided `spec.md`, not authored by the user, while still preserving a deterministic runtime contract.
+- **Changes made:**
+  - `spec-files/outstanding/agentic_orchestrator_spec_coverage_and_reconciliation_enforcement_spec.md` - expanded the manifest section to define the inference-to-materialization pipeline, generation insertion points, generator responsibilities, supported inference inputs, confidence/provenance metadata, stable ID strategy, bootstrap vs verified generation modes, and the policy boundary between advisory and blocking inferred obligations.
+- **Result:** Documentation-only change; tests not run. Spec now clearly defines how manifests are auto-generated from existing specs without adding author burden to users.
+
+✅ **Entry 207 — Define deterministic audit and gap-closure loop for manifest performance**
+
+- **Goal:** Make the spec explicit about how the runtime deterministically evaluates performance against the generated manifest and what concrete workflow closes gaps between manifest obligations and unfinished feature work.
+- **Changes made:**
+  - `spec-files/outstanding/agentic_orchestrator_spec_coverage_and_reconciliation_enforcement_spec.md` - added an end-to-end deterministic evaluation model, per-obligation status ladder (`missing_trace`, `planned_only`, `in_progress`, `verified`, `deferred`, `out_of_scope`), exact evidence inputs, reduction rules for implementation and verification evidence, feature-level rollup metrics, gap classification (`planning_gap`, `implementation_gap`, `verification_gap`), remediation payload shape, and explicit builder/QA closure responsibilities after reconciliation.
+- **Result:** Documentation-only change; tests not run. Spec now describes how the system measures manifest fulfillment and how it drives plan revisions to close remaining gaps.
+
+✅ **Entry 208 — Clarify manifest generation ownership and runtime insertion points**
+
+- **Goal:** Remove ambiguity about whether manifest generation requires a new agent by defining it as a system-owned preprocessing step with explicit runtime ownership and invocation points.
+- **Changes made:**
+  - `spec-files/outstanding/agentic_orchestrator_spec_coverage_and_reconciliation_enforcement_spec.md` - added an explicit architecture decision against introducing a new `PromptIntakeAgent` for M58, defined the end-to-end system flow from `spec.md` to `spec.manifest.json` to planner consumption, specified runtime ownership boundaries, outlined the manifest generator service interface, and documented preferred invocation points in feature bootstrap/context loading rather than on every planner turn.
+- **Result:** Documentation-only change; tests not run. Spec now clearly states how the manifest is created inside the system and who owns that responsibility.
+
+✅ **Entry 209 — Rewrite manifest-generation contract to separate bootstrap inference from verified enforcement**
+
+- **Goal:** Eliminate the misleading implication that a `SpecManifestGenerationPort` can deterministically produce an authoritative manifest from arbitrary prose.
+- **Changes made:**
+  - `spec-files/outstanding/agentic_orchestrator_spec_coverage_and_reconciliation_enforcement_spec.md` - rewrote the manifest-generation section to replace the implied deterministic `SpecManifestGenerationPort` with a two-stage architecture: `SpecManifestProposalPort` producing `spec.manifest.bootstrap.json`, and a distinct `ManifestVerificationPort` responsible for promotion to `spec.manifest.verified.json`; also updated the runtime flow, ownership boundaries, artifact types, and enforcement rules so bootstrap inference is explicitly non-authoritative until promoted.
+- **Result:** Documentation-only change; tests not run. Spec now makes the uncertainty boundary explicit instead of hiding it behind a deterministic-looking generation interface.
+
+✅ **Entry 210 — Author interactive planning intake and requirements verification spec**
+
+- **Goal:** Redesign the planner mental model so raw specs first pass through an explicit intake/requirements-normalization phase before execution planning, building, and QA begin.
+- **Changes made:**
+  - `spec-files/outstanding/agentic_orchestrator_interactive_planning_intake_and_requirements_verification_spec.md` - added a new outstanding feature spec defining an `intake` lifecycle phase, bootstrap versus verified manifest artifacts, intake planner responsibilities, targeted human interaction during requirement formation, verified-manifest promotion rules, transition to execution planning, integration with the existing question protocol, runtime ownership boundaries, implementation slices `M59.1` through `M59.8`, and cross-platform acceptance criteria.
+- **Result:** Documentation-only change; tests not run. Spec authored and added to the outstanding spec inventory.
+
+✅ **Entry 211 — Add explicit dashboard and CLI intake interaction model to M59 spec**
+
+- **Goal:** Make the intake spec concrete about how operators see, answer, and route planner intake questions across the dashboard, focus view, triage drawer, and CLI.
+- **Changes made:**
+  - `spec-files/outstanding/agentic_orchestrator_interactive_planning_intake_and_requirements_verification_spec.md` - added a dedicated operator-UX section covering `Needs Me`, `awaiting_input`, root pending-questions, triage drawer answer controls, focus-view `HumanInputPanel`, frontend request/response wiring through question routes, CLI parity via `aop status` / `aop questions` / `aop answer`, and updated implementation/testing/acceptance sections to require those surfaces explicitly.
+- **Result:** Documentation-only change; tests not run. Spec now explicitly defines how intake questions propagate from planner to UI/CLI and how operator answers return to the runtime.
+
+✅ **Entry 212 — Tighten intake payload contracts and question-readiness definition**
+
+- **Goal:** Define the exact payloads the frontend consumes for intake interactions and make “agent is ready with a question” depend on persisted runtime state rather than transient planner output.
+- **Changes made:**
+  - `spec-files/outstanding/agentic_orchestrator_interactive_planning_intake_and_requirements_verification_spec.md` - added a formal question-readiness contract, explicit non-ready states, source-of-truth readiness rule based on persisted open question + `awaiting_input` + `resume_status=intake`, and concrete API payload extensions for `FeatureQuestion`, `FeatureSummary`, `FeatureTriageDetail`, dashboard pending-questions, feature questions route, answer route response shape, and focus-view intake review summary.
+- **Result:** Documentation-only change; tests not run. Spec now defines when the runtime should treat a planner question as actionable and what exact data the UI/CLI receive to render and answer it deterministically.
+
+✅ **Entry 250 — Author decision-centric remediation spec for the feature focus page**
+
+- **Goal:** Define an implementation-ready spec for fixing the current `/feature/{id}` page’s information architecture, weak decision support, hidden inspection tools, and missing spec/progress visibility.
+- **Changes made:**
+  - `spec-files/outstanding/agentic_orchestrator_feature_focus_view_track_c_decision_centric_remediation_spec.md` - added a new outstanding feature spec covering the critical design assessment, decision-first goals, page model, required `FeatureDetail` and API additions, sidebar/overview/plan/changes/runtime/history/transcript/review redesign requirements, component refactor plan, testing strategy, rollout slices, and acceptance criteria for a more useful focus page.
+- **Result:** Documentation-only change; tests not run. Spec authored and added to the outstanding spec inventory.
+
+✅ **Entry 251 — Execute Track C decision-centric remediation for the feature focus page**
+
+- **Goal:** Implement the Track C focus-view redesign so `/feature/{id}` becomes a decision-first operator surface with evidence-backed readiness, real plan/spec visibility, correct tab ownership, and inspectable runtime/history workflows.
+- **Changes made:**
+  - `packages/web-dashboard/src/lib/types.ts`, `packages/web-dashboard/src/lib/focus-detail-derivations.ts`, `packages/web-dashboard/src/lib/aop-client.ts`, `packages/web-dashboard/src/lib/usage-burn.ts`, `packages/web-dashboard/src/lib/launch-markdown.ts`
+    - extended `FeatureDetail` with `spec`, `plan_progress`, `verification_summary`, `revision_summary`, and `actionable_risks`; added pure derivations for progress/readiness/revisions/risks/active-role; added freshness metadata to usage burn; added feature-detail readers for spec, paginated checkpoints, and run history; anchored rendered markdown headings for spec navigation.
+  - `packages/web-dashboard/src/app/api/features/[id]/spec/route.ts`, `packages/web-dashboard/src/app/api/features/[id]/plan-progress/route.ts`, `packages/web-dashboard/src/app/api/features/[id]/checkpoints/route.ts`, `packages/web-dashboard/src/app/api/features/[id]/checkpoint-diff/route.ts`, `packages/web-dashboard/src/app/api/features/[id]/history/runs/route.ts`, `packages/web-dashboard/src/app/api/features/[id]/history/run/[runId]/route.ts`
+    - added the lazy API surface needed for spec viewing, plan progress refresh, checkpoint pagination/inspection, and archived run browsing.
+  - `packages/web-dashboard/src/components/focus/OperationalSummaryCard.tsx`, `packages/web-dashboard/src/components/focus/ProgressSnapshotCard.tsx`, `packages/web-dashboard/src/components/focus/FeatureDecisionBanner.tsx`, `packages/web-dashboard/src/components/focus/VerificationSummaryCard.tsx`, `packages/web-dashboard/src/components/focus/RecentMaterialChanges.tsx`, `packages/web-dashboard/src/components/focus/ActionableRiskList.tsx`, `packages/web-dashboard/src/components/focus/SpecViewer.tsx`, `packages/web-dashboard/src/components/focus/PlanProgressPanel.tsx`, `packages/web-dashboard/src/components/focus/CheckpointRail.tsx`, `packages/web-dashboard/src/components/focus/CheckpointInspector.tsx`, `packages/web-dashboard/src/components/focus/RunHistoryBrowser.tsx`, `packages/web-dashboard/src/components/focus/RoleLogViewer.tsx`
+    - added the new Track C decision/inspection components.
+  - `packages/web-dashboard/src/components/focus/ContextSidebar.tsx`, `packages/web-dashboard/src/components/focus/tabs/OverviewTab.tsx`, `packages/web-dashboard/src/components/focus/tabs/PlanTab.tsx`, `packages/web-dashboard/src/components/focus/tabs/ChangesTab.tsx`, `packages/web-dashboard/src/components/focus/tabs/GatesQaTab.tsx`, `packages/web-dashboard/src/components/focus/tabs/RuntimeTab.tsx`, `packages/web-dashboard/src/components/focus/tabs/HistoryTab.tsx`, `packages/web-dashboard/src/components/focus/tabs/ReviewTab.tsx`, `packages/web-dashboard/src/components/focus/tabs/TranscriptTab.tsx`, `packages/web-dashboard/src/components/focus/FocusLayout.tsx`
+    - re-scoped the page around operator jobs: sidebar summary + progress, decision-first overview, spec/progress plan tab, paginated checkpoint investigation in Changes, runtime/log ownership in Runtime and History, evidence-first Gates & QA, review-only Review, and searchable/followable Transcript.
+  - `packages/web-dashboard/src/components/focus/UsageBurnChart.tsx`, `packages/web-dashboard/src/components/focus/CollisionRadar.tsx`, `packages/web-dashboard/src/components/focus/GateFlakinessSummary.tsx`, `packages/web-dashboard/src/components/plan-viewer.tsx`, `packages/web-dashboard/src/components/diff-viewer.tsx`, `packages/web-dashboard/src/components/evidence-viewer.tsx`, `packages/web-dashboard/src/components/focus/RecentMaterialChanges.tsx`, `packages/web-dashboard/src/styles/dashboard.module.css`
+    - added freshness labels, collapsed collision radar behavior, last-failure signal, accepted-plan semantics, file-level diff inspection, runtime-safe evidence rendering, tab-navigation-safe material change links, and overflow-safe responsive styling.
+  - `packages/web-dashboard/test/lib/focus-detail-derivations.spec.ts`, `packages/web-dashboard/test/components/focus-layout.spec.tsx`, `packages/web-dashboard/test/components/overview-tab.spec.tsx`, `packages/web-dashboard/test/components/plan-tab.spec.tsx`, `packages/web-dashboard/test/components/changes-tab.spec.tsx`, `packages/web-dashboard/test/components/gates-qa-tab.spec.tsx`, `packages/web-dashboard/test/components/runtime-tab.spec.tsx`, `packages/web-dashboard/test/components/transcript-tab.spec.tsx`
+    - added regression coverage for the new derivations, decision-first layout, plan/spec visibility, checkpoint investigation, verification ownership, runtime logging, and transcript controls.
+- **Result:** `npm run verify` ✅. `npm run build --workspace @aop/web-dashboard` ✅. Focus-view Track C slices 1–6 are implemented and removed from `Next Tasks`.
+
+✅ **Entry 252 — Normalize feature execution mode to interactive in the dashboard**
+
+- **Goal:** Stop the feature focus UI from surfacing the deprecated `deterministic` execution mode and keep the Runtime tab aligned with the interactive-only direction of the platform.
+- **Changes made:**
+  - `packages/web-dashboard/src/lib/aop-client.ts` - normalized legacy feature-state execution modes to `interactive` and defaulted feature detail payloads to `interactive` when execution mode is absent so dashboard feature views stop inheriting stale deterministic values.
+  - `packages/web-dashboard/src/components/focus/HeroBlock.tsx`, `packages/web-dashboard/src/components/focus/OperationalSummaryCard.tsx`, `packages/web-dashboard/src/components/focus/tabs/RuntimeTab.tsx` - pinned the feature-surface execution-mode label to `interactive` so the hero, operational summary, and Runtime tab no longer leak deprecated deterministic labels.
+  - `packages/web-dashboard/test/components/runtime-tab.spec.tsx` - added a regression test proving the Runtime tab still renders `interactive` when legacy detail data reports `deterministic`.
+- **Result:** `npx vitest run packages/web-dashboard/test/components/runtime-tab.spec.tsx` [PASS]. `npm run typecheck` [PASS]. `npm run lint` [PASS].
+
+✅ **Entry 253 — Critically harden planner, builder, QA, and reconciler prompt contracts**
+
+- **Goal:** Eliminate prompt-role ambiguity and stale prompt/runtime mismatches so planner, builder, QA, and reconciler each operate with sharper responsibilities and consistent interactive-output rules.
+- **Changes made:**
+  - `agentic/orchestrator/prompts/planner.system.md`, `config/agentic/orchestrator/prompts/planner.system.md` - added explicit planning decision rules, stronger post-QA reconciliation guidance against the verified manifest, tighter acceptance/risk guidance, and a `NOTE` discipline section so the planner revises the plan instead of hand-waving real gaps.
+  - `agentic/orchestrator/prompts/builder.system.md`, `config/agentic/orchestrator/prompts/builder.system.md` - expanded builder execution discipline, clarified when to use `more_context` versus `ask_user_input`, and required higher-signal completion notes including tests and residual risks.
+  - `agentic/orchestrator/prompts/qa.system.md`, `config/agentic/orchestrator/prompts/qa.system.md` - tightened QA’s reproduce-fix-verify loop, clarified operator-escalation rules, and required note content that names reproduced failures, fixes, tests, and remaining risks.
+  - `agentic/orchestrator/prompts/reconciler.system.md`, `config/agentic/orchestrator/prompts/reconciler.system.md` - replaced the stale patch/tool-centric reconciler model with the actual interactive worktree-editing contract, including semantic-merge discipline, approved-collision handling, verification expectations, and operator-escalation rules.
+  - `apps/control-plane/src/providers/cli-worker-provider.ts`, `apps/control-plane/src/supervisor/worker-decision-loop.ts` - separated role-specific interactive wrapper instructions so builder, QA, and reconciler no longer inherit the same generic contract; added planner intake/planning distinction and explicit role-specific request semantics.
+  - `apps/control-plane/test/worker-provider-adapters.spec.ts`, `apps/control-plane/test/worker-decision-loop.spec.ts` - added regression coverage for QA/reconciler/provider prompt shaping, planner intake prompt shaping, `INTAKE_SUBMISSION` routing, and promptless `ask_user_input` no-op handling to recover branch coverage after the new role-specific branches landed.
+- **Result:** `npx vitest run apps/control-plane/test/worker-decision-loop.spec.ts apps/control-plane/test/worker-provider-adapters.spec.ts` [PASS]. `npm run verify` [PASS].
+
+✅ **Entry 254 — Make planner intake visible across the dashboard**
+
+- **Goal:** Promote the new `intake` planner subphase from backend-only metadata into a first-class dashboard state so operators can see it on the board, filter for it, and inspect intake progress directly in focus view.
+- **Changes made:**
+  - `packages/web-dashboard/src/lib/dashboard-utils.ts`, `packages/web-dashboard/src/components/kanban-board.tsx`, `packages/web-dashboard/src/components/feature-card.tsx`, `packages/web-dashboard/src/styles/dashboard.module.css` - added an `Intake` board column, fixed phase-filter round-tripping for `intake` and `awaiting_input`, included intake in the active-work filter, added an intake-specific empty-state message, and gave intake cards a dedicated visual treatment instead of silently falling back to planning styling.
+  - `packages/web-dashboard/src/app/feature/[id]/page.tsx` - switched focus-page status labeling to prefer `client_status_label` so intake features show user-facing labels like `In Intake` / `Needs Input` instead of raw internal status strings.
+  - `packages/web-dashboard/src/components/focus/tabs/OverviewTab.tsx` - added a dedicated `Requirements Intake` section that surfaces intake status, bootstrap/verified manifest versions, open ambiguities, review status, question counts, and promotion basis directly in the focus overview.
+  - `packages/web-dashboard/test/components/kanban-board.spec.tsx`, `packages/web-dashboard/test/components/command-center-root.spec.tsx`, `packages/web-dashboard/test/components/overview-tab.spec.tsx` - added regression coverage for the new intake column/filter visibility and the focus-view intake summary.
+- **Result:** `npx vitest run packages/web-dashboard/test/components/kanban-board.spec.tsx packages/web-dashboard/test/components/command-center-root.spec.tsx packages/web-dashboard/test/components/overview-tab.spec.tsx packages/web-dashboard/test/components/triage-drawer.spec.tsx packages/web-dashboard/test/components/human-input-panel.spec.tsx packages/web-dashboard/test/components/runtime-tab.spec.tsx packages/web-dashboard/test/components/focus-layout.spec.tsx` [PASS]. `npm run typecheck` [PASS]. `npm run verify` [PASS].
+
+✅ **Entry 255 — Author Plan-tab intake/planning workspace spec**
+
+- **Goal:** Define a decision-first Focus-page Plan tab that accurately models the new two-subphase planner lifecycle (`intake` then `planning`) and gives operators a useful workspace for requirement verification, planning readiness, and accepted-plan trust.
+- **Changes made:**
+  - `spec-files/outstanding/agentic_orchestrator_focus_plan_tab_intake_planning_workspace_spec.md` - added a new outstanding spec defining the Plan-tab redesign: current-state critique, lifecycle-oriented information architecture, intake and planning workspace requirements, unified artifact viewer, new `FeaturePlanWorkspace` read model, route/derivation expectations, component ownership, rollout slices, and acceptance criteria.
+- **Result:** Documentation-only change; tests not run. Spec authored and added to the outstanding spec inventory.
+
+✅ **Entry 263 — Split the focus planning surface into Intake and Planning tabs**
+
+- **Goal:** Refine the planner-surface spec so intake question answering happens where ambiguity context lives, and so intake and execution planning are modeled as separate operator tabs instead of one overloaded workspace.
+- **Changes made:**
+  - `spec-files/outstanding/agentic_orchestrator_focus_plan_tab_intake_planning_workspace_spec.md` - rewrote the information architecture to replace the single combined planner tab with separate `Intake` and `Planning` focus tabs; moved intake question answering into the `Ambiguity Queue` flow via inline answer panels; split artifact ownership by tab; replaced the old unified `FeaturePlanWorkspace` read model with shared lifecycle plus tab-specific intake/planning workspace models; updated route expectations, component ownership, rollout slices, and acceptance criteria accordingly.
+- **Result:** Documentation-only change; tests not run. Spec now reflects a two-tab planner UX with actionable ambiguity answering rather than a combined tab model.
+
+✅ **Entry 264 — Re-enroll awaiting-input features into the active run on retry and resume**
+
+- **Goal:** Make `retry` and `resume` put `awaiting_input` features back under the live kernel/supervisor instead of returning a passive waiting payload that leaves the feature detached from the active run.
+- **Changes made:**
+  - `apps/control-plane/src/cli/resume-command-handler.ts` - added active-run enrollment handling so resumable features are submitted through `runtime.execution_request_submit` when a fresh run lease exists; normalized enrollment metadata; treated duplicate execution requests as pending; and kept `already_enrolled` as a first-class outcome when the feature is already assigned.
+  - `apps/control-plane/src/interfaces/cli/bootstrap.ts` - routed retry and merge repair handoff through `ResumeCommandHandler` so `awaiting_input` features rejoin the active run instead of skipping auto-resume.
+  - `apps/control-plane/test/resume-command.spec.ts` - added regression coverage for active-run enrollment, already-enrolled waiting features, duplicate execution requests, malformed runtime-session metadata, untyped request metadata normalization, and non-duplicate enrollment failure propagation.
+  - `apps/control-plane/test/bootstrap.spec.ts`, `apps/control-plane/test/cli.unit.spec.ts` - updated CLI handoff expectations so retry/merge auto-resume uses the resume enrollment path and reports `active_run_enrollment` / `already_enrolled` outcomes correctly.
+- **Result:** `npx vitest run apps/control-plane/test/resume-command.spec.ts apps/control-plane/test/bootstrap.spec.ts apps/control-plane/test/cli.unit.spec.ts` [PASS] (3 files / 114 tests). `npm run nx -- run control-plane:test` [PASS] (116 files / 1934 tests, branch coverage gate satisfied). `npm run verify` [PASS].
+
+✅ **Entry 265 — Allow waiting-state metadata patches during retry/resume recovery**
+
+- **Goal:** Fix the remaining `retry`/`resume` failure where the kernel rejected non-status `feature.state_patch` calls while a feature was already in `awaiting_input`, preventing session/cluster metadata from being updated during recovery.
+- **Changes made:**
+  - `apps/control-plane/src/application/services/feature-state-service.ts` - added the missing `awaiting_input -> awaiting_input` legal transition so metadata-only state patches are allowed while a feature is paused for human input.
+  - `apps/control-plane/test/feature-state-service.spec.ts` - added a regression that patches cluster metadata on an `awaiting_input` feature and verifies the feature remains in the waiting state with its human-input snapshot intact.
+- **Result:** `npx vitest run apps/control-plane/test/feature-state-service.spec.ts apps/control-plane/test/resume-command.spec.ts apps/control-plane/test/bootstrap.spec.ts` [PASS] (3 files / 67 tests). `npm run typecheck` [PASS]. `npm run verify` [PASS] (116 files / 1937 tests; coverage 95.66% statements, 90.01% branches, 95.16% functions, 95.84% lines).
+
+✅ **Entry 266 — Fix intake manifest ref loading and question-tool output contracts**
+
+- **Goal:** Resolve the runtime failures triggered by dashboard question answers where intake manifest validation could not resolve local schema refs and the question/send-message tool output schemas were validating the wrong payload shape.
+- **Changes made:**
+  - `apps/control-plane/src/core/schemas.ts` - added local schema preloading to `SchemaRegistry` so AJV registers top-level repo schemas by `$id` before compilation; reused preloaded validators when available to resolve local `$ref` links such as `spec.manifest.bootstrap.schema.json#/$defs/...`.
+  - `agentic/orchestrator/tools/schemas/output/feature.question_answer.output.schema.json` - corrected the schema to validate the successful `response.data` payload returned by the tool runtime, including `feature_id`, `question_id`, `question_status`, `feature_status`, `resume_status`, and `resumed`.
+  - `agentic/orchestrator/tools/schemas/output/feature.question_create.output.schema.json` - corrected the schema to validate the data payload shape returned for question creation instead of an outer `{ ok, data }` envelope.
+  - `agentic/orchestrator/tools/schemas/output/feature.question_list.output.schema.json` - corrected the schema to validate the direct `{ items }` data payload returned by the tool runtime.
+  - `agentic/orchestrator/tools/schemas/output/feature.send_message.output.schema.json` - corrected the schema to validate the direct send-message data payload with `feature_id`, `session_id`, `target_role`, `status`, and `delivered`.
+  - `apps/control-plane/test/core-utils.spec.ts` - added a regression proving `SchemaRegistry` can validate `spec.manifest.verified.schema.json` and `intake.review.schema.json` when they reference `$defs` from `spec.manifest.bootstrap.schema.json`.
+  - `apps/control-plane/test/mcp-helpers.spec.ts` - expanded tool-contract coverage to validate the real output payloads for `feature.send_message`, `feature.question_create`, `feature.question_answer`, and `feature.question_list` under the runtime validator.
+- **Result:** `npx vitest run apps/control-plane/test/core-utils.spec.ts apps/control-plane/test/mcp-helpers.spec.ts packages/web-dashboard/test/api/features/question-answer.route.spec.ts` [PASS] (3 files / 46 tests). `npm run validate:mcp-contracts` [PASS] (existing `date-time` warning only).
+
+✅ **Entry 271 — Recover unresolved intake ambiguities through persisted clarification questions**
+
+- **Goal:** Prevent unresolved Intake -> Planning transitions from dropping into `blocked` when the planner cannot make progress, and instead keep the feature in the intake loop by asking clarifying questions until the manifest can be verified.
+- **Changes made:**
+  - `apps/control-plane/src/supervisor/planner-phase.ts` - added shared planner-phase resolvers so intake/planning prompt selection derives from intake artifacts and waiting-input metadata instead of relying only on the top-level feature status.
+  - `apps/control-plane/src/supervisor/session-orchestrator.ts`, `apps/control-plane/src/supervisor/worker-decision-loop.ts` - kept blocked-but-unresolved features on the intake prompt/session; passed `planner_phase=intake` consistently; and created intake questions with explicit `resume_status: intake` / `resume_phase: intake`.
+  - `apps/control-plane/src/supervisor/planning-wave-executor.ts` - added intake-recovery helpers that detect unresolved ambiguities, missing verified manifests, malformed/no-progress/context-stall planner turns, and open-question state; routed those cases into `feature.question_create` instead of `blocked`; and kept reconciliation on the normal blocked path only when ambiguities are already answered or the manifest state is otherwise inconsistent.
+  - `apps/control-plane/src/application/services/question-service.ts`, `apps/control-plane/src/core/kernel.ts`, `agentic/orchestrator/tools/schemas/input/feature.question_create.input.schema.json` - extended the shared question protocol to accept explicit resume targets, allowed `intake <-> awaiting_input` transitions, normalized `prompt_summary`, and resumed answered intake questions back into `intake`.
+  - `apps/control-plane/test/question-service.spec.ts`, `apps/control-plane/test/worker-decision-loop.spec.ts`, `apps/control-plane/test/supervisor-collaborators.spec.ts`, `apps/control-plane/test/planning-wave-executor.spec.ts` - added regressions covering blocked unresolved intake staying on intake prompts, `ask_user_input` from intake carrying intake resume targets, malformed/no-progress/context-stall intake turns generating clarification questions, and the negative cases where the system should still block.
+  - `packages/web-dashboard/src/lib/focus-view.ts` - simplified verified-manifest tab visibility narrowing so the dashboard build no longer failed during the final `verify` pass after the intake changes.
+- **Result:** `npx vitest run apps/control-plane/test/question-service.spec.ts apps/control-plane/test/worker-decision-loop.spec.ts apps/control-plane/test/supervisor-collaborators.spec.ts apps/control-plane/test/planning-wave-executor.spec.ts` [PASS]. `npm run typecheck` [PASS]. `npm run test` [PASS] (116 files / 1953 tests, branch coverage 90.01%). `npm run verify` [PASS].
+
+✅ **Entry 272 — Keep unresolved intake on clarification instead of leaking into plan mutation**
+
+- **Goal:** Prevent `resume`/`retry` from failing with `verified_manifest_required` by ensuring unresolved intake never reaches `plan.submit` or `plan.update`, and keep asking follow-up clarifying questions until the open intake ambiguities are actually resolved.
+- **Changes made:**
+  - `apps/control-plane/src/supervisor/worker-decision-loop.ts` - added intake-only plan-mutation interception so planner `PLAN_SUBMISSION` and `amend_plan` outputs reroute into `feature.question_create` when there is no verified manifest; suppressed plan mutation entirely when intake already has an open question or no open ambiguities to ask about; and preserved normal plan submission once a verified manifest exists.
+  - `apps/control-plane/src/supervisor/planning-wave-executor.ts` - changed intake clarification fallback to allow follow-up questions for ambiguity IDs that were answered previously but remain open in `intake.review.json`, carrying `prior_answered_ambiguity_ids` so the planner can explicitly ask for the remaining unresolved detail instead of blocking the feature.
+  - `apps/control-plane/test/worker-decision-loop.spec.ts` - added regressions for planner submissions during unresolved intake, suppression while an intake question is already open, verified-manifest allowance for real plan submission, amend-plan rerouting during intake, and builder patch no-op routing coverage.
+  - `apps/control-plane/test/planning-wave-executor.spec.ts` - updated intake recovery expectations to verify follow-up clarification behavior and added branch coverage for stub auto-promotion/no-op accepted-plan normalization guards.
+- **Result:** `npx vitest run apps/control-plane/test/worker-decision-loop.spec.ts apps/control-plane/test/planning-wave-executor.spec.ts` [PASS] (2 files / 112 tests). `npm run typecheck` [PASS]. `npm run verify` [PASS] (116 files / 1964 tests; coverage 95.79% statements, 90.04% branches, 95.24% functions, 95.96% lines).
+
+✅ **Entry 273 — Skip post-QA plan reconciliation while blocked intake is still unresolved**
+
+- **Goal:** Stop blocked features with stale accepted plans from bypassing intake and hitting `plan.update` during post-QA reconciliation before a verified manifest exists.
+- **Changes made:**
+  - `apps/control-plane/src/supervisor/planning-wave-executor.ts` - changed the blocked-feature planning-wave skip so it only applies to blocked features already in the execution-planning lifecycle; blocked features still in `planner_phase=intake` now continue to receive planner intake turns even if an old `plan.json` exists. Also skipped `runPostQaReconciliation()` entirely for blocked features whose resolved planner phase is still `intake`, preventing direct `PLAN_UPDATE` calls before intake verification.
+  - `apps/control-plane/test/planning-wave-executor.spec.ts` - added regressions proving blocked intake features with existing plans still execute the planner intake turn, and that blocked intake features are excluded from post-QA reconciliation plan updates.
+- **Result:** `npx vitest run apps/control-plane/test/planning-wave-executor.spec.ts apps/control-plane/test/worker-decision-loop.spec.ts` [PASS] (2 files / 114 tests). `npm run typecheck` [PASS]. `npm run verify` [PASS].
+
+✅ **Entry 274 — Bridge answered intake questions back into ambiguity resolution**
+
+- **Goal:** Make answered intake clarification questions usable by the planner and intake runtime instead of leaving them stranded in `questions.json`, so repeated answers for the same ambiguity IDs become structured evidence that can resolve the intake contract.
+- **Changes made:**
+  - `apps/control-plane/src/core/intake-artifacts.ts`, `agentic/orchestrator/schemas/intake.review.schema.json` - added the system-owned `clarification_answers` bridge model to `intake.review.json`, capturing the answered question ID, ambiguity IDs, obligation IDs, answer payload, timestamps, and whether the answer has merely been captured (`candidate`) or has been applied to a resolved ambiguity state (`applied`).
+  - `apps/control-plane/src/application/services/intake-service.ts` - expanded question evidence parsing to include prompt/answer/question identity, added review-sync logic that derives clarification-answer bridges from persisted intake questions, preserves stale reviews when no `questions.json` evidence exists, heals existing features during `ensureIntakeArtifacts()`, and carries the bridge forward during `INTAKE_SUBMISSION`.
+  - `apps/control-plane/src/core/kernel.ts` - synchronized intake review bridges immediately after `feature.question_create` and `feature.question_answer`, so the persisted intake artifacts are coherent before auto-resume or the next planner turn.
+  - `apps/control-plane/src/providers/cli-worker-provider.ts` - exposed intake review status, open ambiguities, and bridged clarification answers in the interactive planner context summary and added `questions.json` to the intake workspace file list.
+  - `apps/control-plane/src/supervisor/planning-wave-executor.ts`, `apps/control-plane/src/supervisor/worker-decision-loop.ts` - updated intake follow-up question generation to include prior answered clarification evidence instead of re-asking the same generic ambiguity prompt without context.
+  - `agentic/orchestrator/prompts/planner-intake.system.md`, `config/agentic/orchestrator/prompts/planner-intake.system.md` - tightened the intake prompt so answered clarification evidence must either be applied to resolve the ambiguity or trigger a narrower follow-up question explaining why the prior answer was insufficient.
+  - `apps/control-plane/test/intake-service.spec.ts`, `apps/control-plane/test/kernel.spec.ts`, `apps/control-plane/test/worker-provider-adapters.spec.ts` - added regressions covering review-bridge syncing from `questions.json`, kernel-side bridge updates after `feature.question_answer`, and planner interactive prompt inclusion of bridged clarification evidence.
+- **Result:** `npx vitest run apps/control-plane/test/intake-service.spec.ts apps/control-plane/test/kernel.spec.ts apps/control-plane/test/worker-provider-adapters.spec.ts` [PASS] (3 files / 87 tests). `npm run typecheck` [PASS]. `npm run verify` [PASS].
+
+✅ **Entry 275 — Recover invalid intake submissions back into clarification**
+
+- **Goal:** Prevent intake verification from surfacing `intake_submission_invalid` to the CLI when the planner resolves ambiguities without sufficient answered evidence, and instead keep the feature inside the intake clarification loop until those ambiguity IDs are actually backed by operator input.
+- **Changes made:**
+  - `apps/control-plane/src/supervisor/worker-decision-loop.ts` - added deterministic recovery for `feature.intake_submit` failures with `INTAKE_SUBMISSION_INVALID`; extracted missing/open ambiguity IDs from validator error details; mapped them back to intake review records even when the planner had already marked them resolved; reused prior clarification answers in the follow-up prompt; and skipped duplicate question creation when an intake question is already open.
+  - `agentic/orchestrator/prompts/planner-intake.system.md`, `config/agentic/orchestrator/prompts/planner-intake.system.md` - tightened the intake prompt so `resolved_ambiguities` may contain only ambiguity IDs that have persisted answered evidence, with all unsupported ambiguities left open for further clarification.
+  - `apps/control-plane/test/worker-decision-loop.spec.ts` - added regressions covering invalid intake submission rerouting, prior-answer carry-forward in the recovery question, and the no-duplicate-question branch when an intake question is already open.
+  - `apps/control-plane/test/mcp.spec.ts` - raised the transport-parity critical-path test timeout to `20_000ms` so the full coverage run no longer fails on the harness default while the parity flow itself remains unchanged.
+- **Result:** `npx vitest run apps/control-plane/test/worker-decision-loop.spec.ts apps/control-plane/test/planning-wave-executor.spec.ts apps/control-plane/test/intake-service.spec.ts` [PASS] (3 files / 154 tests). `npx vitest run apps/control-plane/test/worker-decision-loop.spec.ts apps/control-plane/test/mcp.spec.ts -t "intake_submission|preserves transport parity for full critical path envelopes and deterministic state transitions"` [PASS] (2 files / 6 tests). `npm run typecheck` [PASS]. `npm run verify` [PASS].
+
+✅ **Entry 276 — Invalidate stale plans when intake verifies a new manifest contract**
+
+- **Goal:** Prevent stale accepted `plan.json` artifacts from surviving the Intake → Planning transition and later failing with `plan_trace_invalid` after the feature has already advanced into build/QA or `ready_to_merge`.
+- **Changes made:**
+  - `apps/control-plane/src/core/intake-artifacts.ts` - added a shared `validatePlanTraceAgainstObligationIds()` helper plus normalized plan-trace parsing so the verified-manifest contract is checked consistently across planning and reconciliation paths.
+  - `apps/control-plane/src/application/services/plan-service.ts` - switched verified-manifest enforcement to the shared plan-trace contract validator, preserving the same `PLAN_TRACE_INVALID` error payload while removing duplicated validation logic.
+  - `apps/control-plane/src/application/services/intake-service.ts` - treated verified-manifest promotion as a contract reset by deleting stale `plan.json` / `plan.md` artifacts under the feature lock and resetting `frontMatter.gates.plan` to `na` before the feature re-enters `planning`.
+  - `apps/control-plane/src/supervisor/planning-wave-executor.ts` - stopped auto-healing `planning -> building` when the accepted plan trace no longer matches the verified manifest; carried plan-trace contract details through post-QA reconciliation; and routed contract mismatches back to the planner instead of auto-submitting an invalid `plan.update`.
+  - `apps/control-plane/test/intake-artifacts.spec.ts` - added pure-unit coverage for malformed plan-trace entry normalization and missing/unknown/duplicate/invalid mapping detection.
+  - `apps/control-plane/test/intake-service.spec.ts` - added a regression proving intake verification clears stale plan artifacts and resets the plan gate before execution planning resumes.
+  - `apps/control-plane/test/planning-wave-executor.spec.ts` - added regressions proving stale plan traces no longer auto-heal into `building` and that verified-manifest trace gaps are sent back to the planner instead of triggering a doomed `PLAN_UPDATE`.
+- **Result:** `npx vitest run apps/control-plane/test/intake-artifacts.spec.ts apps/control-plane/test/intake-service.spec.ts apps/control-plane/test/planning-wave-executor.spec.ts` [PASS] (3 files / 107 tests). `npm run typecheck` [PASS]. `npm run verify` [in progress during logging after the earlier 89.95% branch-coverage miss was corrected with the new helper tests].
+
+✅ **Entry 277 — Align dashboard review approval with merge-gate readiness**
+
+- **Goal:** Prevent the dashboard Review tab from advertising merge approval before the merge gate has passed, and give operators an explicit merge-gate action that matches the real merge prerequisites.
+- **Changes made:**
+  - `packages/web-dashboard/src/lib/orchestrator-tools.ts` - added merge-readiness orchestration for the dashboard: reconcile mainline, run the merge gate on demand, and make `approveFeatureReview()` perform the same pre-merge preparation before calling `feature.ready_to_merge`.
+  - `packages/web-dashboard/src/app/api/actions/route.ts` - introduced `review.run_merge_gate`, disabled `review.approve` until `feature.gates.merge === 'pass'`, and returned action-state reasons that explicitly tell the operator to run or re-run the merge gate first.
+  - `packages/web-dashboard/src/app/api/features/[id]/review/route.ts`, `packages/web-dashboard/src/app/api/features/[id]/triage/route.ts`, `packages/web-dashboard/src/lib/types.ts` - extended the review/triage contracts with the new merge-gate action so the dashboard surfaces stay consistent.
+  - `packages/web-dashboard/src/components/focus/tabs/ReviewTab.tsx` - added a dedicated `Merge Gate` section with current status, a `Run Merge Gate` / `Re-run Merge Gate` button, and approval disabling until the feature is actually `ready_to_merge` and the merge gate has passed.
+  - `packages/web-dashboard/src/components/dashboard/triage-drawer.tsx` - added `Run Merge Gate` to the triage action cluster so the lighter-weight review surface no longer strands ready-to-merge features behind a disabled Approve button.
+  - `packages/web-dashboard/test/api/actions/route.spec.ts`, `packages/web-dashboard/test/api/features/triage.route.spec.ts`, `packages/web-dashboard/test/components/review-tab.spec.tsx`, `packages/web-dashboard/test/components/triage-drawer.spec.tsx` - added regressions covering approval disablement before merge-gate pass, the new review action, triage action-state alignment, and the new Review-tab/Triage-drawer controls.
+- **Result:** `npx vitest run packages/web-dashboard/test/api/actions/route.spec.ts packages/web-dashboard/test/api/features/triage.route.spec.ts packages/web-dashboard/test/components/review-tab.spec.tsx packages/web-dashboard/test/components/triage-drawer.spec.tsx` [PASS] (4 files / 18 tests). `npm run typecheck` [PASS]. `npm run verify` [PASS].
+
+✅ **Entry 278 — Remove approval submission controls until merge gate passes**
+
+- **Goal:** Make the Review tab reflect the actual merge contract by removing the approval submission path entirely until the merge gate succeeds, instead of merely showing a disabled Approve button.
+- **Changes made:**
+  - `packages/web-dashboard/src/components/focus/tabs/ReviewTab.tsx` - changed the `Review Decision` section so approval-only controls (`Approval token`, `Merge strategy`, and `Approve`) render only after `feature.gates.merge === 'pass'`; when the gate has not passed, the panel now shows a blocking explanation instead of a disabled submission path.
+  - `packages/web-dashboard/test/components/review-tab.spec.tsx` - split coverage into locked and unlocked review states, asserting that approval controls are absent before merge-gate success and present afterward.
+- **Result:** `npx vitest run packages/web-dashboard/test/components/review-tab.spec.tsx` [PASS] (1 file / 2 tests). `npm run typecheck` [PASS]. `npm run verify` [PASS].
+
+✅ **Entry 279 — Bound merge-gate repair loops and reroute failed merge review back to QA**
+
+- **Goal:** Let merge-gate failures recover through QA a maximum of five times before parking the feature in `failed`, while keeping the CLI and dashboard aligned with the bounded merge-repair contract.
+- **Changes made:**
+  - `apps/control-plane/src/core/merge-repair.ts`, `agentic/orchestrator/schemas/state.schema.json` - added the persisted `merge_repair` state model plus helpers for detecting blocked merge-gate failures, recording failure evidence, rerouting to QA, clearing active repair state, and exhausting the repair budget at five attempts.
+  - `apps/control-plane/src/application/services/gate-service.ts`, `apps/control-plane/src/application/services/feature-state-service.ts`, `apps/control-plane/src/supervisor/run-coordinator.ts` - taught merge-gate failures to record repair state, transition to `failed` when the budget is exhausted, allow `ready_to_merge -> failed` / `blocked -> failed`, and stop auto-retrying blocked merge failures until an explicit QA reroute occurs.
+  - `apps/control-plane/src/cli/retry-command-handler.ts`, `apps/control-plane/src/cli/merge-command-handler.ts`, `apps/control-plane/src/interfaces/cli/bootstrap.ts` - rerouted blocked merge failures through `retry -> qa -> resume`, surfaced repair-attempt metadata and recovery availability in merge/retry responses, and prevented the CLI from dead-ending on merge gate failures that still have repair budget remaining.
+  - `packages/web-dashboard/src/lib/types.ts`, `packages/web-dashboard/src/lib/aop-client.ts`, `packages/web-dashboard/src/lib/orchestrator-tools.ts`, `packages/web-dashboard/src/components/focus/tabs/ReviewTab.tsx` - surfaced `merge_repair` state to the dashboard, changed `review.request_changes` into a true `Send Back to QA` reroute for blocked merge failures, displayed attempt counts and exhausted state in Review, and blocked further review actions once the repair budget is spent.
+  - `apps/control-plane/test/feature-state-service.spec.ts`, `apps/control-plane/test/incremental-gates.spec.ts`, `apps/control-plane/test/cli-helpers.spec.ts`, `apps/control-plane/test/merge-command-handler.spec.ts`, `apps/control-plane/test/bootstrap.spec.ts`, `apps/control-plane/test/run-coordinator.spec.ts`, `packages/web-dashboard/test/api/actions/route.spec.ts`, `packages/web-dashboard/test/components/review-tab.spec.tsx`, `apps/control-plane/test/dashboard-api.integration.spec.ts`, `apps/control-plane/test/collision-queue.spec.ts` - added regressions for exhausted merge-repair failure routing, CLI merge/retry recovery metadata, dashboard QA reroute behavior, ready-to-merge fixtures requiring `gates.merge === 'pass'`, and the slow collision queue coverage path.
+  - `docs/core/DOMAIN-LOGIC.md` - updated the documented state machine to reflect `intake`, `awaiting_input`, bounded merge-repair reroutes, and the explicit `failed` parking path after repair exhaustion.
+- **Result:** `npx vitest run apps/control-plane/test/collision-queue.spec.ts apps/control-plane/test/dashboard-api.integration.spec.ts` [PASS] (2 files / 50 tests). `npm run typecheck` [PASS]. `npm run verify` [PASS] (116 files / 2011 tests; 95.84% statements, 90.01% branches, 95.46% functions, 96.01% lines).
+
+✅ **Entry 280 — Skip redundant auto-resume after successful retry gate reruns**
+
+- **Goal:** Prevent `retry` from surfacing misleading follow-on resume failures after an in-place gate rerun already completed and advanced the feature state.
+- **Changes made:**
+  - `apps/control-plane/src/interfaces/cli/bootstrap.ts` - added `shouldAttemptAutoResumeAfterRetry()` so CLI retry only hands off to `resume` when the retry actually rerouted a blocked or awaiting-input feature back into an active phase; successful in-place gate reruns now report `auto_resume.attempted: false` with `skipped_reason: retry_completed_in_place`.
+  - `apps/control-plane/test/bootstrap.spec.ts` - updated retry bootstrap coverage to assert that successful direct gate reruns skip `ResumeCommandHandler` instead of attempting a redundant auto-resume.
+  - `apps/control-plane/test/cli.unit.spec.ts` - updated the active-run retry contract to verify that a successful direct gate rerun no longer submits an execution enrollment request.
+  - `README.md` - documented that `repo.reconcile_mainline` only consumes committed base-branch refs, so local fixes must be committed on the base branch or applied directly in the feature worktree to be picked up automatically.
+- **Result:** `npx vitest run apps/control-plane/test/bootstrap.spec.ts apps/control-plane/test/cli.unit.spec.ts` [PASS] (2 files / 86 tests). `npm run typecheck` [PASS].
+
+✅ **Entry 281 — Preserve failed tool envelopes through the MCP executor**
+
+- **Goal:** Fix in-process tool calls like `repo.reconcile_mainline` so handler failures remain proper fail envelopes instead of being rewrapped as successful payloads that then fail output-schema validation.
+- **Changes made:**
+  - `apps/control-plane/src/mcp/kernel-tool-executor.ts` - added ToolResponse envelope detection so `dispatchTool()` results with `ok: true/false` pass through unchanged; only legacy plain payloads are wrapped with `ok(...)`.
+  - `apps/control-plane/test/kernel-tool-executor.spec.ts` - added focused coverage for successful envelope passthrough, failed envelope passthrough, and legacy plain-payload wrapping behavior.
+- **Result:** `npx vitest run apps/control-plane/test/kernel-tool-executor.spec.ts apps/control-plane/test/tool-runtime.spec.ts` [PASS] (2 files / 23 tests). `npm run typecheck` [PASS]. `npx tsc -p apps/control-plane/tsconfig.build.json` [PASS]. `npx eslint apps/control-plane/src/mcp/kernel-tool-executor.ts apps/control-plane/test/kernel-tool-executor.spec.ts --max-warnings 0` [PASS].
+
+✅ **Entry 282 — Tail and scroll live agent console output in the Runtime tab**
+
+- **Goal:** Make the Runtime tab’s live agent rendering usable for long-running sessions by showing the newest output by default and allowing the operator to scroll within the console.
+- **Changes made:**
+  - `packages/web-dashboard/src/lib/aop-client.ts` - added `DEFAULT_LIVE_AGENT_OUTPUT_LINE_LIMIT`, a line-tail helper, and `tailLines` support in `readLiveAgentOutputSnapshots()` so live snapshots default to the newest 500 lines instead of loading the full buffer.
+  - `packages/web-dashboard/src/app/api/features/[id]/live-output/route.ts` - added `line_limit` parsing with a default of `500` and a capped override so the live-output API returns a bounded tail window deterministically.
+  - `packages/web-dashboard/src/components/focus/LiveAgentConsole.tsx` - tracked the active line limit, updated the console copy to explain the default tail behavior, kept follow-live scrolling pinned to the bottom, and rendered the live output inside a dedicated scroll container.
+  - `packages/web-dashboard/src/styles/dashboard.module.css` - added the `liveConsoleOutput` scroll styling with a bounded height and vertical overflow for the runtime console.
+  - `packages/web-dashboard/test/api/features/live-output.route.spec.ts`, `packages/web-dashboard/test/lib/aop-client.spec.ts`, `packages/web-dashboard/test/components/runtime-tab.spec.tsx` - added regressions covering the default `500` line limit, route propagation of `line_limit`, trimming a 600-line log down to the newest 500 lines, and the updated Runtime-tab messaging.
+  - `apps/control-plane/test/feature-resume-phase.spec.ts`, `apps/control-plane/test/gate-log-extractor.spec.ts`, `apps/control-plane/test/providers.spec.ts` - added focused branch-coverage regressions required to keep the repo-wide `verify` gate above the 90% branch threshold after the dashboard change.
+- **Result:** `npx vitest run packages/web-dashboard/test/api/features/live-output.route.spec.ts packages/web-dashboard/test/lib/aop-client.spec.ts packages/web-dashboard/test/components/runtime-tab.spec.tsx` [PASS] (3 files / 10 tests). `npx vitest run apps/control-plane/test/feature-resume-phase.spec.ts apps/control-plane/test/gate-log-extractor.spec.ts` [PASS] (2 files / 26 tests). `npx vitest run apps/control-plane/test/providers.spec.ts -t "generateProviderCliExtraArgs"` [PASS] (1 file / 8 tests). `npm run typecheck` [PASS]. `npm run verify` [PASS] (118 files / 2034 tests; 95.89% statements, 90.00% branches, 95.47% functions, 96.06% lines).
+
+✅ **Entry 283 — Heal malformed intake review artifacts before schema validation**
+
+- **Goal:** Prevent intake artifact reads from failing with `state_validation_failed` when `intake.review.json` contains legacy or malformed ambiguity fields, malformed obligation references, invalid promotion metadata, or degraded clarification-answer structure.
+- **Changes made:**
+  - `apps/control-plane/src/application/services/intake-service.ts` - added deterministic normalization for intake-review ambiguities, clarification answers, verification basis, review status, and submitted ambiguity lists; sanitized malformed legacy review artifacts on read; normalized answered-question evidence back into canonical ambiguity/obligation IDs; and forced `intakeSubmit()` to persist only schema-valid `open_ambiguities` / `resolved_ambiguities`.
+  - `apps/control-plane/test/intake-service.spec.ts` - added regressions covering malformed legacy ambiguity healing, preserved clarification-answer sorting and explicit resolution-status retention, non-array clarification-answer cleanup, malformed question-evidence normalization, and normalized intake-submission ambiguity persistence.
+  - `apps/control-plane/test/kernel.spec.ts` - added an integration regression proving `feature.get_context` heals a poisoned `intake.review.json` in place instead of surfacing `STATE_VALIDATION_FAILED`.
+  - `apps/control-plane/test/kernel.branches.spec.ts`, `apps/control-plane/test/kernel.coverage.spec.ts`, `apps/control-plane/test/supervisor.spec.ts` - raised the timeout on three long-path coverage/integration tests so the full `verify` run remains stable under coverage instrumentation after the new intake-healing paths were added.
+- **Result:** `npx vitest run apps/control-plane/test/intake-service.spec.ts apps/control-plane/test/kernel.spec.ts` [PASS] (2 files / 62 tests). `npx vitest run apps/control-plane/test/kernel.branches.spec.ts apps/control-plane/test/kernel.coverage.spec.ts apps/control-plane/test/supervisor.spec.ts` [PASS] (3 files / 15 tests). `npm run typecheck` [PASS]. `npm run verify` [PASS] (118 files / 2040 tests; 95.90% statements, 90.00% branches, 95.49% functions, 96.07% lines).
+
+✅ **Entry 284 — Harden intake prompt payload-shape instructions**
+
+- **Goal:** Reduce malformed `INTAKE_SUBMISSION` payloads at the source by making the planner-intake prompt explicitly require canonical ambiguity/object shapes and verbatim ID copying from intake artifacts.
+- **Changes made:**
+  - `agentic/orchestrator/prompts/planner-intake.system.md` - added a `Structured payload discipline` section requiring verbatim `ambiguity_id` / `obligation_ids` copying from `spec.manifest.bootstrap.json` and `intake.review.json`, forbidding extra ambiguity-object fields such as `resolution`, restricting `obligation_ids` to bare `OBL-###` tokens, and adding concrete good/bad examples.
+  - `config/agentic/orchestrator/prompts/planner-intake.system.md` - mirrored the same hardening in the active config prompt so the runtime-loaded intake planner instructions match the canonical source prompt.
+- **Result:** `npm run verify` [PASS] (118 files / 2040 tests; 95.90% statements, 90.00% branches, 95.49% functions, 96.07% lines).
+
+✅ **Entry 285 — Ignore malformed verified-manifest drafts during init/resume and planning**
+
+- **Goal:** Prevent stale draft `spec.manifest.verified.json` artifacts from poisoning intake review sync or being treated as authoritative during `feature.init`, `feature.get_context`, and plan submission.
+- **Changes made:**
+  - `apps/control-plane/src/application/services/intake-service.ts` - changed `readVerifiedManifest()` to require `spec.manifest.verified.schema.json` validation before returning a verified manifest, downgraded stale `intake.status=verified` summary output when no canonical verified manifest survives validation, and cleared preserved `verified_manifest_version` markers when a verified manifest is no longer valid.
+  - `apps/control-plane/src/application/services/plan-service.ts` - added validated verified-manifest reads and tightened planning preconditions so `intake.status=verified` without a schema-valid verified manifest now fails with `VERIFIED_MANIFEST_REQUIRED` instead of accepting a stale draft contract.
+  - `apps/control-plane/test/intake-service.spec.ts` - added a regression proving `ensureIntakeArtifacts()` ignores malformed verified-manifest drafts (`verification_basis=pending_confirmation`, non-canonical obligation IDs) and rewrites review/summary metadata back to an unverified state.
+  - `apps/control-plane/test/kernel.spec.ts` - added an integration regression for the actual resume path: rerunning `feature.init` on a feature with a stale draft verified-manifest artifact now succeeds and heals the persisted intake review instead of surfacing `STATE_VALIDATION_FAILED`.
+  - `apps/control-plane/test/plan-service.spec.ts` - added a regression proving planning treats malformed verified-manifest artifacts as missing and blocks execution planning with `VERIFIED_MANIFEST_REQUIRED`.
+- **Result:** `npx vitest run apps/control-plane/test/intake-service.spec.ts apps/control-plane/test/plan-service.spec.ts apps/control-plane/test/kernel.spec.ts` [PASS] (3 files / 82 tests). `npm run typecheck` [PASS].
+
+✅ **Entry 286 — Cover malformed verified-manifest guardrails and stabilize supervisor coverage timing**
+
+- **Goal:** Keep the malformed verified-manifest recovery fix green under the repo-wide coverage gate by covering the remaining null-guard branches and extending a long-running supervisor topology test past the default timeout under instrumentation.
+- **Changes made:**
+  - `apps/control-plane/test/plan-service.spec.ts` - added regressions proving execution planning treats schema-valid-but-non-object verified-manifest payloads and verified-manifest payloads missing required fields as absent contracts, exercising the remaining `asVerifiedManifest()` guard branches.
+  - `apps/control-plane/test/intake-service.spec.ts` - added a regression that drops malformed clarification answers missing required fields while retaining valid answers with derived `resolution_status`, exercising the new clarification normalization rejection path.
+  - `apps/control-plane/test/supervisor.spec.ts` - raised the timeout for the `2 + 3N topology` coverage path to `15000ms` so the full coverage run no longer flakes on the default 5s timeout.
+- **Result:** `npx vitest run apps/control-plane/test/intake-service.spec.ts apps/control-plane/test/plan-service.spec.ts` [PASS] (2 files / 66 tests). `npx vitest run apps/control-plane/test/supervisor.spec.ts` [PASS] (1 file / 9 tests). `npm run typecheck` [PASS].
+
+✅ **Entry 287 — Normalize reviewed intake manifests before promotion**
+
+- **Goal:** Prevent answered intake review flows from failing with raw `state_validation_failed` when the planner submits draft-style verified manifests (`OBL-V##`, `constraint`, operator-added obligations) after a human review confirmation.
+- **Changes made:**
+  - `apps/control-plane/src/application/services/intake-service.ts` - normalized submitted verified-manifest obligation IDs into canonical `OBL-###` tokens, mapped supported kind aliases such as `constraint -> contract`, stripped unsupported fields like `added_by`, accepted legacy `AMB-MANIFEST-REVIEW` confirmation questions for `human_review_confirmed`, and changed incoming verified-manifest schema failures to return `INTAKE_SUBMISSION_INVALID` instead of `STATE_VALIDATION_FAILED`.
+  - `agentic/orchestrator/schemas/spec.manifest.verified.schema.json` - split verified-manifest obligation validation away from the bootstrap schema so verified manifests can retain empty `source_refs` arrays for operator-added obligations while still enforcing the canonical verified-manifest contract.
+  - `apps/control-plane/test/intake-service.spec.ts` - added regressions covering draft reviewed manifests with `OBL-V##` IDs, legacy manifest-review confirmation questions, alias-kind normalization, operator-added obligations with empty `source_refs`, and the new `INTAKE_SUBMISSION_INVALID` schema-failure path.
+- **Result:** `npx vitest run apps/control-plane/test/intake-service.spec.ts apps/control-plane/test/kernel.spec.ts apps/control-plane/test/plan-service.spec.ts apps/control-plane/test/worker-decision-loop.spec.ts` [PASS] (4 files / 144 tests). `npm run typecheck` [PASS]. `npm run validate:mcp-contracts` [PASS].
+
+✅ **Entry 288 — Resume persisted Claude worker sessions instead of recreating them**
+
+- **Goal:** Prevent Claude-backed worker runs from failing with `Session ID ... is already in use` after the first successful turn by distinguishing new-session creation from subsequent session resumes.
+- **Changes made:**
+  - `apps/control-plane/src/providers/provider-defaults.ts` - added a dedicated Claude `run_resume` command template that uses `--resume {session_id}` while keeping the first-run `--session-id {session_id}` template unchanged.
+  - `apps/control-plane/src/providers/cli-worker-provider.ts` - taught `runWorker()` to choose between create and resume templates, track bootstrapped Claude session IDs in memory, fall back to the persisted Claude JSONL transcript on disk when deciding whether a session already exists, and clear bootstrapped state whenever a role/feature session is refreshed or closed.
+  - `apps/control-plane/test/worker-provider-adapters.spec.ts` - added regressions proving the second Claude run for the same session uses `--resume` and that a pre-existing Claude transcript forces resume behavior even before the current provider instance has seen a successful run.
+- **Result:** `npx vitest run apps/control-plane/test/worker-provider-adapters.spec.ts apps/control-plane/test/providers.spec.ts` [PASS] (2 files / 112 tests). `npm run typecheck` [PASS]. `npx eslint --no-ignore apps/control-plane/src/providers/provider-defaults.ts apps/control-plane/src/providers/cli-worker-provider.ts apps/control-plane/test/worker-provider-adapters.spec.ts --max-warnings 0` [PASS].
+
+✅ **Entry 289 — Fail reconciliation early on dirty feature worktrees**
+
+- **Goal:** Replace opaque auto-merge/rebase failures with a precise `uncommitted_changes` response when mainline reconciliation is attempted against a feature worktree that still has local edits.
+- **Changes made:**
+  - `apps/control-plane/src/application/services/git-reconciliation-service.ts` - added porcelain-status parsing plus a preflight dirty-worktree check inside `performAutoMerge()`, filtered out orchestrator/runtime noise, and now return `UNCOMMITTED_CHANGES` with `worktree_path` and dirty `files` before attempting `merge --ff-only` or `rebase`.
+  - `apps/control-plane/test/git-reconciliation-service.spec.ts` - updated the auto-merge success/failure fixtures for the extra status probe and added a regression proving dirty feature worktrees now fail with `uncommitted_changes` and the blocking file list.
+- **Result:** `npx vitest run apps/control-plane/test/git-reconciliation-service.spec.ts` [PASS] (1 file / 56 tests). `npm run typecheck` [PASS]. `npx eslint --no-ignore apps/control-plane/src/application/services/git-reconciliation-service.ts apps/control-plane/test/git-reconciliation-service.spec.ts --max-warnings 0` [PASS].
+
+✅ **Entry 290 — Checkpoint dirty feature worktrees before merge-time reconciliation**
+
+- **Goal:** Ensure the merge flow has a deterministic path forward when a feature worktree still has local edits by committing those edits before reconciliation, so conflicts can either auto-merge cleanly or fall through to the existing reconciler-lane workflow.
+- **Changes made:**
+  - `agentic/orchestrator/tools/schemas/input/repo.reconcile_mainline.input.schema.json` - added optional `commit_message` support so merge-driven reconciliation can receive the operator’s checkpoint message through the MCP contract.
+  - `apps/control-plane/src/cli/merge-command-handler.ts`, `apps/control-plane/src/application/kernel-tool-wiring.ts`, `apps/control-plane/src/core/kernel.ts` - threaded `commit_message` through the merge command and kernel `repo.reconcile_mainline` path.
+  - `apps/control-plane/src/application/services/git-reconciliation-service.ts` - added merge-time worktree checkpointing that stages and commits dirty feature-worktree changes before reconciliation when a checkpoint commit message is supplied, allowing deterministic reconciliation to run on committed state instead of failing on uncommitted edits.
+  - `apps/control-plane/test/merge-command-handler.spec.ts`, `apps/control-plane/test/kernel-tool-wiring.spec.ts`, `apps/control-plane/test/git-reconciliation-service.spec.ts` - added regressions proving merge forwards the checkpoint commit message into reconciliation, kernel wiring preserves the new argument, and reconciliation commits dirty worktrees before auto-merge.
+- **Result:** `npx vitest run apps/control-plane/test/merge-command-handler.spec.ts apps/control-plane/test/kernel-tool-wiring.spec.ts apps/control-plane/test/git-reconciliation-service.spec.ts` [PASS] (3 files / 79 tests). `npm run typecheck` [PASS]. `npm run validate:mcp-contracts` [PASS]. `npx eslint --no-ignore apps/control-plane/src/cli/merge-command-handler.ts apps/control-plane/src/application/kernel-tool-wiring.ts apps/control-plane/src/core/kernel.ts apps/control-plane/src/application/services/git-reconciliation-service.ts apps/control-plane/test/merge-command-handler.spec.ts apps/control-plane/test/kernel-tool-wiring.spec.ts apps/control-plane/test/git-reconciliation-service.spec.ts --max-warnings 0` [PASS].
+
+✅ **Entry 291 — Checkpoint dirty feature worktrees during resume-time reconciliation**
+
+- **Goal:** Prevent `resume` and other supervisor phase-preflight reconciliation paths from dead-ending on `uncommitted_changes` when a feature worktree contains local edits that can be deterministically checkpointed before mainline sync.
+- **Changes made:**
+  - `apps/control-plane/src/supervisor/run-coordinator.ts` - added a deterministic phase-specific checkpoint commit message for `repo.reconcile_mainline` so planning/building/qa preflight reconciliation can commit dirty feature-worktree changes before attempting fast-forward/rebase logic.
+  - `apps/control-plane/test/run-coordinator.spec.ts` - updated the supervisor reconciliation expectations to assert the new `commit_message` payload for planning/building/qa preflights and added a focused assertion that conflict-detected planning preflight still goes through the reconciler path with the checkpoint message attached.
+- **Result:** `npx vitest run apps/control-plane/test/run-coordinator.spec.ts apps/control-plane/test/merge-command-handler.spec.ts apps/control-plane/test/git-reconciliation-service.spec.ts` [PASS] (3 files / 137 tests). `npx vitest run apps/control-plane/test/kernel.coverage2.spec.ts apps/control-plane/test/run-coordinator.spec.ts` [PASS] (2 files / 153 tests). `npm run typecheck` [PASS]. `npm run verify` [FAIL] (`control-plane:test` branch coverage 89.16% below the repo-wide 90% threshold in the current workspace).
+
+✅ **Entry 292 — Align dashboard merge approval with commit-backed reconciliation**
+
+- **Goal:** Prevent dashboard-driven merge approvals from dead-ending on dirty feature worktrees by giving the `/api/actions` and review API paths the same checkpoint-commit reconciliation behavior as the CLI merge flow.
+- **Changes made:**
+  - `packages/web-dashboard/src/lib/orchestrator-tools.ts` - added `resolveDashboardMergeCommitMessage()`, taught `runFeatureMergeGate()` to pass `commit_message` into `repo.reconcile_mainline`, and ensured `approveFeatureReview()` reuses the same resolved operator message for both pre-merge reconciliation and `feature.ready_to_merge`.
+  - `packages/web-dashboard/src/app/api/actions/route.ts`, `packages/web-dashboard/src/app/api/features/[id]/review/route.ts` - changed dashboard approval routes to treat the UI `message` field as the merge `commit_message` fallback, matching the payload emitted by `ReviewTab`.
+  - `apps/control-plane/src/core/kernel.ts` - passed the merge `commitMessage` into the ready-to-merge reconciliation precheck so direct `feature.ready_to_merge` calls also checkpoint dirty worktrees before syncing mainline.
+  - `packages/web-dashboard/test/api/actions/route.spec.ts`, `packages/web-dashboard/test/lib/orchestrator-tools.spec.ts`, `apps/control-plane/test/kernel.coverage2.spec.ts` - added regressions proving the dashboard approval route forwards `message` as the merge commit message, the dashboard merge-message helper preserves operator text/default fallback, and merge-time kernel reconciliation now receives the commit message argument.
+- **Result:** `npx vitest run packages/web-dashboard/test/api/actions/route.spec.ts packages/web-dashboard/test/lib/orchestrator-tools.spec.ts apps/control-plane/test/kernel.coverage2.spec.ts` [PASS] (3 files / 110 tests). `npm run typecheck` [PASS]. `npx eslint --no-ignore packages/web-dashboard/src/lib/orchestrator-tools.ts packages/web-dashboard/src/app/api/actions/route.ts 'packages/web-dashboard/src/app/api/features/[id]/review/route.ts' apps/control-plane/src/core/kernel.ts apps/control-plane/test/kernel.coverage2.spec.ts --max-warnings 0` [PASS].
+
+✅ **Entry 293 — Stabilize checkpoint freshness and hide idle checkpoint noise**
+
+- **Goal:** Prevent clean or duplicate idle checkpoints from falsely staling gate evidence and misleading the Changes rail into looking like a feature never produced material work.
+- **Changes made:**
+  - `apps/control-plane/src/application/services/checkpoint-service.ts`, `apps/control-plane/src/core/gate-freshness.ts`, `apps/control-plane/src/application/services/gate-service.ts`, `apps/control-plane/src/core/gates.ts` - added checkpoint/evidence `workspace_fingerprint` and `head_sha` metadata, carried the last material fingerprint forward across idle checkpoints, switched gate input metadata to use the latest effective checkpoint, and taught freshness assessment to prefer workspace fingerprints while remaining backward-compatible with legacy `input_diff_hash` artifacts.
+  - `apps/control-plane/src/supervisor/planning-wave-executor.ts` - changed blocked stale-evidence handling so passing-but-stale blocked features are routed back into verification (`retry_qa` / `rerun_full_gate`) instead of staying in the dead-end `blocked_stale_evidence` path.
+  - `packages/web-dashboard/src/lib/types.ts`, `packages/web-dashboard/src/lib/aop-client.ts`, `packages/web-dashboard/src/app/api/features/[id]/checkpoints/route.ts`, `packages/web-dashboard/src/components/focus/CheckpointRail.tsx`, `packages/web-dashboard/src/components/focus/tabs/ChangesTab.tsx` - preserved idle checkpoint metadata, added material-only checkpoint paging with hidden-idle counts, and exposed an `Include idle checkpoints` toggle so the Changes rail defaults to meaningful checkpoints without losing auditability.
+  - `apps/control-plane/test/gate-freshness.spec.ts`, `apps/control-plane/test/checkpoint-service.spec.ts`, `apps/control-plane/test/gates.spec.ts`, `apps/control-plane/test/incremental-gates.spec.ts`, `apps/control-plane/test/planning-wave-executor.spec.ts`, `packages/web-dashboard/test/components/changes-tab.spec.tsx`, `packages/web-dashboard/test/lib/aop-client.spec.ts` - added 8 focused regressions covering carried-forward workspace fingerprints, persisted gate metadata, blocked stale-evidence recovery, material-only checkpoint paging, and the default idle-checkpoint filter in the Changes tab.
+- **Result:** `npx vitest run apps/control-plane/test/gate-freshness.spec.ts apps/control-plane/test/checkpoint-service.spec.ts apps/control-plane/test/planning-wave-executor.spec.ts apps/control-plane/test/gates.spec.ts apps/control-plane/test/incremental-gates.spec.ts packages/web-dashboard/test/components/changes-tab.spec.tsx packages/web-dashboard/test/lib/aop-client.spec.ts` [PASS] (7 files / 145 tests). `npm run typecheck` [PASS]. `npx eslint --no-ignore apps/control-plane/src/core/gate-freshness.ts apps/control-plane/src/application/services/checkpoint-service.ts apps/control-plane/src/application/services/gate-service.ts apps/control-plane/src/core/gates.ts apps/control-plane/src/supervisor/planning-wave-executor.ts apps/control-plane/test/gate-freshness.spec.ts apps/control-plane/test/checkpoint-service.spec.ts apps/control-plane/test/planning-wave-executor.spec.ts apps/control-plane/test/gates.spec.ts apps/control-plane/test/incremental-gates.spec.ts packages/web-dashboard/src/lib/types.ts packages/web-dashboard/src/lib/aop-client.ts packages/web-dashboard/src/app/api/features/\[id\]/checkpoints/route.ts packages/web-dashboard/src/components/focus/CheckpointRail.tsx packages/web-dashboard/src/components/focus/tabs/ChangesTab.tsx packages/web-dashboard/test/components/changes-tab.spec.tsx --max-warnings 0` [PASS]. `npm run validate:mcp-contracts` [PASS] (AJV emitted existing `unknown format "date-time"` warnings only).
+
+✅ **Entry 294 — Prevent ready-to-merge recovery regressions and restore dashboard runtime coverage**
+
+- **Goal:** Stop `ready_to_merge` features from being treated as resumable recovery work after unrelated dashboard/runtime changes, and keep the repo-wide coverage gate green after adding the dashboard runtime entrypoint.
+- **Changes made:**
+  - `apps/control-plane/src/cli/resume-command-handler.ts` - blocked generic `resume` from re-enrolling `ready_to_merge` features and now return `INVALID_STATUS_TRANSITION` when a caller explicitly tries to resume one.
+  - `apps/control-plane/src/application/services/gate-service.ts`, `apps/control-plane/src/application/services/git-reconciliation-service.ts`, `apps/control-plane/src/supervisor/run-coordinator.ts` - cleared stale `recovery` metadata when features advance into `ready_to_merge` or are rewritten through mainline-conflict recovery paths so merge-ready features no longer inherit old planner recovery state.
+  - `packages/web-dashboard/src/lib/aop-client.ts`, `packages/web-dashboard/src/lib/health-diagnosis.ts`, `packages/web-dashboard/src/lib/focus-detail-derivations.ts` - changed dashboard action-state and focus-detail derivation logic so `ready_to_merge` features are rendered as review-ready instead of “recovering,” even if historical recovery metadata exists on the artifact.
+  - `apps/control-plane/test/resume-command.spec.ts`, `apps/control-plane/test/cli.unit.spec.ts`, `apps/control-plane/test/git-reconciliation-service.spec.ts`, `apps/control-plane/test/run-coordinator.spec.ts`, `apps/control-plane/test/service-retry-paths.spec.ts`, `packages/web-dashboard/test/lib/aop-client.spec.ts`, `packages/web-dashboard/test/lib/health-diagnosis.spec.ts`, `packages/web-dashboard/test/lib/focus-detail-derivations.spec.ts` - updated stale expectations and added regressions covering ready-to-merge resume rejection plus stale-recovery cleanup across service and UI paths.
+  - `apps/control-plane/test/dashboard-runtime.spec.ts` - added an entrypoint coverage suite for explicit flags, fallback derivation, and startup failure handling so `apps/control-plane/src/cli/dashboard-runtime.ts` no longer drags global branch coverage below threshold.
+- **Result:** `npx vitest run apps/control-plane/test/dashboard-runtime.spec.ts apps/control-plane/test/cli.unit.spec.ts` [PASS] (2 files / 61 tests). `npm run typecheck` [PASS]. `npm run verify` [PASS] (120 files / 2110 tests, 90.05% branch coverage).
+
+✅ **Entry 295 — Route dashboard execution requests through the dashboard runtime bridge**
+
+- **Goal:** Eliminate `forbidden_tool_for_role` failures from `/api/actions` and `/api/launch/submit` by ensuring dashboard HTTP routes never call `runtime.execution_request_submit` directly with the in-process dashboard `orchestrator` identity.
+- **Changes made:**
+  - `packages/web-dashboard/src/app/api/actions/route.ts` - removed the stale active-run enrollment shortcut for `feature.retry` auto-resume and `feature.resume`, so both paths now always delegate through `resumeFeatureExecution()` and the dashboard-owned runtime bridge.
+  - `packages/web-dashboard/src/app/api/launch/submit/route.ts` - removed direct per-feature active-run enrollment from the launch submit route so launch always goes through `submitLaunchEnrollment()`, whether it is attaching to an active run or starting a dashboard-owned run.
+  - `packages/web-dashboard/test/api/actions/route.spec.ts`, `packages/web-dashboard/test/api/launch/submit.route.spec.ts` - updated the route regressions to assert runtime-bridge delegation for resume/retry and batched launch enrollment for both active-run and runtime-start launch flows.
+- **Result:** `npx vitest run packages/web-dashboard/test/api/actions/route.spec.ts packages/web-dashboard/test/api/launch/submit.route.spec.ts` [PASS] (2 files / 20 tests). `npm run typecheck` [PASS]. `npm run build --workspace @aop/web-dashboard` [PASS].
+
+✅ **Entry 296 — Make dashboard retry and merge handoff report real reconciler progress**
+
+- **Goal:** Stop dashboard `retry` and merge recovery from claiming success when the live dashboard runtime has an active sibling run but stale lease expiry metadata, and surface actual reconciler dispatch failures instead of leaving blocked features appearing to “start” without moving.
+- **Changes made:**
+  - `apps/control-plane/src/cli/dashboard-runtime-runner.ts` - added same-instance heartbeat grace for active dashboard-run detection, changed prepared-conflict resume/approve flows to redrive the reconciler immediately when the sibling runtime is alive, and now return `reconciliation_failed` instead of optimistic success when the prepared handoff cannot actually be dispatched.
+  - `apps/control-plane/src/core/utils/index-normalizer.ts` - restored global `isRunLeaseFresh()` to strict lease-expiry semantics so stale-run takeover, epoch tracking, and non-dashboard runtime behavior remain deterministic.
+  - `apps/control-plane/src/providers/providers.ts`, `apps/control-plane/src/application/services/git-reconciliation-service.ts` - included provider command `stderr` in null-provider failure details and reconciliation log formatting so Claude/CLI send failures are visible in `reconciliation.log` instead of collapsing into opaque `dispatch_failed` messages.
+  - `apps/control-plane/test/dashboard-runtime-runner.spec.ts`, `apps/control-plane/test/index-normalizer.spec.ts`, `apps/control-plane/test/supervisor.spec.ts` - added regressions covering immediate reconciler redrive on a heartbeat-fresh sibling runtime, truthful `reconciliation_failed` responses on redrive failure, preserved strict lease-freshness semantics, and extended two slow topology tests with explicit timeouts so full coverage runs remain stable.
+- **Result:** `npx vitest run apps/control-plane/test/dashboard-runtime-runner.spec.ts apps/control-plane/test/index-normalizer.spec.ts apps/control-plane/test/git-reconciliation-service.spec.ts apps/control-plane/test/epoch-tracking.spec.ts apps/control-plane/test/supervisor.spec.ts apps/control-plane/test/mcp.spec.ts` [PASS] (6 files / 165 tests). `npm run typecheck` [PASS]. `npm run verify` [PASS].
+
+✅ **Entry 297 — Unify CLI/Dashboard execution paths (backend Phases 1-7)**
+
+- **Goal:** Fix the `reconciliation_failed` bug when dashboard retries a mainline-divergent blocked feature, and unify retry/resume/merge paths between CLI and dashboard to eliminate behavioral divergence.
+- **Changes made:**
+  - `apps/control-plane/src/core/mainline-conflict.ts` — **NEW** canonical `hasPendingMainlineConflict()` utility replacing 5 divergent implementations across the codebase.
+  - `apps/control-plane/test/mainline-conflict.spec.ts` — **NEW** 12 tests covering pending, resolved, non-mainline, malformed, and empty input cases.
+  - `apps/control-plane/src/cli/retry-resume-decision.ts` — **NEW** extracted `shouldAttemptAutoResumeAfterRetry()` and `mergeFailureRequiresRepairLoop()` from `bootstrap.ts` into a shared importable module.
+  - `apps/control-plane/test/retry-resume-decision.spec.ts` — **NEW** 14 tests covering retry_failed, waiting_for_input, reroute_status, retry_executed, merge_disabled with/without recovery.
+  - `apps/control-plane/src/index.ts` — Added exports: `hasPendingMainlineConflict`, `mergeFailureRequiresRepairLoop`, `shouldAttemptAutoResumeAfterRetry`, `RetryCommandHandler`, merge-repair helpers (`normalizeMergeRepairState`, `buildMergeRepairQaReroute`, `buildMergeGateFailureState`, `isBlockedMergeGateFailure`, `clearActiveMergeRepair`).
+  - `apps/control-plane/src/interfaces/cli/bootstrap.ts` — Replaced local `mergeFailureRequiresRepairLoop`, `shouldAttemptAutoResumeAfterRetry`, `asRecord` with imports from `retry-resume-decision.ts`.
+  - `apps/control-plane/src/cli/dashboard-runtime-runner.ts` — **Phase 6 fix**: removed blocking `hasPendingMainlineConflict` check and conditional reconciler dispatch from `executeResumeCommand()`, replaced with best-effort `redrivePreparedReconcilerConflict()`. **Phase 5**: added `attemptMergeRepairChain()` to `handleApprove()` for MERGE_DISABLED recovery using `RetryCommandHandler` + `shouldAttemptAutoResumeAfterRetry`. Removed dead `readFeatureFrontMatter()` method.
+  - `apps/control-plane/src/application/services/feature-send-message-service.ts` — Replaced private `hasPendingMainlineConflict` method with import from `core/mainline-conflict.ts`.
+  - `apps/control-plane/src/cli/attach-command-handler.ts` — Replaced local `hasPendingMainlineConflict` function with import from `core/mainline-conflict.ts`.
+  - `apps/control-plane/src/supervisor/run-coordinator.ts` — Replaced private `hasPendingMainlineConflict` method with import from `core/mainline-conflict.ts`.
+  - `packages/web-dashboard/src/lib/orchestrator-tools.ts` — Replaced 136-line `retryFeature()` reimplementation with thin bridge delegation to `RetryCommandHandler.execute()`. Added `RetryCommandHandler` and `shouldAttemptAutoResumeAfterRetry` to `RuntimeBridge` interface.
+  - `packages/web-dashboard/src/app/api/actions/route.ts` — Removed `hasPendingMainlineConflict` pre-filter that short-circuited retry for mainline-divergent features (root cause of `reconciliation_failed` bug). Replaced hardcoded `feature.phase === 'blocked'` auto-resume with inline auto-resume decision logic matching CLI behavior.
+  - `apps/control-plane/test/dashboard-runtime-runner.spec.ts` — Updated 3 tests to reflect unified resume behavior: resume no longer fails with `reconciliation_failed` for mainline-divergent features; best-effort redrive is always attempted.
+  - `docs/core/CLI-DASHBOARD-DIVERGENCE.md` — Rewrote to reflect unified paths and document remaining divergences.
+- **Result:** `npm run test` ✅ (122 test files / 2149 tests passing). `npm run lint` ✅. `npm run typecheck` ✅. `npm run validate:architecture` ✅.
+
+✅ **Entry 298 — UI changes and Conflict Resolution UI foundation**
+
+- **Goal:** Update dashboard toast messaging for unified retry/merge responses, add conflict action states, and build the Conflict Resolution UI foundation (types, API routes, MCP tools, components).
+- **Changes made:**
+  - `packages/web-dashboard/src/components/dashboard/triage-drawer.tsx` — Updated retry toast to show composite retry+auto_resume status.
+  - `packages/web-dashboard/src/components/focus/tabs/ReviewTab.tsx` — Added toast for merge repair chain (`response.data.retry` indicates MERGE_DISABLED auto-repair).
+  - `packages/web-dashboard/src/lib/types.ts` — Added `ConflictResolutionStrategy`, `ConflictFileEntry`, `FeatureConflictSummary`, `ReconcilerQueueSnapshot` types. Added `conflict_resolve`/`conflict_abort` to `DashboardFeatureActionKey`. Added `conflict_summary` to `FeatureSummary` and `FeatureDetail`.
+  - `packages/web-dashboard/src/lib/dashboard-action-states.ts` — Added `conflict_resolve` and `conflict_abort` action states with mainline conflict detection and reconciler activity checks.
+  - `packages/web-dashboard/test/api/actions/route.spec.ts` — Updated 5 tests to match unified retry route behavior (no hasPendingMainlineConflict pre-filter, composite response structure).
+  - `agentic/orchestrator/tools/catalog.json` — Added 3 new MCP tool entries: `repo.conflict_files`, `repo.resolve_conflict`, `repo.conflict_abort`.
+  - `agentic/orchestrator/tools/schemas/input/` — Added 3 input schemas for conflict tools.
+  - `agentic/orchestrator/tools/schemas/output/` — Added 3 output schemas for conflict tools.
+  - `apps/control-plane/src/core/constants.ts` — Added `REPO_CONFLICT_FILES`, `REPO_RESOLVE_CONFLICT`, `REPO_CONFLICT_ABORT` constants.
+  - `apps/control-plane/src/application/tools/tool-metadata.ts` — Registered `REPO_RESOLVE_CONFLICT` and `REPO_CONFLICT_ABORT` as mutating tools.
+  - `packages/web-dashboard/src/app/api/features/[id]/conflicts/route.ts` — **NEW** GET endpoint returning `FeatureConflictSummary`.
+  - `packages/web-dashboard/src/app/api/features/[id]/conflicts/files/route.ts` — **NEW** GET endpoint for conflict file content.
+  - `packages/web-dashboard/src/app/api/features/[id]/conflicts/resolve/route.ts` — **NEW** POST endpoint for submitting resolutions.
+  - `packages/web-dashboard/src/app/api/features/[id]/conflicts/abort/route.ts` — **NEW** POST endpoint for aborting conflict merge.
+  - `packages/web-dashboard/src/app/api/reconciler/queue/route.ts` — **NEW** GET endpoint for global reconciler queue snapshot.
+  - `packages/web-dashboard/src/components/focus/tabs/ConflictsTab.tsx` — **NEW** Conflict resolution workspace with file list, strategy selector, side-by-side diff, manual merge editor, and submit/abort actions.
+  - `packages/web-dashboard/src/components/focus/ConflictStatusCard.tsx` — **NEW** Sidebar card showing conflict summary and "View Conflicts" button.
+  - `packages/web-dashboard/src/components/dashboard/reconciler-queue-card.tsx` — **NEW** Dashboard card showing global reconciler queue with active/queued features.
+  - `packages/web-dashboard/src/lib/focus-view.ts` — Added `'conflicts'` tab registration with visibility tied to active conflict state.
+  - `packages/web-dashboard/src/components/focus/FocusLayout.tsx` — Added `conflicts` tab dispatch to `ConflictsTab`.
+- **Result:** `npm run test` ✅ (165 test files / 2305 tests passing). `npm run lint` ✅. `npm run typecheck` ✅. `npm run validate:architecture` ✅. `npm run validate:mcp-contracts` ✅.
+
+✅ **Entry 299 — Blocked state guidance system for dashboard**
+
+- **Goal:** Decode every blocked sub-cause into human-readable guidance with actionable recovery steps, so operators understand why a feature is blocked and what to do about it.
+- **Changes made:**
+  - `packages/web-dashboard/src/lib/blocked-state-guidance.ts` — **NEW** Blocked state decoder mapping 12+ distinct blocked causes across 6 categories (gate_failure, mainline_divergence, provider_failure, operational, merge_repair, review_denied) to structured guidance with summary, explanation, severity, auto-recoverability, and actionable steps with dashboard actions and CLI commands.
+  - `packages/web-dashboard/src/components/focus/BlockedGuidanceBanner.tsx` — **NEW** React component rendering blocked guidance as full banner (explanation + action buttons + CLI hints) or compact inline hint.
+  - `packages/web-dashboard/src/components/focus/tabs/OverviewTab.tsx` — Added `BlockedGuidanceBanner` below `FeatureDecisionBanner` on the Overview tab.
+  - `packages/web-dashboard/src/components/feature-card.tsx` — Added compact `BlockedGuidanceBanner` to feature cards showing decoded reason instead of raw "blocked".
+  - `packages/web-dashboard/src/styles/dashboard.module.css` — Added `.cardBlockedHint` style.
+- **Result:** `npm run test` ✅ (165 test files / 2305 tests). `npm run lint` ✅. `npm run typecheck` ✅. `npm run build` ✅.
+
+✅ **Entry 300 — Async approve with polling + reconciler dispatch + merge conflict diff fix**
+
+- **Goal:** Fix high-latency `review.approve` by making it async with polling, fix reconciler not dispatching for blocked features, and fix diff file splitting during merge conflicts.
+- **Changes made:**
+  - `packages/web-dashboard/src/lib/dashboard-runtime-client.ts` — Added `submitDashboardRuntimeCommandAsync()` (fire-and-return), `readCommandStatus()` for polling, and `AsyncCommandSubmission`/`CommandStatusResult` types.
+  - `packages/web-dashboard/src/app/api/actions/status/route.ts` — **NEW** GET endpoint for polling command status by `request_id`.
+  - `packages/web-dashboard/src/lib/orchestrator-tools.ts` — Added `approveFeatureReviewAsync()` using async submit.
+  - `packages/web-dashboard/src/app/api/actions/route.ts` — `review.approve` now returns 202 Accepted with `request_id` for polling instead of blocking.
+  - `packages/web-dashboard/src/app/api/features/[id]/review/route.ts` — Updated to use `approveFeatureReviewAsync`.
+  - `packages/web-dashboard/src/components/focus/tabs/ReviewTab.tsx` — Added polling state (`pendingApprove`), 2-second poll interval, progress spinner replacing approve button during merge, toast notifications on completion/failure.
+  - `packages/web-dashboard/src/styles/dashboard.module.css` — Added `.spinnerSmall` CSS animation.
+  - `apps/control-plane/src/supervisor/run-coordinator.ts` — `recoverBlockedFeatures` now dispatches reconciler for blocked features with pending mainline conflicts via `redrivePreparedReconcilerConflict`.
+  - `apps/control-plane/src/supervisor/types.ts` — Added optional `redrivePreparedReconcilerConflict` to `FeatureOrchestrationPort`.
+  - `apps/control-plane/src/application/services/git-reconciliation-service.ts` — Set `recovery.state: 'retrying'` when reconciler is assigned to a conflict.
+  - `packages/web-dashboard/src/lib/worktree-diff.ts` — Fixed diff file splitting during merge conflicts: detect `MERGE_HEAD` and use `git diff HEAD` instead of `git diff` to produce standard unified diff format.
+- **Result:** `npm run test` ✅ (control-plane: 118 files / 2066 tests; 2 web-dashboard test files fail due to pre-existing conflict markers in feature worktree). `npm run lint` ✅. `npm run typecheck` ✅. `npm run build` ✅.
+
+✅ **Entry 301 — Fix lost-update race in reconciliation state writes**
+
+- **Goal:** Fix a concurrency defect where `GitReconciliationService` state writes bypassed the feature file lock, allowing concurrent gate result writes to be silently overwritten (e.g. `gates.full: pass` lost when reconciler blocked a feature).
+- **Changes made:**
+  - `apps/control-plane/src/application/services/git-reconciliation-service.ts` — Added `withFeatureLock` to `GitReconciliationServicePort` interface. Wrapped all three read-modify-write state methods (`updateReconciliationState`, `upsertMainlineConflictState`, `resolveMainlineConflictState`) in `this.port.withFeatureLock()` and added version increment + `last_updated` timestamp to each write. Added local `readFrontMatterVersion()` helper.
+  - `apps/control-plane/test/git-reconciliation-service.spec.ts` — Added `withFeatureLock` pass-through mock to test port factory.
+  - `apps/control-plane/test/worker-execution-policy.spec.ts` — Fixed 4 typecheck errors by casting `unknown`-typed mock call arguments through `Record<string, unknown>`.
+  - `docs/core/ARCHITECTURE.md` — Added "State Mutation Concurrency Contract" section documenting the invariant that all `state.md` read-modify-write cycles must hold the feature file lock.
+- **Result:** `npm run test` ✅ (all 63 git-reconciliation-service tests pass). `npm run typecheck` ✅. `npm run lint` ✅.
+
+✅ **Entry 302 — Dashboard UX: merge conflict clarity, mainline status banner, spinner fix**
+
+- **Goal:** Fix misleading "Merging..." label and spinner shown for blocked-by-divergence features; add uncommitted changes detection so users know to commit before merging.
+- **Changes made:**
+  - `packages/web-dashboard/src/lib/aop-client.ts` — Changed `deriveClientStatusLabel()` from `'Merging\u2026'` to `'Merge Conflict'` for blocked+mainline_divergence features.
+  - `packages/web-dashboard/src/components/feature-card.tsx` — Renamed `isMerging` to `isMainlineDivergence`; added `isActiveMerge` (only true for `ready_to_merge` phase) to control spinner display. Blocked features with divergence now show warning indicator + `BlockedGuidanceBanner` instead of spinner. Removed the `!isMerging` exclusion so all blocked features show guidance.
+  - `packages/web-dashboard/src/lib/blocked-state-guidance.ts` — Split the `recovery.state === 'retrying'` branch: mainline_divergence now returns severity `'warning'` with actionable "commit your changes" messaging and a "Resolve Conflicts" action; other retrying causes retain the original info-severity guidance.
+  - `packages/web-dashboard/src/app/api/mainline/status/route.ts` — **NEW** GET endpoint that runs `git status --porcelain` and `git rev-parse --abbrev-ref HEAD` to detect uncommitted changes on the mainline branch. Returns `{ has_uncommitted_changes, file_count, branch, summary }`.
+  - `packages/web-dashboard/src/components/dashboard/mainline-status-banner.tsx` — **NEW** client component that polls `/api/mainline/status` every 15 seconds and shows a dismissible warning banner when uncommitted changes are detected, prompting the user to commit.
+  - `packages/web-dashboard/src/app/page.tsx` — Imported and rendered `MainlineStatusBanner` between `AttentionStrip` and `TaskFilterBar`.
+- **Result:** `npm run typecheck` ✅. `npm run lint` ✅. `npm run test` ✅ (122 files / 2157 tests).
+
+✅ **Entry 303 — Dashboard collision approval and notification**
+
+- **Goal:** Surface plan collision detection and approval in the dashboard UI so users know when features are blocked by overlapping plans and can approve the overlap without the CLI.
+- **Changes made:**
+  - `packages/web-dashboard/src/lib/types.ts` — Added `collision` field to `FeatureSummary` type with `with_feature_ids`, `collision_fingerprint`, `file_paths`, `detected_at`.
+  - `packages/web-dashboard/src/lib/aop-client.ts` — Added `resolveActiveCollision()` helper that reads `index.collision_records` to find unresolved collisions for a feature; populated in `normalizeFeatureSummary`. Added `'Plan Collision'` label to `deriveClientStatusLabel()` and `'Plan Collision'` attention reason to `deriveAttentionReasons()`.
+  - `packages/web-dashboard/src/lib/blocked-state-guidance.ts` — Added collision detection branch (priority 1) in `decodeBlockedGuidance()` that shows "Plan collision with X" summary, lists overlapping files, and provides "Approve Overlap" and "Retry" actions with CLI command template.
+  - `packages/web-dashboard/src/lib/orchestrator-tools.ts` — Added `approveCollisionOverride()` function that calls `kernel.collisionOverrideAllow()` directly for dashboard-driven collision approval.
+  - `packages/web-dashboard/src/app/api/collisions/approve/route.ts` — **NEW** POST endpoint accepting `{ feature_id, with_feature_id, reason, resume? }` to approve collision overrides and optionally resume the feature.
+  - `packages/web-dashboard/src/components/feature-card.tsx` — Added `isCollisionBlocked` flag; collision-blocked features now show warning indicator alongside mainline divergence.
+- **Result:** `npm run typecheck` ✅. `npm run lint` ✅. `npm run test` ✅ (122 files / 2157 tests).
+
+✅ **Entry 304 — Interactive collision approval on focus page**
+
+- **Goal:** Add an interactive collision approval UI on the focus page so users can see and resolve plan collisions directly from the dashboard without the CLI.
+- **Changes made:**
+  - `packages/web-dashboard/src/components/focus/CollisionApprovalBanner.tsx` — **NEW** client component that renders when a feature has an active collision. Shows which features collide, lists overlapping files in a collapsible details section, and provides a per-counterpart approval form with a reason text input and "Approve & Resume" button. On approval, calls `POST /api/collisions/approve` and triggers a detail refresh.
+  - `packages/web-dashboard/src/components/focus/tabs/OverviewTab.tsx` — Imported and rendered `CollisionApprovalBanner` between `BlockedGuidanceBanner` and the intake section, so collision-blocked features show the approval form prominently on the overview.
+- **Result:** `npm run typecheck` ✅. `npm run lint` ✅. `npm run test` ✅ (122 files / 2157 tests).
+
+✅ **Entry 305 — Fix stale conflict detection in reconciliation service**
+
+- **Goal:** Fix defect where the reconciler would perpetually re-block a feature on a stale mainline conflict even when the merge would now succeed cleanly, because it never re-validated recorded conflicts against current mainline state.
+- **Changes made:**
+  - `apps/control-plane/src/application/services/git-reconciliation-service.ts` — Two fixes:
+    1. `reuseExistingConflictIfPresent`: added mainline-head staleness check — if the recorded conflict's `mainline_head` differs from the current `rev-parse` of the base ref, the stale in-progress merge is aborted (`git merge --abort`) and the method returns `null` so a fresh reconciliation runs instead of perpetuating the stale conflict.
+    2. `materializeConflictWorktree`: added stale-merge cleanup — checks for leftover unmerged files from a previous failed reconciliation and aborts the stale merge before attempting a fresh `git merge --no-commit --no-ff`.
+  - `apps/control-plane/test/git-reconciliation-service.spec.ts` — Added stale-merge check mock (`diff --name-only --diff-filter=U` returning empty) to all 8 test sites that reach `materializeConflictWorktree`.
+- **Result:** `npm run typecheck` ✅. `npm run lint` ✅. `npm run test` ✅ (122 files / 2157 tests, all 63 reconciliation tests pass).
+
+✅ **Entry 306 — Fix collision_records missing from dashboard index read**
+
+- **Goal:** Fix the root cause of collision notifications never appearing in the dashboard: `readFeaturesIndex()` was not copying `collision_records` from the parsed index into the normalized output, so `resolveActiveCollision()` always received an empty array.
+- **Changes made:**
+  - `packages/web-dashboard/src/lib/aop-client.ts` — Added `collision_records` extraction to `readFeaturesIndex()` normalization block, alongside the existing `lock_leases`, `dep_blocked`, and `runtime_sessions` fields.
+- **Result:** `npm run typecheck` ✅. `npm run lint` ✅. `npm run test` ✅ (122 files / 2157 tests).
+
+✅ **Entry 307 — Dashboard-level collision banner and approval drawer**
+
+- **Goal:** Move collision approval from a card-level banner to a dashboard-level notification with a rail drawer for interactive approval, matching the triage drawer UX pattern.
+- **Changes made:**
+  - `packages/web-dashboard/src/components/dashboard/collision-approval-drawer.tsx` — **NEW** drawer component following the `TriageDrawer` pattern: sticky rail panel with collision details, overlapping file list, and per-counterpart approval form using existing CSS classes (`.triageDrawer`, `.section`, `.sectionTitle`, `.button`, `.buttonSuccess`, `.textarea`).
+  - `packages/web-dashboard/src/app/page.tsx` — Added `collisionDrawer` state and `featuresWithCollisions` memo. Added clickable collision banner (amber `.banner` style) between `MainlineStatusBanner` and `TaskFilterBar` that opens the drawer on click. Rendered `CollisionApprovalDrawer` in the `commandCenterRail` above the `TriageDrawer`. On approval, clears drawer and refreshes dashboard status.
+  - `packages/web-dashboard/src/components/focus/tabs/OverviewTab.tsx` — Removed `CollisionApprovalBanner` import and usage (approval moved to dashboard drawer).
+- **Result:** `npm run typecheck` ✅. `npm run lint` ✅. `npm run test` ✅ (122 files / 2157 tests).
+
+✅ **Entry 308 — Add reconciler to live agent console**
+
+- **Goal:** Add a live agent console tab for the reconciler alongside planner/builder/qa in the Runtime tab so users can monitor reconciler output.
+- **Changes made:**
+  - `packages/web-dashboard/src/lib/types.ts` — Extended `RawLogFileMeta.role`, `LiveAgentOutputSnapshot.role`, `AgentRolePerformanceCardData.role`, and `owner_role` fields to include `'reconciler'`.
+  - `packages/web-dashboard/src/lib/aop-client.ts` — Added `'reconciler'` to `TRACKED_AGENT_ROLES`, `LOG_FILENAME_PATTERN`, and `normalizeRawLogRole()`. Changed role performance to skip roles with `'unknown'` status (prevents empty reconciler cards when no events exist).
+  - `packages/web-dashboard/src/lib/review-contracts.ts` — Added `'reconciler'` to `RAW_LOG_FILENAME_PATTERN` and `normalizeRoleFilter()`.
+  - `packages/web-dashboard/src/lib/focus-detail-derivations.ts` — Added `'reconciler'` to `RoleName`, `ROLE_ORDER`, `isTrackedRole()`, and `normalizeOwnerRole()`.
+  - `packages/web-dashboard/src/components/focus/LiveAgentConsole.tsx` — Added `'reconciler'` to `FALLBACK_SNAPSHOTS` so the reconciler tab always appears.
+  - `packages/web-dashboard/src/components/focus/tabs/RuntimeTab.tsx` — Extended `initialRole` guard to accept `'reconciler'`.
+- **Result:** `npm run typecheck` ✅. `npm run lint` ✅. `npm run test` ✅ (122 files / 2157 tests).
+
+---
+
+✅ **Entry 183 — Add organizer session types to supervisor type definitions**
+
+- **Goal:** Add type definitions for organizer session tracking to mirror the reconciler session pattern.
+- **Changes made:**
+  - `apps/control-plane/src/supervisor/types.ts` — Added `organizer_session_id?: string` to `RuntimeSessionsSnapshot`; added `UpdateOrganizerSessionInput` interface; added `updateOrganizerSession` to `FeatureOrchestrationPort`; added `organizerSessionId?: string | null` to `SupervisorRuntimeState`; added `organizer?: string | null` to `PromptBundle`.
+- **Result:** `npm run lint` ✅. Typecheck errors expected (kernel does not yet implement `updateOrganizerSession` — Task 4 will add that).
+
+✅ **Entry 184 — Add OrganizerOrderingArtifact type and JSON schema**
+
+- **Goal:** Define the foundational data type and schema for the organizer sidecar ordering artifact persisted to `.aop/runtime/<instanceId>/organizer-ordering.json`.
+- **Changes made:**
+  - `apps/control-plane/src/supervisor/types.ts` — Added `OrganizerDependencyEntry`, `OrganizerDeferredEntry`, `OrganizerBlockedEntry`, and `OrganizerOrderingArtifact` interfaces (after `RuntimeSessionsSnapshot`).
+  - `agentic/orchestrator/schemas/organizer-ordering-artifact.schema.json` — Created JSON schema (draft-2020-12) with required fields, `$defs` for dependency/deferred/blocked entries, enum-validated classification values, and `additionalProperties: false`.
+  - `apps/control-plane/test/organizer-ordering-artifact.spec.ts` — Created 4 tests covering valid complete artifact, partial completion status, missing required fields, and invalid classification enum value.
+- **Result:** `npx vitest run apps/control-plane/test/organizer-ordering-artifact.spec.ts` ✅ (4/4 tests passing). `npm run lint` ✅.
+
+✅ **Entry 185 — Implement OrganizerAgentEnrollmentScheduler adapter**
+
+- **Goal:** Create the stateless adapter that reads the organizer ordering artifact from disk and translates ready/deferred/blocked sets into EnrollmentDecision[], falling back to CapacityAwareEnrollmentScheduler when artifact is missing, corrupt, partial, or expired.
+- **Changes made:**
+  - `apps/control-plane/src/supervisor/organizer-enrollment-scheduler.ts` — Created `OrganizerAgentEnrollmentScheduler` class implementing `EnrollmentScheduler`. Reads artifact from disk, validates expiry and completion_status, maps ready_set to `queue_now`/`defer` (capacity check), maps deferred_set/blocked_set to `defer`/`dependency_blocked`, delegates unknown features to fallback scheduler, falls back entirely on missing/corrupt/partial/expired artifact.
+  - `apps/control-plane/test/organizer-enrollment-scheduler.spec.ts` — 10 tests covering all fallback paths (missing, corrupt, partial, expired), ready feature (queue_now and capacity_full defer), deferred feature, blocked feature, unknown feature (fallback), and mixed multi-feature scenario.
+- **Result:** `npx vitest run apps/control-plane/test/organizer-enrollment-scheduler.spec.ts` ✅ (10/10 tests passing). `npm run lint` ✅.
+
+✅ **Entry 186 — Trigger enrollment re-evaluation on terminal state transitions**
+
+- **Goal:** Ensure deferred features are re-evaluated immediately when a blocking feature reaches a terminal enrollment status (merged, failed, paused_budget, ready_to_merge) rather than waiting for the next 2-second polling interval.
+- **Changes made:**
+  - `apps/control-plane/src/supervisor/run-coordinator.ts` — In `notifyStatusTransitions`, added a call to `this.executionEnrollmentService.notifyNewRequestHint()` after detecting a status transition to any `ENROLLMENT_TERMINAL_STATUSES` value.
+  - `apps/control-plane/test/run-coordinator.spec.ts` — Added `executionEnrollmentService` option to `makeCoordinatorDeps` factory so tests can inject a trackable mock. Added 1 test (`GIVEN_feature_transitions_to_terminal_status_WHEN_notifyStatusTransitions_runs_THEN_calls_notifyNewRequestHint`) that verifies `notifyNewRequestHint` is called twice (once at startup, once on MERGED transition).
+- **Result:** `npx vitest run apps/control-plane/test/run-coordinator.spec.ts` ✅ (69/69 tests passing). `npm run lint` ✅.
+
+✅ **Entry 187 — Add ensureGlobalOrganizerSession to SessionOrchestrator**
+
+- **Goal:** Extend session lifecycle management to include an organizer session using the same reattach-or-create pattern as the reconciler session.
+- **Changes made:**
+  - `apps/control-plane/src/supervisor/session-orchestrator.ts` — Added private `ensureGlobalOrganizerSession()` method mirroring `ensureGlobalReconcilerSession()`: reads runtime sessions, attempts reattach if run/owner/provider match, sets `state.organizerSessionId` and `state.runMetadata.organizer_reattached`, creates fresh session via `provider.createSession('organizer', 'global', prompts.organizer ?? null)`, persists via `kernel.updateOrganizerSession()`, closes orphaned previous session on failure. Added `await this.ensureGlobalOrganizerSession()` at both call sites in `ensureGlobalOrchestratorSession()` (reattach path and new session path).
+  - `apps/control-plane/test/session-management.spec.ts` — Added import for `SessionOrchestrator`. Added 2 unit tests: `GIVEN_fresh_run_WHEN_ensureGlobalOrchestratorSession_called_THEN_organizer_session_created_and_state_set` and `GIVEN_matching_run_with_valid_organizer_session_WHEN_reattach_succeeds_THEN_organizer_reattached_from_existing_session`, covering the create and reattach paths respectively.
+- **Result:** `npx vitest run apps/control-plane/test/session-management.spec.ts` ✅ (23 tests passing). `npm run lint` ✅. `npm run typecheck` ✅.
+
+✅ **Entry 188 — Expose organizer ordering status in dashboard API**
+
+- **Goal:** Add dashboard visibility into the organizer sidecar's ordering artifact so operators can see which features are ready, deferred, and blocked by the organizer.
+- **Changes made:**
+  - `packages/web-dashboard/src/lib/types.ts` — Added `OrganizerDeferredSummary`, `OrganizerBlockedSummary`, and `OrganizerStatusProjection` interfaces. Added optional `organizer?: OrganizerStatusProjection` field to `DashboardStatusPayload`.
+  - `packages/web-dashboard/src/lib/aop-client.ts` — Added `OrganizerStatusProjection` to type imports. Added `readOrganizerStatus(repoRoot, instanceId)` exported function that reads `.aop/runtime/<instanceId>/organizer-ordering.json`, normalizes `ready_set`, `deferred_set`, and `blocked_set` into the projection shape, and returns the `available: false` fallback on missing file, null instanceId, or parse error.
+  - `packages/web-dashboard/src/app/api/status/route.ts` — Imported `readOrganizerStatus`. After calling `readDashboardStatus`, extracted `owner_instance_id` from `payload.runtime`, called `readOrganizerStatus`, and spread `organizer` into the response envelope.
+- **Result:** `npx vitest run packages/web-dashboard/test/` ✅ (43 files / 156 tests passing). `npm run lint` ✅.
+
+✅ **Entry 319 — Wire ArtifactStager into build wave executor and update builder file guidance**
+
+- **Goal:** Ensure staged read-only context artifacts (spec.md, plan.md, plan.json, qa_test_index.json) are copied into the worktree's `.aop/context/` directory before each builder worker dispatch, and update the interactive builder prompt to reference them.
+- **Changes made:**
+  - `apps/control-plane/src/supervisor/build-wave-executor.ts` — Added `import type { ArtifactStager }`, added `artifactStager?: ArtifactStager` to `BuildWaveExecutorDependencies`, added `private readonly artifactStager: ArtifactStager | null` field, initialized in constructor, and added a non-fatal `stage()` call (resolving worktree path as `<repoRoot>/.worktrees/<featureId>`) before `workerDecisionRunner.execute()`.
+  - `apps/control-plane/src/providers/cli-worker-provider.ts` — Updated `buildInteractiveWorkerPrompt()` builder block to show `Staged artifacts` section referencing `<workingDir>/.aop/context/` (or `<featureDir>/.aop/context/` fallback) and a separate `Runtime artifacts` section.
+  - `apps/control-plane/src/supervisor/runtime.ts` — Added `import { ArtifactStager }`, constructed `const artifactStager = new ArtifactStager(this.kernel.getRepoRoot())` before `BuildWaveExecutor` instantiation, and passed `artifactStager` into the `BuildWaveExecutor` dependencies object.
+- **Result:** `npm run build` ✅. `npm run test` ✅ (all test files passing).
+
+✅ **Entry 320 — Add drag-and-drop file/folder loading to Launch Workspace**
+
+- **Goal:** Allow users to drag `.md` files and folders onto the Launch Workspace page to bulk-load feature specs as drafts.
+- **Changes made:**
+  - `packages/web-dashboard/src/lib/drop-zone-utils.ts` — New utility: `collectMarkdownFromDrop()` recursively collects `.md` files from `DataTransferItem[]` using `webkitGetAsEntry()` with folder traversal; `supportsDirectoryDrop()` capability check; `DropResult` interface.
+  - `packages/web-dashboard/src/app/launch/page.tsx` — Added `dragActive` state, `dragCounterRef`, four drag event handlers (`handleDragEnter`, `handleDragLeave`, `handleDragOver`, `handleDrop`), overlay rendering, status banner feedback.
+  - `packages/web-dashboard/src/styles/dashboard.module.css` — Added `.dropZoneOverlay` CSS (fixed overlay, dashed green border, backdrop blur).
+- **Result:** `npm run build` ✅. TypeScript compiles clean.
+
+✅ **Entry 321 — Add prompt overlay system for provider-specific agent instructions**
+
+- **Goal:** Allow provider-specific prompt sections (e.g., Claude-specific planning instructions) to be appended to base role prompts at runtime via overlay files.
+- **Changes made:**
+  - `agentic/orchestrator/schemas/agents.schema.json` — Added `prompt_overlay_dir` string property to `runtime` object with default `config/agentic/orchestrator/prompts/overrides`.
+  - `config/agentic/orchestrator/agents.yaml` — Added `prompt_overlay_dir: config/agentic/orchestrator/prompts/overrides` to runtime config.
+  - `apps/control-plane/src/providers/cli-worker-provider.ts` — Added exported `resolvePromptOverlay()` function, `overlayDir` option/field on `CliWorkerProvider`, overlay resolution in `runWorker()`.
+  - `apps/control-plane/src/providers/worker-provider-factory.ts` — Added `overlayDir` to `CreateWorkerProviderInput`, passed to all `CliWorkerProvider` constructions.
+  - `apps/control-plane/src/cli/run-command-handler.ts`, `resume-command-handler.ts`, `dashboard-runtime-runner.ts`, `interfaces/cli/bootstrap.ts` — Resolve `overlayDir` from agents config and pass to factory.
+  - `apps/control-plane/test/prompt-overlay.spec.ts` — 5 tests covering overlay resolution (file exists, missing file, missing dir, different role, empty file).
+  - `config/agentic/orchestrator/prompts/overrides/` — 4 overlay files: `planner.claude.md`, `planner.codex.md`, `builder.claude.md`, `builder.codex.md`.
+- **Result:** `npm run build` ✅. `npm run test` ✅ (173 files / 2449 tests). `npm run validate:mcp-contracts` ✅. `npm run validate:architecture` ✅.
+
+✅ **Entry 322 — Add artifact stager for builder worktree context**
+
+- **Goal:** Copy feature spec and plan artifacts into a well-known `.aop/context/` directory in the builder's worktree so the builder agent can easily reference them.
+- **Changes made:**
+  - `apps/control-plane/src/supervisor/artifact-stager.ts` — New `ArtifactStager` class: copies required artifacts (`spec.md`, `plan.md`, `plan.json`) and optional (`qa_test_index.json`) to `.aop/context/` in worktree, writes a descriptive `README.md`.
+  - `apps/control-plane/test/artifact-stager.spec.ts` — 5 tests covering copy, optional artifact, overwrite, README generation.
+- **Result:** `npm run test` ✅. 5/5 artifact stager tests passing.