From ca29259a3af28db31da266f6f6ca6e91c4ea661e Mon Sep 17 00:00:00 2001
From: Jeffrey Phillips Freeman <the@jeffreyfreeman.me>
Date: Wed, 18 Feb 2026 12:57:22 -0500
Subject: [PATCH] Docs: Updated implementation plan

---
 implementation_plan.md | 541 ++++++++++++++++++++++++-----------------
 1 file changed, 317 insertions(+), 224 deletions(-)

diff --git a/implementation_plan.md b/implementation_plan.md
index 79446cbf..3cc36e93 100644
--- a/implementation_plan.md
+++ b/implementation_plan.md
@@ -31,15 +31,15 @@
 
 ## Guiding Principles
 
-- Keep `docs/specification.md` as the single source of truth; this plan is sequencing only and stays intentionally minimal.
-- Local mode is the only execution target through M6; server mode is stub-only (interfaces raise `NotImplementedError`) with no server implementation in this repo.
-- Plan lifecycle: Action (non-processing) → Strategize → Execute → Apply; decision tree persisted, Execute may revert to Strategize, Apply terminal states are `applied`/`constrained`/`errored`/`cancelled` with constrained allowed to revert.
-- Identity rules: actions/projects/tools/skills/actors/automation profiles use namespaced names; plans/decisions/resources/validation attachments use ULIDs; top-level plans may carry names, subplans are ULID-only.
-- Registry-first: ResourceType/Resource/Tool/Validation/Skill/Actor/Provider registries are authoritative.
-- Resource registry: physical/virtual resources form a DAG; resource types define parent/child constraints, auto-discovery rules, sandbox strategy, handler metadata, and equivalence rules for virtual resources.
-- Tool-only mutation path: tool lifecycle (discover/activate/execute/deactivate) uses resource bindings and ChangeSet capture; validations are read-only tools (required/informational) attached to resources with optional project/plan scope.
+- Keep `docs/specification.md` as the single source of truth; this plan stays intentionally minimal and sequencing-only.
+- Local mode is the only execution target through M6; server mode is stub-only (ACP/LSP client interfaces raise `NotImplementedError`) with no server implementation here.
+- Plan lifecycle: Action → Strategize → Execute → Apply; decision tree persisted; Execute may revert to Strategize; Apply terminal states are `applied`/`constrained`/`errored`/`cancelled` with constrained allowed to revert.
+- Identity rules: actions/projects/tools/skills/actors/automation profiles use namespaced names; plans/decisions/resources/validation attachments use ULIDs; top-level plans may be named but child plans are ULID-only.
+- Registry-first: Resource/ResourceType/Tool/Validation/Skill/Actor/Provider registries are authoritative; validation attachments are resource-scoped with optional project/plan narrowing.
+- Resource model: physical/virtual resources form a DAG; resource types define parent/child constraints, auto-discovery, sandbox strategy, handler metadata, and equivalence for virtual resources.
+- Tool execution: tool lifecycle (discover/activate/execute/deactivate) uses resource bindings and ChangeSet capture; validations are read-only tools with required/informational mode.
 - YAML configs (actions/actors/tools/skills/validations/resource types/automation profiles) follow spec schemas with env-var interpolation; validate at load time.
-- ACMS v1 (UKO + CRP + Context Assembly Pipeline) is the M6 target; details remain in the spec.
+- ACMS v1 (UKO + CRP + Context Assembly Pipeline) is the M6 target; all detail stays in the spec.
 
 ### Core Architectural Requirements
 
@@ -49,7 +49,7 @@
 
 **Autonomy with Control**: Decision-tree recording, invariants + reconciliation, automation profiles, and correction flows per spec.
 
-**Interop**: MCP + Agent Skills Standard tool sources supported via tool/skill abstraction (local mode).
+**Interop**: MCP + Agent Skills tool sources in local mode; ACP/LSP interface stubs present for future server/IDE clients.
 
 ### Continuous Testing and Documentation Policy
 - Do not mark any parent checklist item complete until **all** subordinate Code, Document, Tests tasks and any generated `Fix - ...` tasks are resolved and the associated Notes section has the latest context.
@@ -1192,14 +1192,14 @@ CLEVERAGENTS_TEST_MODE=true
 - Milestone forecast (Target -> ETA | Delta | Risk):
   - M1 (2026-02-15) -> ETA 2026-02-20 | +5d | HIGH
   - M2 (2026-02-18) -> ETA 2026-02-24 | +6d | HIGH
-  - M3 (2026-02-22) -> ETA 2026-02-28 | +6d | HIGH
-  - M4 (2026-03-01) -> ETA 2026-03-05 | +4d | MED-HIGH
-  - M5 (2026-03-05) -> ETA 2026-03-08 | +3d | MEDIUM
+  - M3 (2026-02-22) -> ETA 2026-02-27 | +5d | HIGH
+  - M4 (2026-03-01) -> ETA 2026-03-04 | +3d | MED-HIGH
+  - M5 (2026-03-05) -> ETA 2026-03-06 | +1d | MEDIUM
   - M6 (2026-03-10) -> ETA 2026-03-12 | +2d | MEDIUM
 - Track forecast (Track | Status | ETA | Risk | Blocking):
   - Track A (Plan lifecycle + persistence) | behind ~2-3d | ETA 2026-02-20 | MED-HIGH | execute/apply integration + CLI/Robot tests
   - Track B (Projects/resources + sandbox) | behind ~3-4d | ETA 2026-02-24 | MED-HIGH | resource tree/inspect + handlers/auto-discovery
-  - Track C (Actors/tools/skills/validations) | behind ~6-7d | ETA 2026-02-28 | HIGH | actor YAML compiler + tool/validation CLI + registry persistence
+  - Track C (Actors/tools/skills/validations) | behind ~6-7d | ETA 2026-02-27 | HIGH | actor YAML compiler + tool/validation CLI + registry persistence
   - Track D (Change tracking + apply pipeline) | behind ~4-5d | ETA 2026-02-24 | HIGH | ChangeSet capture + validation gating + diff review
   - Track Q (Quality automation) | ahead | ETA 2026-02-18 | LOW | maintenance only
   - Track T (Testing) | at risk (Rui out) | ETA 2026-02-27+ | HIGH | QA load on Brent + feature owners
@@ -1210,6 +1210,32 @@ CLEVERAGENTS_TEST_MODE=true
   - Aditya | available | medium | MEDIUM | actor/skill YAML configs + MCP adapter + hierarchical graphs
   - Brent | available | high (QA load) | MED-HIGH | coverage + integration stability + CLI/persistence tests
   - Rui | unavailable 2026-02-13 to 2026-02-27 | zero | HIGH | test backlog resumes after 2026-02-27
+- Mike/Brian | standby | low | LOW | none
+
+### 2026-02-18 (Day 10 since kickoff on 2026-02-09)
+- Timeline reference: Day 7/M1 = 2026-02-15, Day 10/M2 = 2026-02-18, Day 14/M3 = 2026-02-22, Day 21/M4 = 2026-03-01, Day 25/M5 = 2026-03-05, Day 30/M6 = 2026-03-10.
+- Summary (Team | Status | Risk | Notes): Behind ~3-4d | HIGH | M1 blocked by apply pipeline + validation gating + M1 CLI/persistence tests; resource/project registries and tool runtime are done, actor/skill schema work in progress.
+- Milestone forecast (Target -> ETA | Delta | Risk):
+  - M1 (2026-02-15) -> ETA 2026-02-20 | +5d | HIGH
+  - M2 (2026-02-18) -> ETA 2026-02-24 | +6d | HIGH
+  - M3 (2026-02-22) -> ETA 2026-02-27 | +5d | HIGH
+  - M4 (2026-03-01) -> ETA 2026-03-04 | +3d | MED-HIGH
+  - M5 (2026-03-05) -> ETA 2026-03-06 | +1d | MEDIUM
+  - M6 (2026-03-10) -> ETA 2026-03-10 | +0d | MED-HIGH
+- Track forecast (Track | Status | ETA | Risk | Blocking):
+  - Track A (Plan lifecycle + persistence) | behind ~2-3d | ETA 2026-02-20 | MED-HIGH | apply pipeline wiring + CLI/persistence tests
+  - Track B (Projects/resources + sandbox) | behind ~3-4d | ETA 2026-02-24 | MED-HIGH | resource tree/inspect + handlers/auto-discovery
+  - Track C (Actors/tools/skills/validations) | behind ~5-6d | ETA 2026-02-27 | HIGH | actor compiler + tool/validation CLI + MCP/Agent Skills adapters
+  - Track D (Change tracking + apply pipeline) | behind ~4-5d | ETA 2026-02-24 | HIGH | apply pipeline + validation gating + diff review
+  - Track Q (Quality automation) | ahead | ETA 2026-02-18 | LOW | maintenance only
+  - Track T (Testing) | at risk (Rui out) | ETA 2026-02-27+ | HIGH | QA load on Brent + feature owners
+- Developer forecast (Name | Availability | Load | Risk | Focus):
+  - Jeff | available | critical-path overloaded | HIGH | apply pipeline wiring + tool/validation CLI + actor compiler
+  - Luis | available | high | MED-HIGH | apply pipeline + validation runner + decision persistence
+  - Hamza | available | med-high | MEDIUM | resource handlers + DAG CLI + UKO/RDF groundwork
+  - Aditya | available | medium | MEDIUM | actor/skill YAML configs + MCP/Agent Skills adapters
+  - Brent | available | high (QA load) | MED-HIGH | M1/M2 CLI/persistence tests + coverage stability
+  - Rui | unavailable 2026-02-13 to 2026-02-27 | zero | HIGH | test backlog resumes after 2026-02-27
   - Mike/Brian | standby | low | LOW | none
 
 ## Implementation Checklist
@@ -1434,23 +1460,23 @@ Merge points and acceptance checks are tracked as checklist items under each mil
   - [X] Quality [Brent]: Verify coverage >=97% via `nox -s coverage_report`. If coverage is <97% then review the current unit test coverage report at `build/coverage.xml` and use it to write new Behave based unit tests to improve code coverage. Specifically, write Behave style unit tests that are descriptively named and specifically improves coverage on whichever file has the most uncovered lines by writing tests that will target the uncovered lines in the report. Once that is done rerun `nox -s coverage_report` to verify all tests pass and coverage is above >=97%. Only mark this as complete once coverage is >=97%, if not repeat this task as many times as is needed until coverage reaches >=97%. (97% total, fail-under=97 passes)
 
 - [X] **COMMIT (Owner: Brent | Group: Q0-Minimum | Branch: feature/q0-min-coverage | Done: Day 5, February 13, 2026 18:54:15 +0000) - Commit message: "feat(qa): enforce coverage >=97% in CI"**
-  - [X] Git [Brent]: `git checkout master` - done on 2026-02-13
-  - [X] Git [Brent]: `git pull origin master` - done on 2026-02-13
-  - [X] Git [Brent]: `git checkout -b feature/q0-min-coverage` - done on 2026-02-13
+  - [X] Git [Brent]: `git checkout master`
+  - [X] Git [Brent]: `git pull origin master`
+  - [X] Git [Brent]: `git checkout -b feature/q0-min-coverage`
   - [X] Git [Brent]: `git fetch origin && git merge origin/master` (run before final tests and before commit) - skipped (SSH key unavailable in CI, already on latest master)
-  - [X] Code [Brent]: Ensure `nox -s coverage_report` fails below 97% and emits a single-line error message suitable for CI parsing. - done on 2026-02-13 (COVERAGE_THRESHOLD constant + session.error with CI-parseable summary)
-  - [X] Code [Brent]: Update CI summary output (or job annotations) to surface the 97% threshold failure line clearly. - done on 2026-02-13 (added "Surface coverage summary" step in CI that reads build/coverage.json)
-  - [X] Docs [Brent]: Update `docs/development/testing.md` with the 97% coverage requirement and a sample failure output. - done on 2026-02-13 (created docs/development/testing.md with full testing guide)
-  - [X] Tests (Behave) [Brent]: Add a scenario that parses coverage config and asserts threshold >=97%. - done on 2026-02-13 (features/coverage_threshold_enforcement.feature, 11 scenarios)
-  - [X] Tests (Robot) [Brent]: Add a Robot test that runs `nox -s coverage_report` and asserts pass/fail behavior. - done on 2026-02-13 (robot/coverage_threshold.robot, 6 test cases)
-  - [X] Tests (ASV) [Brent]: Add `benchmarks/coverage_report_bench.py` for coverage report runtime baseline. - done on 2026-02-13 (benchmarks/coverage_report_bench.py, 4 benchmarks)
-  - [X] Quality [Brent]: Run `nox` (all default sessions, including benchmark). - done on 2026-02-13 (lint 0 findings, typecheck 0 errors, 2235 unit scenarios passed, 211 integration tests passed)
-  - [X] Git [Brent]: `git add .` (only after coverage check passes) - done on 2026-02-13
-  - [X] Git [Brent]: `git commit -m "feat(qa): enforce coverage >=97% in CI"` (only after coverage check passes) - done on 2026-02-13
+  - [X] Code [Brent]: Ensure `nox -s coverage_report` fails below 97% and emits a single-line error message suitable for CI parsing. (COVERAGE_THRESHOLD constant + session.error with CI-parseable summary)
+  - [X] Code [Brent]: Update CI summary output (or job annotations) to surface the 97% threshold failure line clearly. (added "Surface coverage summary" step in CI that reads build/coverage.json)
+  - [X] Docs [Brent]: Update `docs/development/testing.md` with the 97% coverage requirement and a sample failure output. (created docs/development/testing.md with full testing guide)
+  - [X] Tests (Behave) [Brent]: Add a scenario that parses coverage config and asserts threshold >=97%. (features/coverage_threshold_enforcement.feature, 11 scenarios)
+  - [X] Tests (Robot) [Brent]: Add a Robot test that runs `nox -s coverage_report` and asserts pass/fail behavior. (robot/coverage_threshold.robot, 6 test cases)
+  - [X] Tests (ASV) [Brent]: Add `benchmarks/coverage_report_bench.py` for coverage report runtime baseline. (benchmarks/coverage_report_bench.py, 4 benchmarks)
+  - [X] Quality [Brent]: Run `nox` (all default sessions, including benchmark). (lint 0 findings, typecheck 0 errors, 2235 unit scenarios passed, 211 integration tests passed)
+  - [X] Git [Brent]: `git add .` (only after coverage check passes)
+  - [X] Git [Brent]: `git commit -m "feat(qa): enforce coverage >=97% in CI"` (only after coverage check passes)
   - [X] Forgejo PR [Brent]: Open PR from `feature/q0-min-coverage` to `master` with description "Enforce 97% coverage via nox coverage_report with explicit CI summary output and updated docs/tests.".
   - [X] Git [Brent]: `git checkout master`
   - [X] Git [Brent]: `git branch -d feature/q0-min-coverage`
-  - [X] Quality [Brent]: Verify coverage >=97% via `nox -s coverage_report`. - done on 2026-02-13 (97.5% coverage, threshold 97%)
+  - [X] Quality [Brent]: Verify coverage >=97% via `nox -s coverage_report`. (97.5% coverage, threshold 97%)
 
 **Parallel Group Q0-Advanced Gates [Brent - AFTER M1]**
 
@@ -1517,11 +1543,11 @@ No standalone Q0-Advanced commits planned. Advanced QA enhancements are bundled
 - [X] Traceability [Aditya]: Found commit "docs(skill): add skill YAML schema and examples" (2026-02-16T19:52:47+05:30); updated C0.skill.schema Done/commit message to match.
 - [X] Traceability [Aditya]: Found commit "feat(cli): add skill commands" (2026-02-17T14:44:40+00:00); updated C0.skill.cli Done/commit message to match.
 - [X] Traceability [Aditya]: Found commit "docs(actor): update schema.py module docstring" (2026-02-09T20:23:33+05:30); updated C3.schema Done/commit message to match.
-- [ ] Traceability [Aditya]: Find the actual commit message used for "feat(actor): add built-in provider actors" in `git log --all`, then update the completed COMMIT entry to replace "Done: commit not found" with the correct `Done: Day <n>, <date> <time>` and align the commit message text.
+- [X] Traceability [Aditya]: Found commit "Feat: Harden actor configuration handling with unsafe confirmations, graph descriptors, and actor-based plan coverage." (2025-12-23T20:57:14-0500); updated C3.builtins Done/commit message to match.
 - [X] Traceability [Aditya]: Found commit "feat(tool): add tool and validation domain models" (2026-02-13T21:41:16+00:00); updated C4.config Done/commit message to match.
-- [ ] Traceability [Jeff]: Find the actual commit message used for "feat(actor): compile actor YAML to runtime graphs" in `git log --all`, then update the completed COMMIT entry to replace "Done: commit not found" with the correct `Done: Day <n>, <date> <time>` and align the commit message text.
-- [ ] Traceability [Jeff]: Find the actual commit message used for "feat(tool): add MCP adapter runtime" in `git log --all`, then update the completed COMMIT entry to replace "Done: commit not found" with the correct `Done: Day <n>, <date> <time>` and align the commit message text.
-- [ ] Traceability [Luis]: Find the actual commit message used for "feat(skill): add skill registry persistence" in `git log --all`, then update the completed COMMIT entry to replace "Done: commit not found" with the correct `Done: Day <n>, <date> <time>` and align the commit message text.
+- [X] Traceability [Jeff]: No matching commit in local refs for "feat(actor): compile actor YAML to runtime graphs" (`git log --all`); reset C3.compiler COMMIT to pending with Planned/Expected until SHA is provided.
+- [X] Traceability [Jeff]: No matching commit in local refs for "feat(tool): add MCP adapter runtime" (`git log --all`); reset C4.adapter COMMIT to pending with Planned/Expected until SHA is provided.
+- [X] Traceability [Luis]: No matching commit in local refs for "feat(skill): add skill registry persistence" (`git log --all`); reset C0.skill.registry COMMIT to pending with Planned/Expected until SHA is provided.
 - [X] Traceability [Luis]: Found commit "feat(core): add v3 lifecycle models, automation levels, subplan support, and security hardening" (2026-02-10T17:16:10+00:00); updated E1.domain Done/commit message to match.
 
 ### Section 3: Plan Lifecycle [WORKSTREAM A - Luis Lead]
