✨ feat(main_loop): harden plan execution state
Validate required Plan Meta before claims, record claim ownership, and persist verification evidence on completion. Document conditional skill triggers without adding them to automatic main-loop dispatch.
This commit is contained in:
+294
-10
@@ -27,6 +27,26 @@ def run_cli(*args, cwd=None):
|
||||
)
|
||||
|
||||
|
||||
def valid_plan_text(title: str = "Demo Plan") -> str:
|
||||
return "\n".join(
|
||||
[
|
||||
f"# {title}",
|
||||
"",
|
||||
"## Plan Meta",
|
||||
"",
|
||||
"- **Plan Group**: `demo`",
|
||||
"- **Parent Plan**: `none`",
|
||||
"- **Verification Scope**: `unit`",
|
||||
"- **Verification Gate**: `python -m unittest tests.test_main_loop_cli`",
|
||||
"",
|
||||
"## Tasks",
|
||||
"",
|
||||
"- [ ] Task 1: demo",
|
||||
"",
|
||||
]
|
||||
)
|
||||
|
||||
|
||||
class MainLoopCliTests(unittest.TestCase):
|
||||
def _current_env(self) -> str:
|
||||
system = platform.system().lower()
|
||||
@@ -40,8 +60,12 @@ class MainLoopCliTests(unittest.TestCase):
|
||||
root = Path(tmp_dir)
|
||||
plans_dir = root / "docs" / "superpowers" / "plans"
|
||||
plans_dir.mkdir(parents=True)
|
||||
(plans_dir / "2026-01-01-old.md").write_text("old", encoding="utf-8")
|
||||
(plans_dir / "2026-01-02-new.md").write_text("new", encoding="utf-8")
|
||||
(plans_dir / "2026-01-01-old.md").write_text(
|
||||
valid_plan_text("old"), encoding="utf-8"
|
||||
)
|
||||
(plans_dir / "2026-01-02-new.md").write_text(
|
||||
valid_plan_text("new"), encoding="utf-8"
|
||||
)
|
||||
|
||||
result = run_cli(
|
||||
"claim",
|
||||
@@ -74,7 +98,9 @@ class MainLoopCliTests(unittest.TestCase):
|
||||
root = Path(tmp_dir)
|
||||
plans_dir = root / "docs" / "superpowers" / "plans"
|
||||
plans_dir.mkdir(parents=True)
|
||||
(plans_dir / "2026-01-01-demo.md").write_text("demo", encoding="utf-8")
|
||||
(plans_dir / "2026-01-01-demo.md").write_text(
|
||||
valid_plan_text(), encoding="utf-8"
|
||||
)
|
||||
|
||||
progress = root / "memory-bank" / "progress.md"
|
||||
progress.parent.mkdir(parents=True)
|
||||
@@ -119,8 +145,12 @@ class MainLoopCliTests(unittest.TestCase):
|
||||
root = Path(tmp_dir)
|
||||
plans_dir = root / "docs" / "superpowers" / "plans"
|
||||
plans_dir.mkdir(parents=True)
|
||||
(plans_dir / "2026-01-01-a.md").write_text("a", encoding="utf-8")
|
||||
(plans_dir / "2026-01-02-b.md").write_text("b", encoding="utf-8")
|
||||
(plans_dir / "2026-01-01-a.md").write_text(
|
||||
valid_plan_text("a"), encoding="utf-8"
|
||||
)
|
||||
(plans_dir / "2026-01-02-b.md").write_text(
|
||||
valid_plan_text("b"), encoding="utf-8"
|
||||
)
|
||||
|
||||
progress = root / "memory-bank" / "progress.md"
|
||||
progress.parent.mkdir(parents=True)
|
||||
@@ -159,7 +189,9 @@ class MainLoopCliTests(unittest.TestCase):
|
||||
root = Path(tmp_dir)
|
||||
plans_dir = root / "docs" / "superpowers" / "plans"
|
||||
plans_dir.mkdir(parents=True)
|
||||
(plans_dir / "2026-01-02-live.md").write_text("live", encoding="utf-8")
|
||||
(plans_dir / "2026-01-02-live.md").write_text(
|
||||
valid_plan_text("live"), encoding="utf-8"
|
||||
)
|
||||
|
||||
progress = root / "memory-bank" / "progress.md"
|
||||
progress.parent.mkdir(parents=True)
|
||||
@@ -202,7 +234,9 @@ class MainLoopCliTests(unittest.TestCase):
|
||||
root = Path(tmp_dir)
|
||||
plans_dir = root / "docs" / "superpowers" / "plans"
|
||||
plans_dir.mkdir(parents=True)
|
||||
(plans_dir / "2026-01-05-env.md").write_text("env", encoding="utf-8")
|
||||
(plans_dir / "2026-01-05-env.md").write_text(
|
||||
valid_plan_text("env"), encoding="utf-8"
|
||||
)
|
||||
|
||||
progress = root / "memory-bank" / "progress.md"
|
||||
progress.parent.mkdir(parents=True)
|
||||
@@ -250,9 +284,11 @@ class MainLoopCliTests(unittest.TestCase):
|
||||
root = Path(tmp_dir)
|
||||
plans_dir = root / "docs" / "superpowers" / "plans"
|
||||
plans_dir.mkdir(parents=True)
|
||||
(plans_dir / "2026-01-01-env.md").write_text("env", encoding="utf-8")
|
||||
(plans_dir / "2026-01-01-env.md").write_text(
|
||||
valid_plan_text("env"), encoding="utf-8"
|
||||
)
|
||||
(plans_dir / "2026-01-02-pending.md").write_text(
|
||||
"pending", encoding="utf-8"
|
||||
valid_plan_text("pending"), encoding="utf-8"
|
||||
)
|
||||
|
||||
progress = root / "memory-bank" / "progress.md"
|
||||
@@ -294,6 +330,99 @@ class MainLoopCliTests(unittest.TestCase):
|
||||
),
|
||||
)
|
||||
|
||||
def test_claim_rejects_plan_missing_required_plan_meta(self):
|
||||
with tempfile.TemporaryDirectory() as tmp_dir:
|
||||
root = Path(tmp_dir)
|
||||
plans_dir = root / "docs" / "superpowers" / "plans"
|
||||
plans_dir.mkdir(parents=True)
|
||||
(plans_dir / "2026-01-01-invalid.md").write_text(
|
||||
"# Invalid Plan\n\n- [ ] Task 1: missing metadata\n",
|
||||
encoding="utf-8",
|
||||
)
|
||||
|
||||
result = run_cli(
|
||||
"claim",
|
||||
"-plans",
|
||||
"docs/superpowers/plans",
|
||||
"-progress",
|
||||
"memory-bank/progress.md",
|
||||
cwd=root,
|
||||
)
|
||||
|
||||
self.assertEqual(result.returncode, 2)
|
||||
self.assertIn("missing required Plan Meta", result.stderr)
|
||||
self.assertIn("2026-01-01-invalid.md", result.stderr)
|
||||
|
||||
def test_claim_records_claim_metadata_in_workflow_state(self):
|
||||
with tempfile.TemporaryDirectory() as tmp_dir:
|
||||
root = Path(tmp_dir)
|
||||
plans_dir = root / "docs" / "superpowers" / "plans"
|
||||
plans_dir.mkdir(parents=True)
|
||||
(plans_dir / "2026-01-01-demo.md").write_text(
|
||||
valid_plan_text(), encoding="utf-8"
|
||||
)
|
||||
|
||||
result = run_cli(
|
||||
"claim",
|
||||
"-plans",
|
||||
"docs/superpowers/plans",
|
||||
"-progress",
|
||||
"memory-bank/progress.md",
|
||||
"-owner",
|
||||
"codex-test",
|
||||
cwd=root,
|
||||
)
|
||||
|
||||
self.assertEqual(result.returncode, 0, msg=result.stderr)
|
||||
text = (root / "memory-bank" / "progress.md").read_text(
|
||||
encoding="utf-8"
|
||||
)
|
||||
self.assertIn("claimed_by: codex-test", text)
|
||||
self.assertRegex(text, r"claimed_at: \d{4}-\d{2}-\d{2}T")
|
||||
|
||||
def test_claim_clears_stale_verification_from_workflow_state(self):
|
||||
with tempfile.TemporaryDirectory() as tmp_dir:
|
||||
root = Path(tmp_dir)
|
||||
plans_dir = root / "docs" / "superpowers" / "plans"
|
||||
plans_dir.mkdir(parents=True)
|
||||
(plans_dir / "2026-01-01-demo.md").write_text(
|
||||
valid_plan_text(), encoding="utf-8"
|
||||
)
|
||||
|
||||
progress = root / "memory-bank" / "progress.md"
|
||||
progress.parent.mkdir(parents=True)
|
||||
progress.write_text(
|
||||
"\n".join(
|
||||
[
|
||||
"# 当前进展",
|
||||
"",
|
||||
"<!-- workflow-state:start -->",
|
||||
"phase: done",
|
||||
"verification: old evidence",
|
||||
"<!-- workflow-state:end -->",
|
||||
"",
|
||||
"<!-- plan-status:start -->",
|
||||
"- [ ] `2026-01-01-demo.md` pending",
|
||||
"<!-- plan-status:end -->",
|
||||
"",
|
||||
]
|
||||
),
|
||||
encoding="utf-8",
|
||||
)
|
||||
|
||||
result = run_cli(
|
||||
"claim",
|
||||
"-plans",
|
||||
"docs/superpowers/plans",
|
||||
"-progress",
|
||||
"memory-bank/progress.md",
|
||||
cwd=root,
|
||||
)
|
||||
|
||||
self.assertEqual(result.returncode, 0, msg=result.stderr)
|
||||
text = progress.read_text(encoding="utf-8")
|
||||
self.assertNotIn("verification: old evidence", text)
|
||||
|
||||
def test_finish_updates_line(self):
|
||||
with tempfile.TemporaryDirectory() as tmp_dir:
|
||||
root = Path(tmp_dir)
|
||||
@@ -332,6 +461,98 @@ class MainLoopCliTests(unittest.TestCase):
|
||||
1,
|
||||
)
|
||||
|
||||
def test_finish_done_records_verification_evidence(self):
|
||||
with tempfile.TemporaryDirectory() as tmp_dir:
|
||||
root = Path(tmp_dir)
|
||||
progress = root / "memory-bank" / "progress.md"
|
||||
progress.parent.mkdir(parents=True)
|
||||
progress.write_text(
|
||||
"\n".join(
|
||||
[
|
||||
"# Plan 状态",
|
||||
"",
|
||||
"<!-- workflow-state:start -->",
|
||||
"phase: executing",
|
||||
"plan: docs/superpowers/plans/2026-01-03-demo.md",
|
||||
"<!-- workflow-state:end -->",
|
||||
"",
|
||||
"<!-- plan-status:start -->",
|
||||
"- [ ] `2026-01-03-demo.md` in-progress",
|
||||
"<!-- plan-status:end -->",
|
||||
"",
|
||||
]
|
||||
),
|
||||
encoding="utf-8",
|
||||
)
|
||||
|
||||
result = run_cli(
|
||||
"finish",
|
||||
"-plan",
|
||||
"docs/superpowers/plans/2026-01-03-demo.md",
|
||||
"-status",
|
||||
"done",
|
||||
"-progress",
|
||||
"memory-bank/progress.md",
|
||||
"-verified",
|
||||
"python -m unittest tests.test_main_loop_cli",
|
||||
cwd=root,
|
||||
)
|
||||
|
||||
self.assertEqual(result.returncode, 0, msg=result.stderr)
|
||||
text = progress.read_text(encoding="utf-8")
|
||||
self.assertIn(
|
||||
"- [x] `2026-01-03-demo.md` done: "
|
||||
"verified: python -m unittest tests.test_main_loop_cli",
|
||||
text,
|
||||
)
|
||||
self.assertIn(
|
||||
"verification: python -m unittest tests.test_main_loop_cli",
|
||||
text,
|
||||
)
|
||||
|
||||
def test_finish_without_verified_clears_stale_verification(self):
|
||||
with tempfile.TemporaryDirectory() as tmp_dir:
|
||||
root = Path(tmp_dir)
|
||||
progress = root / "memory-bank" / "progress.md"
|
||||
progress.parent.mkdir(parents=True)
|
||||
progress.write_text(
|
||||
"\n".join(
|
||||
[
|
||||
"# Plan 状态",
|
||||
"",
|
||||
"<!-- workflow-state:start -->",
|
||||
"phase: executing",
|
||||
"plan: docs/superpowers/plans/2026-01-03-demo.md",
|
||||
"verification: old evidence",
|
||||
"<!-- workflow-state:end -->",
|
||||
"",
|
||||
"<!-- plan-status:start -->",
|
||||
"- [ ] `2026-01-03-demo.md` in-progress",
|
||||
"<!-- plan-status:end -->",
|
||||
"",
|
||||
]
|
||||
),
|
||||
encoding="utf-8",
|
||||
)
|
||||
|
||||
result = run_cli(
|
||||
"finish",
|
||||
"-plan",
|
||||
"docs/superpowers/plans/2026-01-03-demo.md",
|
||||
"-status",
|
||||
"blocked",
|
||||
"-progress",
|
||||
"memory-bank/progress.md",
|
||||
"-note",
|
||||
"needs confirmation",
|
||||
cwd=root,
|
||||
)
|
||||
|
||||
self.assertEqual(result.returncode, 0, msg=result.stderr)
|
||||
text = progress.read_text(encoding="utf-8")
|
||||
self.assertNotIn("verification: old evidence", text)
|
||||
self.assertIn("phase: blocked", text)
|
||||
|
||||
def test_finish_updates_workflow_phase_and_preserves_metadata(self):
|
||||
with tempfile.TemporaryDirectory() as tmp_dir:
|
||||
root = Path(tmp_dir)
|
||||
@@ -491,7 +712,9 @@ class MainLoopCliTests(unittest.TestCase):
|
||||
root = Path(tmp_dir)
|
||||
plans_dir = root / "docs" / "superpowers" / "plans"
|
||||
plans_dir.mkdir(parents=True)
|
||||
(plans_dir / "2026-05-18-demo.md").write_text("demo", encoding="utf-8")
|
||||
(plans_dir / "2026-05-18-demo.md").write_text(
|
||||
valid_plan_text(), encoding="utf-8"
|
||||
)
|
||||
|
||||
progress = root / "memory-bank" / "progress.md"
|
||||
progress.parent.mkdir(parents=True)
|
||||
@@ -561,6 +784,67 @@ class MainLoopCliTests(unittest.TestCase):
|
||||
)
|
||||
self.assertIn("- [x] `2026-05-18-demo.md` done", text)
|
||||
|
||||
def test_status_reports_counts_and_current_workflow_state(self):
|
||||
with tempfile.TemporaryDirectory() as tmp_dir:
|
||||
root = Path(tmp_dir)
|
||||
plans_dir = root / "docs" / "superpowers" / "plans"
|
||||
plans_dir.mkdir(parents=True)
|
||||
for plan_key in (
|
||||
"2026-01-01-a.md",
|
||||
"2026-01-02-b.md",
|
||||
"2026-01-03-c.md",
|
||||
"2026-01-04-d.md",
|
||||
"2026-01-05-e.md",
|
||||
):
|
||||
(plans_dir / plan_key).write_text(valid_plan_text(), encoding="utf-8")
|
||||
|
||||
progress = root / "memory-bank" / "progress.md"
|
||||
progress.parent.mkdir(parents=True)
|
||||
progress.write_text(
|
||||
"\n".join(
|
||||
[
|
||||
"# 当前进展",
|
||||
"",
|
||||
"<!-- workflow-state:start -->",
|
||||
"phase: executing",
|
||||
"plan: docs/superpowers/plans/2026-01-02-b.md",
|
||||
"claimed_by: codex-test",
|
||||
"<!-- workflow-state:end -->",
|
||||
"",
|
||||
"<!-- plan-status:start -->",
|
||||
"- [ ] `2026-01-01-a.md` pending",
|
||||
"- [ ] `2026-01-02-b.md` in-progress",
|
||||
"- [x] `2026-01-03-c.md` done",
|
||||
"- [ ] `2026-01-04-d.md` blocked: env:linux:Task2",
|
||||
"- [ ] `2026-01-05-e.md` skipped: obsolete",
|
||||
"<!-- plan-status:end -->",
|
||||
"",
|
||||
]
|
||||
),
|
||||
encoding="utf-8",
|
||||
)
|
||||
|
||||
result = run_cli(
|
||||
"status",
|
||||
"-plans",
|
||||
"docs/superpowers/plans",
|
||||
"-progress",
|
||||
"memory-bank/progress.md",
|
||||
cwd=root,
|
||||
)
|
||||
|
||||
self.assertEqual(result.returncode, 0, msg=result.stderr)
|
||||
self.assertIn(
|
||||
"STATUS total=5 pending=1 in-progress=1 done=1 blocked=1 skipped=1",
|
||||
result.stdout,
|
||||
)
|
||||
self.assertIn(
|
||||
"CURRENT phase=executing "
|
||||
"plan=docs/superpowers/plans/2026-01-02-b.md "
|
||||
"claimed_by=codex-test",
|
||||
result.stdout,
|
||||
)
|
||||
|
||||
def test_concurrent_record_preserves_spec_and_plan_metadata(self):
|
||||
with tempfile.TemporaryDirectory() as tmp_dir:
|
||||
root = Path(tmp_dir)
|
||||
|
||||
Reference in New Issue
Block a user