okstra 0.179.2 → 0.183.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +1 -1
- package/dist/cli-registry.mjs +30 -2
- package/dist/cli-registry.mjs.map +1 -1
- package/dist/commands/execute/incremental-carry.mjs +9 -8
- package/dist/commands/execute/incremental-carry.mjs.map +1 -1
- package/dist/commands/execute/plan-verify.mjs +3 -1
- package/dist/commands/execute/plan-verify.mjs.map +1 -1
- package/dist/commands/execute/render-bundle.d.mts +4 -2
- package/dist/commands/execute/render-bundle.mjs +46 -5
- package/dist/commands/execute/render-bundle.mjs.map +1 -1
- package/dist/commands/execute/run.mjs +11 -3
- package/dist/commands/execute/run.mjs.map +1 -1
- package/dist/commands/inspect/model-io.d.mts +1 -0
- package/dist/commands/inspect/model-io.mjs +25 -0
- package/dist/commands/inspect/model-io.mjs.map +1 -0
- package/dist/commands/inspect/stage-map.mjs +29 -8
- package/dist/commands/inspect/stage-map.mjs.map +1 -1
- package/dist/commands/inspect/task-list.mjs +52 -6
- package/dist/commands/inspect/task-list.mjs.map +1 -1
- package/dist/commands/inspect/user-response.mjs +14 -4
- package/dist/commands/inspect/user-response.mjs.map +1 -1
- package/dist/commands/lifecycle/check-project.d.mts +1 -0
- package/dist/commands/lifecycle/check-project.mjs +69 -50
- package/dist/commands/lifecycle/check-project.mjs.map +1 -1
- package/dist/commands/lifecycle/contract-check.d.mts +1 -0
- package/dist/commands/lifecycle/contract-check.mjs +18 -0
- package/dist/commands/lifecycle/contract-check.mjs.map +1 -0
- package/dist/commands/lifecycle/preflight.mjs +154 -51
- package/dist/commands/lifecycle/preflight.mjs.map +1 -1
- package/dist/commands/pr/pr.d.mts +1 -0
- package/dist/commands/pr/pr.mjs +19 -1
- package/dist/commands/pr/pr.mjs.map +1 -1
- package/dist/commands/report/agent-activity.mjs +2 -2
- package/dist/commands/report/approval-decision.d.mts +1 -0
- package/dist/commands/report/approval-decision.mjs +21 -0
- package/dist/commands/report/approval-decision.mjs.map +1 -0
- package/dist/commands/report/design-snapshot.d.mts +1 -0
- package/dist/commands/report/design-snapshot.mjs +19 -0
- package/dist/commands/report/design-snapshot.mjs.map +1 -0
- package/dist/commands/report/translate.mjs +3 -0
- package/dist/commands/report/translate.mjs.map +1 -1
- package/dist/lib/host-registry-client.mjs +13 -9
- package/dist/lib/host-registry-client.mjs.map +1 -1
- package/docs/architecture/storage-model.md +1 -1
- package/docs/architecture.md +21 -10
- package/docs/cli.md +36 -20
- package/docs/container.md +6 -4
- package/docs/contributor-change-matrix.md +1 -1
- package/docs/for-ai/README.md +2 -2
- package/docs/for-ai/skills/okstra-brief-gen.md +5 -3
- package/docs/for-ai/skills/okstra-code-review.md +4 -4
- package/docs/for-ai/skills/okstra-container-build.md +20 -17
- package/docs/for-ai/skills/okstra-inspect.md +20 -23
- package/docs/for-ai/skills/okstra-manager.md +19 -18
- package/docs/for-ai/skills/okstra-memory.md +2 -2
- package/docs/for-ai/skills/okstra-pr-gen.md +3 -3
- package/docs/for-ai/skills/okstra-rollup.md +14 -13
- package/docs/for-ai/skills/okstra-run.md +7 -3
- package/docs/for-ai/skills/okstra-schedule-gen.md +15 -18
- package/docs/for-ai/skills/okstra-setup.md +7 -7
- package/docs/for-ai/skills/okstra-usage.md +5 -4
- package/docs/for-ai/skills/okstra-user-response.md +50 -32
- package/docs/project-structure-overview.md +43 -31
- package/docs/task-process/implementation-planning.md +2 -2
- package/docs/task-process/implementation.md +7 -4
- package/package.json +1 -1
- package/runtime/BUILD.json +2 -2
- package/runtime/agents/workers/claude-worker.md +4 -4
- package/runtime/agents/workers/report-writer-worker.md +15 -164
- package/runtime/agents/workers/translator-worker.md +5 -13
- package/runtime/bin/okstra-error-log.py +51 -11
- package/runtime/bin/okstra-report-translate.py +210 -23
- package/runtime/prompts/host-orchestration/implementation.md +1 -1
- package/runtime/prompts/launch.template.md +9 -12
- package/runtime/prompts/lead/adapters/cmux.md +1 -1
- package/runtime/prompts/lead/context-loader.md +41 -141
- package/runtime/prompts/lead/convergence.md +10 -8
- package/runtime/prompts/lead/okstra-lead-contract.md +40 -49
- package/runtime/prompts/lead/plan-body-verification.md +217 -23
- package/runtime/prompts/lead/report-writer.md +81 -421
- package/runtime/prompts/lead/team-contract.md +9 -54
- package/runtime/prompts/profiles/_clarification-recommendation.md +5 -4
- package/runtime/prompts/profiles/_coding-conventions-preflight.md +3 -2
- package/runtime/prompts/profiles/_common-contract.md +4 -4
- package/runtime/prompts/profiles/_implementation-deliverable.md +1 -1
- package/runtime/prompts/profiles/_implementation-diff-review.md +1 -1
- package/runtime/prompts/profiles/_implementation-verifier.md +3 -3
- package/runtime/prompts/profiles/change-impact-analysis.md +1 -1
- package/runtime/prompts/profiles/error-analysis.md +1 -1
- package/runtime/prompts/profiles/feature-analysis.md +1 -1
- package/runtime/prompts/profiles/final-verification.md +1 -1
- package/runtime/prompts/profiles/implementation-planning.md +20 -12
- package/runtime/prompts/profiles/improvement-discovery.md +1 -1
- package/runtime/prompts/profiles/project-analysis.md +1 -1
- package/runtime/prompts/profiles/release-handoff.md +0 -1
- package/runtime/prompts/profiles/requirements-discovery.md +1 -1
- package/runtime/prompts/wizard/prompts.ko.json +0 -1
- package/runtime/python/okstra_ctl/adapters/hosts/capability_adapter.py +69 -17
- package/runtime/python/okstra_ctl/adapters/hosts/claude-code/adapter.py +13 -4
- package/runtime/python/okstra_ctl/adapters/hosts/claude-code/relay.md +8 -2
- package/runtime/python/okstra_ctl/adapters/hosts/codex/adapter.py +2 -2
- package/runtime/python/okstra_ctl/adapters/hosts/codex/relay.md +50 -5
- package/runtime/python/okstra_ctl/adapters/hosts/external/relay.md +1 -1
- package/runtime/python/okstra_ctl/adapters/hosts/grok/adapter.py +2 -2
- package/runtime/python/okstra_ctl/adapters/hosts/grok/relay.md +66 -5
- package/runtime/python/okstra_ctl/adapters/providers/grok/adapter.py +70 -2
- package/runtime/python/okstra_ctl/agent_activity.py +141 -38
- package/runtime/python/okstra_ctl/agent_invocation.py +19 -6
- package/runtime/python/okstra_ctl/agent_prompt_cli.py +70 -23
- package/runtime/python/okstra_ctl/analysis_inputs.py +5 -4
- package/runtime/python/okstra_ctl/analysis_packet.py +124 -3
- package/runtime/python/okstra_ctl/approval_decisions.py +328 -0
- package/runtime/python/okstra_ctl/attempt_evidence.py +2 -2
- package/runtime/python/okstra_ctl/backfill.py +13 -10
- package/runtime/python/okstra_ctl/batch.py +2 -4
- package/runtime/python/okstra_ctl/build_tools.py +6 -3
- package/runtime/python/okstra_ctl/claim_reproduction.py +101 -0
- package/runtime/python/okstra_ctl/clarification_items.py +27 -13
- package/runtime/python/okstra_ctl/cmux.py +130 -52
- package/runtime/python/okstra_ctl/code_review_target.py +34 -8
- package/runtime/python/okstra_ctl/consumers.py +5 -4
- package/runtime/python/okstra_ctl/container.py +103 -8
- package/runtime/python/okstra_ctl/context_cost.py +2 -1
- package/runtime/python/okstra_ctl/contract_graph.py +497 -0
- package/runtime/python/okstra_ctl/contract_graph_cli.py +62 -0
- package/runtime/python/okstra_ctl/convergence.py +338 -17
- package/runtime/python/okstra_ctl/convergence_engine.py +10 -18
- package/runtime/python/okstra_ctl/convergence_provenance.py +58 -8
- package/runtime/python/okstra_ctl/convergence_store.py +55 -34
- package/runtime/python/okstra_ctl/design_prep.py +7 -4
- package/runtime/python/okstra_ctl/design_snapshot.py +134 -0
- package/runtime/python/okstra_ctl/dispatch_core.py +97 -69
- package/runtime/python/okstra_ctl/dispatch_state.py +163 -63
- package/runtime/python/okstra_ctl/doctor.py +6 -3
- package/runtime/python/okstra_ctl/domain/worker_presentation.py +70 -9
- package/runtime/python/okstra_ctl/entrypoints/hosts.py +16 -30
- package/runtime/python/okstra_ctl/error_log_write.py +35 -30
- package/runtime/python/okstra_ctl/error_report.py +26 -1
- package/runtime/python/okstra_ctl/error_zip.py +27 -5
- package/runtime/python/okstra_ctl/execution_identity.py +3 -2
- package/runtime/python/okstra_ctl/execution_manifest.py +7 -4
- package/runtime/python/okstra_ctl/execution_mutation_audit.py +6 -2
- package/runtime/python/okstra_ctl/final_report_schema.py +26 -17
- package/runtime/python/okstra_ctl/fix_cycles.py +2 -2
- package/runtime/python/okstra_ctl/fixed_text.py +39 -0
- package/runtime/python/okstra_ctl/git_reconcile.py +41 -9
- package/runtime/python/okstra_ctl/handoff.py +5 -4
- package/runtime/python/okstra_ctl/i18n.py +4 -2
- package/runtime/python/okstra_ctl/implementation_direction.py +22 -14
- package/runtime/python/okstra_ctl/implementation_outcome.py +4 -7
- package/runtime/python/okstra_ctl/incremental_carry.py +130 -17
- package/runtime/python/okstra_ctl/incremental_scope.py +12 -4
- package/runtime/python/okstra_ctl/index.py +8 -11
- package/runtime/python/okstra_ctl/initial_prompt_materialization.py +79 -7
- package/runtime/python/okstra_ctl/invocation.py +3 -6
- package/runtime/python/okstra_ctl/json_boundary.py +366 -0
- package/runtime/python/okstra_ctl/json_registry.py +10 -12
- package/runtime/python/okstra_ctl/jsonl.py +19 -2
- package/runtime/python/okstra_ctl/lead_events.py +33 -1
- package/runtime/python/okstra_ctl/listing.py +3 -3
- package/runtime/python/okstra_ctl/log_report.py +24 -2
- package/runtime/python/okstra_ctl/manager_cli.py +92 -7
- package/runtime/python/okstra_ctl/manager_store.py +12 -10
- package/runtime/python/okstra_ctl/material.py +5 -1
- package/runtime/python/okstra_ctl/migrate.py +29 -25
- package/runtime/python/okstra_ctl/model_cli.py +3 -15
- package/runtime/python/okstra_ctl/model_io_cli.py +1051 -0
- package/runtime/python/okstra_ctl/mutation_probe.py +13 -4
- package/runtime/python/okstra_ctl/pane_reclaim.py +3 -2
- package/runtime/python/okstra_ctl/path_hints.py +12 -0
- package/runtime/python/okstra_ctl/paths.py +21 -0
- package/runtime/python/okstra_ctl/plan_items.py +115 -4
- package/runtime/python/okstra_ctl/plan_items_cli.py +626 -34
- package/runtime/python/okstra_ctl/ports/worker_dispatch.py +2 -1
- package/runtime/python/okstra_ctl/pr_template.py +3 -2
- package/runtime/python/okstra_ctl/project_meta.py +5 -7
- package/runtime/python/okstra_ctl/recap.py +5 -4
- package/runtime/python/okstra_ctl/reconcile.py +21 -27
- package/runtime/python/okstra_ctl/registry/host_discovery.py +3 -2
- package/runtime/python/okstra_ctl/registry/provider_registry.py +3 -2
- package/runtime/python/okstra_ctl/render.py +74 -16
- package/runtime/python/okstra_ctl/render_final_report.py +10 -8
- package/runtime/python/okstra_ctl/report_assembly.py +509 -0
- package/runtime/python/okstra_ctl/report_contract.py +2 -1
- package/runtime/python/okstra_ctl/report_finalize.py +67 -32
- package/runtime/python/okstra_ctl/report_html/render.py +3 -2
- package/runtime/python/okstra_ctl/report_inputs.py +72 -0
- package/runtime/python/okstra_ctl/report_language.py +3 -2
- package/runtime/python/okstra_ctl/report_markdown.py +81 -8
- package/runtime/python/okstra_ctl/report_narrative.py +351 -0
- package/runtime/python/okstra_ctl/report_projections.py +265 -0
- package/runtime/python/okstra_ctl/report_synthesis_packet.py +518 -0
- package/runtime/python/okstra_ctl/report_views.py +3 -2
- package/runtime/python/okstra_ctl/rollup.py +65 -4
- package/runtime/python/okstra_ctl/run.py +184 -65
- package/runtime/python/okstra_ctl/run_audit.py +3 -2
- package/runtime/python/okstra_ctl/run_context.py +6 -9
- package/runtime/python/okstra_ctl/run_index_row.py +2 -8
- package/runtime/python/okstra_ctl/schedule_semantics.py +5 -2
- package/runtime/python/okstra_ctl/schema_excerpt.py +15 -8
- package/runtime/python/okstra_ctl/session_transcript.py +27 -1
- package/runtime/python/okstra_ctl/set_work_status.py +64 -38
- package/runtime/python/okstra_ctl/stage_fix_carry.py +8 -6
- package/runtime/python/okstra_ctl/stage_ledger.py +132 -18
- package/runtime/python/okstra_ctl/stage_map.py +96 -28
- package/runtime/python/okstra_ctl/stage_targets.py +3 -4
- package/runtime/python/okstra_ctl/team.py +3 -2
- package/runtime/python/okstra_ctl/team_reconcile.py +11 -2
- package/runtime/python/okstra_ctl/time_report.py +51 -4
- package/runtime/python/okstra_ctl/usage_identity.py +2 -1
- package/runtime/python/okstra_ctl/usage_report.py +58 -4
- package/runtime/python/okstra_ctl/user_response.py +1431 -66
- package/runtime/python/okstra_ctl/wizard.py +11 -44
- package/runtime/python/okstra_ctl/work_categories.py +3 -2
- package/runtime/python/okstra_ctl/worker_dispatch.py +5 -2
- package/runtime/python/okstra_ctl/worker_prompt_body.py +49 -3
- package/runtime/python/okstra_ctl/worker_prompt_contract.py +3 -2
- package/runtime/python/okstra_ctl/worker_prompt_policy.py +31 -3
- package/runtime/python/okstra_ctl/worker_runner.py +14 -12
- package/runtime/python/okstra_ctl/workflow.py +2 -1
- package/runtime/python/okstra_ctl/worktree.py +3 -2
- package/runtime/python/okstra_ctl/wrapper_status.py +4 -2
- package/runtime/python/okstra_ctl/write_policy.py +4 -2
- package/runtime/python/okstra_token_usage/antigravity.py +39 -12
- package/runtime/python/okstra_token_usage/collect.py +90 -38
- package/runtime/python/okstra_token_usage/grok.py +127 -0
- package/runtime/schemas/final-report-v2.0.schema.json +9 -0
- package/runtime/schemas/final-report-v3.0.schema.json +10219 -0
- package/runtime/schemas/report-narrative-v3.0.schema.json +30 -0
- package/runtime/schemas/report-synthesis-packet-v1.0.schema.json +140 -0
- package/runtime/skills/okstra-brief-gen/SKILL.md +9 -7
- package/runtime/skills/okstra-code-review/SKILL.md +21 -11
- package/runtime/skills/okstra-container-build/SKILL.md +18 -18
- package/runtime/skills/okstra-inspect/SKILL.md +12 -11
- package/runtime/skills/okstra-inspect/facets/error-zip.md +8 -8
- package/runtime/skills/okstra-inspect/facets/errors.md +2 -2
- package/runtime/skills/okstra-inspect/facets/history.md +9 -14
- package/runtime/skills/okstra-inspect/facets/logs.md +2 -2
- package/runtime/skills/okstra-inspect/facets/recap.md +5 -5
- package/runtime/skills/okstra-inspect/facets/report.md +6 -10
- package/runtime/skills/okstra-inspect/facets/status.md +9 -8
- package/runtime/skills/okstra-inspect/facets/time.md +3 -3
- package/runtime/skills/okstra-manager/SKILL.md +16 -14
- package/runtime/skills/okstra-memory/SKILL.md +3 -3
- package/runtime/skills/okstra-pr-gen/SKILL.md +5 -4
- package/runtime/skills/okstra-rollup/SKILL.md +6 -16
- package/runtime/skills/okstra-run/SKILL.md +7 -7
- package/runtime/skills/okstra-schedule-gen/SKILL.md +21 -17
- package/runtime/skills/okstra-setup/SKILL.md +21 -13
- package/runtime/skills/okstra-setup/references/project-config.md +2 -2
- package/runtime/skills/okstra-usage/SKILL.md +10 -10
- package/runtime/skills/okstra-user-response/SKILL.md +78 -107
- package/runtime/templates/report-writer-prompt-preamble.md +29 -19
- package/runtime/templates/reports/html/macros/forms.html +6 -4
- package/runtime/templates/reports/schedule.template.md +4 -4
- package/runtime/templates/worker-error-contract.md +17 -29
- package/runtime/validators/validate-run.py +636 -72
- package/runtime/validators/validate_session_conformance.py +43 -7
|
@@ -15,8 +15,8 @@ Plan-body verification runs **after** finding convergence and **after** the repo
|
|
|
15
15
|
```
|
|
16
16
|
Phase 4 workers produce independent analyses (Findings F-001…)
|
|
17
17
|
→ Phase 5.5 FINDING convergence ([convergence](./convergence.md), sections "Convergence Algorithm" through "Convergence State Artifact")
|
|
18
|
-
→ Phase 6 report-writer authors
|
|
19
|
-
→ okstra plan-items
|
|
18
|
+
→ Phase 6 report-writer authors report-writer-narrative Markdown (consolidated Option Candidates / Stepwise Execution Order / Dependency / Validation Checklist / Rollback)
|
|
19
|
+
→ okstra plan-items prepare + prompt + validate-prepared creates and projects the deterministic P-* queue
|
|
20
20
|
→ PLAN-BODY VERIFICATION ROUND ← this contract
|
|
21
21
|
→ final render/validation
|
|
22
22
|
→ User Approval gate (the frontmatter `approved:` flip is honoured by run-prep only when this round's Gate result is `passed` or `passed-with-dissent`)
|
|
@@ -56,9 +56,9 @@ The shared Majority definition and the auto-disable rule (fewer than 2 analyser
|
|
|
56
56
|
From the report-writer's draft of `## 5.4 Implementation Plan Deliverables`, the lead creates the verification queue only through this sequence (see also `templates/reports/final-report-v2.template.md` §5.5.9):
|
|
57
57
|
|
|
58
58
|
```text
|
|
59
|
-
okstra plan-items
|
|
60
|
-
→ place
|
|
61
|
-
→ okstra plan-items validate --
|
|
59
|
+
okstra plan-items prepare --narrative <report-writer-narrative.md> --run-manifest <run-manifest>
|
|
60
|
+
→ place `okstra plan-items prompt --run-manifest <run-manifest>` output verbatim in every verifier prompt
|
|
61
|
+
→ okstra plan-items validate-prepared --narrative <report-writer-narrative.md> --run-manifest <run-manifest>
|
|
62
62
|
```
|
|
63
63
|
|
|
64
64
|
The persisted `items[]` are the sole queue. The lead MUST NOT freely summarise,
|
|
@@ -103,6 +103,130 @@ For every detector-produced `(stage, kind)`, extract exactly one plan item named
|
|
|
103
103
|
|
|
104
104
|
When extracting each item, lead also captures a **`subject`** — a plain one-line label (≤12 words) describing *what that item is* in the reader's terms, e.g. `P-Opt-1` → "Option A: split upload v2 into a new module", `P-Step-1.1` → "Stage 1 Step 2: regression-check with `npm run test:v2`". This is a label-capture, not new analysis. The `subject` is what §5.5.9 renders as the per-item heading so the reader knows *what* each AGREE/DISAGREE is about without cross-referencing §4.5; a bare `P-*` ID with no subject is a contract violation. **Enforced:** `validators/validate-run.py` `_validate_plan_item_subject_substance` fails a subject that is a placeholder — under 3 chars, equal to the item id, or shaped like a bare `P-*` id.
|
|
105
105
|
|
|
106
|
+
## Fact and judgement (BLOCKING)
|
|
107
|
+
|
|
108
|
+
A single-vote block has a reason behind it: two spelled-out references
|
|
109
|
+
contradicting each other is a fact one verifier can settle by looking, and a
|
|
110
|
+
fact must not be outvoted. What was missing is that the fact was never checked —
|
|
111
|
+
writing "this path does not exist" was enough to block.
|
|
112
|
+
|
|
113
|
+
So a DISAGREE on a single-vote kind declares what sort of claim it is:
|
|
114
|
+
|
|
115
|
+
- **`claimKind: fact`** — okstra can reproduce it. Carry a `reproduction` probe:
|
|
116
|
+
`path-exists` / `path-absent`, `literal-present` / `literal-absent`, or
|
|
117
|
+
`citations-differ`. **okstra runs it and writes `reproductionResult`; do not
|
|
118
|
+
write that field yourself.** A verifier that reports its own result puts the
|
|
119
|
+
gate on a self-report, and the same claim then settles differently depending
|
|
120
|
+
on who raised it.
|
|
121
|
+
- **`claimKind: judgement`** — no mechanical check exists. It takes a quorum,
|
|
122
|
+
exactly like `b` / `c` / `e`.
|
|
123
|
+
|
|
124
|
+
A claim that cannot be written as one of those three probes is a `judgement`.
|
|
125
|
+
That is a classification, not a demotion: giving a single-vote block to something
|
|
126
|
+
no machine can confirm is what was wrong in the first place.
|
|
127
|
+
|
|
128
|
+
| Declared | Reproduced | Effect |
|
|
129
|
+
|---|---|---|
|
|
130
|
+
| `fact` | `reproduced` | blocks on one vote |
|
|
131
|
+
| `fact` | `not-reproduced` | quorum, and the claim is recorded as unfounded |
|
|
132
|
+
| `fact` | `not-runnable` | quorum — okstra could not judge it, which refutes nothing |
|
|
133
|
+
| `judgement` | — | quorum |
|
|
134
|
+
| nothing declared | — | blocks on one vote, as before |
|
|
135
|
+
|
|
136
|
+
The last row is deliberate. Verdicts recorded before this field existed are not
|
|
137
|
+
re-judged in hindsight, so adoption only ever relaxes: a claim earns the quorum
|
|
138
|
+
route by declaring itself, never loses a block by staying silent.
|
|
139
|
+
|
|
140
|
+
**Enforced:** `validators/validate-run.py` `_single_vote_block_survives`, with
|
|
141
|
+
the probes in `scripts/okstra_ctl/claim_reproduction.py`.
|
|
142
|
+
|
|
143
|
+
## What the gate asks (BLOCKING)
|
|
144
|
+
|
|
145
|
+
The gate does not ask whether the plan is free of defects. Under adversarial
|
|
146
|
+
reading a plan of any size yields findings every round, so a bar of zero is not
|
|
147
|
+
reachable and a run that aims at it does not end — one task spent five runs and
|
|
148
|
+
its last two went entirely into the plan's account of itself.
|
|
149
|
+
|
|
150
|
+
It asks two things instead, and both must hold:
|
|
151
|
+
|
|
152
|
+
1. **The stage about to start is executable as written.** Its steps, commands,
|
|
153
|
+
exit contract, rollback target and validation signals are settled — §"Gate
|
|
154
|
+
scope" decides which items that covers.
|
|
155
|
+
2. **What was set aside is written down.** Every defect the gate stopped
|
|
156
|
+
blocking on appears in `planBodyVerification.setAside` with its reason —
|
|
157
|
+
`observed` (a frozen stage), `deferred` (a stage not yet reached), or
|
|
158
|
+
`record` (the plan's account of itself).
|
|
159
|
+
|
|
160
|
+
The second condition is what makes the first safe to relax. Knowing a defect is
|
|
161
|
+
the acceptance condition, not removing it; without the register a deferred
|
|
162
|
+
defect and one nobody raised read the same in the report.
|
|
163
|
+
|
|
164
|
+
`okstra plan-items complete-round` writes the register from the same computation
|
|
165
|
+
that produced the gate value. Do not hand-write it — a hand-written register
|
|
166
|
+
drifts from the verdicts it claims to summarise, and nothing else reads it, so
|
|
167
|
+
the drift stays invisible.
|
|
168
|
+
|
|
169
|
+
**Enforced:** `validators/validate-run.py` `_validate_set_aside_register` fails
|
|
170
|
+
a scored round whose declared register does not match the one recomputed from
|
|
171
|
+
the verdicts.
|
|
172
|
+
|
|
173
|
+
## Two blocks — execution and record (BLOCKING)
|
|
174
|
+
|
|
175
|
+
A plan carries two kinds of content, and they answer to different gates.
|
|
176
|
+
|
|
177
|
+
| Block | Items | A defect there |
|
|
178
|
+
|---|---|---|
|
|
179
|
+
| `execution` | steps, options, dependencies, validations, rollbacks, design prep, variation points, the selected direction | blocks the start |
|
|
180
|
+
| `record` | requirement coverage rows, and the approval dispositions and decision references they carry | **does not block.** It is recorded and becomes the next run's input |
|
|
181
|
+
|
|
182
|
+
The record is the plan's account of itself: which brief line each stage answers,
|
|
183
|
+
what the user decided, which clarification a deviation rests on. It has to be
|
|
184
|
+
accurate and it is still verified — but a wrong sentence in it does not make the
|
|
185
|
+
next stage unsafe to start, and treating it as though it did is what kept a plan
|
|
186
|
+
whose executable content had already settled from ever being approved.
|
|
187
|
+
|
|
188
|
+
**A requirement that nothing builds is not a record defect.** A coverage row with
|
|
189
|
+
`status: gap` or a `blocked C-NNN` blocks through `gateBlockedBy: coverage-gap`,
|
|
190
|
+
which reads the rows directly and is untouched by this split. What stops blocking
|
|
191
|
+
is a verdict about the row's *accuracy* — a citation that resolves to the wrong
|
|
192
|
+
stage, a disposition recorded without its confirmation.
|
|
193
|
+
|
|
194
|
+
**Enforced:** `scripts/okstra_ctl/plan_items.py` `_item_block` assigns the block
|
|
195
|
+
at extraction, `okstra plan-items seed` carries it onto the row, and
|
|
196
|
+
`validators/validate-run.py` `_plan_item_gate_class` downgrades a `record`
|
|
197
|
+
blocker to `has-dissent`. `_independent_coverage_blockers` is the separate
|
|
198
|
+
channel that keeps a genuine gap blocking.
|
|
199
|
+
|
|
200
|
+
## Gate scope — the stage about to start (BLOCKING)
|
|
201
|
+
|
|
202
|
+
The plan covers every stage; implementation runs one at a time. An item blocks
|
|
203
|
+
approval only when it has standing over the stage that is about to start:
|
|
204
|
+
|
|
205
|
+
- **`in-scope`** — one of the item's stages is `ready` or `active`, or the item
|
|
206
|
+
belongs to no stage at all. It blocks.
|
|
207
|
+
- **`observed`** — the item's stages are all `done`. It does not block. A frozen
|
|
208
|
+
stage's defect cannot be fixed by planning at all: the Stage Ledger forbids
|
|
209
|
+
editing its commands, so an item that blocks on one blocks forever.
|
|
210
|
+
- **`deferred`** — the item's stages are all still `blocked`. It does not block;
|
|
211
|
+
the stage it judges has not been reached.
|
|
212
|
+
|
|
213
|
+
An item with no `stageScope` is `in-scope` on purpose. `P-Opt-*`, `P-Var-*`,
|
|
214
|
+
`P-Dep-*`, `P-Rb-*` and `P-Dir-1` judge the plan as a whole, and scoping them out
|
|
215
|
+
would stop an unrequested-work verdict from blocking a start. So does a coverage
|
|
216
|
+
or validation row whose plan has not filled `stageRefs` yet — an absent scope is
|
|
217
|
+
read as every stage, which is the safe direction.
|
|
218
|
+
|
|
219
|
+
**Nothing is dropped.** An out-of-scope blocker becomes `has-dissent`, so the
|
|
220
|
+
gate reads `passed-with-dissent` rather than `passed` and the reader can see that
|
|
221
|
+
something is outstanding. `gate.items[]` carries the bucket for each item; a
|
|
222
|
+
scoped-out defect and a real consensus would otherwise look identical in the
|
|
223
|
+
record.
|
|
224
|
+
|
|
225
|
+
**Enforced:** `validators/validate-run.py` `_stage_scope_bucket` and
|
|
226
|
+
`_plan_item_gate_class`, which `_recompute_plan_body_gate` and
|
|
227
|
+
`_gate_summary_item` both call — the scoping cannot apply to the gate value and
|
|
228
|
+
not to the summary the round protocol records.
|
|
229
|
+
|
|
106
230
|
## Plan-body verdict semantics
|
|
107
231
|
|
|
108
232
|
The verdict tokens `AGREE` / `DISAGREE` / `SUPPLEMENT` are reused, but their meaning is plan-specific:
|
|
@@ -222,9 +346,11 @@ CLI-wrapper calls follow the planned execution surface after
|
|
|
222
346
|
consume only `modelExecutionValue`. A missing or invalid invocation contract blocks the
|
|
223
347
|
round before any host or provider process starts.
|
|
224
348
|
|
|
225
|
-
1. Lead runs `okstra plan-items
|
|
349
|
+
1. Lead runs `okstra plan-items prepare --narrative <report-writer-narrative.md> --run-manifest <run-manifest>`, places the fixed output of `okstra plan-items prompt --run-manifest <run-manifest>` verbatim in every verifier prompt, then runs `okstra plan-items validate-prepared --narrative <report-writer-narrative.md> --run-manifest <run-manifest>`. Python resolves the one convergence-owned state path from that run identity. Dispatch only after that exact-match validation succeeds.
|
|
226
350
|
|
|
227
|
-
**Then seed the landing table (BLOCKING):** `okstra plan-items seed --
|
|
351
|
+
**Then seed the landing table (BLOCKING):** `okstra plan-items seed --narrative <report-writer-narrative.md> --state <plan-body-verification.json> --run-manifest <run-manifest.json>`. `apply-verdicts` in step 8 refuses a verdict whose item has no `planBodyVerification.planItems[]` row. The report writer never owns that state, so the deterministic seed is the only creator of its rows. The seed is idempotent by id and never touches an existing row, so it is safe to re-run between rounds and after a self-fix re-extraction. Skipping it makes step 8 fail with `plan-body state has no row for [...]`.
|
|
352
|
+
|
|
353
|
+
**`--run-manifest` is what scopes the gate to the stage you are starting.** Seed uses it to record `planBodyVerification.stageLedger` — a `{stage: status}` snapshot in the Stage Ledger's own `done` / `active` / `ready` / `blocked` vocabulary. Without it the block carries no ledger, and the gate falls back to judging every stage at once, which is the behaviour described in the paragraph below and the reason this flag exists.
|
|
228
354
|
2. For each analyser worker in the roster (`claude`, `codex`, and `antigravity` if opted in), lead constructs a reverify prompt using the template in §"Plan-body reverify prompt" below.
|
|
229
355
|
3. Dispatch uses the same wrapper infrastructure as finding convergence, so the `--role-slug` is the same canonical `<role>-worker` that convergence uses — not a round-specific slug. Result file path: `runs/<task-type>/worker-results/<role>-worker-plan-verify-r<N>-implementation-planning-<seq>.md` (e.g. `codex-worker-plan-verify-r1-implementation-planning-003.md`). **`<seq>` is the report's sequence** — the one in this run's `final-report-<task-type>-<seq>` filename, NOT the `workerResults` sequence the initial analysis results carry. The two are equal in most runs and diverge in some (`reports: 004` alongside `workerResults: 005` is a real case), and provenance globs on the report's. Picking the other one makes `_validate_plan_body_verdict_provenance` report that no result file exists while the file is sitting in the directory. The `-worker-` token is load-bearing twice over: §"Plan-body reverify prompt" requires the same anchor headers as convergence, whose `**Audit sidecar path:**` is derived by `okstra_ctl.worker_artifact_paths.audit_sidecar_rel()` inserting `-audit-` after that token — a slug without it makes the header underivable and the helper raises. Record each `planItems[].verdicts[].worker` as the same `<role>-worker` string, because provenance compares it to this filename's prefix. **Enforced:** `tests/contract/test_reverify_dispatch_anchors.py` derives the sidecar from the documented name and re-extracts the prefix the provenance resolver uses.
|
|
230
356
|
**Verdict provenance (BLOCKING).** Every verdict recorded in `planItems[].verdicts[]` MUST trace back to a dispatch that actually returned a result file at the path above. The whole gate — classification, self-fix eligibility, promotion, `gateBlockedBy` — is computed from these votes, so an unbacked vote lets the round be skipped while the gate still reads `passed`. **Enforced:** `validators/validate-run.py` `_validate_plan_body_verdict_provenance` fails any `verdicts[].worker` with no matching `<worker>-plan-verify-r<N>-<task-type>-<seq>.md` result file. Recording a `verification-error` for a dispatch that produced no result is the correct way to represent a failed worker — inventing an `AGREE` is a contract violation.
|
|
@@ -237,7 +363,9 @@ round before any host or provider process starts.
|
|
|
237
363
|
- `partial-consensus` — majority `AGREE`, dissenting `DISAGREE` recorded.
|
|
238
364
|
- `dissent-isolated` — only one worker `DISAGREE`s, others `AGREE` — treat as `partial-consensus` for gate purposes; record dissent. (Distinct from finding-convergence `worker-unique`, which means the *opposite*: only one worker AGREEs. Plan-body classifications use this dedicated label to avoid the collision.)
|
|
239
365
|
- `majority-disagree` — a *majority* of analysers `DISAGREE` (majority needs ≥2 participating non-error votes; rollback-ordering `DISAGREE(d)` votes are advisory and excluded from the tally), OR any single-vote-blocking kind fires: one `DISAGREE(a)` on any item other than a `P-Var-*` one — where kind `a` never blocks on one vote and takes a majority like `b` / `e` — or one `DISAGREE(f)` on a `P-Req-*` item (see §"Single-vote-blocking kinds"). This classification **blocks approval**.
|
|
240
|
-
- `needs-reverify` —
|
|
366
|
+
- `needs-reverify` — one of two shapes the round could not settle.
|
|
367
|
+
- **An even split on a blocking kind.** The majority test is strict, so a panel splitting evenly (1-AGREE / 1-DISAGREE, 2-2, …) reaches neither `full-consensus` nor `majority-disagree`. Until this shape existed it folded into `has-dissent` and the gate passed: two verifiers read the same plan, disagreed on a defect that is not advisory, and the split was recorded and never acted on. An even panel is not only the two-analyser roster — one `UNVERIFIABLE` or one lost dispatch makes any roster even for that item. Re-dispatch those items and record the votes with `--round 2`; a split that survives that round becomes `majority-disagree` and goes to the user, because nothing further is going to settle it. **The round is not optional**: `needs-reverify` folds into `passed-with-dissent`, so without the re-verification this classification would be a label and nothing else. **Enforced:** `validators/validate-run.py` `_validate_unresolved_tie_was_reverified` fails a gate declared over a tie that was never re-verified, and `_classify_plan_item_gate` promotes a tie carrying a round-2 verdict to `majority-disagree`.
|
|
368
|
+
- **A lone dissent nobody cross-verified** — a single-vote-blocking kind fired but the item has **fewer than 2 participating non-error votes**, i.e. the lone dissent was never cross-verified because its peer returned `verification-error`. A single-vote-blocking kind means "one *confirmed* DISAGREE is enough"; an unconfirmed one is not, and on a `P-Var-*` item none fires at all — its kind `a` never blocks on one vote and takes a majority like `b` / `e`. This does **not** block approval — blocking on it would make a worker failure produce a stricter gate than a healthy roster, the same paradox the ≥2-vote majority rule already rules out. The item is re-dispatched in the next round (step 7); if it survives the round budget it is promoted per step 8 with a Statement that says verification never completed. **Enforced:** `validators/validate-run.py` `_classify_plan_item_gate` returns `needs-reverify` for this shape and `_recompute_plan_body_gate` folds it into `passed-with-dissent`.
|
|
241
369
|
- `contested` only meaningful when `maxRounds > 1`; at default `maxRounds=1`, fold any unresolved item into `partial-consensus`.
|
|
242
370
|
5. Gate result resolution:
|
|
243
371
|
- any `majority-disagree` item present AND `gating=true` → `blocked-by-disagreement`
|
|
@@ -258,7 +386,7 @@ round before any host or provider process starts.
|
|
|
258
386
|
**Record the cause, not just the outcome.** The gate value names the outcome; `planBodyVerification.gateBlockedBy` (array) names every input that blocked it — `majority-disagree`, `coverage-gap`, `non-result`. Two independent inputs can block: a `majority-disagree` plan item, and a Requirement Coverage `gap` / `blocked C-NNN` row (`prompts/profiles/implementation-planning.md` §"Requirement Coverage"). A coverage-only block still renders as `blocked-by-disagreement` because that is the only blocking non-abort value, so **without `gateBlockedBy` the report asserts a worker disagreement that never happened** and the reader hunts for a dissent that does not exist. Leave the array empty for a passing gate. **Enforced:** `validators/validate-run.py` `_validate_gate_blocked_by` cross-checks the declared causes against the recorded verdicts and coverage rows, and fails a passing gate that has a blocking coverage row — the coverage rule was prose-only before.
|
|
259
387
|
|
|
260
388
|
**A coverage row citing this run's own `C-NNN` is not an independent blocker.** When a coverage row's `blocked C-NNN` points at a clarification that step 8 below promoted from a `majority-disagree` item in *this same run*, that blocker is already counted once as the plan item. Counting it again as a coverage gap makes the run block on a clarification it just authored, and the row carries into the next run as a fresh blocker — the Requirement Coverage ↔ Clarification cycle. Such rows are excluded from `coverage-gap`. **Enforced:** `validators/validate-run.py` `_independent_coverage_blockers`.
|
|
261
|
-
6.
|
|
389
|
+
6. `okstra plan-items complete-round --run-manifest <current-run-manifest.json>` derives `planBodyVerification.participatingAnalysers` from the current assigned roster and persisted votes, then atomically records the completed round. The gate arithmetic is unchanged, but a shrunken roster changes what the round can settle: with two participating analysers a 1-AGREE / 1-DISAGREE split is a tie, so it reaches neither consensus nor `majority-disagree` and the item has to go back for a round (see `needs-reverify` above). **Enforced:** `validators/validate-run.py` `_validate_participating_analysers` recomputes `voting` from the recorded verdicts and fails a declared figure the table denies. `validators/validate-run.py` `_detect_uniform_verifier` remains advisory; do not copy its JSON output into state.
|
|
262
390
|
|
|
263
391
|
**Check each verifier's verdict distribution before the next round.** Read the `okstra plan-verify` warnings alongside the gate value. Two shapes mean the roster was narrower than it looks: a verifier whose every vote was one token, and a verifier that returned no vote for items it was assigned. Both are contract violations of the adversarial posture, not stylistic preferences — the verifier is told to open the cited evidence and judge it.
|
|
264
392
|
|
|
@@ -266,19 +394,19 @@ round before any host or provider process starts.
|
|
|
266
394
|
|
|
267
395
|
**How the corrective round is recorded.** The first prompt was dispatched, so it is immutable — `--replace-undispatched` refuses it, correctly. Materialize the correction under a NEW `--invocation-id` and a new prompt path. Before linking its result, retire the first attempt's link: `okstra agent-prompt reject-result --run-manifest <path> --dispatch-id <first dispatch id> --superseded-by <corrective dispatch id> --reason "<what was wrong with the returned result>"`. Without that step the corrective `link-result` fails with `agent result is already linked to another dispatch`, which is how a worker that ran for twenty minutes and wrote a good result ends up unrecordable. Nothing is deleted: the rejected link stays in `agentResultLinks` carrying `supersededBy` and `rejectionReason`, so the ledger shows both attempts and why the second exists.
|
|
268
396
|
|
|
269
|
-
Then
|
|
397
|
+
Then run `okstra plan-items complete-round --state <plan-body-verification.json> --run-manifest <current-run-manifest.json> --round <N>`. Python appends one immutable round history entry, records each verified item's votes, derives the current projection from the actual assigned roster, and stamps `completedAt` after the preceding verification command succeeds. The file accumulates across rounds; it is never truncated to the latest one. Report assembly later projects the completed nested `planBodyVerification` into the final record.
|
|
270
398
|
7. **Self-fix loop (one rewrite, targeting planner-fixable defects).** After round 1, lead may run one report-writer rewrite when at least one `majority-disagree` item has a majority of its `DISAGREE` verdicts at `fixability == planner-fixable`. The targeted re-verification after that rewrite is round 2. After round 2, stop automatic self-fix regardless of outcome. Classify every remaining item as `user-decision`, `noncritical-dissent`, or `correctness-critical`. A second automatic self-fix is a contract violation. The fixed order is initial verification → one planner self-fix → targeted re-verification → user gate.
|
|
271
|
-
- **Group the targets by cause before instructing (BLOCKING).** Blocked items are usually several derivatives of one defect
|
|
399
|
+
- **Group the targets by cause before instructing (BLOCKING).** Blocked items are usually several derivatives of one defect. Lead partitions this round's targets into cause groups and instructs each group as **"remove this cause"**, naming the derivatives it accounts for. The convergence command owns the persisted group and correction fields; the lead does not edit JSON state.
|
|
272
400
|
- lead instructs report-writer to rewrite the items in each cause group (NOT a full draft regeneration; procedure in [report-writer](./report-writer.md) §"Self-fix rewrite").
|
|
273
401
|
- missing or weak `P-Prep-*` contracts are repaired by adding kind-specific inline detail or an AI-prepared PREP item with a concrete proposal. Facts that require user or external authority remain `blocked` and keep their request material; never invent those facts during self-fix.
|
|
274
402
|
- **Drop plan items whose element the round deleted.** A self-fix rewrite may remove a plan element (a validation check, a rollback row). `P-*` ids are positional, so a deletion shifts every later row and silently re-points surviving verdicts at their neighbours — and a verdict recorded against a removed element keeps blocking a gate while being unfindable in the plan, so reading the plan never reveals the cause. After each round, re-extract plan items with `okstra plan-items extract` and re-verify any item whose `subject` no longer matches; never carry the old vote forward across a shift. **Enforced:** `validators/validate-run.py` `_validate_verdicts_match_current_subjects` (re-pointing) and `_validate_plan_item_extraction_completeness` (dangling ids).
|
|
275
403
|
- **Classify each cause group before instructing it (BLOCKING).** A group is either an *authoring* defect — the plan says something wrong, incomplete, or self-contradictory, which self-fix owns — or a *citation* defect, where the plan points at an analysis artifact incorrectly. Only the first is self-fix work. For the second the finding already exists and already went through convergence, so the fix is to re-cite the converged artifact; instructing report-writer to re-derive the fact means the author reads the source material and produces a **finding that never went through convergence**, which the plan then carries as if it had. That is the role boundary the lead contract draws ("keep analysis, execution, verification, and report authoring responsibilities distinct; return defects to the role that owns them"), and report-writer is authoring-only by its own contract. `P-Req-*` items with breakage kind `f` are where this goes wrong most often: the question is usually whether a coverage row points correctly at something already measured, not whether the measurement is right. State the classification in the group's instruction so the author knows which of the two it is being asked to do.
|
|
276
404
|
- **A verdict older than the last self-fix is not a verdict (BLOCKING).** A verdict cast in round 1 judged the text before the only automatic rewrite. Once that rewrite runs, the judgement is about a plan that no longer exists. `--round <N>` on `apply-verdicts` stamps each row, and `validators/validate-run.py` `_validate_verdict_rounds_outlive_self_fix` fails any non-carried item whose verdict round is at or before `selfFixRoundsApplied`. Before declaring the gate, every item still holding a pre-self-fix verdict MUST be re-verified in round 2.
|
|
277
|
-
-
|
|
278
|
-
-
|
|
405
|
+
- Lead re-runs plan-body verification, then records each worker Markdown result through `okstra plan-items apply-verdicts --state <plan-body-verification.json> --result <worker>=<result.md> --round <N>`. Score the result with `okstra plan-verify --narrative <report-writer-narrative.md> --state <plan-body-verification.json>`, then call `okstra plan-items complete-round --state <plan-body-verification.json> --run-manifest <current-run-manifest.json> --round <N>`. These commands fail on an assigned item the worker left unanswered, on a verdict for an item outside the queue, and on a duplicate worker result.
|
|
406
|
+
- For a self-fix, record the correction through the typed convergence command rather than writing `selfFixNote` or `selfFixGroups` JSON. A resolved item does not create a clarification.
|
|
279
407
|
- **Each round is a worker batch.** Before dispatching round N ≥ 2, reclaim the previous round's completed verifiers exactly as at any other batch boundary ([okstra-lead-contract](./okstra-lead-contract.md) "Run-scoped worker-resource lifecycle") and emit `PROGRESS: phase-batch-cleanup panes=<n>`, then announce the round with `PROGRESS: phase-5.5.9-plan-verify round=<N> items=<count>`. Saying a round will "reuse" the previous verifiers and then dispatching under fresh names leaves every prior round holding its panes — five rounds of that is what exhausts the pane budget and blocks the next dispatch. **Enforced:** `validators/validate_session_conformance.py` `_check_plan_verify_cleanup_checkpoints` requires both lines once the state file records two or more rounds.
|
|
280
|
-
- **Round completion.** A round is complete only after
|
|
281
|
-
- **Loop termination.**
|
|
408
|
+
- **Round completion.** A round is complete only after `okstra plan-verify` exits 0 and `okstra plan-items complete-round` succeeds. A round left with a non-zero exit carries its defect into the next round's inputs. Report assembly and rendering occur only after the convergence state is terminal. **Enforced:** `validators/validate-run.py` `_validate_plan_body_state_rounds` requires one stored round per round number and a corresponding item vote.
|
|
409
|
+
- **Loop termination.** The convergence command owns the round count and stop reason; the lead does not write either JSON field. A user-directed correction does not consume the automatic self-fix limit, and a verification failure after that correction does not restart the automatic loop:
|
|
282
410
|
- `all-resolved` — no planner-fixable `majority-disagree` item remains. Exit.
|
|
283
411
|
- `no-progress` — the round resolved **zero** planner-fixable items relative to the previous round. Exit even with budget left: the same rewrite would repeat. Newly *introduced* defects count against progress, so a rewrite that trades one defect for another stops the loop rather than churning. A round that re-targets only what the previous round left unresolved is this same conclusion reached one dispatch earlier — exit on it under this reason rather than paying for the round that proves it. **Enforced (advisory):** `validators/validate-run.py` `_detect_self_fix_recurrence` warns on that shape and names this stop reason.
|
|
284
412
|
- `max-rounds-reached` — `selfFixRoundsApplied == selfFixMaxRounds`. Exit.
|
|
@@ -291,10 +419,10 @@ round before any host or provider process starts.
|
|
|
291
419
|
- `Statement` summarising the disagreement and the worker breakage `<kind>`
|
|
292
420
|
- `Kind` chosen per the standard policy (usually `decision` for option-level conflicts, `data-point` for path/symbol mismatches)
|
|
293
421
|
- `Blocks=approval`
|
|
294
|
-
- the
|
|
422
|
+
- the report record's `planItems[].clarificationRefs[]` reaching that `C-<N>`. Under contract v3 the report record carries the **plural** field and the v3.0 schema forbids `clarificationId` on a plan item; report assembly derives the refs from the activity ledger's `clarificationRefs[]` + `planItemIds[]`, so record the decision through `okstra approval-decision` rather than writing the link by hand. The lead-owned state file keeps the singular `clarificationId`. `validators/validate-run.py` `_validate_plan_body_clarification_matching` recomputes each item's class and fails when a majority-disagree item reaches no clarification, or reaches one that is missing or not `blocks: approval`.
|
|
295
423
|
- set `approvalContext.classification` to `user-decision` for a majority `needs-user-input` item, `correctness-critical` for `DISAGREE(a)`, `DISAGREE(f)` on `P-Req-*`, or an independent Requirement Coverage blocker, and `noncritical-dissent` for another surviving majority disagreement.
|
|
296
|
-
-
|
|
297
|
-
- **Self-fix exhaustion is not risk acceptance.** A `noncritical-dissent` item remains blocking until the user explicitly selects `accept-risk`. Record the user's non-empty original text and
|
|
424
|
+
- record the decision through `okstra approval-decision open`. Each option carries `disposition`, exactly one `reach`, and optional `scopeEffects`. The activity ledger carries affected `planItemIds` and `clarificationRefs`; the approval row never copies those backtrace IDs. `select` is allowed only for `user-decision`, `accept-risk` only for `noncritical-dissent`, and `request-revision` / `reject` for any classification. `correctness-critical` never offers or records `accept-risk`. **Enforced:** `scripts/okstra_ctl/approval_decisions.py` and report assembly.
|
|
425
|
+
- **Self-fix exhaustion is not risk acceptance.** A `noncritical-dissent` item remains blocking until the user explicitly selects `accept-risk`. Record the user's non-empty original text and existing activity check references through `okstra approval-decision resolve`; report assembly derives the report `resolution`.
|
|
298
426
|
- **Correctness-critical defects cannot be waived.** After the user-directed correction, targeted re-verification of every linked item MUST record only `AGREE` or an acceptable `SUPPLEMENT`, and any independent Requirement Coverage blocker MUST be removed before the row becomes `resolved`. A `DISAGREE` or `verification-error` returns it to `open`. **Enforced:** `validators/validate-run.py` `_validate_correctness_resolution`.
|
|
299
427
|
- When a correctness-critical `planner-fixable` item is promoted, its `Statement` MUST state "planner self-fix attempted but unresolved" and name the stop reason. `validators/validate-run.py` `_validate_self_fix_before_clarification` fails when a planner-fixable majority item is promoted while the budget is not exhausted — it requires `selfFixRoundsApplied >= 1` **and** `selfFixStopReason` in `{no-progress, max-rounds-reached}`, so neither `all-resolved` nor `not-attempted` can excuse a promotion.
|
|
300
428
|
- Approval state transitions are fixed:
|
|
@@ -303,25 +431,46 @@ round before any host or provider process starts.
|
|
|
303
431
|
- `answered → open` when application or checking fails
|
|
304
432
|
- `open → obsolete` only when a plan change removes the question
|
|
305
433
|
`open` and `answered` continue to block approval; only `resolved` and `obsolete` are non-blocking. A user-directed correction does not consume the automatic self-fix limit, and a failed check does not restart the automatic loop.
|
|
306
|
-
- A terminal row
|
|
434
|
+
- A terminal row preserves its original dissent classification only from the convergence-owned state history. Every `user-decision-required` / `user-decision-evaluated` activity cites the row's `C-NNN` in `clarificationRefs` and affected plan items in `planItemIds`. A resolved decision names only existing `A-NNN` checks. Report assembly validates those links and derives the report backtraces; it does not accept copied IDs from the approval ledger. When an independent coverage-only blocker is corrected, keep the `C-NNN` in the non-blocking Requirement Coverage row's `decisionRefs`. `obsolete` is valid only after current evidence shows that the question or blocker disappeared.
|
|
307
435
|
9. Approval lives in the report record `frontmatter.approved` field — there is no in-body marker line. The user may set it to `true` (via `--approve` or the in-session wizard) only when the Gate result is `passed` or `passed-with-dissent`. **Enforced:** run-prep (`scripts/okstra_ctl/run.py` `_validate_approved_plan`) fail-closes an `approved: true` plan whose record carries a blocking `gateResult` or an open/answered `Blocks: approval` clarification row, and `validators/validate-run.py` `_validate_plan_body_gate_recompute` rejects a declared `gateResult` healthier than the recorded votes.
|
|
308
436
|
|
|
309
437
|
## `plan-body-verification-<task-type>-<seq>.json` schema
|
|
310
438
|
|
|
311
|
-
**
|
|
439
|
+
**Take the path from the launch prompt, never from this filename (BLOCKING).**
|
|
440
|
+
The run's `## Run Paths` block renders `Plan-body verification state:` with the
|
|
441
|
+
exact path, and `scripts/okstra_ctl/paths.py` is what computed it. Do not build
|
|
442
|
+
the name from the pattern in this heading: a run carries **two seq families** —
|
|
443
|
+
`state` (team-state, convergence, lead-events, this file) and `reports` (the
|
|
444
|
+
final report and its siblings) — and they diverge whenever the two advance at
|
|
445
|
+
different rates. Writing this file under the report's seq puts it where nothing
|
|
446
|
+
looks: `validators/validate_session_conformance.py` resolves it from the
|
|
447
|
+
team-state name, so the round count reads as 0 and
|
|
448
|
+
`verification-round-completed count must match automatic plan-body rounds=0`
|
|
449
|
+
fails a run whose rounds all ran.
|
|
450
|
+
|
|
451
|
+
**Which file is authoritative for what.** Contract v3 keeps both views in one convergence-owned state file before publication:
|
|
312
452
|
|
|
313
453
|
| | records | what a self-fix round does to it |
|
|
314
454
|
|---|---|---|
|
|
315
|
-
| `state/plan-body-verification-<task-type>-<seq>.json` |
|
|
316
|
-
|
|
|
455
|
+
| `state/plan-body-verification-<task-type>-<seq>.json` top-level `planItems[]` / `roundHistory[]` | round-by-round history, including superseded rounds | **appends** — earlier rounds remain immutable |
|
|
456
|
+
| the same file's `planBodyVerification` | final state after the self-fix loop | **overwrites** — each re-verification replaces current `planItems[].verdicts` |
|
|
457
|
+
| `data.json` `implementationPlanning.planBodyVerification` | published projection | report assembly copies the validated final state once |
|
|
317
458
|
|
|
318
|
-
**The gate is computed from
|
|
459
|
+
**The gate is computed from the nested final projection.** The top-level audit history may differ because it preserves superseded rounds. Report assembly copies the final projection rather than asking the report writer to transcribe it. **Enforced:** `validators/validate-run.py` `_validate_plan_body_state_file` requires the audit keys once a round has run, and `scripts/okstra_ctl/report_assembly.py` reads only the convergence-owned `planBodyVerification` projection.
|
|
319
460
|
|
|
320
461
|
The per-round structures mirror the finding-convergence state artifact ([convergence](./convergence.md) §"Convergence State Artifact"): `roundHistory[]` is the round-level ledger, and each item's `rounds[]` is its per-round vote history — the same split as that file's `roundHistory[]` / `findings[].rounds[]`.
|
|
321
462
|
|
|
322
463
|
```json
|
|
323
464
|
{
|
|
324
465
|
"schemaVersion": "1.1",
|
|
466
|
+
"owner": "convergence",
|
|
467
|
+
"planBodyVerification": {
|
|
468
|
+
"roundCount": 2,
|
|
469
|
+
"gateResult": "passed-with-dissent",
|
|
470
|
+
"gateBlockedBy": [],
|
|
471
|
+
"planItems": [],
|
|
472
|
+
"dissentLog": []
|
|
473
|
+
},
|
|
325
474
|
"phase": "implementation-planning",
|
|
326
475
|
"effectiveMaxRounds": 1,
|
|
327
476
|
"gating": true,
|
|
@@ -417,9 +566,35 @@ Required prompt anchor headers are identical to finding convergence (see [conver
|
|
|
417
566
|
The [convergence](./convergence.md) §"Required reverify output contract"
|
|
418
567
|
applies unchanged: append it verbatim after the response format below.
|
|
419
568
|
|
|
569
|
+
The prompt-body contract check runs on every `analysis`-audience prompt, not
|
|
570
|
+
just the critic's, so this round needs the same two lines the critic's
|
|
571
|
+
instructions need ([convergence](./convergence.md) §"What the critic
|
|
572
|
+
task-instructions file MUST contain"): a `**Prompt Delivery Mode:**` header and,
|
|
573
|
+
under `## Inputs`, exactly one `- Primary analysis packet:` line whose path ends
|
|
574
|
+
in `analysis-packet.md`. The literal label and the backticks are what the check
|
|
575
|
+
matches — a bare path or a reworded label counts as zero. They are in the
|
|
576
|
+
template below; keep them when you fill it in.
|
|
577
|
+
|
|
578
|
+
Carrying the packet does not license re-analysis. It is there so the verifier
|
|
579
|
+
can resolve a plan item back to the requirement it claims to satisfy; the
|
|
580
|
+
posture in §"Adversarial plan-body posture" still applies, and this round does
|
|
581
|
+
not revisit the requirements themselves.
|
|
582
|
+
|
|
583
|
+
Omitting either line fails `okstra team dispatch --dispatch-kind
|
|
584
|
+
reverify-planbody-r<n>` before any process starts, reported as `<task-type>
|
|
585
|
+
prompt contract: <worker>: exactly one Primary analysis packet path is required
|
|
586
|
+
(found 0)`. Fix the instructions file and re-materialize with
|
|
587
|
+
`--replace-undispatched` rather than editing the published prompt.
|
|
588
|
+
|
|
420
589
|
````
|
|
421
590
|
Perform plan-body verification for <task-key> (round 1).
|
|
422
591
|
|
|
592
|
+
**Prompt Delivery Mode:** eager-include
|
|
593
|
+
|
|
594
|
+
## Inputs
|
|
595
|
+
|
|
596
|
+
- Primary analysis packet: `<path ending in analysis-packet.md>`
|
|
597
|
+
|
|
423
598
|
## Instructions
|
|
424
599
|
|
|
425
600
|
Review the following items extracted from the consolidated implementation plan
|
|
@@ -436,6 +611,13 @@ verdict:
|
|
|
436
611
|
(e) item contradicts the trade-off matrix — **including a `P-Opt-*` option carrying an abstraction (helper module, strategy / factory, indirection layer, interface), a configuration knob every planned call site passes identically, or an optional parameter no planned call site supplies, when no `P-Req-*` requirement-coverage item in this same queue maps to it**: the matrix priced a complexity the option does not buy. Decide this from the queue alone — the requirement-coverage rows are in it, so this is plan-internal consistency, not a re-analysis of the brief. A behavior that already has two implementations is the opposite defect and belongs to `P-Var-*`; do not raise both on one behavior,
|
|
437
612
|
(f) requirement coverage row does not map the stated requirement to a concrete satisfying option / stage / step — citing an existing option counts as concrete even if that option's paths are abbreviated (that is (b) on the option's item, not (f)).
|
|
438
613
|
When you give a DISAGREE, also answer **Fixability** — `planner-fixable` if this defect can be fixed using only the code + this plan draft + the brief, `needs-user-input` if an open user clarification / external information is required.
|
|
614
|
+
|
|
615
|
+
On a `DISAGREE(a)`, or a `DISAGREE(f)` on a `P-Req-*` item, also answer **Claim** — those are the kinds that can block on your vote alone, so state what sort of claim it is and give okstra something to check.
|
|
616
|
+
|
|
617
|
+
- **`fact`** — write a **Probe** okstra can run, as one line of JSON: `{"kind": "path-absent", "path": "src/missing.ts"}`. The kinds are `path-exists`, `path-absent`, `literal-present`, `literal-absent` (a literal inside a file), and `citations-differ` (two spelled-out references that contradict each other, as `left` / `right`). Paths are project-relative.
|
|
618
|
+
- **`judgement`** — no probe. It takes a quorum, like `b` / `c` / `e`.
|
|
619
|
+
|
|
620
|
+
**Do not write a reproduction result.** okstra runs the probe and records the outcome; a result you write is discarded. If your claim cannot be written as one of those probes, it is a `judgement` — that is a classification, not a demotion, and a claim no machine can confirm should never have blocked on one vote.
|
|
439
621
|
- **SUPPLEMENT**: The item is sound but a dependency / edge case / precondition
|
|
440
622
|
is missing.
|
|
441
623
|
- **UNVERIFIABLE**: Capability, credential, network, or service state prevents
|
|
@@ -509,9 +691,16 @@ rerun a free-form requirements analysis. Every DISAGREE includes Fixability.
|
|
|
509
691
|
|
|
510
692
|
## Response format
|
|
511
693
|
|
|
694
|
+
Head each block with `### <plan item id>` at exactly three hashes. The heading
|
|
695
|
+
depth is not style: the collector parses `^### ` and nothing else, so a block
|
|
696
|
+
written at any other depth is not an unparsed block — it is a verdict that was
|
|
697
|
+
never recorded, and the round is scored on the items that remain.
|
|
698
|
+
|
|
512
699
|
### P-Step-3
|
|
513
700
|
**Verdict**: AGREE | DISAGREE(<a|b|c|d|e|f>) | SUPPLEMENT | UNVERIFIABLE
|
|
514
701
|
**Fixability** (only when DISAGREE): planner-fixable | needs-user-input — "planner-fixable if it can be fixed using only the code + this plan + the brief". Fixability is not applicable for `UNVERIFIABLE`.
|
|
702
|
+
**Claim** (only on `DISAGREE(a)`, or `DISAGREE(f)` on a P-Req item): fact | judgement
|
|
703
|
+
**Probe** (only when Claim is fact): <one line of JSON, e.g. {"kind": "path-absent", "path": "src/missing.ts"}>
|
|
515
704
|
**Note**: <the falsification candidate considered and why it is excluded; required even for AGREE>
|
|
516
705
|
**Explanation**: <2-3 sentences>
|
|
517
706
|
|
|
@@ -525,6 +714,11 @@ rerun a free-form requirements analysis. Every DISAGREE includes Fixability.
|
|
|
525
714
|
**Explanation**: <2-3 sentences applying the disposition-specific rule>
|
|
526
715
|
````
|
|
527
716
|
|
|
717
|
+
**This template is the round-1 prompt.** Before rendering a round 2 or later,
|
|
718
|
+
read §"Re-verification rounds (round 2+)" below first — such a round carries
|
|
719
|
+
blocks this template does not have, and re-rendering this one alone is a
|
|
720
|
+
contract violation.
|
|
721
|
+
|
|
528
722
|
When `config.adversarial == true`, the lead prepends the adversarial framing from §"Adversarial plan-body posture" to the `## Instructions` block: the burden of proof is on the plan, the verifier opens and confirms every accessible cited path / command, and evidence that was opened but is insufficient yields the applicable `DISAGREE(<kind>)` rather than `AGREE`. Inability to inspect because of capability, credential, network, or service state yields `UNVERIFIABLE`, not DISAGREE. The verdict tokens, breakage kinds (a–f), classification, and the majority gate threshold are unchanged. This prepended framing supersedes the template's "Judge solely from plan internal consistency" instruction for the adversarial round.
|
|
529
723
|
|
|
530
724
|
The "Reverify prompt: required-reading suppression" rule in [convergence](./convergence.md) (lightweight mode does NOT inject a `[Required reading]` clause) applies here as well.
|