@@ -1784,7 +1810,7 @@ No standalone Q0-Advanced commits planned. Advanced QA enhancements are bundled
   - [ ] Forgejo PR [Brent]: Open PR from `feature/m1-cli-tests-behave` to `master` with description "Add Behave CLI coverage for action/plan lifecycle commands, formats, and error paths; includes CLI smoke format assertions.".
 
 
-- [ ] **COMMIT (Owner: Brent | Group: A4b.tests.robot | Branch: feature/m1-cli-tests-robot | Planned: Day 10 | Expected: Day 13) - Commit message: "test(cli): add Robot lifecycle CLI coverage"**
+- [ ] **COMMIT (Owner: Brent | Group: A4b.tests.robot | Branch: feature/m1-cli-tests-robot | Planned: Day 10 | Expected: Day 12) - Commit message: "test(cli): add Robot lifecycle CLI coverage"**
   - [ ] Git [Brent]: `git checkout master`
   - [ ] Git [Brent]: `git pull origin master`
   - [ ] Git [Brent]: `git checkout -b feature/m1-cli-tests-robot`
@@ -1963,7 +1989,7 @@ No standalone Q0-Advanced commits planned. Advanced QA enhancements are bundled
   - [X] Quality [Jeff]: Verify coverage >=97% via `nox -s coverage_report`. Done: Day 7, February 15, 2026.
 
 
-- [ ] **COMMIT (Owner: Brent | Group: A5.tests.behave | Branch: feature/m1-persistence-tests-behave | Planned: Day 10 | Expected: Day 13) - Commit message: "test(persistence): add Behave plan/action persistence coverage"**
+- [ ] **COMMIT (Owner: Brent | Group: A5.tests.behave | Branch: feature/m1-persistence-tests-behave | Planned: Day 10 | Expected: Day 12) - Commit message: "test(persistence): add Behave plan/action persistence coverage"**
   - [ ] Git [Brent]: `git checkout master`
   - [ ] Git [Brent]: `git pull origin master`
   - [ ] Git [Brent]: `git checkout -b feature/m1-persistence-tests-behave`
@@ -1983,7 +2009,7 @@ No standalone Q0-Advanced commits planned. Advanced QA enhancements are bundled
   - [ ] Forgejo PR [Brent]: Open PR from `feature/m1-persistence-tests-behave` to `master` with description "Add Behave coverage for action + plan persistence, phase transitions, restart behavior, and ordering checks.".
 
 
-- [ ] **COMMIT (Owner: Brent | Group: A5.tests.robot | Branch: feature/m1-persistence-tests-robot | Planned: Day 11 | Expected: Day 14) - Commit message: "test(persistence): add Robot persistence coverage"**
+- [ ] **COMMIT (Owner: Brent | Group: A5.tests.robot | Branch: feature/m1-persistence-tests-robot | Planned: Day 11 | Expected: Day 12) - Commit message: "test(persistence): add Robot persistence coverage"**
   - [ ] Git [Brent]: `git checkout master`
   - [ ] Git [Brent]: `git pull origin master`
   - [ ] Git [Brent]: `git checkout -b feature/m1-persistence-tests-robot`
@@ -2116,7 +2142,7 @@ No standalone Q0-Advanced commits planned. Advanced QA enhancements are bundled
   - [ ] Git [Jeff]: `git push -u origin feature/m4-automation-profiles-cli`
   - [ ] Forgejo PR [Jeff]: Open PR from `feature/m4-automation-profiles-cli` to `master` with description "Add automation-profile CLI commands, output formats, and tests.".
 
-- [ ] **COMMIT (Owner: Jeff | Group: A6.legacy | Branch: feature/m4-automation-legacy-cleanup | Planned: Day 25 | Expected: Day 26) - Commit message: "refactor(automation): remove automation_level legacy fields"**
+- [ ] **COMMIT (Owner: Jeff | Group: A6.legacy | Branch: feature/m4-automation-legacy-cleanup | Planned: Day 25 | Expected: Day 25) - Commit message: "refactor(automation): remove automation_level legacy fields"**
   - [ ] Git [Jeff]: `git checkout master`
   - [ ] Git [Jeff]: `git pull origin master`
   - [ ] Git [Jeff]: `git checkout -b feature/m4-automation-legacy-cleanup`
@@ -2135,19 +2161,19 @@ No standalone Q0-Advanced commits planned. Advanced QA enhancements are bundled
   - [ ] Git [Jeff]: `git push -u origin feature/m4-automation-legacy-cleanup`
   - [ ] Forgejo PR [Jeff]: Open PR from `feature/m4-automation-legacy-cleanup` to `master` with description "Remove automation_level legacy fields in favor of automation profiles with migrations + tests.".
 
-**Parallel Group A4c: Plan Diagnostics & Artifacts [Jeff]** (post-M1; depends on C5.diff + C9.execute)
-  **SEQUENTIAL NOTE**: A4c should not start until ChangeSet diff artifacts are stable (C5.diff) and plan execution writes plan metadata (C9.execute/C9.apply).
-- [ ] **COMMIT (Owner: Jeff | Group: A4c.plan-diff | Branch: feature/m4-plan-diagnostics | Planned: Day 21 | Expected: Day 23) - Commit message: "feat(cli): add plan diff command"**
+**Parallel Group A4c: Plan Diagnostics & Artifacts [Jeff]** (M4; depends on D3/D4 + C5.diff)
+  **SEQUENTIAL NOTE**: A4c starts after decision tree + correction flows land; ChangeSet diff must already exist (D0b.apply).
+- [ ] **COMMIT (Owner: Jeff | Group: A4c.plan-diff | Branch: feature/m4-plan-diagnostics | Planned: Day 21 | Expected: Day 25) - Commit message: "feat(cli): add plan diff command"**
   - [ ] Git [Jeff]: `git checkout master`
   - [ ] Git [Jeff]: `git pull origin master`
   - [ ] Git [Jeff]: `git checkout -b feature/m4-plan-diagnostics`
   - [ ] Git [Jeff]: `git fetch origin && git merge origin/master`
-  - [ ] Code [Jeff]: Add `agents plan diff <plan_id>` and `agents plan diff --correction <correction_id>` CLI wiring with rich/plain/json/yaml output.
-  - [ ] Code [Jeff]: Load ChangeSet + DiffBuilder artifacts for the plan or correction attempt; emit explicit errors when missing or incompatible.
-  - [ ] Code [Jeff]: Normalize diff output grouping by resource + change type with stable ordering for snapshot tests.
-  - [ ] Docs [Jeff]: Update CLI reference with diff examples and `--correction` usage.
-  - [ ] Tests (Behave) [Jeff]: Add scenarios for diff output (single resource, multi-resource, missing diff, correction diff).
-  - [ ] Tests (Robot) [Jeff]: Add Robot CLI test running `plan diff` after an execute/apply dry run.
+  - [ ] Code [Jeff]: Extend `agents plan diff` to support correction-aware diffs (`--correction`) in addition to the baseline ChangeSet diff from D0b.apply.
+  - [ ] Code [Jeff]: Load ChangeSet + decision/correction metadata; emit explicit errors when correction data is missing or incompatible.
+  - [ ] Code [Jeff]: Normalize diff output grouping by resource + change type with stable ordering for snapshot tests; include correction summary in headers.
+  - [ ] Docs [Jeff]: Update CLI reference with correction diff examples and `--correction` usage.
+  - [ ] Tests (Behave) [Jeff]: Add scenarios for correction diffs, missing correction data, and fallback to baseline diff.
+  - [ ] Tests (Robot) [Jeff]: Add Robot CLI test running `plan diff --correction` after a correction attempt.
   - [ ] Tests (ASV) [Jeff]: Add `benchmarks/plan_diff_cli_bench.py` for diff rendering overhead.
   - [ ] Quality [Jeff]: Verify coverage >=97% via `nox -s coverage_report`. If coverage is <97% then review the current unit test coverage report at `build/coverage.xml` and use it to write new Behave based unit tests to improve code coverage. Specifically, write Behave style unit tests that are descriptively named and specifically improves coverage on whichever file has the most uncovered lines by writing tests that will target the uncovered lines in the report. Once that is done rerun `nox -s coverage_report` to verify all tests pass and coverage is above >=97%. Only mark this as complete once coverage is >=97%, if not repeat this task as many times as is needed until coverage reaches >=97%.
   - [ ] Quality [Jeff]: Run `nox` (all default sessions, including benchmark), fix any errors if needed ensuring nox passes across **entire** code base, do not ignore any failure even if it seems unrelated to this commit, fix it.
@@ -2156,16 +2182,16 @@ No standalone Q0-Advanced commits planned. Advanced QA enhancements are bundled
   - [ ] Git [Jeff]: `git push -u origin feature/m4-plan-diagnostics`
   - [ ] Forgejo PR [Jeff]: Open PR from `feature/m4-plan-diagnostics` to `master` with description "Add plan diff CLI command with ChangeSet rendering and tests.".
 
-- [ ] **COMMIT (Owner: Jeff | Group: A4c.artifacts | Branch: feature/m4-plan-diagnostics | Planned: Day 22 | Expected: Day 24) - Commit message: "feat(cli): add plan artifacts and prompt commands"**
+- [ ] **COMMIT (Owner: Jeff | Group: A4c.artifacts | Branch: feature/m4-plan-diagnostics | Planned: Day 22 | Expected: Day 25) - Commit message: "feat(cli): add plan artifacts and prompt commands"**
   - [ ] Git [Jeff]: `git checkout master`
   - [ ] Git [Jeff]: `git pull origin master`
   - [ ] Git [Jeff]: `git checkout -b feature/m4-plan-diagnostics`
   - [ ] Git [Jeff]: `git fetch origin && git merge origin/master`
-  - [ ] Code [Jeff]: Implement `agents plan artifacts <plan_id>` to list stored artifacts (decision snapshots, diff, logs, validation summaries, ChangeSet metadata).
+  - [ ] Code [Jeff]: Extend `agents plan artifacts` to include decision snapshots, correction attempts, and validation summaries beyond the ChangeSet metadata added in D0b.apply.
   - [ ] Code [Jeff]: Implement `agents plan prompt <plan_id> <guidance>` to append guidance and record a `prompt_definition` decision.
-  - [ ] Code [Jeff]: Persist prompt guidance as plan metadata and attach to decision tree for subsequent Strategize/Execute phases.
+  - [ ] Code [Jeff]: Persist prompt guidance in plan metadata and link it to the decision tree for subsequent Strategize/Execute phases.
   - [ ] Docs [Jeff]: Add CLI reference docs for `plan artifacts` and `plan prompt` with output field descriptions.
-  - [ ] Tests (Behave) [Jeff]: Add scenarios for artifacts listing and prompt recording.
+  - [ ] Tests (Behave) [Jeff]: Add scenarios for extended artifacts listing and prompt recording.
   - [ ] Tests (Robot) [Jeff]: Add Robot CLI tests covering artifacts and prompt commands.
   - [ ] Tests (ASV) [Jeff]: Add `benchmarks/plan_artifacts_cli_bench.py` for listing overhead.
   - [ ] Quality [Jeff]: Verify coverage >=97% via `nox -s coverage_report`. If coverage is <97% then review the current unit test coverage report at `build/coverage.xml` and use it to write new Behave based unit tests to improve code coverage. Specifically, write Behave style unit tests that are descriptively named and specifically improves coverage on whichever file has the most uncovered lines by writing tests that will target the uncovered lines in the report. Once that is done rerun `nox -s coverage_report` to verify all tests pass and coverage is above >=97%. Only mark this as complete once coverage is >=97%, if not repeat this task as many times as is needed until coverage reaches >=97%.
@@ -2200,7 +2226,7 @@ No standalone Q0-Advanced commits planned. Advanced QA enhancements are bundled
   - [X] Git [Jeff]: `git branch -d feature/m3-session-domain`
   - [X] Quality [Jeff]: Verify coverage >=97% via `nox -s coverage_report`. Coverage 97% overall (session.py 98%).
 
-- [ ] **COMMIT (Owner: Brent | Group: A7.domain.tests | Branch: feature/m3-session-domain-robot | Planned: Day 13 | Expected: Day 16) - Commit message: "test(session): add robot session model smoke tests"**
+- [ ] **COMMIT (Owner: Brent | Group: A7.domain.tests | Branch: feature/m3-session-domain-robot | Planned: Day 13 | Expected: Day 20) - Commit message: "test(session): add robot session model smoke tests"**
   - [ ] Git [Brent]: `git checkout master`
   - [ ] Git [Brent]: `git pull origin master`
   - [ ] Git [Brent]: `git checkout -b feature/m3-session-domain-robot`
@@ -2215,7 +2241,7 @@ No standalone Q0-Advanced commits planned. Advanced QA enhancements are bundled
   - [ ] Git [Brent]: `git commit -m "test(session): add robot session model smoke tests"`
   - [ ] Git [Brent]: `git push -u origin feature/m3-session-domain-robot`
   - [ ] Forgejo PR [Brent]: Open PR from `feature/m3-session-domain-robot` to `master` with description "Add Robot smoke tests for session domain model with docs and Behave alignment.".
-- [ ] **COMMIT (Owner: Luis | Group: A7.persistence | Branch: feature/m3-session-persistence | Planned: Day 14 | Expected: Day 19) - Commit message: "feat(session): add session persistence and repositories"**
+- [ ] **COMMIT (Owner: Luis | Group: A7.persistence | Branch: feature/m3-session-persistence | Planned: Day 14 | Expected: Day 20) - Commit message: "feat(session): add session persistence and repositories"**
   - [ ] Git [Luis]: `git checkout master`
   - [ ] Git [Luis]: `git pull origin master`
   - [ ] Git [Luis]: `git checkout -b feature/m3-session-persistence`
@@ -2255,7 +2281,7 @@ No standalone Q0-Advanced commits planned. Advanced QA enhancements are bundled
   - [ ] Forgejo PR [Brent]: Open PR from `feature/m3-session-cli` to `master` with description "Add session CLI commands with Behave/Robot coverage and docs updates."
 
 **Parallel Group A8: Config CLI [Brent]** (M3; post-M1; depends on Settings)
-- [ ] **COMMIT (Owner: Brent | Group: A8.cli | Branch: feature/m3-config-cli | Planned: Day 16 | Expected: Day 21) - Commit message: "feat(cli): add config get/set/list commands"**
+- [ ] **COMMIT (Owner: Brent | Group: A8.cli | Branch: feature/m3-config-cli | Planned: Day 16 | Expected: Day 20) - Commit message: "feat(cli): add config get/set/list commands"**
   - [ ] Git [Brent]: `git checkout master`
   - [ ] Git [Brent]: `git pull origin master`
   - [ ] Git [Brent]: `git checkout -b feature/m3-config-cli`
@@ -2399,7 +2425,7 @@ No standalone Q0-Advanced commits planned. Advanced QA enhancements are bundled
   - [X] Forgejo PR [Jeff]: Open PR from `feature/m2-resource-core-db` to `master` with description "Add resource registry tables, indexes, and migration tests.".
   - [X] Quality [Jeff]: Verify coverage >=97% via `nox -s coverage_report`. (models.py 94% with combined tests, overall suite maintains 97%)
 
-- [ ] **COMMIT (Owner: Brent | Group: B0.db.resources.tests | Branch: feature/m1-resource-db-robot-tests | Planned: Day 11 | Expected: Day 14) - Commit message: "test(db): add resource registry robot smoke test"**
+- [ ] **COMMIT (Owner: Brent | Group: B0.db.resources.tests | Branch: feature/m1-resource-db-robot-tests | Planned: Day 11 | Expected: Day 15) - Commit message: "test(db): add resource registry robot smoke test"**
   - [ ] Git [Brent]: `git checkout master`
   - [ ] Git [Brent]: `git pull origin master`
   - [ ] Git [Brent]: `git checkout -b feature/m1-resource-db-robot-tests`
@@ -2575,7 +2601,7 @@ No standalone Q0-Advanced commits planned. Advanced QA enhancements are bundled
   - [X] Git [Jeff]: `git branch -d feature/m2-resource-dag`
   - [X] Quality [Jeff]: Verify coverage >=97% via `nox -s coverage_report`. If coverage is <97% then review the current unit test coverage report at `build/coverage.xml` and use it to write new Behave based unit tests to improve code coverage. Specifically, write Behave style unit tests that are descriptively named and specifically improves coverage on whichever file has the most uncovered lines by writing tests that will target the uncovered lines in the report. Once that is done rerun `nox -s coverage_report` to verify all tests pass and coverage is above >=97%. Only mark this as complete once coverage is >=97%, if not repeat this task as many times as is needed until coverage reaches >=97%.
 
-- [ ] **COMMIT (Owner: Jeff | Group: B1.cli | Branch: feature/m2-resource-cli-extensions | Planned: Day 13 | Expected: Day 18) - Commit message: "feat(cli): add resource tree and inspect commands"**
+- [ ] **COMMIT (Owner: Jeff | Group: B1.cli | Branch: feature/m2-resource-cli-extensions | Planned: Day 13 | Expected: Day 16) - Commit message: "feat(cli): add resource tree and inspect commands"**
   - [ ] Git [Jeff]: `git checkout master`
   - [ ] Git [Jeff]: `git pull origin master`
   - [ ] Git [Jeff]: `git checkout -b feature/m2-resource-cli-extensions`
@@ -2733,7 +2759,7 @@ No standalone Q0-Advanced commits planned. Advanced QA enhancements are bundled
   - [X] Forgejo PR [Jeff]: Open PR from `feature/m3-tool-domain` to `master` with description "Add tool + validation domain models, schema loaders, and tests.".
   - [X] Quality [Jeff]: Verify coverage >=97% via `nox -s coverage_report`. Coverage is 97% overall (tool.py 99% coverage).
 
