okstra 0.207.0 → 0.208.0

package/runtime/python/okstra_ctl/wizard/__init__.py

@@ -1,8 +1,8 @@
 """okstra-run wizard — state machine for interactive task setup.
 
 The okstra-run skill used to encode the full input-collection flow in prose,
-which drifted into seven internal inconsistencies (executor placement,
-free-text-via-AskUserQuestion, missing clarification prompt for impl, etc.).
+which drifted into seven internal inconsistencies (free-text-via-AskUserQuestion,
+missing clarification prompt for impl, etc.).
 This package owns the flow as code so the skill becomes a thin loop.
 
 Public surface (re-exported here; the skill calls it through the
@@ -24,34 +24,25 @@ from __future__ import annotations
 
 from .ids import (
     ALL_STAGES,
-    ANTIGRAVITY_MODEL_OPTIONS,
     BASE_REF_FREE_INPUT_TOKEN,
     BRIEF_CARRY_ABORT,
     BRIEF_CARRY_SWITCH_ENTRY,
     CANONICAL_BASE_REFS,
-    CLAUDE_MODEL_OPTIONS,
-    CODEX_MODEL_OPTIONS,
-    EXECUTORS,
-    GROK_MODEL_OPTIONS,
     GROUP_LABELS,
     GROUP_MAX_TABS,
-    GROUP_MODELS,
     GROUP_OPTIONS,
-    KIMI_MODEL_OPTIONS,
     PICK_OTHER,
     PICK_SKIP,
     PICK_TYPE_CUSTOM,
     PICK_USE_DEFAULT,
     PICK_USE_SUGGESTED,
     PROMPT_GROUPS,
-    ROLE_BLURBS,
     SCOPE_SHAPE_LINKED,
     SCOPE_SHAPE_NO_ANSWERS,
     SCOPE_SHAPE_UNLINKED,
     S_ABORTED,
     S_ANALYSIS_TARGET,
     S_ANALYSIS_TARGET_PICK,
-    S_ANTIGRAVITY_MODEL,
     S_APPROVED_PLAN,
     S_APPROVED_PLAN_PICK,
     S_APPROVE_PLAN_CONFIRM,
@@ -63,12 +54,7 @@ from .ids import (
     S_BRIEF_PATH_PICK,
     S_CLARIFICATION,
     S_CLARIFICATION_PICK,
-    S_CLAUDE_MODEL,
-    S_CODEX_MODEL,
     S_CONFIRM,
-    S_CRITIC_PICK,
-    S_CRITIC_TEXT,
-    S_DEFAULTS_OR_CUSTOM,
     S_DESIGN_PREP_CONFIRM,
     S_DESIGN_PREP_DECISION,
     S_DESIGN_PREP_OVERRIDES,
@@ -76,15 +62,10 @@ from .ids import (
     S_DIRECTIVE_PICK,
     S_DONE,
     S_EDIT_TARGET,
-    S_EXECUTOR,
-    S_EXECUTOR_MODEL,
     S_FEATURE_EVIDENCE,
     S_FEATURE_EVIDENCE_PICK,
     S_FIX_CYCLE_CONFIRM,
-    S_GROK_MODEL,
     S_HANDOFF_STAGE_PICK,
-    S_KIMI_MODEL,
-    S_LEAD_MODEL,
     S_PROJECT_EVIDENCE,
     S_PROJECT_EVIDENCE_PICK,
     S_PR_TEMPLATE,
@@ -92,7 +73,6 @@ from .ids import (
     S_PR_TEMPLATE_SCOPE,
     S_RELATED_TASKS,
     S_RELATED_TASKS_PICK,
-    S_REPORT_WRITER_MODEL,
     S_REUSE_PREVIOUS,
     S_REVERIFY_SCOPE_PICK,
     S_REVERIFY_SCOPE_STAGES,
@@ -105,8 +85,6 @@ from .ids import (
     S_TASK_PICK,
     S_TASK_TYPE,
     S_TASK_TYPE_TEXT,
-    S_WORKERS_CUSTOM,
-    S_WORKERS_OVERRIDE,
     TASK_PICK_NEW_TOKEN,
     TASK_TYPES,
     TASK_TYPE_VALUES,

package/runtime/python/okstra_ctl/wizard/cli.py

@@ -8,7 +8,7 @@ from pathlib import Path
 from okstra_ctl.registry.host_registry import default_host_registry
 
 from .state import WizardError
-from .statefile import _save_resumed_state_file, load_state_file, save_state_file
+from .statefile import load_state_file, save_state_file
 from .confirmation import confirmation_block
 from .engine import (
     _auto_start_new_task_when_it_is_the_only_choice,
@@ -55,7 +55,6 @@ def main(argv: list[str]) -> int:
         choices=("spawn-process", "current-session"),
     )
     p_init.add_argument("--available-function", action="append", default=[])
-    p_init.add_argument("--critic", default="")
 
     p_step = sub.add_parser("step")
     p_step.add_argument("--state-file", required=True)
@@ -88,8 +87,6 @@ def main(argv: list[str]) -> int:
             host_entry_mode=args.entry_mode,
             available_functions=args.available_function,
         )
-        if args.critic:
-            state.critic = args.critic
         _auto_start_new_task_when_it_is_the_only_choice(state)
         save_state_file(state_path, state)
         first = next_prompt(state)
@@ -124,7 +121,7 @@ def main(argv: list[str]) -> int:
             else:
                 result = submit(state, args.answer)
         except WizardError as exc:
-            _save_resumed_state_file(state_path, persisted_state)
+            save_state_file(state_path, persisted_state)
             try:
                 # current 는 방금 디스크로 되돌린 상태에서 렌더한다. 뮤테이션이
                 # 진행되다 만 state 로 렌더하면, 검증 전에 필드를 채운 핸들러
@@ -142,7 +139,7 @@ def main(argv: list[str]) -> int:
             print(json.dumps({"ok": False, "error": str(exc), "current": current},
                              ensure_ascii=False, indent=2))
             return 0
-        _save_resumed_state_file(state_path, state)
+        save_state_file(state_path, state)
         print(json.dumps({"ok": True, **result}, ensure_ascii=False, indent=2))
         return 0
 

package/runtime/python/okstra_ctl/wizard/confirmation.py

@@ -22,7 +22,7 @@ from .state import (
     WizardError,
     WizardState,
     _load_role_profile_for_state,
-    _role_selection_enabled,
+    _role_selection_ready,
 )
 from .prompts import _msg, _opt, _p
 from .sources import _resolve_path, _reverify_scope_preview
@@ -255,16 +255,7 @@ def confirmation_block(state: WizardState) -> str:
     worktree_line = _worktree_preview_line(state)
     if worktree_line is not None:
         lines.append(worktree_line)
-    role_selection = _role_selection_enabled(state)
-    if state.task_type == "implementation" and not role_selection:
-        lines.append(f"  executor      : {state.executor or '(default)'}")
-        lines.append(
-            _msg(state.workspace_root, "confirmation", "workers_implementation_default")
-        )
-    elif not role_selection:
-        roster = state.workers_override or ",".join(state.profile_workers) or "(profile default)"
-        lines.append(f"  workers       : {roster}")
-    if role_selection:
+    if _role_selection_ready(state):
         profile = _load_role_profile_for_state(state)
         native_provider = default_host_registry().resolve(
             state.host_runtime
@@ -308,32 +299,9 @@ def confirmation_block(state: WizardState) -> str:
                 "dynamic_role",
                 role=requirement.role,
             ))
-    else:
-        lines.append(
-            f"  lead          : {state.lead_provider or 'claude'} / "
-            f"{state.lead_model or 'default'}"
-        )
-        if state.claude_model:
-            lines.append(f"  claude-model  : {state.claude_model}")
-        if state.codex_model:
-            lines.append(f"  codex-model   : {state.codex_model}")
-        if state.antigravity_model:
-            lines.append(f"  antigravity-model  : {state.antigravity_model}")
-        if state.grok_model:
-            lines.append(f"  grok-model    : {state.grok_model}")
-        if state.kimi_model:
-            lines.append(f"  kimi-model    : {state.kimi_model}")
-        if state.report_writer_model or state.report_writer_provider:
-            lines.append(
-                f"  report-writer : {state.report_writer_provider or 'claude'} / "
-                f"{state.report_writer_model or 'default'}"
-            )
     lines.append(f"  directive     : {state.directive or '(none)'}")
     if state.related_tasks_raw:
         lines.append(f"  related-tasks : {state.related_tasks_raw}")
-    if (not role_selection
-            and state.task_type in ("requirements-discovery", "error-analysis", "implementation-planning", "final-verification")):
-        lines.append(f"  critic        : {state.critic or '(off)'}")
     if state.task_type in _STAGE_SCOPED_TASK_TYPES:
         lines.append(f"  approved-plan : {state.approved_plan_path}")
         stage = wizard_stage_confirmation_label(
@@ -365,7 +333,7 @@ def confirmation_block(state: WizardState) -> str:
     report_writer_models = state.role_models.get("report-writer", [])
     translator_model = (
         report_writer_models[0] if report_writer_models
-        else f"{state.report_writer_provider or 'claude'}/{state.report_writer_model or 'default'}"
+        else "(selection required)"
     )
     lines.append(_msg(
         state.workspace_root, "confirmation", "translation_scope", model=translator_model,

package/runtime/python/okstra_ctl/wizard/engine.py

@@ -23,7 +23,6 @@ from .ids import (
     PROMPT_GROUPS,
     S_ABORTED,
     S_CONFIRM,
-    S_DEFAULTS_OR_CUSTOM,
     S_DESIGN_PREP_CONFIRM,
     S_DESIGN_PREP_OVERRIDES,
     S_DONE,
@@ -43,7 +42,7 @@ from .picker_navigation import (
 from .roles import _submit_role_prompt, next_role_prompt
 from .steps_identity import _submit_task_pick
 from .steps_analysis import _advance_design_prep_item
-from .registry import STEPS, STEP_BY_ID
+from .registry import STEPS, STEP_BY_ID, _ROLE_SELECTION_BOUNDARY
 
 
 # ---- Public API ---------------------------------------------------------
@@ -57,7 +56,6 @@ def init_state(
 ) -> WizardState:
     """Bootstrap a new wizard state."""
     return WizardState(
-        execution_identity_version=2,
         workspace_root=workspace_root,
         project_root=project_root,
         project_id=project_id,
@@ -177,7 +175,7 @@ def _next_prompt_screen(state: WizardState) -> Prompt:
     if state.confirmed:
         return Prompt(step=S_DONE, kind="done")
     for step in STEPS:
-        if step.id == S_DEFAULTS_OR_CUSTOM:
+        if step.id == _ROLE_SELECTION_BOUNDARY:
             role_prompt = next_role_prompt(state)
             if role_prompt is not None:
                 return role_prompt

package/runtime/python/okstra_ctl/wizard/ids.py

@@ -4,7 +4,6 @@ from __future__ import annotations
 import re
 
 from okstra_ctl.analysis_inputs import ANALYSIS_TASK_TYPES
-from okstra_ctl.models import picker_options
 
 
 # ---- Constants -----------------------------------------------------------
@@ -33,21 +32,6 @@ TASK_TYPES: list[tuple[str, str]] = [
 TASK_TYPE_VALUES = [tt for tt, _ in TASK_TYPES]
 
 
-EXECUTORS = ["claude", "codex", "antigravity"]
-
-
-# 역할 한 줄 설명 — defaults_or_custom 안내에서 각 역할이 무슨 일을 하는지 보여준다.
-ROLE_BLURBS = {
-    "lead": "Okstra lead · 워커 dispatch·교차검증 수렴·최종 합성",
-    "claude": "독립 분석 워커 (Claude)",
-    "codex": "독립 분석 워커 (Codex)",
-    "antigravity": "독립 분석 워커 (Antigravity)",
-    "grok": "독립 분석 워커 (Grok)",
-    "kimi": "독립 분석 워커 (Kimi)",
-    "report-writer": "최종 리포트 작성 (분석은 하지 않음)",
-}
-
-
 # Task types that consume an approved plan and need a stage-scope pick:
 # implementation executes a stage, final-verification verifies a stage
 # (or the whole task via `auto`). Both gate the approved-plan + stage steps.
@@ -72,21 +56,6 @@ CANONICAL_BASE_REFS = ["main", "dev", "staging", "preprod", "prod"]
 BASE_REF_FREE_INPUT_TOKEN = "__free_input__"
 
 
-CLAUDE_MODEL_OPTIONS = ["default", *picker_options("claude")]
-
-
-CODEX_MODEL_OPTIONS = ["default", *picker_options("codex")]
-
-
-ANTIGRAVITY_MODEL_OPTIONS = ["default", *picker_options("antigravity")]
-
-
-GROK_MODEL_OPTIONS = ["default", *picker_options("grok")]
-
-
-KIMI_MODEL_OPTIONS = ["default", *picker_options("kimi")]
-
-
 # special pick value: start a brand-new task
 TASK_PICK_NEW_TOKEN = "__new__"
 
@@ -108,10 +77,6 @@ PICK_TYPE_CUSTOM = "__free_input__"
 _ABORT_OPTION = "__abort__"
 
 
-# workers_override 에서 "옵션 워커를 추가하지 않음" 을 뜻하는 sentinel.
-_DEFAULT_ROSTER_TOKEN = "__default_roster__"
-
-
 _RECENT_PREFIX = "__recent:"
 
 
@@ -222,51 +187,9 @@ S_STAGE_PICK = "stage_pick"
 S_HANDOFF_STAGE_PICK = "handoff_stage_pick"
 
 
-S_EXECUTOR = "executor"
-
-
-S_CRITIC_PICK = "critic_pick"
-
-
-S_CRITIC_TEXT = "critic_text"
-
-
 S_REUSE_PREVIOUS = "reuse_previous"
 
 
-S_DEFAULTS_OR_CUSTOM = "defaults_or_custom"
-
-
-S_WORKERS_OVERRIDE = "workers_override"
-
-
-S_WORKERS_CUSTOM = "workers_custom"
-
-
-S_LEAD_MODEL = "lead_model"
-
-
-S_EXECUTOR_MODEL = "executor_model"
-
-
-S_CLAUDE_MODEL = "claude_model"
-
-
-S_CODEX_MODEL = "codex_model"
-
-
-S_ANTIGRAVITY_MODEL = "antigravity_model"
-
-
-S_GROK_MODEL = "grok_model"
-
-
-S_KIMI_MODEL = "kimi_model"
-
-
-S_REPORT_WRITER_MODEL = "report_writer_model"
-
-
 S_DIRECTIVE_PICK = "directive_pick"
 
 
@@ -317,9 +240,6 @@ S_ABORTED = "aborted"
 
 # ---- 멀티탭 배치 프롬프트 그룹 (방출 계층 전용) ----
 # 그룹 id 는 S_* 가 아니므로 prompts JSON SOT / step-id 동기화 검사 대상이 아니다.
-GROUP_MODELS = "models"
-
-
 GROUP_OPTIONS = "options"
 
 
@@ -327,18 +247,14 @@ GROUP_MAX_TABS = 4  # AskUserQuestion 의 질문(탭) 수 한도
 
 
 # 멤버는 모두 서로 의존이 없는 단일선택 픽 step 이어야 한다.
-# *_TEXT 후속 / workers_override / pr_template_scope 는 의존성 때문에 개별 유지.
+# *_TEXT 후속 / pr_template_scope 는 의존성 때문에 개별 유지.
 PROMPT_GROUPS: dict[str, tuple[str, ...]] = {
-    GROUP_MODELS: (S_LEAD_MODEL, S_EXECUTOR_MODEL, S_CLAUDE_MODEL,
-                   S_CODEX_MODEL, S_ANTIGRAVITY_MODEL, S_GROK_MODEL,
-                   S_KIMI_MODEL, S_REPORT_WRITER_MODEL),
     GROUP_OPTIONS: (S_DIRECTIVE_PICK, S_RELATED_TASKS_PICK,
                     S_CLARIFICATION_PICK, S_PR_TEMPLATE_PICK),
 }
 
 
 GROUP_LABELS: dict[str, str] = {
-    GROUP_MODELS: "모델 선택 (탭별로 선택)",
     GROUP_OPTIONS: "추가 옵션 (탭별로 선택)",
 }
 
@@ -406,8 +322,5 @@ _REUSE_FILLED_STEPS = (
     S_FEATURE_EVIDENCE_PICK, S_FEATURE_EVIDENCE,
     S_PROJECT_EVIDENCE_PICK, S_PROJECT_EVIDENCE,
     S_ANALYSIS_TARGET_PICK, S_ANALYSIS_TARGET,
-    S_DEFAULTS_OR_CUSTOM, S_WORKERS_OVERRIDE, S_LEAD_MODEL, S_EXECUTOR_MODEL,
-    S_CLAUDE_MODEL, S_CODEX_MODEL, S_ANTIGRAVITY_MODEL, S_GROK_MODEL,
-    S_KIMI_MODEL, S_REPORT_WRITER_MODEL,
     S_DIRECTIVE_PICK, S_DIRECTIVE, S_RELATED_TASKS_PICK, S_RELATED_TASKS,
     S_CLARIFICATION_PICK, S_CLARIFICATION)