okstra 0.183.2 → 0.184.0

package/runtime/python/okstra_ctl/wizard.py

@@ -1231,17 +1231,6 @@ def _wizard_state_from_json(payload: dict[str, Any]) -> WizardState:
     if version != 2:
         state.execution_identity_version = 2
         _convert_v1_provider_selections(state, payload)
-        # v1 은 리더 확인 칸이 없었다. 변환 재개 시 다시 묻지 않는다.
-        if (
-            state.host_entry_mode == "current-session"
-            and _LEADER_SESSION_STEP not in state.answered
-        ):
-            state.answered.append(_LEADER_SESSION_STEP)
-        if (
-            state.host_entry_mode == "current-session"
-            and _LEADER_SESSION_STEP not in state.role_selection_order
-        ):
-            state.role_selection_order.insert(0, _LEADER_SESSION_STEP)
     return state
 
 
@@ -1281,13 +1270,8 @@ def _role_model_prompt_id(role: str, ordinal: int) -> str:
     return f"role-model:{role}:{ordinal}"
 
 
-_LEADER_SESSION_STEP = "leader-session"
-
-
 def _is_role_selection_step(step_id: str) -> bool:
-    return step_id == _LEADER_SESSION_STEP or step_id.startswith(
-        ("role-count:", "role-model:", "role-add:")
-    )
+    return step_id.startswith(("role-count:", "role-model:", "role-add:"))
 
 
 def _selected_role_count(
@@ -1320,36 +1304,6 @@ def _selectable_static_requirements(
     return tuple(requirements)
 
 
-def _leader_session_prompt(state: WizardState) -> Prompt:
-    """current-session 리더 칸: 모델/effort 표시만 하고 role_models 에 쓰지 않는다."""
-    attestation = _host_session_context(state).current_model
-    model_ref = (
-        attestation.normalized_model_ref
-        or attestation.observed_model
-        or "current-session"
-    )
-    steps = _load_wizard_root(state.workspace_root)["steps"]
-    raw = steps.get("leader_session") or {}
-    effort_suffix = ""
-    if attestation.effort:
-        effort_template = raw.get("effort_suffix", " · effort {effort}")
-        effort_suffix = effort_template.format(effort=attestation.effort)
-    prompt = _p(
-        state.workspace_root,
-        "leader_session",
-        model_ref=model_ref,
-        effort_suffix=effort_suffix,
-    )
-    continue_label = prompt["options"].get("continue", "계속")
-    return Prompt(
-        step=_LEADER_SESSION_STEP,
-        kind="pick",
-        label=prompt["label"],
-        options=[_opt("continue", continue_label)],
-        echo_template=prompt["echo_template"],
-    )
-
-
 def _count_prompt(
     state: WizardState,
     requirement: RoleRequirement,
@@ -1777,13 +1731,6 @@ def next_role_prompt(state: WizardState) -> Prompt | None:
     if not _role_selection_enabled(state) or not _identity_ready(state):
         return None
     state.use_defaults = False
-    # current-session: 리더는 읽기 전용 확인 칸만 먼저 보여 준다.
-    if (
-        state.host_entry_mode == "current-session"
-        and _LEADER_SESSION_STEP not in state.answered
-        and _LEADER_SESSION_STEP not in state.role_selection_order
-    ):
-        return _leader_session_prompt(state)
     profile = _load_role_profile_for_state(state)
     for requirement in profile.roles:
         # 필수 수량: min < max 이고 min > 0 일 때만.
@@ -1884,11 +1831,6 @@ def _validate_submitted_role_model(
 
 
 def _submit_role_prompt(state: WizardState, prompt: Prompt, value: str) -> str:
-    if prompt.step == _LEADER_SESSION_STEP:
-        if value != "continue":
-            raise WizardError("leader session step accepts only 'continue'")
-        # role_models["leader"] 에 쓰지 않는다 — 현재 세션 모델을 그대로 쓴다.
-        return "leader-session: continue"
     if prompt.step.startswith("role-count:"):
         role = prompt.step.split(":", 1)[1]
         profile = _load_role_profile_for_state(state)
@@ -2041,9 +1983,11 @@ def _p(workspace_root: str, step_id: str, **vars: str) -> dict:
         raise WizardError(f"unknown wizard step_id: {step_id!r}")
     label_template = raw.get("label", "")
     fv_label_template = raw.get("label_final_verification", "")
+    unlinked_template = raw.get("label_unlinked", "")
     try:
         label = label_template.format(**vars)
         label_final_verification = fv_label_template.format(**vars)
+        label_unlinked = unlinked_template.format(**vars)
     except KeyError as exc:
         missing = exc.args[0] if exc.args else "<unknown>"
         raise WizardError(
@@ -2052,6 +1996,7 @@ def _p(workspace_root: str, step_id: str, **vars: str) -> dict:
     return {
         "label": label,
         "label_final_verification": label_final_verification,
+        "label_unlinked": label_unlinked,
         "echo_template": raw.get("echo_template", ""),
         "options": raw.get("options", {}),
         "options_final_verification": raw.get("options_final_verification", {}),
@@ -4191,14 +4136,15 @@ def _reverify_scope_preview(state: WizardState) -> Optional[dict]:
 
 
 def _reverify_scope_pick_required(state: WizardState) -> bool:
-    """좁힐 여지가 있는 재실행에서만 범위를 묻는다.
+    """좁힐 여지가 있거나, unlinked id 의 stage 번호를 받아야 할 때 묻는다.
 
-    링크가 끊겨 full 이 이미 확정된 재실행에서 물으면 어떤 답도 판정을 바꾸지
-    못한다 — 고를 수 없는 선택지를 내미는 화면이 하나 느는 것뿐이다. 그 경우
-    확인 블록의 `reverify-scope: full 예상` 줄이 이유까지 같이 알려준다.
+    unlinked 는 full 확정이 아니다. SHA 가 바뀌었거나 입력을 읽을 수 없어
+    `wouldForceFull` 인 경우만 질문이 의미 없다.
     """
     preview = _reverify_scope_preview(state)
-    return preview is not None and not preview["wouldForceFull"]
+    return preview is not None and (
+        not preview["wouldForceFull"] or bool(preview["unlinkedIds"])
+    )
 
 
 def _reverify_scope_step_pending(state: WizardState) -> bool:
@@ -4234,13 +4180,20 @@ def _prior_stage_numbers(state: WizardState) -> set[int]:
 def _build_reverify_scope_pick(state: WizardState) -> Prompt:
     t = _p(state.workspace_root, "reverify_scope_pick")
     opts = t["options"]
+    preview = _reverify_scope_preview(state) or {}
+    unlinked = bool(preview.get("unlinkedIds"))
+    options = []
+    if not unlinked:
+        options.append(_opt("auto", opts["auto"]))
+        options.append(_opt("full", opts["full"]))
+        options.append(_opt(PICK_TYPE_CUSTOM, opts[PICK_TYPE_CUSTOM]))
+    else:
+        options.append(_opt(PICK_TYPE_CUSTOM, opts[PICK_TYPE_CUSTOM]))
+        options.append(_opt("full", opts["full"]))
+    label = t["label_unlinked"] if unlinked else t["label"]
     return Prompt(
-        step=S_REVERIFY_SCOPE_PICK, kind="pick", label=t["label"],
-        options=[
-            _opt("auto", opts["auto"]),
-            _opt("full", opts["full"]),
-            _opt(PICK_TYPE_CUSTOM, opts[PICK_TYPE_CUSTOM]),
-        ],
+        step=S_REVERIFY_SCOPE_PICK, kind="pick", label=label,
+        options=options,
         echo_template=t["echo_template"])
 
 
@@ -4255,6 +4208,13 @@ def _submit_reverify_scope_pick(state: WizardState, value: str) -> Optional[str]
         raise WizardError(
             f"expected 'auto' / 'full' / {PICK_TYPE_CUSTOM!r}, got: {value!r}"
         )
+    if picked == "auto":
+        preview = _reverify_scope_preview(state) or {}
+        unlinked = preview.get("unlinkedIds") or []
+        if unlinked:
+            raise WizardError(
+                t["errors"]["unlinked_auto"].format(ids=", ".join(unlinked))
+            )
     state.reverify_scope = picked
     state.reverify_scope_pending_text = False
     return t["echo_suffixes"][picked]
@@ -4271,6 +4231,12 @@ def _submit_reverify_scope_stages(state: WizardState, value: str) -> Optional[st
     t = _p(state.workspace_root, "reverify_scope_stages")
     tokens = [token.strip() for token in value.split(",") if token.strip()]
     if not tokens:
+        preview = _reverify_scope_preview(state) or {}
+        unlinked = preview.get("unlinkedIds") or []
+        if unlinked:
+            raise WizardError(
+                t["errors"]["unlinked_empty"].format(ids=", ".join(unlinked))
+            )
         state.reverify_scope = "auto"
         state.reverify_scope_pending_text = False
         return t["echo_suffixes"]["auto"]
@@ -6341,13 +6307,13 @@ def _reverify_scope_line(state: WizardState) -> Optional[str]:
     if state.reverify_scope and state.reverify_scope != "auto":
         return _msg(state.workspace_root, "confirmation",
                     "reverify_scope_user_stages", stages=state.reverify_scope)
-    if not preview["wouldForceFull"]:
-        return _msg(state.workspace_root, "confirmation",
-                    "reverify_scope_incremental")
     if preview["unlinkedIds"]:
         return _msg(state.workspace_root, "confirmation",
                     "reverify_scope_unlinked",
                     ids=", ".join(preview["unlinkedIds"]))
+    if not preview["wouldForceFull"]:
+        return _msg(state.workspace_root, "confirmation",
+                    "reverify_scope_incremental")
     return _msg(state.workspace_root, "confirmation", "reverify_scope_full",
                 reason=preview["reason"])
 

package/runtime/schemas/final-report-v2.0.schema.json

@@ -9145,6 +9145,12 @@
       "properties": {
         "setAside": {"type": "array", "items": {"type": "object", "required": ["id", "reason"], "additionalProperties": false, "properties": {"id": {"type": "string", "minLength": 1}, "reason": {"type": "string", "enum": ["record", "observed", "deferred"]}}}},
         "stageLedger": {"type": "object", "additionalProperties": {"type": "string", "enum": ["done", "active", "ready", "blocked"]}},
+        "dispatchQueue": {
+          "type": "array",
+          "description": "Plan-item ids sent to verifiers this round. In-scope plus plan-wide; deferred and observed stages are omitted.",
+          "items": {"type": "string", "minLength": 1},
+          "uniqueItems": true
+        },
         "uniformVerifiers": {
           "type": "array",
           "description": "Verifiers whose every vote this round was one verdict. Advisory: a unanimous round is legitimate, but the gate reads as a three-way cross-check unless this sits beside it.",
@@ -9172,6 +9178,10 @@
             }
           }
         },
+        "gating": {
+          "type": "boolean",
+          "description": "If false, plan-body verification is advisory: majority-disagree does not block approval, the self-fix loop does not run, and only one automatic round is allowed. Legal only when designPreparation.mode is no-design-inputs and the Stage Map has exactly one row. Prepare emits true; plan-items prepare/seed flip it after those facts exist."
+        },
         "roundCount": {
           "type": "integer",
           "minimum": 0
@@ -9247,6 +9257,8 @@
             "properties": {
               "block": {"type": "string", "enum": ["execution", "record"]},
               "stageScope": {"type": "array", "minItems": 1, "uniqueItems": true, "items": {"type": "integer", "minimum": 1}},
+              "contentHash": {"type": "string", "pattern": "^[a-f0-9]{64}$", "description": "SHA-256 of subject+payload+block+stageScope for the current extract."},
+              "verifiedContentHash": {"type": "string", "pattern": "^[a-f0-9]{64}$", "description": "contentHash at the last apply-verdicts. Matching hashes keep a pre-self-fix verdict."},
               "id": {
                 "type": "string",
                 "minLength": 1

package/runtime/schemas/final-report-v3.0.schema.json

@@ -9140,6 +9140,12 @@
       "properties": {
         "setAside": {"type": "array", "items": {"type": "object", "required": ["id", "reason"], "additionalProperties": false, "properties": {"id": {"type": "string", "minLength": 1}, "reason": {"type": "string", "enum": ["record", "observed", "deferred"]}}}},
         "stageLedger": {"type": "object", "additionalProperties": {"type": "string", "enum": ["done", "active", "ready", "blocked"]}},
+        "dispatchQueue": {
+          "type": "array",
+          "description": "Plan-item ids sent to verifiers this round. In-scope plus plan-wide; deferred and observed stages are omitted.",
+          "items": {"type": "string", "minLength": 1},
+          "uniqueItems": true
+        },
         "uniformVerifiers": {
           "type": "array",
           "description": "Verifiers whose every vote this round was one verdict. Advisory: a unanimous round is legitimate, but the gate reads as a three-way cross-check unless this sits beside it.",
@@ -9167,6 +9173,10 @@
             }
           }
         },
+        "gating": {
+          "type": "boolean",
+          "description": "If false, plan-body verification is advisory: majority-disagree does not block approval, the self-fix loop does not run, and only one automatic round is allowed. Legal only when designPreparation.mode is no-design-inputs and the Stage Map has exactly one row. Prepare emits true; plan-items prepare/seed flip it after those facts exist."
+        },
         "roundCount": {
           "type": "integer",
           "minimum": 0
@@ -9242,6 +9252,8 @@
             "properties": {
               "block": {"type": "string", "enum": ["execution", "record"]},
               "stageScope": {"type": "array", "minItems": 1, "uniqueItems": true, "items": {"type": "integer", "minimum": 1}},
+              "contentHash": {"type": "string", "pattern": "^[a-f0-9]{64}$", "description": "SHA-256 of subject+payload+block+stageScope for the current extract."},
+              "verifiedContentHash": {"type": "string", "pattern": "^[a-f0-9]{64}$", "description": "contentHash at the last apply-verdicts. Matching hashes keep a pre-self-fix verdict."},
               "id": {
                 "type": "string",
                 "minLength": 1

package/runtime/skills/okstra-run/SKILL.md

@@ -185,9 +185,9 @@ That is the entire interactive flow. The wizard handles:
 - base-ref pick + git rev-parse validation (skipped when reusing an active worktree),
 - `implementation`-only sub-flow: approved-plan path (frontmatter `approved: true` check) + stage pick (`auto` = the earliest incomplete stage whose dependencies are satisfied, or a specific stage number). Implementer slots use role-count / role-model like every other role (`executor` is only a compatibility alias for `implementer`). When an approved plan is selected and a `## PLAN DECISION` sidecar carrying `Status: approved`, exported from the report — matching the plan on source-report·seq — is detected in that run's sibling `user-responses/`, the approve-confirm step expands to 3 options (`yes_apply` recommended: approve + apply the option as exported / `yes` approve only / `no` abort) — `yes_apply` validates the option against the plan's `optionCandidates` before applying it via the existing approval·option path,
 - `release-handoff`-only sub-flow: after the approved plan auto-resolves, a `handoff_stage_pick` multi-select — choose an eligible stage bundle (stage-group) or the whole task (when an accepted whole-task verification report exists); the result goes out as render-args' `stages` key (csv, empty when whole-task),
-- launch selection after identity/worktree steps: leader session read-only (current-session) → role-count per static role (`min..max`, omit uses **recommended**, skip when `min == max`) → role-model `provider/model` per slot → min=0 roles only via role-add (default skip). The wizard does not fork on defaults-vs-customize, does not show a provider roster multi-pick, and does not offer a separate implementer-provider pick. Dynamic verifiers are not chosen at launch. `--workers` is compatibility-only, not a launch picker. Repeated `--role-count` / `--role-model` tokens on `renderArgv` are intentional,
+- launch selection after identity/worktree steps: role-count per static role (`min..max`, omit uses **recommended**, skip when `min == max`) → role-model `provider/model` per slot → min=0 roles only via role-add (default skip). current-session lead is this session and is listed on the confirmation summary, not as a wizard step. The wizard does not fork on defaults-vs-customize, does not show a provider roster multi-pick, and does not offer a separate implementer-provider pick. Dynamic verifiers are not chosen at launch. `--workers` is compatibility-only, not a launch picker. Repeated `--role-count` / `--role-model` tokens on `renderArgv` are intentional,
 - **resume-clarification (in-session equivalent)** — there is no separate mode or flag matching the shell's `okstra.sh --resume-clarification`; two steps of the standard flow carry out its substance. (1) `reuse_previous` (yes/no to reuse the previous run's settings — in `requirements-discovery` / `error-analysis` / `implementation-planning`, only when prior run-inputs exist): YES prefills role-count·role-model·directive·related-tasks at once. (2) `clarification_pick`: if the **task-type's own** previous `final-report` exists it is auto-recommended as the carry-in input (falling back to the newest by mtime across all phases when absent), and the same run's `user-responses/` sidecar (answers the user filled in) is attached alongside. The chosen path is passed to prepare as `--clarification-response` — the user makes the sidecar via the report's `Export user response`, places it in `runs/<task-type>/user-responses/`, and re-runs the same phase,
-- **re-verification scope (`reverify_scope_pick`, `implementation-planning` clarification re-runs only)** — asked right before `confirm`, and **only when the re-run is narrowable** (every answered `C-NNN` traces back to a stage in the prior report). 3 options: `auto` (recommended — leave it to the lead's `okstra incremental-scope` decision) / `full` (re-verify every stage) / Enter directly (a stage-number CSV, validated against the prior report's Stage Map). The answer goes out as `--reverify-scope` and reaches the lead prompt as the `REVERIFY_SCOPE_MODE` / `REVERIFY_SCOPE_STAGES` tokens; it shapes that CLI's inputs rather than replacing the decision. When the re-run is not narrowable the step does not appear — full is already fixed, and the confirmation block's `reverify-scope` line says which answered id broke the link,
+- **re-verification scope (`reverify_scope_pick`, `implementation-planning` clarification re-runs only)** — asked right before `confirm` when the re-run is narrowable **or** an answered `C-NNN` traces to no stage. When every answered id traces to a stage: 3 options — `auto` (recommended — leave it to the lead's `okstra incremental-scope` decision) / `full` (re-verify every stage) / Enter directly (a stage-number CSV, validated against the prior report's Stage Map). When an id is unlinked, `auto` is omitted and the user names stages or picks `full`; that unlinked id does not freeze the run at full. The answer goes out as `--reverify-scope` and reaches the lead prompt as the `REVERIFY_SCOPE_MODE` / `REVERIFY_SCOPE_STAGES` tokens; it shapes that CLI's inputs rather than replacing the decision. The confirmation block's `reverify-scope` line names unlinked ids as needing stage numbers, not as a forced full re-run,
 - `release-handoff` PR template override + persist scope,
 - final `Proceed / Edit` confirmation; on `Edit` the wizard asks which step to rewind to and clears every later answer.