-- [ ] **COMMIT (Owner: Brent | Group: C1.tool.domain.tests | Branch: feature/m3-tool-domain-robot | Planned: Day 10 | Expected: Day 15) - Commit message: "test(tool): add robot tool model smoke tests"**
+- [ ] **COMMIT (Owner: Brent | Group: C1.tool.domain.tests | Branch: feature/m3-tool-domain-robot | Planned: Day 10 | Expected: Day 19) - Commit message: "test(tool): add robot tool model smoke tests"**
   - [ ] Git [Brent]: `git checkout master`
   - [ ] Git [Brent]: `git pull origin master`
   - [ ] Git [Brent]: `git checkout -b feature/m3-tool-domain-robot`
@@ -2855,7 +2881,7 @@ No standalone Q0-Advanced commits planned. Advanced QA enhancements are bundled
   - [X] Git [Jeff]: `git branch -d feature/m3-skill-domain`
   - [X] Quality [Jeff]: Verify coverage >=97% via `nox -s coverage_report`. Coverage 97% overall (skill.py 98%).
 
-- [ ] **COMMIT (Owner: Brent | Group: C0.skill.domain.tests | Branch: feature/m3-skill-domain-robot | Planned: Day 10 | Expected: Day 15) - Commit message: "test(skill): add robot skill resolver smoke tests"**
+- [ ] **COMMIT (Owner: Brent | Group: C0.skill.domain.tests | Branch: feature/m3-skill-domain-robot | Planned: Day 10 | Expected: Day 19) - Commit message: "test(skill): add robot skill resolver smoke tests"**
   - [ ] Git [Brent]: `git checkout master`
   - [ ] Git [Brent]: `git pull origin master`
   - [ ] Git [Brent]: `git checkout -b feature/m3-skill-domain-robot`
@@ -2870,23 +2896,23 @@ No standalone Q0-Advanced commits planned. Advanced QA enhancements are bundled
   - [ ] Git [Brent]: `git commit -m "test(skill): add robot skill resolver smoke tests"`
   - [ ] Git [Brent]: `git push -u origin feature/m3-skill-domain-robot`
   - [ ] Forgejo PR [Brent]: Open PR from `feature/m3-skill-domain-robot` to `master` with description "Add Robot smoke tests for skill resolver with docs and Behave alignment.".
-- [X] **COMMIT (Owner: Luis | Group: C0.skill.registry | Branch: feature/m3-skill-registry | Done: commit not found) - Commit message: "feat(skill): add skill registry persistence"**
-  - [X] Git [Luis]: `git checkout master`
-  - [X] Git [Luis]: `git pull origin master`
-  - [X] Git [Luis]: `git checkout -b feature/m3-skill-registry`
-  - [X] Git [Luis]: `git fetch origin && git merge origin/master` (run before final tests and before commit)
-  - [X] Code [Luis]: Add `skills` and `skill_items` tables and implement SkillRepository + SkillRegistryService.
-  - [X] Docs [Luis]: Add `docs/reference/skill_registry.md` with registration behavior and filters.
-  - [X] Tests (Behave) [Luis]: Add `features/skill_registry.feature` for add/update/remove and invalid include cases.
-  - [X] Tests (Robot) [Luis]: Add `robot/skill_registry.robot` CLI/service smoke tests.
-  - [X] Tests (ASV) [Luis]: Add `benchmarks/skill_registry_bench.py` for registry list performance.
-  - [X] Quality [Luis]: Run `nox` (all default sessions, including benchmark), fix any errors if needed ensuring nox passes.
-  - [X] Git [Luis]: `git add .`
-  - [X] Git [Luis]: `git commit -m "feat(skill): add skill registry persistence"`
-  - [X] Forgejo PR [Luis]: Open PR from `feature/m3-skill-registry` to `master` with description "Add skill registry persistence and service with tests.".
-  - [X] Git [Luis]: `git checkout master`
-  - [X] Git [Luis]: `git branch -d feature/m3-skill-registry`
-  - [X] Quality [Luis]: Verify coverage >=97% via `nox -s coverage_report`. If coverage is <97% then review the current unit test coverage report at `build/coverage.xml` and use it to write new Behave based unit tests to improve code coverage. Specifically, write Behave style unit tests that are descriptively named and specifically improves coverage on whichever file has the most uncovered lines by writing tests that will target the uncovered lines in the report. Once that is done rerun `nox -s coverage_report` to verify all tests pass and coverage is above >=97%, if not repeat this task as many times as is needed until coverage reaches >=97%.
+- [ ] **COMMIT (Owner: Luis | Group: C0.skill.registry | Branch: feature/m3-skill-registry | Planned: Day 15 | Expected: Day 20) - Commit message: "feat(skill): add skill registry persistence"**
+  - [ ] Git [Luis]: `git checkout master`
+  - [ ] Git [Luis]: `git pull origin master`
+  - [ ] Git [Luis]: `git checkout -b feature/m3-skill-registry`
+  - [ ] Git [Luis]: `git fetch origin && git merge origin/master` (run before final tests and before commit)
+  - [ ] Code [Luis]: Add `skills` and `skill_items` tables and implement SkillRepository + SkillRegistryService.
+  - [ ] Docs [Luis]: Add `docs/reference/skill_registry.md` with registration behavior and filters.
+  - [ ] Tests (Behave) [Luis]: Add `features/skill_registry.feature` for add/update/remove and invalid include cases.
+  - [ ] Tests (Robot) [Luis]: Add `robot/skill_registry.robot` CLI/service smoke tests.
+  - [ ] Tests (ASV) [Luis]: Add `benchmarks/skill_registry_bench.py` for registry list performance.
+  - [ ] Quality [Luis]: Run `nox` (all default sessions, including benchmark), fix any errors if needed ensuring nox passes.
+  - [ ] Git [Luis]: `git add .`
+  - [ ] Git [Luis]: `git commit -m "feat(skill): add skill registry persistence"`
+  - [ ] Forgejo PR [Luis]: Open PR from `feature/m3-skill-registry` to `master` with description "Add skill registry persistence and service with tests.".
+  - [ ] Git [Luis]: `git checkout master`
+  - [ ] Git [Luis]: `git branch -d feature/m3-skill-registry`
+  - [ ] Quality [Luis]: Verify coverage >=97% via `nox -s coverage_report`. If coverage is <97% then review the current unit test coverage report at `build/coverage.xml` and use it to write new Behave based unit tests to improve code coverage. Specifically, write Behave style unit tests that are descriptively named and specifically improves coverage on whichever file has the most uncovered lines by writing tests that will target the uncovered lines in the report. Once that is done rerun `nox -s coverage_report` to verify all tests pass and coverage is above >=97%, if not repeat this task as many times as is needed until coverage reaches >=97%.
 
 - [X] **COMMIT (Owner: Aditya | Group: C0.skill.cli | Branch: feature/m3-skill-cli | Done: Day 9, February 17, 2026 14:44:40 +0000) - Commit message: "feat(cli): add skill commands"**
   - [X] Git [Aditya]: `git checkout master`
@@ -2906,6 +2932,49 @@ No standalone Q0-Advanced commits planned. Advanced QA enhancements are bundled
   - [X] Git [Aditya]: `git branch -d feature/m3-skill-cli`
   - [X] Quality [Aditya]: Verify coverage >=97% via `nox -s coverage_report`. If coverage is <97% then review the current unit test coverage report at `build/coverage.xml` and use it to write new Behave based unit tests to improve code coverage. Specifically, write Behave style unit tests that are descriptively named and specifically improves coverage on whichever file has the most uncovered lines by writing tests that will target the uncovered lines in the report. Once that is done rerun `nox -s coverage_report` to verify all tests pass and coverage is above >=97%, if not repeat this task as many times as is needed until coverage reaches >=97%.
 
+**Parallel Group C0.agent-skills: Agent Skills Integration (M3)**
+  **PARALLEL SUBTRACK C0.agent-skills.loader [Aditya]**: SKILL.md loader + tool adapter
+  **PARALLEL SUBTRACK C0.agent-skills.registry [Jeff]**: discovery + registry integration
+  **SEQUENTIAL MERGE NOTE**: C0.agent-skills.loader → C0.agent-skills.registry.
+
+- [ ] **COMMIT (Owner: Aditya | Group: C0.agent-skills.loader | Branch: feature/m3-agent-skills-loader | Planned: Day 17 | Expected: Day 19) - Commit message: "feat(skill): add agent skills loader"**
+  - [ ] Git [Aditya]: `git checkout master`
+  - [ ] Git [Aditya]: `git pull origin master`
+  - [ ] Git [Aditya]: `git checkout -b feature/m3-agent-skills-loader`
+  - [ ] Git [Aditya]: `git fetch origin && git merge origin/master`
+  - [ ] Code [Aditya]: Add `AgentSkillSpec` loader that parses `SKILL.md` frontmatter + progressive disclosure sections into structured steps with stable ordering.
+  - [ ] Code [Aditya]: Map Agent Skills to Tool/Validation definitions with namespaced naming, resource binding slots, and read-only defaults.
+  - [ ] Code [Aditya]: Support `scripts/`, `references/`, and `assets/` folders with path normalization and safe read-only access rules.
+  - [ ] Docs [Aditya]: Add `docs/reference/agent_skills.md` describing folder layout, parsing rules, and tool mapping.
+  - [ ] Tests (Behave) [Aditya]: Add scenarios for valid/invalid SKILL.md parsing, namespaced naming, and step ordering.
+  - [ ] Tests (Robot) [Aditya]: Add Robot test that loads a sample Agent Skills folder and verifies tool metadata.
+  - [ ] Tests (ASV) [Aditya]: Add `benchmarks/agent_skills_loader_bench.py` for parsing throughput.
+  - [ ] Quality [Aditya]: Verify coverage >=97% via `nox -s coverage_report`. If coverage is <97% then review the current unit test coverage report at `build/coverage.xml` and use it to write new Behave based unit tests to improve code coverage. Specifically, write Behave style unit tests that are descriptively named and specifically improves coverage on whichever file has the most uncovered lines by writing tests that will target the uncovered lines in the report. Once that is done rerun `nox -s coverage_report` to verify all tests pass and coverage is above >=97%. Only mark this as complete once coverage is >=97%, if not repeat this task as many times as is needed until coverage reaches >=97%.
+  - [ ] Quality [Aditya]: Run `nox` (all default sessions, including benchmark), fix any errors if needed ensuring nox passes across **entire** code base, do not ignore any failure even if it seems unrelated to this commit, fix it.
+  - [ ] Git [Aditya]: Perform an appropriate `git add` command to add all the files that should be part of this commit to the git index
+  - [ ] Git [Aditya]: `git commit -m "feat(skill): add agent skills loader"`
+  - [ ] Git [Aditya]: `git push -u origin feature/m3-agent-skills-loader`
+  - [ ] Forgejo PR [Aditya]: Open PR from `feature/m3-agent-skills-loader` to `master` with description "Add Agent Skills loader, mapping rules, and tests.".
+
+- [ ] **COMMIT (Owner: Jeff | Group: C0.agent-skills.registry | Branch: feature/m3-agent-skills-registry | Planned: Day 18 | Expected: Day 20) - Commit message: "feat(skill): integrate agent skills discovery"**
+  - [ ] Git [Jeff]: `git checkout master`
+  - [ ] Git [Jeff]: `git pull origin master`
+  - [ ] Git [Jeff]: `git checkout -b feature/m3-agent-skills-registry`
+  - [ ] Git [Jeff]: `git fetch origin && git merge origin/master`
+  - [ ] Code [Jeff]: Add config key `skills.agent_skills_paths` with default discovery path and allow multiple folders.
+  - [ ] Code [Jeff]: Register Agent Skills tools in ToolRegistry with `source=agent_skills` and include source metadata in `agents skill tools` output.
+  - [ ] Code [Jeff]: Add discovery refresh hook in SkillRegistryService and CLI `agents skill tools` to optionally re-scan Agent Skills paths.
+  - [ ] Docs [Jeff]: Update `docs/reference/skill_registry.md` and CLI reference with Agent Skills discovery behavior and output fields.
+  - [ ] Tests (Behave) [Jeff]: Add scenarios for discovery, refresh, and source metadata rendering.
+  - [ ] Tests (Robot) [Jeff]: Add Robot CLI test that lists Agent Skills tools with source metadata.
+  - [ ] Tests (ASV) [Jeff]: Add `benchmarks/agent_skills_discovery_bench.py` for discovery overhead.
+  - [ ] Quality [Jeff]: Verify coverage >=97% via `nox -s coverage_report`. If coverage is <97% then review the current unit test coverage report at `build/coverage.xml` and use it to write new Behave based unit tests to improve code coverage. Specifically, write Behave style unit tests that are descriptively named and specifically improves coverage on whichever file has the most uncovered lines by writing tests that will target the uncovered lines in the report. Once that is done rerun `nox -s coverage_report` to verify all tests pass and coverage is above >=97%, if not repeat this task as many times as is needed until coverage reaches >=97%.
+  - [ ] Quality [Jeff]: Run `nox` (all default sessions, including benchmark), fix any errors if needed ensuring nox passes across **entire** code base, do not ignore any failure even if it seems unrelated to this commit, fix it.
+  - [ ] Git [Jeff]: Perform an appropriate `git add` command to add all the files that should be part of this commit to the git index
+  - [ ] Git [Jeff]: `git commit -m "feat(skill): integrate agent skills discovery"`
+  - [ ] Git [Jeff]: `git push -u origin feature/m3-agent-skills-registry`
+  - [ ] Forgejo PR [Jeff]: Open PR from `feature/m3-agent-skills-registry` to `master` with description "Integrate Agent Skills discovery into skill/tool registries with tests.".
+
 **Parallel Group C3: Actor Registry + CLI (M3)**
   **PARALLEL SUBTRACK C3.registry [Jeff]**: Actor registry persistence alignment
   **PARALLEL SUBTRACK C3.cli [Jeff]**: Actor CLI alignment to YAML-first config
@@ -2930,26 +2999,26 @@ No standalone Q0-Advanced commits planned. Advanced QA enhancements are bundled
   - [X] Git [Aditya]: `git branch -d feature/m3-actor-schema`
   - [X] Quality [Aditya]: Verify coverage >=97% via `nox -s coverage_report`. If coverage is <97% then review the current unit test coverage report at `build/coverage.xml` and use it to write new Behave based unit tests to improve code coverage. Specifically, write Behave style unit tests that are descriptively named and specifically improves coverage on whichever file has the most uncovered lines by writing tests that will target the uncovered lines in the report. Once that is done rerun `nox -s coverage_report` to verify all tests pass and coverage is above >=97%. Only mark this as complete once coverage is >=97%, if not repeat this task as many times as is needed until coverage reaches >=97%.
 
-- [X] **COMMIT (Owner: Jeff | Group: C3.compiler | Branch: feature/m3-actor-compiler | Done: commit not found) - Commit message: "feat(actor): compile actor YAML to runtime graphs"**
-  - [X] Git [Jeff]: `git checkout master`
-  - [X] Git [Jeff]: `git pull origin master`
-  - [X] Git [Jeff]: `git checkout -b feature/m3-actor-compiler`
-  - [X] Git [Jeff]: `git fetch origin && git merge origin/master` (run before final tests and before commit)
-  - [X] Code [Jeff]: Implement ActorCompiler that converts actor YAML into LangGraph nodes and tool nodes.
-  - [X] Code [Jeff]: Resolve skill references into tool lists for tool nodes.
-  - [X] Docs [Jeff]: Add `docs/reference/actor_compiler.md` with compilation flow and error cases.
-  - [X] Tests (Behave) [Jeff]: Add scenarios for compile success, missing tool errors, and invalid graph wiring.
-  - [X] Tests (Robot) [Jeff]: Add Robot test that compiles a sample actor and executes a dry-run.
-  - [X] Tests (ASV) [Jeff]: Add `benchmarks/actor_compiler_bench.py` for compile latency baseline.
-  - [X] Quality [Jeff]: Run `nox` (all default sessions, including benchmark), fix any errors if needed ensuring nox passes.
-  - [X] Git [Jeff]: `git add .`
-  - [X] Git [Jeff]: `git commit -m "feat(actor): compile actor YAML to runtime graphs"`
-  - [X] Forgejo PR [Jeff]: Open PR from `feature/m3-actor-compiler` to `master` with description "Add actor compiler for YAML → runtime graphs with tests/docs.".
-  - [X] Git [Jeff]: `git checkout master`
-  - [X] Git [Jeff]: `git branch -d feature/m3-actor-compiler`
-  - [X] Quality [Jeff]: Verify coverage >=97% via `nox -s coverage_report`. If coverage is <97% then review the current unit test coverage report at `build/coverage.xml` and use it to write new Behave based unit tests to improve code coverage. Specifically, write Behave style unit tests that are descriptively named and specifically improves coverage on whichever file has the most uncovered lines by writing tests that will target the uncovered lines in the report. Once that is done rerun `nox -s coverage_report` to verify all tests pass and coverage is above >=97%. Only mark this as complete once coverage is >=97%, if not repeat this task as many times as is needed until coverage reaches >=97%.
+- [ ] **COMMIT (Owner: Jeff | Group: C3.compiler | Branch: feature/m3-actor-compiler | Planned: Day 14 | Expected: Day 20) - Commit message: "feat(actor): compile actor YAML to runtime graphs"**
+  - [ ] Git [Jeff]: `git checkout master`
+  - [ ] Git [Jeff]: `git pull origin master`
+  - [ ] Git [Jeff]: `git checkout -b feature/m3-actor-compiler`
+  - [ ] Git [Jeff]: `git fetch origin && git merge origin/master` (run before final tests and before commit)
+  - [ ] Code [Jeff]: Implement ActorCompiler that converts actor YAML into LangGraph nodes and tool nodes.
+  - [ ] Code [Jeff]: Resolve skill references into tool lists for tool nodes.
+  - [ ] Docs [Jeff]: Add `docs/reference/actor_compiler.md` with compilation flow and error cases.
+  - [ ] Tests (Behave) [Jeff]: Add scenarios for compile success, missing tool errors, and invalid graph wiring.
+  - [ ] Tests (Robot) [Jeff]: Add Robot test that compiles a sample actor and executes a dry-run.
+  - [ ] Tests (ASV) [Jeff]: Add `benchmarks/actor_compiler_bench.py` for compile latency baseline.
+  - [ ] Quality [Jeff]: Run `nox` (all default sessions, including benchmark), fix any errors if needed ensuring nox passes.
+  - [ ] Git [Jeff]: `git add .`
+  - [ ] Git [Jeff]: `git commit -m "feat(actor): compile actor YAML to runtime graphs"`
+  - [ ] Forgejo PR [Jeff]: Open PR from `feature/m3-actor-compiler` to `master` with description "Add actor compiler for YAML → runtime graphs with tests/docs.".
+  - [ ] Git [Jeff]: `git checkout master`
+  - [ ] Git [Jeff]: `git branch -d feature/m3-actor-compiler`
+  - [ ] Quality [Jeff]: Verify coverage >=97% via `nox -s coverage_report`. If coverage is <97% then review the current unit test coverage report at `build/coverage.xml` and use it to write new Behave based unit tests to improve code coverage. Specifically, write Behave style unit tests that are descriptively named and specifically improves coverage on whichever file has the most uncovered lines by writing tests that will target the uncovered lines in the report. Once that is done rerun `nox -s coverage_report` to verify all tests pass and coverage is above >=97%, if not repeat this task as many times as is needed until coverage reaches >=97%.
 
-- [ ] **COMMIT (Owner: Jeff | Group: C3.registry | Branch: feature/m3-actor-registry | Planned: Day 15 | Expected: Day 21) - Commit message: "feat(actor): align actor registry persistence"**
+- [ ] **COMMIT (Owner: Jeff | Group: C3.registry | Branch: feature/m3-actor-registry | Planned: Day 15 | Expected: Day 20) - Commit message: "feat(actor): align actor registry persistence"**
   - [ ] Git [Jeff]: `git checkout master`
   - [ ] Git [Jeff]: `git pull origin master`
   - [ ] Git [Jeff]: `git checkout -b feature/m3-actor-registry`
@@ -2966,7 +3035,7 @@ No standalone Q0-Advanced commits planned. Advanced QA enhancements are bundled
   - [ ] Git [Jeff]: `git push -u origin feature/m3-actor-registry`
   - [ ] Forgejo PR [Jeff]: Open PR from `feature/m3-actor-registry` to `master` with description "Align actor registry persistence with YAML text + metadata.".
 
-- [ ] **COMMIT (Owner: Jeff | Group: C3.cli | Branch: feature/m3-actor-cli | Planned: Day 16 | Expected: Day 22) - Commit message: "feat(cli): align actor commands to YAML"**
+- [ ] **COMMIT (Owner: Jeff | Group: C3.cli | Branch: feature/m3-actor-cli | Planned: Day 16 | Expected: Day 20) - Commit message: "feat(cli): align actor commands to YAML"**
   - [ ] Git [Jeff]: `git checkout master`
   - [ ] Git [Jeff]: `git pull origin master`
   - [ ] Git [Jeff]: `git checkout -b feature/m3-actor-cli`
@@ -2983,7 +3052,7 @@ No standalone Q0-Advanced commits planned. Advanced QA enhancements are bundled
   - [ ] Git [Jeff]: `git push -u origin feature/m3-actor-cli`
   - [ ] Forgejo PR [Jeff]: Open PR from `feature/m3-actor-cli` to `master` with description "Align actor CLI commands to YAML-first configs with tests/docs.".
 
-- [X] **COMMIT (Owner: Aditya | Group: C3.builtins | Branch: feature/m3-provider-actors | Done: commit not found) - Commit message: "feat(actor): add built-in provider actors"**
+- [X] **COMMIT (Owner: Aditya | Group: C3.builtins | Branch: feature/m3-provider-actors | Done: Day -47, December 23, 2025 20:57:14 -0500) - Commit message: "Feat: Harden actor configuration handling with unsafe confirmations, graph descriptors, and actor-based plan coverage."**
   - [X] Git [Aditya]: `git checkout master`
   - [X] Git [Aditya]: `git pull origin master`
   - [X] Git [Aditya]: `git checkout -b feature/m3-provider-actors`
@@ -2996,7 +3065,7 @@ No standalone Q0-Advanced commits planned. Advanced QA enhancements are bundled
   - [X] Tests (ASV) [Aditya]: Add `benchmarks/provider_actor_load_bench.py` for registry load cost.
   - [X] Quality [Aditya]: Run `nox` (all default sessions, including benchmark), fix any errors if needed ensuring nox passes.
   - [X] Git [Aditya]: `git add .`
-  - [X] Git [Aditya]: `git commit -m "feat(actor): add built-in provider actors"`
+  - [X] Git [Aditya]: `git commit -m "Feat: Harden actor configuration handling with unsafe confirmations, graph descriptors, and actor-based plan coverage."`
   - [X] Forgejo PR [Aditya]: Open PR from `feature/m3-provider-actors` to `master` with description "Add built-in provider actor configs with defaults and tests.".
   - [X] Git [Aditya]: `git checkout master`
   - [X] Git [Aditya]: `git branch -d feature/m3-provider-actors`
@@ -3007,23 +3076,23 @@ No standalone Q0-Advanced commits planned. Advanced QA enhancements are bundled
   **PARALLEL SUBTRACK C4.config [Aditya]**: MCP config + examples
   **SEQUENTIAL MERGE NOTE**: C4.adapter lands before C4.config examples used in tests.
 
-- [X] **COMMIT (Owner: Jeff | Group: C4.adapter | Branch: feature/m3-mcp-adapter | Done: commit not found) - Commit message: "feat(tool): add MCP adapter runtime"**
-  - [X] Git [Jeff]: `git checkout master`
-  - [X] Git [Jeff]: `git pull origin master`
-  - [X] Git [Jeff]: `git checkout -b feature/m3-mcp-adapter`
-  - [X] Git [Jeff]: `git fetch origin && git merge origin/master` (run before final tests and before commit)
-  - [X] Code [Jeff]: Implement MCP tool source adapter that registers tools into ToolRegistry with source metadata.
-  - [X] Docs [Jeff]: Add `docs/reference/mcp_adapter.md` with connection settings and allowlist rules.
-  - [X] Tests (Behave) [Jeff]: Add scenarios for MCP adapter registration and tool listing.
-  - [X] Tests (Robot) [Jeff]: Add Robot test that loads MCP adapter with a mock server.
-  - [X] Tests (ASV) [Jeff]: Add `benchmarks/mcp_adapter_bench.py` for adapter initialization cost.
-  - [X] Quality [Jeff]: Run `nox` (all default sessions, including benchmark), fix any errors if needed ensuring nox passes.
-  - [X] Git [Jeff]: `git add .`
-  - [X] Git [Jeff]: `git commit -m "feat(tool): add MCP adapter runtime"`
-  - [X] Forgejo PR [Jeff]: Open PR from `feature/m3-mcp-adapter` to `master` with description "Add MCP adapter runtime for external tool sources with tests/docs.".
-  - [X] Git [Jeff]: `git checkout master`
-  - [X] Git [Jeff]: `git branch -d feature/m3-mcp-adapter`
-  - [X] Quality [Jeff]: Verify coverage >=97% via `nox -s coverage_report`. If coverage is <97% then review the current unit test coverage report at `build/coverage.xml` and use it to write new Behave based unit tests to improve code coverage. Specifically, write Behave style unit tests that are descriptively named and specifically improves coverage on whichever file has the most uncovered lines by writing tests that will target the uncovered lines in the report. Once that is done rerun `nox -s coverage_report` to verify all tests pass and coverage is above >=97%. Only mark this as complete once coverage is >=97%, if not repeat this task as many times as is needed until coverage reaches >=97%.
+- [ ] **COMMIT (Owner: Jeff | Group: C4.adapter | Branch: feature/m3-mcp-adapter | Planned: Day 18 | Expected: Day 20) - Commit message: "feat(tool): add MCP adapter runtime"**
+  - [ ] Git [Jeff]: `git checkout master`
+  - [ ] Git [Jeff]: `git pull origin master`
+  - [ ] Git [Jeff]: `git checkout -b feature/m3-mcp-adapter`
+  - [ ] Git [Jeff]: `git fetch origin && git merge origin/master` (run before final tests and before commit)
+  - [ ] Code [Jeff]: Implement MCP tool source adapter that registers tools into ToolRegistry with source metadata.
+  - [ ] Docs [Jeff]: Add `docs/reference/mcp_adapter.md` with connection settings and allowlist rules.
+  - [ ] Tests (Behave) [Jeff]: Add scenarios for MCP adapter registration and tool listing.
+  - [ ] Tests (Robot) [Jeff]: Add Robot test that loads MCP adapter with a mock server.
+  - [ ] Tests (ASV) [Jeff]: Add `benchmarks/mcp_adapter_bench.py` for adapter initialization cost.
+  - [ ] Quality [Jeff]: Run `nox` (all default sessions, including benchmark), fix any errors if needed ensuring nox passes.
+  - [ ] Git [Jeff]: `git add .`
+  - [ ] Git [Jeff]: `git commit -m "feat(tool): add MCP adapter runtime"`
+  - [ ] Forgejo PR [Jeff]: Open PR from `feature/m3-mcp-adapter` to `master` with description "Add MCP adapter runtime for external tool sources with tests/docs.".
+  - [ ] Git [Jeff]: `git checkout master`
+  - [ ] Git [Jeff]: `git branch -d feature/m3-mcp-adapter`
+  - [ ] Quality [Jeff]: Verify coverage >=97% via `nox -s coverage_report`. If coverage is <97% then review the current unit test coverage report at `build/coverage.xml` and use it to write new Behave based unit tests to improve code coverage. Specifically, write Behave style unit tests that are descriptively named and specifically improves coverage on whichever file has the most uncovered lines by writing tests that will target the uncovered lines in the report. Once that is done rerun `nox -s coverage_report` to verify all tests pass and coverage is above >=97%, if not repeat this task as many times as is needed until coverage reaches >=97%.
 
 - [X] **COMMIT (Owner: Aditya | Group: C4.config | Branch: feature/m3-mcp-config | Done: Day 5, February 13, 2026 21:41:16 +0000) - Commit message: "feat(tool): add tool and validation domain models"**
   - [X] Git [Aditya]: `git checkout master`
@@ -3093,7 +3162,7 @@ No standalone Q0-Advanced commits planned. Advanced QA enhancements are bundled
   - [X] Git [Aditya]: `git checkout master`
   - [X] Git [Aditya]: `git branch -d feature/m3-actor-schema-examples`
   - [X] Quality [Aditya]: Verify coverage >=97% via `nox -s coverage_report`. If coverage is <97% then review the current unit test coverage report at `build/coverage.xml` and use it to write new Behave based unit tests to improve code coverage. Specifically, write Behave style unit tests that are descriptively named and specifically improves coverage on whichever file has the most uncovered lines by writing tests that will target the uncovered lines in the report. Once that is done rerun `nox -s coverage_report` to verify all tests pass and coverage is above >=97%. Only mark this as complete once coverage is >=97%, if not repeat this task as many times as is needed until coverage reaches >=97%.
-- [ ] **COMMIT (Owner: Aditya | Group: C1.examples | Branch: feature/m3-actor-schema-examples | Planned: Day 12 | Expected: Day 18) - Commit message: "docs(actor): add actor yaml examples"**
+- [ ] **COMMIT (Owner: Aditya | Group: C1.examples | Branch: feature/m3-actor-schema-examples | Planned: Day 12 | Expected: Day 19) - Commit message: "docs(actor): add actor yaml examples"**
   - [ ] Git [Aditya]: `git checkout master`
   - [ ] Git [Aditya]: `git pull origin master`
   - [ ] Git [Aditya]: `git checkout -b feature/m3-actor-schema-examples`
@@ -3189,7 +3258,7 @@ No standalone Q0-Advanced commits planned. Advanced QA enhancements are bundled
 **Parallel Group C2: Actor Loading & Compilation [Aditya + Jeff]** (depends on C1)
   **PARALLEL SUBTRACK C2.legacy [Jeff]**: Remove v2 actor config compatibility (after C1.schema)
   **SEQUENTIAL NOTE**: C2.legacy must land before C2.loader/C2.compiler to avoid dual-format support.
-- [ ] **COMMIT (Owner: Aditya | Group: C2.loader | Branch: feature/m3-actor-loader | Planned: Day 13 | Expected: Day 20) - Commit message: "feat(actor): add actor registry and loader"**
+- [ ] **COMMIT (Owner: Aditya | Group: C2.loader | Branch: feature/m3-actor-loader | Planned: Day 13 | Expected: Day 19) - Commit message: "feat(actor): add actor registry and loader"**
   - [ ] Git [Aditya]: `git checkout master`
   - [ ] Git [Aditya]: `git pull origin master`
   - [ ] Git [Aditya]: `git checkout -b feature/m3-actor-loader`
@@ -3209,7 +3278,7 @@ No standalone Q0-Advanced commits planned. Advanced QA enhancements are bundled
   - [ ] Git [Aditya]: `git commit -m "feat(actor): add actor registry and loader"`
   - [ ] Git [Aditya]: `git push -u origin feature/m3-actor-loader`
   - [ ] Forgejo PR [Aditya]: Open PR from `feature/m3-actor-loader` to `master` with description "Add actor registry/loader, discovery rules, and tests.".
-- [ ] **COMMIT (Owner: Jeff | Group: C2.compiler | Branch: feature/m3-actor-compiler | Planned: Day 14 | Expected: Day 21) - Commit message: "feat(actor): compile actor configs to LangGraph"**
+- [ ] **COMMIT (Owner: Jeff | Group: C2.compiler | Branch: feature/m3-actor-compiler | Planned: Day 14 | Expected: Day 20) - Commit message: "feat(actor): compile actor configs to LangGraph"**
   - [ ] Git [Jeff]: `git checkout master`
   - [ ] Git [Jeff]: `git pull origin master`
   - [ ] Git [Jeff]: `git checkout -b feature/m3-actor-compiler`
@@ -3229,7 +3298,7 @@ No standalone Q0-Advanced commits planned. Advanced QA enhancements are bundled
   - [ ] Git [Jeff]: `git commit -m "feat(actor): compile actor configs to LangGraph"`
   - [ ] Git [Jeff]: `git push -u origin feature/m3-actor-compiler`
   - [ ] Forgejo PR [Jeff]: Open PR from `feature/m3-actor-compiler` to `master` with description "Compile actor configs to LangGraph with tool wiring and diagnostics.".
-- [ ] **COMMIT (Owner: Jeff | Group: C2.refs | Branch: feature/m3-actor-refs | Planned: Day 15 | Expected: Day 22) - Commit message: "feat(actor): resolve actor references and subgraphs"**
+- [ ] **COMMIT (Owner: Jeff | Group: C2.refs | Branch: feature/m3-actor-refs | Planned: Day 15 | Expected: Day 20) - Commit message: "feat(actor): resolve actor references and subgraphs"**
   - [ ] Git [Jeff]: `git checkout master`
   - [ ] Git [Jeff]: `git pull origin master`
   - [ ] Git [Jeff]: `git checkout -b feature/m3-actor-refs`
@@ -3249,7 +3318,7 @@ No standalone Q0-Advanced commits planned. Advanced QA enhancements are bundled
   - [ ] Git [Jeff]: `git push -u origin feature/m3-actor-refs`
   - [ ] Forgejo PR [Jeff]: Open PR from `feature/m3-actor-refs` to `master` with description "Resolve actor references/subgraphs with diagnostics and tests.".
 
-- [ ] **COMMIT (Owner: Jeff | Group: C2.legacy | Branch: feature/m3-actor-legacy-cleanup | Planned: Day 16 | Expected: Day 23) - Commit message: "refactor(actor): drop v2 actor config compatibility"**
+- [ ] **COMMIT (Owner: Jeff | Group: C2.legacy | Branch: feature/m3-actor-legacy-cleanup | Planned: Day 16 | Expected: Day 20) - Commit message: "refactor(actor): drop v2 actor config compatibility"**
   - [ ] Git [Jeff]: `git checkout master`
   - [ ] Git [Jeff]: `git pull origin master`
   - [ ] Git [Jeff]: `git checkout -b feature/m3-actor-legacy-cleanup`
@@ -3269,7 +3338,7 @@ No standalone Q0-Advanced commits planned. Advanced QA enhancements are bundled
   - [ ] Forgejo PR [Jeff]: Open PR from `feature/m3-actor-legacy-cleanup` to `master` with description "Drop v2 actor config compatibility and update docs/tests.".
 
 **Parallel Group C2.context: Actor Context Commands [Jeff]** (depends on C2.loader; post-M2)
-- [ ] **COMMIT (Owner: Jeff | Group: C2.context | Branch: feature/m3-actor-context | Planned: Day 17 | Expected: Day 24) - Commit message: "feat(cli): add actor context commands"**
+- [ ] **COMMIT (Owner: Jeff | Group: C2.context | Branch: feature/m3-actor-context | Planned: Day 17 | Expected: Day 20) - Commit message: "feat(cli): add actor context commands"**
   - [ ] Git [Jeff]: `git checkout master`
   - [ ] Git [Jeff]: `git pull origin master`
   - [ ] Git [Jeff]: `git checkout -b feature/m3-actor-context`
@@ -3291,7 +3360,7 @@ No standalone Q0-Advanced commits planned. Advanced QA enhancements are bundled
   - [ ] Forgejo PR [Jeff]: Open PR from `feature/m3-actor-context` to `master` with description "Add actor context CLI commands and tests.".
 
 **Parallel Group C3: Skill Protocol & Context [Jeff]** (critical path; depends on C1)
-- [ ] **COMMIT (Owner: Jeff | Group: C3.protocol | Branch: feature/m3-skill-protocol | Planned: Day 16 | Expected: Day 23) - Commit message: "feat(skill): add skill protocol and metadata"**
+- [ ] **COMMIT (Owner: Jeff | Group: C3.protocol | Branch: feature/m3-skill-protocol | Planned: Day 16 | Expected: Day 20) - Commit message: "feat(skill): add skill protocol and metadata"**
   - [ ] Git [Jeff]: `git checkout master`
   - [ ] Git [Jeff]: `git pull origin master`
   - [ ] Git [Jeff]: `git checkout -b feature/m3-skill-protocol`
@@ -3311,7 +3380,7 @@ No standalone Q0-Advanced commits planned. Advanced QA enhancements are bundled
   - [ ] Git [Jeff]: `git commit -m "feat(skill): add skill protocol and metadata"`
   - [ ] Git [Jeff]: `git push -u origin feature/m3-skill-protocol`
   - [ ] Forgejo PR [Jeff]: Open PR from `feature/m3-skill-protocol` to `master` with description "Add skill protocol, metadata models, and tests.".
-- [ ] **COMMIT (Owner: Jeff | Group: C3.context | Branch: feature/m3-skill-protocol | Planned: Day 17 | Expected: Day 24) - Commit message: "feat(skill): add skill context and registry"**
+- [ ] **COMMIT (Owner: Jeff | Group: C3.context | Branch: feature/m3-skill-protocol | Planned: Day 17 | Expected: Day 20) - Commit message: "feat(skill): add skill context and registry"**
   - [ ] Git [Jeff]: `git checkout master`
   - [ ] Git [Jeff]: `git pull origin master`
   - [ ] Git [Jeff]: `git checkout -b feature/m3-skill-protocol`
@@ -3331,7 +3400,7 @@ No standalone Q0-Advanced commits planned. Advanced QA enhancements are bundled
   - [ ] Git [Jeff]: `git commit -m "feat(skill): add skill context and registry"`
   - [ ] Git [Jeff]: `git push -u origin feature/m3-skill-protocol`
   - [ ] Forgejo PR [Jeff]: Open PR from `feature/m3-skill-protocol` to `master` with description "Add skill context, registry, and change tracking hooks.".
-- [ ] **COMMIT (Owner: Jeff | Group: C3.inline | Branch: feature/m3-skill-protocol | Planned: Day 17 | Expected: Day 24) - Commit message: "feat(skill): add inline tool executor"**
+- [ ] **COMMIT (Owner: Jeff | Group: C3.inline | Branch: feature/m3-skill-protocol | Planned: Day 17 | Expected: Day 20) - Commit message: "feat(skill): add inline tool executor"**
   - [ ] Git [Jeff]: `git checkout master`
   - [ ] Git [Jeff]: `git pull origin master`
   - [ ] Git [Jeff]: `git checkout -b feature/m3-skill-protocol`
@@ -3352,7 +3421,7 @@ No standalone Q0-Advanced commits planned. Advanced QA enhancements are bundled
   - [ ] Forgejo PR [Jeff]: Open PR from `feature/m3-skill-protocol` to `master` with description "Add inline tool executor with safety constraints and tests.".
 
 **Parallel Group C4: Built-in Skills [Jeff + Luis]** (depends on C3)
-- [ ] **COMMIT (Owner: Jeff | Group: C4.file | Branch: feature/m3-skill-file-search | Planned: Day 18 | Expected: Day 25) - Commit message: "feat(skill): add file operation skills"**
+- [ ] **COMMIT (Owner: Jeff | Group: C4.file | Branch: feature/m3-skill-file-search | Planned: Day 18 | Expected: Day 20) - Commit message: "feat(skill): add file operation skills"**
   - [ ] Git [Jeff]: `git checkout master`
   - [ ] Git [Jeff]: `git pull origin master`
   - [ ] Git [Jeff]: `git checkout -b feature/m3-skill-file-search`
@@ -3375,7 +3444,7 @@ No standalone Q0-Advanced commits planned. Advanced QA enhancements are bundled
   - [ ] Git [Jeff]: `git commit -m "feat(skill): add file operation skills"`
   - [ ] Git [Jeff]: `git push -u origin feature/m3-skill-file-search`
   - [ ] Forgejo PR [Jeff]: Open PR from `feature/m3-skill-file-search` to `master` with description "Add file operation skills with sandboxed guards and tests.".
-- [ ] **COMMIT (Owner: Jeff | Group: C4.search | Branch: feature/m3-skill-file-search | Planned: Day 18 | Expected: Day 25) - Commit message: "feat(skill): add directory and search skills"**
+- [ ] **COMMIT (Owner: Jeff | Group: C4.search | Branch: feature/m3-skill-file-search | Planned: Day 18 | Expected: Day 20) - Commit message: "feat(skill): add directory and search skills"**
   - [ ] Git [Jeff]: `git checkout master`
   - [ ] Git [Jeff]: `git pull origin master`
   - [ ] Git [Jeff]: `git checkout -b feature/m3-skill-file-search`
@@ -3397,7 +3466,7 @@ No standalone Q0-Advanced commits planned. Advanced QA enhancements are bundled
   - [ ] Git [Jeff]: `git commit -m "feat(skill): add directory and search skills"`
   - [ ] Git [Jeff]: `git push -u origin feature/m3-skill-file-search`
   - [ ] Forgejo PR [Jeff]: Open PR from `feature/m3-skill-file-search` to `master` with description "Add directory/search skills with deterministic output and tests.".
-- [ ] **COMMIT (Owner: Luis | Group: C4.git | Branch: feature/m3-skill-git | Planned: Day 19 | Expected: Day 26) - Commit message: "feat(skill): add git operation skills"**
+- [ ] **COMMIT (Owner: Luis | Group: C4.git | Branch: feature/m3-skill-git | Planned: Day 19 | Expected: Day 20) - Commit message: "feat(skill): add git operation skills"**
   - [ ] Git [Luis]: `git checkout master`
   - [ ] Git [Luis]: `git pull origin master`
   - [ ] Git [Luis]: `git checkout -b feature/m3-skill-git`
@@ -3421,7 +3490,7 @@ No standalone Q0-Advanced commits planned. Advanced QA enhancements are bundled
   - [ ] Forgejo PR [Luis]: Open PR from `feature/m3-skill-git` to `master` with description "Add read-only git operation skills with safety guards and tests.".
 
 **Parallel Group C5: Tool Routing & Change Tracking [Luis + Jeff]** (depends on C3/C4)
-- [ ] **COMMIT (Owner: Luis | Group: C5.model | Branch: feature/m3-change-model | Planned: Day 19 | Expected: Day 26) - Commit message: "feat(change): add ChangeSet models and invocation tracker"**
+- [ ] **COMMIT (Owner: Luis | Group: C5.model | Branch: feature/m3-change-model | Planned: Day 19 | Expected: Day 20) - Commit message: "feat(change): add ChangeSet models and invocation tracker"**
   - [ ] Git [Luis]: `git checkout master`
   - [ ] Git [Luis]: `git pull origin master`
   - [ ] Git [Luis]: `git checkout -b feature/m3-change-model`
@@ -3444,7 +3513,7 @@ No standalone Q0-Advanced commits planned. Advanced QA enhancements are bundled
   - [ ] Git [Luis]: `git commit -m "feat(change): add ChangeSet models and invocation tracker"`
   - [ ] Git [Luis]: `git push -u origin feature/m3-change-model`
   - [ ] Forgejo PR [Luis]: Open PR from `feature/m3-change-model` to `master` with description "Add ChangeSet models, invocation tracking, and tests.".
-- [ ] **COMMIT (Owner: Jeff | Group: C5.router | Branch: feature/m3-tool-router | Planned: Day 20 | Expected: Day 26) - Commit message: "feat(change): add tool router for providers"**
+- [ ] **COMMIT (Owner: Jeff | Group: C5.router | Branch: feature/m3-tool-router | Planned: Day 20 | Expected: Day 20) - Commit message: "feat(change): add tool router for providers"**
   - [ ] Git [Jeff]: `git checkout master`
   - [ ] Git [Jeff]: `git pull origin master`
   - [ ] Git [Jeff]: `git checkout -b feature/m3-tool-router`
@@ -3468,7 +3537,7 @@ No standalone Q0-Advanced commits planned. Advanced QA enhancements are bundled
   - [ ] Git [Jeff]: `git commit -m "feat(change): add tool router for providers"`
   - [ ] Git [Jeff]: `git push -u origin feature/m3-tool-router`
   - [ ] Forgejo PR [Jeff]: Open PR from `feature/m3-tool-router` to `master` with description "Add tool router for providers with schema mapping and tests.".
-- [ ] **COMMIT (Owner: Luis | Group: C5.diff | Branch: feature/m3-diff-review | Planned: Day 20 | Expected: Day 27) - Commit message: "feat(change): add diff review artifacts"**
+- [ ] **COMMIT (Owner: Luis | Group: C5.diff | Branch: feature/m3-diff-review | Planned: Day 20 | Expected: Day 20) - Commit message: "feat(change): add diff review artifacts"**
   - [ ] Git [Luis]: `git checkout master`
   - [ ] Git [Luis]: `git pull origin master`
   - [ ] Git [Luis]: `git checkout -b feature/m3-diff-review`
@@ -3493,7 +3562,7 @@ No standalone Q0-Advanced commits planned. Advanced QA enhancements are bundled
   - [ ] Forgejo PR [Luis]: Open PR from `feature/m3-diff-review` to `master` with description "Add diff review artifacts and CLI-ready serializers with tests.".
 
 **Parallel Group C6: Validation Pipeline [Luis + Jeff]** (depends on C5 and validation attachment config)
-- [ ] **COMMIT (Owner: Luis | Group: C6.pipeline | Branch: feature/m3-validation-pipeline | Planned: Day 21 | Expected: Day 28) - Commit message: "feat(validation): add validation pipeline and results model"**
+- [ ] **COMMIT (Owner: Luis | Group: C6.pipeline | Branch: feature/m3-validation-pipeline | Planned: Day 21 | Expected: Day 20) - Commit message: "feat(validation): add validation pipeline and results model"**
   - [ ] Git [Luis]: `git checkout master`
   - [ ] Git [Luis]: `git pull origin master`
   - [ ] Git [Luis]: `git checkout -b feature/m3-validation-pipeline`
@@ -3519,7 +3588,7 @@ No standalone Q0-Advanced commits planned. Advanced QA enhancements are bundled
   - [ ] Git [Luis]: `git commit -m "feat(validation): add validation pipeline and results model"`
   - [ ] Git [Luis]: `git push -u origin feature/m3-validation-pipeline`
   - [ ] Forgejo PR [Luis]: Open PR from `feature/m3-validation-pipeline` to `master` with description "Add validation pipeline and results model with ordering/timeout rules and tests.".
-- [ ] **COMMIT (Owner: Jeff | Group: C6.wraps | Branch: feature/m3-validation-wraps | Planned: Day 21 | Expected: Day 28) - Commit message: "feat(validation): support wrapped tools and transforms"**
+- [ ] **COMMIT (Owner: Jeff | Group: C6.wraps | Branch: feature/m3-validation-wraps | Planned: Day 21 | Expected: Day 20) - Commit message: "feat(validation): support wrapped tools and transforms"**
   - [ ] Git [Jeff]: `git checkout master`
   - [ ] Git [Jeff]: `git pull origin master`
   - [ ] Git [Jeff]: `git checkout -b feature/m3-validation-wraps`
@@ -3543,7 +3612,7 @@ No standalone Q0-Advanced commits planned. Advanced QA enhancements are bundled
   - [ ] Git [Jeff]: `git commit -m "feat(validation): support wrapped tools and transforms"`
   - [ ] Git [Jeff]: `git push -u origin feature/m3-validation-wraps`
   - [ ] Forgejo PR [Jeff]: Open PR from `feature/m3-validation-wraps` to `master` with description "Support validation wraps/transform execution with safety guards and tests.".
-- [ ] **COMMIT (Owner: Jeff | Group: C6.gating | Branch: feature/m3-validation-gating | Planned: Day 22 | Expected: Day 29) - Commit message: "feat(validation): integrate validation with apply gating"**
+- [ ] **COMMIT (Owner: Jeff | Group: C6.gating | Branch: feature/m3-validation-gating | Planned: Day 22 | Expected: Day 20) - Commit message: "feat(validation): integrate validation with apply gating"**
   - [ ] Git [Jeff]: `git checkout master`
   - [ ] Git [Jeff]: `git pull origin master`
   - [ ] Git [Jeff]: `git checkout -b feature/m3-validation-gating`
@@ -3568,7 +3637,7 @@ No standalone Q0-Advanced commits planned. Advanced QA enhancements are bundled
   - [ ] Forgejo PR [Jeff]: Open PR from `feature/m3-validation-gating` to `master` with description "Integrate validation gating into apply workflow with CLI summaries and tests.".
 
 **Parallel Group C7: MCP Adapter [Aditya]** (depends on C0.runtime + C1.tool.registry)
-- [ ] **COMMIT (Owner: Aditya | Group: C7.mcp | Branch: feature/m3-mcp-adapter | Planned: Day 18 | Expected: Day 23) - Commit message: "feat(skill): add MCP adapter for external tools"**
+- [ ] **COMMIT (Owner: Aditya | Group: C7.mcp | Branch: feature/m3-mcp-adapter | Planned: Day 18 | Expected: Day 20) - Commit message: "feat(skill): add MCP adapter for external tools"**
   - [ ] Git [Aditya]: `git checkout master`
   - [ ] Git [Aditya]: `git pull origin master`
   - [ ] Git [Aditya]: `git checkout -b feature/m3-mcp-adapter`
@@ -3599,7 +3668,7 @@ No standalone Q0-Advanced commits planned. Advanced QA enhancements are bundled
   - [ ] Git [Aditya]: `git branch -d feature/m3-mcp-adapter`
 
 **Parallel Group C8: Built-in Provider Actors [Aditya]** (depends on C1.schema + C2.loader)
-- [ ] **COMMIT (Owner: Aditya | Group: C8.providers | Branch: feature/m3-provider-actors | Planned: Day 18 | Expected: Day 23) - Commit message: "feat(actor): add built-in provider actors"**
+- [ ] **COMMIT (Owner: Aditya | Group: C8.providers | Branch: feature/m3-provider-actors | Planned: Day 18 | Expected: Day 20) - Commit message: "feat(actor): add built-in provider actors"**
   - [ ] Git [Aditya]: `git checkout master`
   - [ ] Git [Aditya]: `git pull origin master`
   - [ ] Git [Aditya]: `git checkout -b feature/m3-provider-actors`
@@ -3624,67 +3693,35 @@ No standalone Q0-Advanced commits planned. Advanced QA enhancements are bundled
   - [ ] Git [Aditya]: `git checkout master`
   - [ ] Git [Aditya]: `git branch -d feature/m3-provider-actors`
 
-**Parallel Group C9: Plan-Actor Integration [Jeff + Luis]** (depends on C2/C5/C6)
-- [ ] **COMMIT (Owner: Jeff | Group: C9.execute | Branch: feature/m3-plan-execute | Planned: Day 22 | Expected: Day 28) - Commit message: "feat(plan): execute strategize and execute phases via actors"**
+**Parallel Group C9: Plan-Actor Integration (M3) [Jeff]** (depends on C2.loader/C3.compiler + C1.tool.cli + D0b.execute)
+  **SEQUENTIAL NOTE**: Replace M1 stub actors with compiled actors after actor registry + tool CLI land.
+- [ ] **COMMIT (Owner: Jeff | Group: C9.execute | Branch: feature/m3-plan-actor-runtime | Planned: Day 22 | Expected: Day 20) - Commit message: "feat(plan): route strategize/execute through compiled actors"**
   - [ ] Git [Jeff]: `git checkout master`
   - [ ] Git [Jeff]: `git pull origin master`
-  - [ ] Git [Jeff]: `git checkout -b feature/m3-plan-execute`
+  - [ ] Git [Jeff]: `git checkout -b feature/m3-plan-actor-runtime`
   - [ ] Git [Jeff]: `git fetch origin && git merge origin/master` (run before final tests and before commit)
-  - [ ] Code [Jeff]: Add local-only Strategize/Execute stub actors for M1 (no LLM) that can be swapped for compiled actors in C9; keep interface compatible with actor registry.
-  - [ ] Code [Jeff]: Connect PlanLifecycleService to actor execution for Strategize and Execute phases.
-  - [ ] Code [Jeff]: Ensure Strategize is read-only and records decisions without modifying resources.
-  - [ ] Code [Jeff]: Ensure Execute uses sandbox resources and tool calls routed through Tool Router + ChangeSet.
-  - [ ] Code [Jeff]: Add plan status updates for phase start/complete/fail during actor execution.
-  - [ ] Code [Jeff]: Persist decision tree root id and strategy decisions into Plan metadata after Strategize completes.
-  - [ ] Code [Jeff]: Propagate project invariants + action invariants into the strategize actor context.
-  - [ ] Code [Jeff]: Add explicit error handling for actor execution failures (capture error_message + error_details).
-  - [ ] Code [Jeff]: Add execution metadata capture (tool_calls count, changeset_id, sandbox_refs) into Plan.
-  - [ ] Code [Jeff]: Add streaming support hooks for `--stream` to emit interim status updates.
-  - [ ] Code [Jeff]: Add guard to prevent Execute when Plan is not in Strategize COMPLETE state.
-  - [ ] Docs [Jeff]: Add `docs/reference/plan_actor_integration.md` with phase flow.
-  - [ ] Docs [Jeff]: Add error handling and retry notes for Strategize/Execute phases.
-  - [ ] Tests (Behave) [Jeff]: Add `features/plan_actor_integration.feature` for strategy/execute flows.
-  - [ ] Tests (Robot) [Jeff]: Add `robot/plan_actor_integration.robot` for end-to-end actor execution.
-  - [ ] Tests (ASV) [Jeff]: Add `benchmarks/plan_actor_integration_bench.py` for execution overhead.
+  - [ ] Code [Jeff]: Replace M1 stub actors with compiled actor graphs resolved from ActorRegistry (strategy/execution actors).
+  - [ ] Code [Jeff]: Pass plan context (projects, resources, invariants, automation profile) into actor runtime; enforce Strategize read-only constraints.
+  - [ ] Code [Jeff]: Route tool nodes through ToolRunner with binding resolution and sandbox paths; ensure ChangeSet capture remains intact.
+  - [ ] Code [Jeff]: Record Strategize decisions into plan metadata (temporary JSON) until DecisionService lands; include decision IDs once D3 is available.
+  - [ ] Code [Jeff]: Add explicit errors for missing actor configs, compile failures, and tool binding failures with actionable messages.
+  - [ ] Docs [Jeff]: Update `docs/reference/plan_execute.md` with compiled actor runtime notes and failure modes.
+  - [ ] Tests (Behave) [Jeff]: Add scenarios for compiled actor execution, missing actor errors, and tool binding failures.
+  - [ ] Tests (Robot) [Jeff]: Add Robot end-to-end test that executes a compiled actor graph with tool calls.
+  - [ ] Tests (ASV) [Jeff]: Add `benchmarks/plan_actor_runtime_bench.py` for compiled execution overhead.
   - [ ] Quality [Jeff]: Verify coverage >=97% via `nox -s coverage_report`. If coverage is <97% then review the current unit test coverage report at `build/coverage.xml` and use it to write new Behave based unit tests to improve code coverage. Specifically, write Behave style unit tests that are descriptively named and specifically improves coverage on whichever file has the most uncovered lines by writing tests that will target the uncovered lines in the report. Once that is done rerun `nox -s coverage_report` to verify all tests pass and coverage is above >=97%. Only mark this as complete once coverage is >=97%, if not repeat this task as many times as is needed until coverage reaches >=97%.
-  - [ ] Quality [Jeff]: Run `nox` (all default sessions, including benchmark).
-  - [ ] Git [Jeff]: `git add .` (only after nox passes)
-  - [ ] Git [Jeff]: `git commit -m "feat(plan): execute strategize and execute phases via actors"`.
-  - [ ] Git [Jeff]: `git push -u origin feature/m3-plan-execute`
-  - [ ] Forgejo PR [Jeff]: Open PR from `feature/m3-plan-execute` to `master` with description "Integrate actor execution for strategize/execute phases with change tracking.".
-  - [ ] Git [Jeff]: `git checkout master`
-  - [ ] Git [Jeff]: `git branch -d feature/m3-plan-execute`
-- [ ] **COMMIT (Owner: Jeff | Group: C9.apply | Branch: feature/m3-plan-apply | Planned: Day 23 | Expected: Day 29) - Commit message: "feat(plan): integrate change review and apply flow"**
-  - [ ] Git [Jeff]: `git checkout master`
-  - [ ] Git [Jeff]: `git pull origin master`
-  - [ ] Git [Jeff]: `git checkout -b feature/m3-plan-apply`
-  - [ ] Git [Jeff]: `git fetch origin && git merge origin/master` (run before final tests and before commit)
-  - [ ] Code [Jeff]: Wire ChangeSet review artifacts into `plan diff` and review-before-apply flow.
-  - [ ] Code [Jeff]: Ensure Apply merges sandbox into real resources only after required validations pass.
-  - [ ] Code [Jeff]: Persist apply summary (files changed, validations) back into Plan metadata for `plan status`.
-  - [ ] Code [Jeff]: Record apply timestamps and set plan state to terminal `applied` only after merge succeeds.
-  - [ ] Code [Jeff]: Add merge failure handling with rollback to sandbox and explicit error output.
-  - [ ] Code [Jeff]: Add per-resource apply summaries and include in plan artifacts output.
-  - [ ] Code [Jeff]: Add guard to prevent Apply when ChangeSet is empty unless `--allow-empty` is set.
-  - [ ] Docs [Jeff]: Update CLI docs for `plan diff` and `plan apply` review output.
-  - [ ] Docs [Jeff]: Add apply error cases and recovery steps (re-run execute, fix validation).
-  - [ ] Tests (Behave) [Jeff]: Add `features/plan_review_apply.feature` for review gate behavior.
-  - [ ] Tests (Robot) [Jeff]: Add `robot/plan_review_apply.robot` for review-before-apply path.
-  - [ ] Tests (ASV) [Jeff]: Add `benchmarks/plan_apply_bench.py` for apply throughput.
-  - [ ] Quality [Jeff]: Verify coverage >=97% via `nox -s coverage_report`. If coverage is <97% then review the current unit test coverage report at `build/coverage.xml` and use it to write new Behave based unit tests to improve code coverage. Specifically, write Behave style unit tests that are descriptively named and specifically improves coverage on whichever file has the most uncovered lines by writing tests that will target the uncovered lines in the report. Once that is done rerun `nox -s coverage_report` to verify all tests pass and coverage is above >=97%. Only mark this as complete once coverage is >=97%, if not repeat this task as many times as is needed until coverage reaches >=97%.
-  - [ ] Quality [Jeff]: Run `nox` (all default sessions, including benchmark).
-  - [ ] Git [Jeff]: `git add .` (only after nox passes)
-  - [ ] Git [Jeff]: `git commit -m "feat(plan): integrate change review and apply flow"`.
-  - [ ] Git [Jeff]: `git push -u origin feature/m3-plan-apply`
-  - [ ] Forgejo PR [Jeff]: Open PR from `feature/m3-plan-apply` to `master` with description "Integrate change review and apply flow with validation gating and tests.".
-  - [ ] Git [Jeff]: `git checkout master`
-  - [ ] Git [Jeff]: `git branch -d feature/m3-plan-apply`
+  - [ ] Quality [Jeff]: Run `nox` (all default sessions, including benchmark), fix any errors if needed ensuring nox passes across **entire** code base, do not ignore any failure even if it seems unrelated to this commit, fix it.
+  - [ ] Git [Jeff]: Perform an appropriate `git add` command to add all the files that should be part of this commit to the git index
+  - [ ] Git [Jeff]: `git commit -m "feat(plan): route strategize/execute through compiled actors"`
+  - [ ] Git [Jeff]: `git push -u origin feature/m3-plan-actor-runtime`
+  - [ ] Forgejo PR [Jeff]: Open PR from `feature/m3-plan-actor-runtime` to `master` with description "Route strategize/execute through compiled actor graphs with tool binding and tests.".
 
 **M3 SUCCESS CRITERIA**:
 - Actor YAML schema validated; examples load and compile to LangGraph.
 - Skills execute via SkillContext; built-in file/dir/search/git skills available.
 - Tool-based change tracking (no output parsing) produces ChangeSet and diff review artifacts.
 - MCP adapter executes a tool against a test MCP server.
+- Agent Skills packages (SKILL.md) load and register as tools with source metadata.
 - Built-in provider actors available (`openai/`, `anthropic/`, `openrouter/` as configured).
 - Validation pipeline runs validation attachments and blocks apply on required failure.
 - Plan lifecycle uses actors for Strategize/Execute and applies ChangeSet after review.
@@ -3764,14 +3801,22 @@ No standalone Q0-Advanced commits planned. Advanced QA enhancements are bundled
   **PARALLEL SUBTRACK D0b.apply [Jeff]**: Review/diff CLI + apply integration
   **SEQUENTIAL MERGE NOTE**: D0b.execute must land before D0b.apply.
 
-- [ ] **COMMIT (Owner: Jeff | Group: D0b.execute | Branch: feature/m1-plan-execute | Planned: Day 11 | Expected: Day 15) - Commit message: "feat(plan): execute strategize and execute via actors"**
+- [ ] **COMMIT (Owner: Jeff | Group: D0b.execute | Branch: feature/m1-plan-execute | Planned: Day 11 | Expected: Day 13) - Commit message: "feat(plan): execute strategize and execute via actors"**
   - [ ] Git [Jeff]: `git checkout master`
   - [ ] Git [Jeff]: `git pull origin master`
   - [ ] Git [Jeff]: `git checkout -b feature/m1-plan-execute`
   - [ ] Git [Jeff]: `git fetch origin && git merge origin/master` (run before final tests and before commit)
+  - [ ] Code [Jeff]: Add local-only Strategize/Execute stub actors for M1 (no LLM) with interfaces compatible with the actor registry.
   - [ ] Code [Jeff]: Connect PlanLifecycleService to actor execution for Strategize and Execute phases.
-  - [ ] Code [Jeff]: Ensure Execute phase uses ToolRunner and captures ChangeSet IDs in plan metadata.
-  - [ ] Docs [Jeff]: Add execute/strategize integration notes and failure handling to `docs/reference/plan_execute.md`.
+  - [ ] Code [Jeff]: Ensure Strategize is read-only and records decisions without modifying resources.
+  - [ ] Code [Jeff]: Ensure Execute uses sandbox resources and tool calls routed through ToolRunner + ChangeSet capture; persist `changeset_id` in plan metadata.
+  - [ ] Code [Jeff]: Add phase start/complete/fail status updates with `error_message` + `error_details` capture on failures.
+  - [ ] Code [Jeff]: Persist decision tree root id and strategy decisions into Plan metadata after Strategize completes.
+  - [ ] Code [Jeff]: Propagate project/action invariants into strategize context and record enforcement decisions (stubbed until D2 reconciliation).
+  - [ ] Code [Jeff]: Capture execution metadata (tool_calls count, sandbox_refs) into Plan metadata.
+  - [ ] Code [Jeff]: Add streaming hooks for `--stream` to emit interim status updates during Strategize/Execute.
+  - [ ] Code [Jeff]: Add guard to prevent Execute when Plan is not in Strategize COMPLETE state.
+  - [ ] Docs [Jeff]: Add execute/strategize integration notes, error handling, and retry guidance to `docs/reference/plan_execute.md`.
   - [ ] Tests (Behave) [Jeff]: Add `features/plan_actor_integration.feature` for strategy/execute flows.
   - [ ] Tests (Robot) [Jeff]: Add `robot/plan_actor_integration.robot` for end-to-end actor execution.
   - [ ] Tests (ASV) [Jeff]: Add `benchmarks/plan_actor_integration_bench.py` for execution overhead.
@@ -3784,14 +3829,18 @@ No standalone Q0-Advanced commits planned. Advanced QA enhancements are bundled
   - [ ] Git [Jeff]: `git checkout master`
   - [ ] Git [Jeff]: `git branch -d feature/m1-plan-execute`
 
-- [ ] **COMMIT (Owner: Jeff | Group: D0b.apply | Branch: feature/m2-plan-apply-review | Planned: Day 12 | Expected: Day 17) - Commit message: "feat(plan): add diff review and apply integration"**
+- [ ] **COMMIT (Owner: Jeff | Group: D0b.apply | Branch: feature/m2-plan-apply-review | Planned: Day 12 | Expected: Day 15) - Commit message: "feat(plan): add diff review and apply integration"**
   - [ ] Git [Jeff]: `git checkout master`
   - [ ] Git [Jeff]: `git pull origin master`
   - [ ] Git [Jeff]: `git checkout -b feature/m2-plan-apply-review`
   - [ ] Git [Jeff]: `git fetch origin && git merge origin/master` (run before final tests and before commit)
-  - [ ] Code [Jeff]: Add `plan diff` output using ChangeSet summaries and resource diffs.
+  - [ ] Code [Jeff]: Add `plan diff` output using ChangeSet summaries and per-resource diffs.
   - [ ] Code [Jeff]: Add `plan artifacts` output including ChangeSet ID, sandbox refs, and apply summary.
+  - [ ] Code [Jeff]: Persist apply summary (files changed, validations) and apply timestamps into Plan metadata for `plan status`.
+  - [ ] Code [Jeff]: Add merge failure handling with sandbox rollback and explicit error output.
+  - [ ] Code [Jeff]: Add guard to prevent Apply when ChangeSet is empty unless `--allow-empty` is set.
   - [ ] Docs [Jeff]: Update CLI reference for `plan diff`/`plan artifacts` output formats.
+  - [ ] Docs [Jeff]: Add apply error cases and recovery steps (re-run execute, fix validation).
   - [ ] Tests (Behave) [Jeff]: Add `features/plan_diff_artifacts.feature` for diff/artifact output fields.
   - [ ] Tests (Robot) [Jeff]: Add `robot/plan_diff_artifacts.robot` for end-to-end diff/artifacts.
   - [ ] Tests (ASV) [Jeff]: Add `benchmarks/plan_diff_bench.py` for diff rendering overhead.
@@ -3829,7 +3878,7 @@ No standalone Q0-Advanced commits planned. Advanced QA enhancements are bundled
   - [ ] Git [Luis]: `git checkout master`
   - [ ] Git [Luis]: `git branch -d feature/m3-validation-apply`
 
-- [ ] **COMMIT (Owner: Jeff | Group: D1.cli | Branch: feature/m3-validation-status | Planned: Day 16 | Expected: Day 21) - Commit message: "feat(cli): surface validation summaries"**
+- [ ] **COMMIT (Owner: Jeff | Group: D1.cli | Branch: feature/m3-validation-status | Planned: Day 16 | Expected: Day 20) - Commit message: "feat(cli): surface validation summaries"**
   - [ ] Git [Jeff]: `git checkout master`
   - [ ] Git [Jeff]: `git pull origin master`
   - [ ] Git [Jeff]: `git checkout -b feature/m3-validation-status`
@@ -3854,7 +3903,7 @@ No standalone Q0-Advanced commits planned. Advanced QA enhancements are bundled
   **PARALLEL SUBTRACK D2.cli [Jeff]**: CLI commands for invariants
   **SEQUENTIAL MERGE NOTE**: D2.model lands before D2.reconcile/D2.cli.
 
-- [ ] **COMMIT (Owner: Hamza | Group: D2.model | Branch: feature/m4-invariant-model | Planned: Day 19 | Expected: Day 24) - Commit message: "feat(domain): add invariant model and storage"**
+- [ ] **COMMIT (Owner: Hamza | Group: D2.model | Branch: feature/m4-invariant-model | Planned: Day 19 | Expected: Day 25) - Commit message: "feat(domain): add invariant model and storage"**
   - [ ] Git [Hamza]: `git checkout master`
   - [ ] Git [Hamza]: `git pull origin master`
   - [ ] Git [Hamza]: `git checkout -b feature/m4-invariant-model`
@@ -3894,7 +3943,7 @@ No standalone Q0-Advanced commits planned. Advanced QA enhancements are bundled
   - [ ] Git [Jeff]: `git checkout master`
   - [ ] Git [Jeff]: `git branch -d feature/m4-invariant-reconcile`
 
-- [ ] **COMMIT (Owner: Jeff | Group: D2.cli | Branch: feature/m4-invariant-cli | Planned: Day 21 | Expected: Day 26) - Commit message: "feat(cli): add invariant commands"**
+- [ ] **COMMIT (Owner: Jeff | Group: D2.cli | Branch: feature/m4-invariant-cli | Planned: Day 21 | Expected: Day 25) - Commit message: "feat(cli): add invariant commands"**
   - [ ] Git [Jeff]: `git checkout master`
   - [ ] Git [Jeff]: `git pull origin master`
   - [ ] Git [Jeff]: `git checkout -b feature/m4-invariant-cli`
@@ -3919,7 +3968,7 @@ No standalone Q0-Advanced commits planned. Advanced QA enhancements are bundled
   **PARALLEL SUBTRACK D3.cli [Hamza]**: Plan tree/explain CLI
   **SEQUENTIAL MERGE NOTE**: D3.domain → D3.service → D3.cli.
 
-- [ ] **COMMIT (Owner: Hamza | Group: D3.domain | Branch: feature/m4-decision-domain | Planned: Day 21 | Expected: Day 26) - Commit message: "feat(domain): add decision model and context snapshots"**
+- [ ] **COMMIT (Owner: Hamza | Group: D3.domain | Branch: feature/m4-decision-domain | Planned: Day 21 | Expected: Day 25) - Commit message: "feat(domain): add decision model and context snapshots"**
   - [ ] Git [Hamza]: `git checkout master`
   - [ ] Git [Hamza]: `git pull origin master`
   - [ ] Git [Hamza]: `git checkout -b feature/m4-decision-domain`
@@ -3938,7 +3987,7 @@ No standalone Q0-Advanced commits planned. Advanced QA enhancements are bundled
   - [ ] Git [Hamza]: `git checkout master`
   - [ ] Git [Hamza]: `git branch -d feature/m4-decision-domain`
 
-- [ ] **COMMIT (Owner: Hamza | Group: D3.service | Branch: feature/m4-decision-service | Planned: Day 22 | Expected: Day 27) - Commit message: "feat(service): add decision recording and snapshot store"**
+- [ ] **COMMIT (Owner: Hamza | Group: D3.service | Branch: feature/m4-decision-service | Planned: Day 22 | Expected: Day 25) - Commit message: "feat(service): add decision recording and snapshot store"**
   - [ ] Git [Hamza]: `git checkout master`
   - [ ] Git [Hamza]: `git pull origin master`
   - [ ] Git [Hamza]: `git checkout -b feature/m4-decision-service`
@@ -3957,7 +4006,7 @@ No standalone Q0-Advanced commits planned. Advanced QA enhancements are bundled
   - [ ] Git [Hamza]: `git checkout master`
   - [ ] Git [Hamza]: `git branch -d feature/m4-decision-service`
 
-- [ ] **COMMIT (Owner: Hamza | Group: D3.cli | Branch: feature/m4-decision-cli | Planned: Day 23 | Expected: Day 28) - Commit message: "feat(cli): add plan tree and explain commands"**
+- [ ] **COMMIT (Owner: Hamza | Group: D3.cli | Branch: feature/m4-decision-cli | Planned: Day 23 | Expected: Day 25) - Commit message: "feat(cli): add plan tree and explain commands"**
   - [ ] Git [Hamza]: `git checkout master`
   - [ ] Git [Hamza]: `git pull origin master`
   - [ ] Git [Hamza]: `git checkout -b feature/m4-decision-cli`
@@ -3981,7 +4030,7 @@ No standalone Q0-Advanced commits planned. Advanced QA enhancements are bundled
   **PARALLEL SUBTRACK D4.append [Jeff]**: Append corrections
   **SEQUENTIAL MERGE NOTE**: D4.revert lands before D4.append.
 
-- [ ] **COMMIT (Owner: Jeff | Group: D4.revert | Branch: feature/m4-decision-revert | Planned: Day 24 | Expected: Day 29) - Commit message: "feat(service): add decision correction revert flow"**
+- [ ] **COMMIT (Owner: Jeff | Group: D4.revert | Branch: feature/m4-decision-revert | Planned: Day 24 | Expected: Day 25) - Commit message: "feat(service): add decision correction revert flow"**
   - [ ] Git [Jeff]: `git checkout master`
   - [ ] Git [Jeff]: `git pull origin master`
   - [ ] Git [Jeff]: `git checkout -b feature/m4-decision-revert`
@@ -4000,7 +4049,7 @@ No standalone Q0-Advanced commits planned. Advanced QA enhancements are bundled
   - [ ] Git [Jeff]: `git checkout master`
   - [ ] Git [Jeff]: `git branch -d feature/m4-decision-revert`
 
-- [ ] **COMMIT (Owner: Jeff | Group: D4.append | Branch: feature/m4-decision-append | Planned: Day 25 | Expected: Day 30) - Commit message: "feat(service): add decision correction append flow"**
+- [ ] **COMMIT (Owner: Jeff | Group: D4.append | Branch: feature/m4-decision-append | Planned: Day 25 | Expected: Day 25) - Commit message: "feat(service): add decision correction append flow"**
   - [ ] Git [Jeff]: `git checkout master`
   - [ ] Git [Jeff]: `git pull origin master`
   - [ ] Git [Jeff]: `git checkout -b feature/m4-decision-append`
@@ -4020,7 +4069,7 @@ No standalone Q0-Advanced commits planned. Advanced QA enhancements are bundled
   - [ ] Git [Jeff]: `git branch -d feature/m4-decision-append`
 
 **Parallel Group D5: Decision Persistence [Hamza + Luis]** (depends on D1)
-- [ ] **COMMIT (Owner: Hamza | Group: D5.db | Branch: feature/m4-decision-persistence | Planned: Day 24 | Expected: Day 29) - Commit message: "feat(db): add decision tables"**
+- [ ] **COMMIT (Owner: Hamza | Group: D5.db | Branch: feature/m4-decision-persistence | Planned: Day 24 | Expected: Day 25) - Commit message: "feat(db): add decision tables"**
   - [ ] Git [Hamza]: `git checkout master`
   - [ ] Git [Hamza]: `git pull origin master`
   - [ ] Git [Hamza]: `git checkout -b feature/m4-decision-persistence`
@@ -4040,7 +4089,7 @@ No standalone Q0-Advanced commits planned. Advanced QA enhancements are bundled
   - [ ] Forgejo PR [Hamza]: Open PR from `feature/m4-decision-persistence` to `master` with description "Add decision persistence tables and migrations.".
   - [ ] Git [Hamza]: `git checkout master`
   - [ ] Git [Hamza]: `git branch -d feature/m4-decision-persistence`
-- [ ] **COMMIT (Owner: Hamza | Group: D5.repo | Branch: feature/m4-decision-persistence | Planned: Day 25 | Expected: Day 30) - Commit message: "feat(repo): add decision repositories"**
+- [ ] **COMMIT (Owner: Hamza | Group: D5.repo | Branch: feature/m4-decision-persistence | Planned: Day 25 | Expected: Day 25) - Commit message: "feat(repo): add decision repositories"**
   - [ ] Git [Hamza]: `git checkout master`
   - [ ] Git [Hamza]: `git pull origin master`
   - [ ] Git [Hamza]: `git checkout -b feature/m4-decision-persistence`
@@ -4060,7 +4109,7 @@ No standalone Q0-Advanced commits planned. Advanced QA enhancements are bundled
   - [ ] Forgejo PR [Hamza]: Open PR from `feature/m4-decision-persistence` to `master` with description "Add decision repositories and persistence queries.".
   - [ ] Git [Hamza]: `git checkout master`
   - [ ] Git [Hamza]: `git branch -d feature/m4-decision-persistence`
-- [ ] **COMMIT (Owner: Luis | Group: D5.di | Branch: feature/m4-decision-di | Planned: Day 26 | Expected: Day 31) - Commit message: "feat(di): wire decision services"**
+- [ ] **COMMIT (Owner: Luis | Group: D5.di | Branch: feature/m4-decision-di | Planned: Day 26 | Expected: Day 25) - Commit message: "feat(di): wire decision services"**
   - [ ] Git [Luis]: `git checkout master`
   - [ ] Git [Luis]: `git pull origin master`
   - [ ] Git [Luis]: `git checkout -b feature/m4-decision-di`
@@ -4079,7 +4128,7 @@ No standalone Q0-Advanced commits planned. Advanced QA enhancements are bundled
   - [ ] Forgejo PR [Luis]: Open PR from `feature/m4-decision-di` to `master` with description "Wire decision services into DI and CLI with tests.".
   - [ ] Git [Luis]: `git checkout master`
   - [ ] Git [Luis]: `git branch -d feature/m4-decision-di`
-- [ ] **COMMIT (Owner: Brent | Group: D5.tests | Branch: feature/m4-decision-tests | Planned: Day 27 | Expected: Day 31) - Commit message: "test(persistence): add decision persistence suites"**
+- [ ] **COMMIT (Owner: Brent | Group: D5.tests | Branch: feature/m4-decision-tests | Planned: Day 27 | Expected: Day 25) - Commit message: "test(persistence): add decision persistence suites"**
   - [ ] Git [Brent]: `git checkout master`
   - [ ] Git [Brent]: `git pull origin master`
   - [ ] Git [Brent]: `git checkout -b feature/m4-decision-tests`
@@ -4100,7 +4149,7 @@ No standalone Q0-Advanced commits planned. Advanced QA enhancements are bundled
   - [ ] Git [Brent]: `git branch -d feature/m4-decision-tests`
 
 **Parallel Group DOD: Definition of Done + Invariants [Luis + Jeff]** (depends on D2/D4)
-- [ ] **COMMIT (Owner: Luis | Group: DOD.dod | Branch: feature/m4-definition-of-done | Planned: Day 26 | Expected: Day 31) - Commit message: "feat(dod): enforce definition-of-done gating"**
+- [ ] **COMMIT (Owner: Luis | Group: DOD.dod | Branch: feature/m4-definition-of-done | Planned: Day 26 | Expected: Day 25) - Commit message: "feat(dod): enforce definition-of-done gating"**
   - [ ] Git [Luis]: `git checkout master`
   - [ ] Git [Luis]: `git pull origin master`
   - [ ] Git [Luis]: `git checkout -b feature/m4-definition-of-done`
@@ -4123,7 +4172,7 @@ No standalone Q0-Advanced commits planned. Advanced QA enhancements are bundled
   - [ ] Forgejo PR [Luis]: Open PR from `feature/m4-definition-of-done` to `master` with description "Enforce definition-of-done gating with evaluation and tests.".
   - [ ] Git [Luis]: `git checkout master`
   - [ ] Git [Luis]: `git branch -d feature/m4-definition-of-done`
-- [ ] **COMMIT (Owner: Jeff | Group: DOD.invariants | Branch: feature/m4-invariants | Planned: Day 27 | Expected: Day 32) - Commit message: "feat(invariant): add invariant models and enforcement"**
+- [ ] **COMMIT (Owner: Jeff | Group: DOD.invariants | Branch: feature/m4-invariants | Planned: Day 27 | Expected: Day 25) - Commit message: "feat(invariant): add invariant models and enforcement"**
   - [ ] Git [Jeff]: `git checkout master`
   - [ ] Git [Jeff]: `git pull origin master`
   - [ ] Git [Jeff]: `git checkout -b feature/m4-invariants`
@@ -4394,7 +4443,7 @@ No standalone Q0-Advanced commits planned. Advanced QA enhancements are bundled
       }
       ```
       - [X] Commit: "feat(domain): define retriable vs non-retriable failures"
-  - [ ] **COMMIT (Owner: Brent | Group: E1.tests | Branch: feature/m5-subplan-tests | Planned: Day 25 | Expected: Day 28) - Commit message: "test(domain): add subplan model suites"**
+- [ ] **COMMIT (Owner: Brent | Group: E1.tests | Branch: feature/m5-subplan-tests | Planned: Day 25 | Expected: Day 26) - Commit message: "test(domain): add subplan model suites"**
   - [ ] Git [Brent]: `git checkout master`
   - [ ] Git [Brent]: `git pull origin master`
   - [ ] Git [Brent]: `git checkout -b feature/m5-subplan-tests`
@@ -4415,7 +4464,7 @@ No standalone Q0-Advanced commits planned. Advanced QA enhancements are bundled
   - [ ] Git [Brent]: `git branch -d feature/m5-subplan-tests`
 
 **Parallel Group E2: Subplan Spawning [Jeff + Aditya]** (depends on D2 + E1)
-- [ ] **COMMIT (Owner: Jeff | Group: E2.service | Branch: feature/m5-subplan-service | Planned: Day 26 | Expected: Day 29) - Commit message: "feat(service): add subplan service and spawn workflow"**
+- [ ] **COMMIT (Owner: Jeff | Group: E2.service | Branch: feature/m5-subplan-service | Planned: Day 26 | Expected: Day 26) - Commit message: "feat(service): add subplan service and spawn workflow"**
   - [ ] Git [Jeff]: `git checkout master`
   - [ ] Git [Jeff]: `git pull origin master`
   - [ ] Git [Jeff]: `git checkout -b feature/m5-subplan-service`
@@ -4444,7 +4493,7 @@ No standalone Q0-Advanced commits planned. Advanced QA enhancements are bundled
   - [ ] Forgejo PR [Jeff]: Open PR from `feature/m5-subplan-service` to `master` with description "Add subplan service, spawn workflows, and tests.".
   - [ ] Git [Jeff]: `git checkout master`
   - [ ] Git [Jeff]: `git branch -d feature/m5-subplan-service`
-- [ ] **COMMIT (Owner: Aditya | Group: E2.actor | Branch: feature/m5-subplan-actor | Planned: Day 26 | Expected: Day 29) - Commit message: "feat(actor): add plan_subplan tool and decision emission"**
+- [ ] **COMMIT (Owner: Aditya | Group: E2.actor | Branch: feature/m5-subplan-actor | Planned: Day 26 | Expected: Day 26) - Commit message: "feat(actor): add plan_subplan tool and decision emission"**
   - [ ] Git [Aditya]: `git checkout master`
   - [ ] Git [Aditya]: `git pull origin master`
   - [ ] Git [Aditya]: `git checkout -b feature/m5-subplan-actor`
@@ -4471,7 +4520,7 @@ No standalone Q0-Advanced commits planned. Advanced QA enhancements are bundled
   - [ ] Git [Aditya]: `git branch -d feature/m5-subplan-actor`
 
 **Parallel Group E3: Parallel Execution [Luis + Jeff]** (depends on E1/E2)
-- [ ] **COMMIT (Owner: Luis | Group: E3.exec | Branch: feature/m5-subplan-exec | Planned: Day 27 | Expected: Day 30) - Commit message: "feat(service): add subplan scheduler and execution"**
+- [ ] **COMMIT (Owner: Luis | Group: E3.exec | Branch: feature/m5-subplan-exec | Planned: Day 27 | Expected: Day 27) - Commit message: "feat(service): add subplan scheduler and execution"**
   - [ ] Git [Luis]: `git checkout master`
   - [ ] Git [Luis]: `git pull origin master`
   - [ ] Git [Luis]: `git checkout -b feature/m5-subplan-exec`
@@ -4500,7 +4549,7 @@ No standalone Q0-Advanced commits planned. Advanced QA enhancements are bundled
   - [ ] Git [Luis]: `git branch -d feature/m5-subplan-exec`
 
 **Parallel Group E4: Result Merging [Jeff]** (depends on E3)
-- [ ] **COMMIT (Owner: Jeff | Group: E4.merge | Branch: feature/m5-subplan-merge | Planned: Day 28 | Expected: Day 31) - Commit message: "feat(merge): add subplan merge strategies"**
+- [ ] **COMMIT (Owner: Jeff | Group: E4.merge | Branch: feature/m5-subplan-merge | Planned: Day 28 | Expected: Day 27) - Commit message: "feat(merge): add subplan merge strategies"**
   - [ ] Git [Jeff]: `git checkout master`
   - [ ] Git [Jeff]: `git pull origin master`
   - [ ] Git [Jeff]: `git checkout -b feature/m5-subplan-merge`
@@ -4528,7 +4577,7 @@ No standalone Q0-Advanced commits planned. Advanced QA enhancements are bundled
   - [ ] Git [Jeff]: `git branch -d feature/m5-subplan-merge`
 
 **Parallel Group E5: Multi-Project Plans [Hamza]** (depends on E2/E4)
-- [ ] **COMMIT (Owner: Hamza | Group: E5.multi | Branch: feature/m5-multi-project | Planned: Day 29 | Expected: Day 32) - Commit message: "feat(plan): add multi-project subplan support"**
+- [ ] **COMMIT (Owner: Hamza | Group: E5.multi | Branch: feature/m5-multi-project | Planned: Day 29 | Expected: Day 27) - Commit message: "feat(plan): add multi-project subplan support"**
   - [ ] Git [Hamza]: `git checkout master`
   - [ ] Git [Hamza]: `git pull origin master`
   - [ ] Git [Hamza]: `git checkout -b feature/m5-multi-project`
@@ -4561,7 +4610,7 @@ No standalone Q0-Advanced commits planned. Advanced QA enhancements are bundled
 **Local-mode only**: large-project autonomy is required; server connectivity remains stubbed.
 
 **Parallel Group G1: Large-Project Decomposition [Jeff]**
-- [ ] **COMMIT (Owner: Jeff | Group: G1.decompose | Branch: feature/m6-large-decompose | Planned: Day 26 | Expected: Day 31) - Commit message: "feat(plan): add large-project decomposition and dependency closure"**
+- [ ] **COMMIT (Owner: Jeff | Group: G1.decompose | Branch: feature/m6-large-decompose | Planned: Day 26 | Expected: Day 30) - Commit message: "feat(plan): add large-project decomposition and dependency closure"**
   - [ ] Git [Jeff]: `git checkout master`
   - [ ] Git [Jeff]: `git pull origin master`
   - [ ] Git [Jeff]: `git checkout -b feature/m6-large-decompose`
@@ -4591,7 +4640,7 @@ No standalone Q0-Advanced commits planned. Advanced QA enhancements are bundled
   - [ ] Git [Jeff]: `git branch -d feature/m6-large-decompose`
 
 **Parallel Group G2: Checkpointing & Rollback [Luis]**
-- [ ] **COMMIT (Owner: Luis | Group: G2.checkpoint | Branch: feature/m6-checkpoint | Planned: Day 27 | Expected: Day 32) - Commit message: "feat(checkpoint): add checkpointing and rollback"**
+- [ ] **COMMIT (Owner: Luis | Group: G2.checkpoint | Branch: feature/m6-checkpoint | Planned: Day 27 | Expected: Day 30) - Commit message: "feat(checkpoint): add checkpointing and rollback"**
   - [ ] Git [Luis]: `git checkout master`
   - [ ] Git [Luis]: `git pull origin master`
   - [ ] Git [Luis]: `git checkout -b feature/m6-checkpoint`
@@ -4620,7 +4669,7 @@ No standalone Q0-Advanced commits planned. Advanced QA enhancements are bundled
   - [ ] Git [Luis]: `git branch -d feature/m6-checkpoint`
 
 **Parallel Group G3: Semantic Validation [Luis]**
-- [ ] **COMMIT (Owner: Luis | Group: G3.semantic | Branch: feature/m6-semantic-validation | Planned: Day 27 | Expected: Day 32) - Commit message: "feat(validation): add semantic validation service"**
+- [ ] **COMMIT (Owner: Luis | Group: G3.semantic | Branch: feature/m6-semantic-validation | Planned: Day 27 | Expected: Day 30) - Commit message: "feat(validation): add semantic validation service"**
   - [ ] Git [Luis]: `git checkout master`
   - [ ] Git [Luis]: `git pull origin master`
   - [ ] Git [Luis]: `git checkout -b feature/m6-semantic-validation`
@@ -4649,7 +4698,7 @@ No standalone Q0-Advanced commits planned. Advanced QA enhancements are bundled
   - [ ] Git [Luis]: `git branch -d feature/m6-semantic-validation`
 
 **Parallel Group G4: Context Tiers & Views [Hamza]**
-- [ ] **COMMIT (Owner: Hamza | Group: G4.context | Branch: feature/m6-context-tiers | Planned: Day 28 | Expected: Day 33) - Commit message: "feat(context): add hot/warm/cold tiers and actor views"**
+- [ ] **COMMIT (Owner: Hamza | Group: G4.context | Branch: feature/m6-context-tiers | Planned: Day 28 | Expected: Day 30) - Commit message: "feat(context): add hot/warm/cold tiers and actor views"**
   - [ ] Git [Hamza]: `git checkout master`
   - [ ] Git [Hamza]: `git pull origin master`
   - [ ] Git [Hamza]: `git checkout -b feature/m6-context-tiers`
@@ -4679,7 +4728,7 @@ No standalone Q0-Advanced commits planned. Advanced QA enhancements are bundled
   - [ ] Git [Hamza]: `git branch -d feature/m6-context-tiers`
 
 **Parallel Group G5: Cost & Risk Estimation [Hamza]**
-- [ ] **COMMIT (Owner: Hamza | Group: G5.estimate | Branch: feature/m6-estimation | Planned: Day 28 | Expected: Day 33) - Commit message: "feat(estimation): add cost and risk estimation actor"**
+- [ ] **COMMIT (Owner: Hamza | Group: G5.estimate | Branch: feature/m6-estimation | Planned: Day 28 | Expected: Day 30) - Commit message: "feat(estimation): add cost and risk estimation actor"**
   - [ ] Git [Hamza]: `git checkout master`
   - [ ] Git [Hamza]: `git pull origin master`
   - [ ] Git [Hamza]: `git checkout -b feature/m6-estimation`
@@ -4705,7 +4754,7 @@ No standalone Q0-Advanced commits planned. Advanced QA enhancements are bundled
   - [ ] Git [Hamza]: `git branch -d feature/m6-estimation`
 
 **Parallel Group G6: CLI Polish [Jeff]**
-- [ ] **COMMIT (Owner: Jeff | Group: G6.cli | Branch: feature/m6-cli-polish | Planned: Day 29 | Expected: Day 33) - Commit message: "chore(cli): polish help and output"**
+- [ ] **COMMIT (Owner: Jeff | Group: G6.cli | Branch: feature/m6-cli-polish | Planned: Day 29 | Expected: Day 30) - Commit message: "chore(cli): polish help and output"**
   - [ ] Git [Jeff]: `git checkout master`
   - [ ] Git [Jeff]: `git pull origin master`
   - [ ] Git [Jeff]: `git checkout -b feature/m6-cli-polish`
@@ -4737,7 +4786,7 @@ By Day 30, the system must be able to (all in LOCAL MODE, server connectivity is
 - Port source code from one language to another autonomously.
 - Use hierarchical subplans (5+ levels deep) for large tasks.
 - Correct decisions at any point without full re-execution.
-- Operate entirely in local mode (server client stubs in place but not implemented).
+- Operate entirely in local mode (ACP/LSP + server client stubs in place, not implemented).
 
 
 ### Section 9: Server Connectivity (Stubs Only) [By Day 30]
@@ -4745,7 +4794,7 @@ By Day 30, the system must be able to (all in LOCAL MODE, server connectivity is
 **Target: Deliver stubs by M6 (Day 30); full server implementation remains post-Day 30**
 
 **Parallel Group F0: Server Client Stubs [Luis]** (required for M6; no server implementation)
-- [ ] **COMMIT (Owner: Luis | Group: F0.stubs | Branch: feature/m6-server-stubs | Planned: Day 28 | Expected: Day 33) - Commit message: "feat(interfaces): add server client stubs"**
+- [ ] **COMMIT (Owner: Luis | Group: F0.stubs | Branch: feature/m6-server-stubs | Planned: Day 28 | Expected: Day 30) - Commit message: "feat(interfaces): add server client stubs"**
   - [ ] Git [Luis]: `git checkout master`
   - [ ] Git [Luis]: `git pull origin master`
   - [ ] Git [Luis]: `git checkout -b feature/m6-server-stubs`
@@ -4774,6 +4823,50 @@ By Day 30, the system must be able to (all in LOCAL MODE, server connectivity is
   - [ ] Git [Luis]: `git checkout master`
   - [ ] Git [Luis]: `git branch -d feature/m6-server-stubs`
 
+**Parallel Group F1: ACP + LSP Stubs [Jeff + Luis]** (M6; local mode only)
+  **PARALLEL SUBTRACK F1.acp [Luis]**: ACP in-process facade + event stream stub
+  **PARALLEL SUBTRACK F1.lsp [Jeff]**: LSP server stub + wiring to ACP facade
+  **SEQUENTIAL MERGE NOTE**: F1.acp → F1.lsp.
+
+- [ ] **COMMIT (Owner: Luis | Group: F1.acp | Branch: feature/m6-acp-local | Planned: Day 29 | Expected: Day 30) - Commit message: "feat(acp): add local ACP facade stubs"**
+  - [ ] Git [Luis]: `git checkout master`
+  - [ ] Git [Luis]: `git pull origin master`
+  - [ ] Git [Luis]: `git checkout -b feature/m6-acp-local`
+  - [ ] Git [Luis]: `git fetch origin && git merge origin/master` (run before final tests and before commit)
+  - [ ] Code [Luis]: Add ACP request/response models for session, plan lifecycle, registry access, and event streaming envelopes.
+  - [ ] Code [Luis]: Implement in-process ACP facade that maps ACP calls to existing services in local mode (no network).
+  - [ ] Code [Luis]: Add ACP event stream stub with in-memory queue and explicit "not implemented for remote" errors.
+  - [ ] Code [Luis]: Add ACP version negotiation helper with default version and rejection for unsupported versions.
+  - [ ] Docs [Luis]: Add `docs/reference/acp_local.md` describing local-mode ACP behavior and stubbed server calls.
+  - [ ] Tests (Behave) [Luis]: Add scenarios for ACP request validation, session create/list, and plan lifecycle calls routed to services.
+  - [ ] Tests (Robot) [Luis]: Add Robot smoke test that calls ACP facade endpoints via CLI wrapper.
+  - [ ] Tests (ASV) [Luis]: Add `benchmarks/acp_facade_bench.py` for request serialization overhead.
+  - [ ] Quality [Luis]: Verify coverage >=97% via `nox -s coverage_report`. If coverage is <97% then review the current unit test coverage report at `build/coverage.xml` and use it to write new Behave based unit tests to improve code coverage. Specifically, write Behave style unit tests that are descriptively named and specifically improves coverage on whichever file has the most uncovered lines by writing tests that will target the uncovered lines in the report. Once that is done rerun `nox -s coverage_report` to verify all tests pass and coverage is above >=97%. Only mark this as complete once coverage is >=97%, if not repeat this task as many times as is needed until coverage reaches >=97%.
+  - [ ] Quality [Luis]: Run `nox` (all default sessions, including benchmark), fix any errors if needed ensuring nox passes across **entire** code base, do not ignore any failure even if it seems unrelated to this commit, fix it.
+  - [ ] Git [Luis]: Perform an appropriate `git add` command to add all the files that should be part of this commit to the git index
+  - [ ] Git [Luis]: `git commit -m "feat(acp): add local ACP facade stubs"`
+  - [ ] Git [Luis]: `git push -u origin feature/m6-acp-local`
+  - [ ] Forgejo PR [Luis]: Open PR from `feature/m6-acp-local` to `master` with description "Add local ACP facade models and stubs for session/plan/registry calls.".
+
+- [ ] **COMMIT (Owner: Jeff | Group: F1.lsp | Branch: feature/m6-lsp-stub | Planned: Day 29 | Expected: Day 30) - Commit message: "feat(lsp): add LSP server stub"**
+  - [ ] Git [Jeff]: `git checkout master`
+  - [ ] Git [Jeff]: `git pull origin master`
+  - [ ] Git [Jeff]: `git checkout -b feature/m6-lsp-stub`
+  - [ ] Git [Jeff]: `git fetch origin && git merge origin/master` (run before final tests and before commit)
+  - [ ] Code [Jeff]: Add minimal LSP server entrypoint that supports initialize/shutdown and reports stubbed capability set.
+  - [ ] Code [Jeff]: Wire LSP requests to ACP facade (local mode) and return explicit "not implemented" responses for unsupported methods.
+  - [ ] Code [Jeff]: Add CLI command `agents lsp` to launch the stub server with logging and PID output.
+  - [ ] Docs [Jeff]: Add `docs/reference/lsp_stub.md` with usage notes and supported methods.
+  - [ ] Tests (Behave) [Jeff]: Add scenarios for LSP initialize/shutdown handshake and stub error responses.
+  - [ ] Tests (Robot) [Jeff]: Add Robot smoke test that launches the LSP stub and validates startup banner.
+  - [ ] Tests (ASV) [Jeff]: Add `benchmarks/lsp_stub_bench.py` for startup latency.
+  - [ ] Quality [Jeff]: Verify coverage >=97% via `nox -s coverage_report`. If coverage is <97% then review the current unit test coverage report at `build/coverage.xml` and use it to write new Behave based unit tests to improve code coverage. Specifically, write Behave style unit tests that are descriptively named and specifically improves coverage on whichever file has the most uncovered lines by writing tests that will target the uncovered lines in the report. Once that is done rerun `nox -s coverage_report` to verify all tests pass and coverage is above >=97%. Only mark this as complete once coverage is >=97%, if not repeat this task as many times as is needed until coverage reaches >=97%.
+  - [ ] Quality [Jeff]: Run `nox` (all default sessions, including benchmark), fix any errors if needed ensuring nox passes across **entire** code base, do not ignore any failure even if it seems unrelated to this commit, fix it.
+  - [ ] Git [Jeff]: Perform an appropriate `git add` command to add all the files that should be part of this commit to the git index
+  - [ ] Git [Jeff]: `git commit -m "feat(lsp): add LSP server stub"`
+  - [ ] Git [Jeff]: `git push -u origin feature/m6-lsp-stub`
+  - [ ] Forgejo PR [Jeff]: Open PR from `feature/m6-lsp-stub` to `master` with description "Add LSP server stub wired to ACP facade with tests and docs.".
+
 **M7 SUCCESS CRITERIA** (Post-Day 30):
 - `agents [--data-dir PATH] [--config-path PATH] connect <server_url>` establishes connection to an external server.
 - Plans can be synced and executed on a remote server.
@@ -4843,7 +4936,7 @@ By Day 30, the system must be able to (all in LOCAL MODE, server connectivity is
   - [ ] Git [Luis]: `git branch -d feature/m6-async-infra`
 
 **Parallel Group 10B: Selective Quality Review [Brent]**
-- [ ] **COMMIT (Owner: Brent | Group: 10B.review | Branch: feature/m6-review-playbook | Planned: Day 22 | Expected: Day 26) - Commit message: "docs(qa): add review playbook and priority matrix"**
+- [ ] **COMMIT (Owner: Brent | Group: 10B.review | Branch: feature/m6-review-playbook | Planned: Day 22 | Expected: Day 25) - Commit message: "docs(qa): add review playbook and priority matrix"**
   - [ ] Git [Brent]: `git checkout master`
   - [ ] Git [Brent]: `git pull origin master`
   - [ ] Git [Brent]: `git checkout -b feature/m6-review-playbook`
@@ -4868,7 +4961,7 @@ By Day 30, the system must be able to (all in LOCAL MODE, server connectivity is
   - [ ] Git [Brent]: `git branch -d feature/m6-review-playbook`
 
 **Parallel Group 10C: Validation Testing Support [Brent + Luis]**
-- [ ] **COMMIT (Owner: Brent | Group: 10C.edge | Branch: feature/m6-validation-edge | Planned: Day 24 | Expected: Day 29) - Commit message: "test(validation): add edge case suites"**
+- [ ] **COMMIT (Owner: Brent | Group: 10C.edge | Branch: feature/m6-validation-edge | Planned: Day 24 | Expected: Day 27) - Commit message: "test(validation): add edge case suites"**
   - [ ] Git [Brent]: `git checkout master`
   - [ ] Git [Brent]: `git pull origin master`
   - [ ] Git [Brent]: `git checkout -b feature/m6-validation-edge`
@@ -4889,7 +4982,7 @@ By Day 30, the system must be able to (all in LOCAL MODE, server connectivity is
   - [ ] Forgejo PR [Brent]: Open PR from `feature/m6-validation-edge` to `master` with description "Add validation edge-case suites and fixtures.".
   - [ ] Git [Brent]: `git checkout master`
   - [ ] Git [Brent]: `git branch -d feature/m6-validation-edge`
-- [ ] **COMMIT (Owner: Luis | Group: 10C.semantic | Branch: feature/m6-validation-semantic | Planned: Day 25 | Expected: Day 30) - Commit message: "test(validation): add semantic validation suites"**
+- [ ] **COMMIT (Owner: Luis | Group: 10C.semantic | Branch: feature/m6-validation-semantic | Planned: Day 25 | Expected: Day 28) - Commit message: "test(validation): add semantic validation suites"**
   - [ ] Git [Luis]: `git checkout master`
   - [ ] Git [Luis]: `git pull origin master`
   - [ ] Git [Luis]: `git checkout -b feature/m6-validation-semantic`
@@ -4910,7 +5003,7 @@ By Day 30, the system must be able to (all in LOCAL MODE, server connectivity is
   - [ ] Forgejo PR [Luis]: Open PR from `feature/m6-validation-semantic` to `master` with description "Add semantic validation test suites and fixtures.".
   - [ ] Git [Luis]: `git checkout master`
   - [ ] Git [Luis]: `git branch -d feature/m6-validation-semantic`
-- [ ] **COMMIT (Owner: Brent | Group: 10C.performance | Branch: feature/m6-perf-scale | Planned: Day 26 | Expected: Day 31) - Commit message: "test(perf): add scale test fixtures"**
+- [ ] **COMMIT (Owner: Brent | Group: 10C.performance | Branch: feature/m6-perf-scale | Planned: Day 26 | Expected: Day 29) - Commit message: "test(perf): add scale test fixtures"**
   - [ ] Git [Brent]: `git checkout master`
   - [ ] Git [Brent]: `git pull origin master`
   - [ ] Git [Brent]: `git checkout -b feature/m6-perf-scale`
@@ -4941,7 +5034,7 @@ By Day 30, the system must be able to (all in LOCAL MODE, server connectivity is
 **Note**: Security tasks focus on runtime protections; quality gates are handled in Section 0.
 
 **Parallel Group SEC1: Remove eval() usage [Luis]**
-- [ ] **COMMIT (Owner: Luis | Group: SEC1.eval | Branch: feature/m4-security-eval | Planned: Day 11 | Expected: Day 13) - Commit message: "fix(security): remove eval-based config parsing"**
+- [ ] **COMMIT (Owner: Luis | Group: SEC1.eval | Branch: feature/m4-security-eval | Planned: Day 11 | Expected: Day 25) - Commit message: "fix(security): remove eval-based config parsing"**
   - [ ] Git [Luis]: `git checkout master`
   - [ ] Git [Luis]: `git pull origin master`
   - [ ] Git [Luis]: `git checkout -b feature/m4-security-eval`
@@ -4964,7 +5057,7 @@ By Day 30, the system must be able to (all in LOCAL MODE, server connectivity is
   - [ ] Git [Luis]: `git branch -d feature/m4-security-eval`
 
 **Parallel Group SEC2: Template Injection Prevention [Luis]**
-- [ ] **COMMIT (Owner: Luis | Group: SEC2.template | Branch: feature/m4-security-template | Planned: Day 11 | Expected: Day 13) - Commit message: "fix(security): harden template rendering"**
+- [ ] **COMMIT (Owner: Luis | Group: SEC2.template | Branch: feature/m4-security-template | Planned: Day 11 | Expected: Day 25) - Commit message: "fix(security): harden template rendering"**
   - [ ] Git [Luis]: `git checkout master`
   - [ ] Git [Luis]: `git pull origin master`
   - [ ] Git [Luis]: `git checkout -b feature/m4-security-template`
@@ -4988,7 +5081,7 @@ By Day 30, the system must be able to (all in LOCAL MODE, server connectivity is
   - [ ] Git [Luis]: `git branch -d feature/m4-security-template`
 
 **Parallel Group SEC3: Exception Handling Audit [Luis]**
-- [ ] **COMMIT (Owner: Luis | Group: SEC3.exceptions | Branch: feature/m4-security-exceptions | Planned: Day 12 | Expected: Day 14) - Commit message: "fix(security): enforce explicit exception handling"**
+- [ ] **COMMIT (Owner: Luis | Group: SEC3.exceptions | Branch: feature/m4-security-exceptions | Planned: Day 12 | Expected: Day 25) - Commit message: "fix(security): enforce explicit exception handling"**
   - [ ] Git [Luis]: `git checkout master`
   - [ ] Git [Luis]: `git pull origin master`
   - [ ] Git [Luis]: `git checkout -b feature/m4-security-exceptions`
@@ -5012,7 +5105,7 @@ By Day 30, the system must be able to (all in LOCAL MODE, server connectivity is
   - [ ] Git [Luis]: `git branch -d feature/m4-security-exceptions`
 
 **Parallel Group SEC4: Async Lifecycle Correctness [Luis]**
-- [ ] **COMMIT (Owner: Luis | Group: SEC4.async | Branch: feature/m4-security-async-cleanup | Planned: Day 12 | Expected: Day 14) - Commit message: "fix(security): close async resources and leaks"**
+- [ ] **COMMIT (Owner: Luis | Group: SEC4.async | Branch: feature/m4-security-async-cleanup | Planned: Day 12 | Expected: Day 25) - Commit message: "fix(security): close async resources and leaks"**
   - [ ] Git [Luis]: `git checkout master`
   - [ ] Git [Luis]: `git pull origin master`
   - [ ] Git [Luis]: `git checkout -b feature/m4-security-async-cleanup`
@@ -5332,7 +5425,7 @@ By Day 30, the system must be able to (all in LOCAL MODE, server connectivity is
 **Target: Begin scaffolding by Day 25; full implementation after M6 (local mode only)**
 
 **Parallel Group ACMS1: UKO Ontology Scaffold [Hamza]**
-- [ ] **COMMIT (Owner: Hamza | Group: ACMS1.uko | Branch: feature/m6-acms-uko-schema | Planned: Day 26 | Expected: Day 28) - Commit message: "feat(uko): add UKO ontology scaffolding"**
+- [ ] **COMMIT (Owner: Hamza | Group: ACMS1.uko | Branch: feature/m6-acms-uko-schema | Planned: Day 26 | Expected: Day 29) - Commit message: "feat(uko): add UKO ontology scaffolding"**
   - [ ] Git [Hamza]: `git checkout master`
   - [ ] Git [Hamza]: `git pull origin master`
   - [ ] Git [Hamza]: `git checkout -b feature/m6-acms-uko-schema`
@@ -5463,7 +5556,7 @@ By Day 30, the system must be able to (all in LOCAL MODE, server connectivity is
   - [ ] Git [Hamza]: `git branch -d feature/m6-acms-scoped-view`
 
 **Parallel Group ACMS6: Skeleton Compression [Jeff]** (depends on ACMS4 + G4 context tiers)
-- [ ] **COMMIT (Owner: Jeff | Group: ACMS6.skeleton | Branch: feature/m6-acms-skeleton-compress | Planned: Day 29 | Expected: Day 31) - Commit message: "feat(acms): add skeleton compressor"**
+- [ ] **COMMIT (Owner: Jeff | Group: ACMS6.skeleton | Branch: feature/m6-acms-skeleton-compress | Planned: Day 29 | Expected: Day 30) - Commit message: "feat(acms): add skeleton compressor"**
   - [ ] Git [Jeff]: `git checkout master`
   - [ ] Git [Jeff]: `git pull origin master`
   - [ ] Git [Jeff]: `git checkout -b feature/m6-acms-skeleton-compress`