okstra 0.234.1 → 0.236.0

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.
Files changed (171) hide show
  1. package/dist/cli-registry.mjs +7 -0
  2. package/dist/cli-registry.mjs.map +1 -1
  3. package/dist/commands/implementation-report/implementation-report.d.mts +1 -0
  4. package/dist/commands/implementation-report/implementation-report.mjs +73 -0
  5. package/dist/commands/implementation-report/implementation-report.mjs.map +1 -0
  6. package/dist/commands/trace/comparison.d.mts +39 -0
  7. package/dist/commands/trace/comparison.mjs +138 -0
  8. package/dist/commands/trace/comparison.mjs.map +1 -0
  9. package/dist/commands/trace/document.d.mts +8 -0
  10. package/dist/commands/trace/document.mjs +37 -0
  11. package/dist/commands/trace/document.mjs.map +1 -0
  12. package/dist/commands/trace/line-counts.d.mts +15 -0
  13. package/dist/commands/trace/line-counts.mjs +107 -0
  14. package/dist/commands/trace/line-counts.mjs.map +1 -0
  15. package/dist/commands/trace/model.d.mts +2 -1
  16. package/dist/commands/trace/model.mjs +13 -1
  17. package/dist/commands/trace/model.mjs.map +1 -1
  18. package/dist/commands/trace/progression.mjs +7 -3
  19. package/dist/commands/trace/progression.mjs.map +1 -1
  20. package/dist/commands/trace/task-link.d.mts +3 -0
  21. package/dist/commands/trace/task-link.mjs.map +1 -1
  22. package/dist/commands/trace/trace.mjs +64 -44
  23. package/dist/commands/trace/trace.mjs.map +1 -1
  24. package/dist/lib/host-registry-client.d.mts +9 -2
  25. package/dist/lib/host-registry-client.mjs +29 -3
  26. package/dist/lib/host-registry-client.mjs.map +1 -1
  27. package/dist/lib/python-helper.d.mts +1 -1
  28. package/dist/lib/python-helper.mjs +11 -5
  29. package/dist/lib/python-helper.mjs.map +1 -1
  30. package/dist/lib/runtime-payload.mjs +1 -0
  31. package/dist/lib/runtime-payload.mjs.map +1 -1
  32. package/dist/lib/types.d.mts +1 -0
  33. package/docs/architecture/storage-model.md +50 -0
  34. package/docs/architecture.md +1 -1
  35. package/docs/cli.md +37 -15
  36. package/docs/project-structure-overview.md +6 -1
  37. package/package.json +1 -1
  38. package/runtime/BUILD.json +2 -2
  39. package/runtime/agents/operations/trace-tests-review.json +6 -0
  40. package/runtime/bin/lib/okstra/usage.sh +8 -8
  41. package/runtime/bin/okstra-qwen-exec.sh +5 -0
  42. package/runtime/prompts/duties/test-reviewer.json +32 -0
  43. package/runtime/prompts/lead/convergence.md +4 -1
  44. package/runtime/prompts/lead/okstra-lead-contract.md +3 -3
  45. package/runtime/prompts/lead/report-writer.md +13 -1
  46. package/runtime/prompts/profiles/_common-contract.md +10 -1
  47. package/runtime/prompts/wizard/prompts.ko.json +16 -4
  48. package/runtime/python/okstra_ctl/adapters/providers/antigravity/adapter.py +10 -2
  49. package/runtime/python/okstra_ctl/adapters/providers/claude/adapter.py +16 -1
  50. package/runtime/python/okstra_ctl/adapters/providers/codex/adapter.py +20 -5
  51. package/runtime/python/okstra_ctl/adapters/providers/kimi/adapter.py +17 -9
  52. package/runtime/python/okstra_ctl/adapters/providers/qwen/adapter.py +88 -0
  53. package/runtime/python/okstra_ctl/adapters/providers/qwen/manifest.json +1 -0
  54. package/runtime/python/okstra_ctl/adapters/providers/qwen/settings.json +12 -0
  55. package/runtime/python/okstra_ctl/adapters/providers/zai/adapter.py +8 -2
  56. package/runtime/python/okstra_ctl/agent/invocation.py +109 -56
  57. package/runtime/python/okstra_ctl/agent/prompt_cli/materialize.py +17 -0
  58. package/runtime/python/okstra_ctl/attempt_evidence.py +5 -2
  59. package/runtime/python/okstra_ctl/business_flow/contracts.py +11 -0
  60. package/runtime/python/okstra_ctl/business_flow/engine.py +90 -32
  61. package/runtime/python/okstra_ctl/business_flow/hooks.py +4 -2
  62. package/runtime/python/okstra_ctl/business_flow/source.py +39 -7
  63. package/runtime/python/okstra_ctl/business_flow/store.py +94 -28
  64. package/runtime/python/okstra_ctl/code_review_census.py +38 -0
  65. package/runtime/python/okstra_ctl/code_review_coverage.py +15 -4
  66. package/runtime/python/okstra_ctl/code_review_prepare.py +15 -3
  67. package/runtime/python/okstra_ctl/code_review_scope.py +3 -2
  68. package/runtime/python/okstra_ctl/code_review_target.py +16 -6
  69. package/runtime/python/okstra_ctl/conformance_evidence.py +44 -21
  70. package/runtime/python/okstra_ctl/consumers.py +6 -1
  71. package/runtime/python/okstra_ctl/convergence.py +95 -5
  72. package/runtime/python/okstra_ctl/convergence_critic_verify_prompt.py +11 -10
  73. package/runtime/python/okstra_ctl/convergence_engine.py +30 -15
  74. package/runtime/python/okstra_ctl/convergence_reverify_prompt.py +9 -2
  75. package/runtime/python/okstra_ctl/coverage_census.py +75 -12
  76. package/runtime/python/okstra_ctl/design_review.py +6 -26
  77. package/runtime/python/okstra_ctl/design_review_evidence.py +6 -26
  78. package/runtime/python/okstra_ctl/dispatch_core.py +9 -2
  79. package/runtime/python/okstra_ctl/dispatch_state.py +5 -0
  80. package/runtime/python/okstra_ctl/domain/role.py +1 -0
  81. package/runtime/python/okstra_ctl/entrypoints/hosts.py +1 -1
  82. package/runtime/python/okstra_ctl/execution_manifest.py +8 -0
  83. package/runtime/python/okstra_ctl/implementation_comparison/__init__.py +12 -0
  84. package/runtime/python/okstra_ctl/implementation_comparison/__main__.py +129 -0
  85. package/runtime/python/okstra_ctl/implementation_comparison/assembly.py +340 -0
  86. package/runtime/python/okstra_ctl/implementation_comparison/baseline.py +254 -0
  87. package/runtime/python/okstra_ctl/implementation_comparison/business_reuse.py +118 -0
  88. package/runtime/python/okstra_ctl/implementation_comparison/commit_source.py +113 -0
  89. package/runtime/python/okstra_ctl/implementation_comparison/html.py +49 -0
  90. package/runtime/python/okstra_ctl/implementation_comparison/inputs.py +348 -0
  91. package/runtime/python/okstra_ctl/implementation_comparison/model.py +47 -0
  92. package/runtime/python/okstra_ctl/implementation_comparison/preparation.py +195 -0
  93. package/runtime/python/okstra_ctl/implementation_comparison/publication.py +317 -0
  94. package/runtime/python/okstra_ctl/implementation_comparison/run_evidence.py +208 -0
  95. package/runtime/python/okstra_ctl/implementation_comparison/run_integration.py +198 -0
  96. package/runtime/python/okstra_ctl/implementation_comparison/source.py +342 -0
  97. package/runtime/python/okstra_ctl/implementation_comparison/target.py +144 -0
  98. package/runtime/python/okstra_ctl/implementation_comparison/task_assembly.py +333 -0
  99. package/runtime/python/okstra_ctl/implementation_comparison/task_selection.py +309 -0
  100. package/runtime/python/okstra_ctl/implementation_generation_evidence.py +134 -0
  101. package/runtime/python/okstra_ctl/implementation_outcome.py +2 -2
  102. package/runtime/python/okstra_ctl/initial_prompt_materialization.py +1 -0
  103. package/runtime/python/okstra_ctl/json_boundary.py +28 -8
  104. package/runtime/python/okstra_ctl/lead_progress.py +1 -1
  105. package/runtime/python/okstra_ctl/model_discovery.py +1 -1
  106. package/runtime/python/okstra_ctl/models.py +2 -2
  107. package/runtime/python/okstra_ctl/paths.py +7 -4
  108. package/runtime/python/okstra_ctl/phases/discussion/profile.md +2 -2
  109. package/runtime/python/okstra_ctl/phases/error_analysis/profile.md +1 -1
  110. package/runtime/python/okstra_ctl/phases/implementation_option_selection/profile.md +1 -1
  111. package/runtime/python/okstra_ctl/phases/implementation_planning/authoring.py +2 -1
  112. package/runtime/python/okstra_ctl/phases/implementation_planning/instructions/plan-body-verification.md +1 -1
  113. package/runtime/python/okstra_ctl/phases/implementation_planning/profile.md +3 -3
  114. package/runtime/python/okstra_ctl/phases/requirements_discovery/profile.md +5 -5
  115. package/runtime/python/okstra_ctl/plan_run_root.py +8 -4
  116. package/runtime/python/okstra_ctl/qa_procedures.py +33 -2
  117. package/runtime/python/okstra_ctl/registry/provider_registry.py +1 -1
  118. package/runtime/python/okstra_ctl/render.py +4 -0
  119. package/runtime/python/okstra_ctl/render_final_report.py +1 -1
  120. package/runtime/python/okstra_ctl/report_execution_evidence.py +88 -15
  121. package/runtime/python/okstra_ctl/report_finalize.py +18 -4
  122. package/runtime/python/okstra_ctl/report_html/render.py +46 -7
  123. package/runtime/python/okstra_ctl/report_html/validation.py +32 -0
  124. package/runtime/python/okstra_ctl/report_synthesis_packet.py +37 -3
  125. package/runtime/python/okstra_ctl/report_view_artifacts.py +12 -0
  126. package/runtime/python/okstra_ctl/review_verdicts.py +9 -0
  127. package/runtime/python/okstra_ctl/run.py +17 -1
  128. package/runtime/python/okstra_ctl/run_context.py +18 -3
  129. package/runtime/python/okstra_ctl/schema_excerpt.py +14 -9
  130. package/runtime/python/okstra_ctl/stage_done.py +11 -3
  131. package/runtime/python/okstra_ctl/stage_ledger.py +2 -2
  132. package/runtime/python/okstra_ctl/stage_map.py +3 -3
  133. package/runtime/python/okstra_ctl/trace_review.py +1 -0
  134. package/runtime/python/okstra_ctl/trace_tasks.py +22 -7
  135. package/runtime/python/okstra_ctl/verdict_blocks.py +7 -2
  136. package/runtime/python/okstra_ctl/verification_dispatch.py +32 -0
  137. package/runtime/python/okstra_ctl/verification_evidence.py +23 -3
  138. package/runtime/python/okstra_ctl/verification_generation.py +3 -2
  139. package/runtime/python/okstra_ctl/verification_inputs.py +3 -2
  140. package/runtime/python/okstra_ctl/verification_invocation.py +7 -3
  141. package/runtime/python/okstra_ctl/wizard/engine.py +28 -1
  142. package/runtime/python/okstra_ctl/wizard/ids.py +8 -0
  143. package/runtime/python/okstra_ctl/wizard/picker_navigation.py +64 -2
  144. package/runtime/python/okstra_ctl/wizard/roles.py +194 -45
  145. package/runtime/python/okstra_ctl/wizard/sources.py +10 -1
  146. package/runtime/python/okstra_ctl/wizard/state.py +67 -20
  147. package/runtime/python/okstra_ctl/wizard/steps_roles.py +6 -3
  148. package/runtime/python/okstra_ctl/wizard/worker_settings.py +129 -25
  149. package/runtime/python/okstra_ctl/worker_audit_ledger.py +44 -8
  150. package/runtime/python/okstra_ctl/worker_prompt_body.py +26 -2
  151. package/runtime/python/okstra_ctl/worker_prompt_headers.py +12 -9
  152. package/runtime/python/okstra_token_usage/claude.py +5 -1
  153. package/runtime/python/okstra_token_usage/collect.py +3 -3
  154. package/runtime/python/okstra_token_usage/pricing.py +1 -0
  155. package/runtime/schemas/report-synthesis-packet-v1.0.schema.json +17 -0
  156. package/runtime/skills/_fragments/wizard-relay-protocol.md +1 -1
  157. package/runtime/skills/okstra-code-review/SKILL.md +1 -1
  158. package/runtime/skills/okstra-code-review/references/census-rules.md +1 -1
  159. package/runtime/skills/okstra-code-review/references/review-calibration.md +1 -1
  160. package/runtime/skills/okstra-discussion/SKILL.md +1 -1
  161. package/runtime/skills/okstra-run/SKILL.md +33 -2
  162. package/runtime/skills/okstra-tdd/SKILL.md +74 -13
  163. package/runtime/templates/reports/html/assets/implementation-comparison.css +39 -0
  164. package/runtime/templates/reports/html/assets/implementation-comparison.js +55 -0
  165. package/runtime/templates/reports/html/i18n/en.json +113 -0
  166. package/runtime/templates/reports/html/i18n/ko.json +113 -0
  167. package/runtime/templates/reports/html/implementation-comparison.template.html +77 -0
  168. package/runtime/templates/reports/implementation-comparison-notes.md +72 -0
  169. package/runtime/templates/trace/trace.template.md +2 -0
  170. package/runtime/templates/worker-prompt-preamble.md +12 -2
  171. package/runtime/validators/validate-report-views.py +4 -36
@@ -8,7 +8,9 @@ verifier: `max > 1`)은 체크박스 한 장이고, 고른 모델 수가 곧 인
8
8
  고정 단일 역할(`min = max = 1`, 예: report-writer·implementer)은 단일 선택 한 장이다.
9
9
 
10
10
  모델 화면(`role-models:<role>`, `role-model:<role>:1`)은 실행 가능한 전체 후보를
11
- 한 번에 제공자별로 묶어 싣는다. 기본 후보(프로젝트 `modelDefaults`, 없으면
11
+ 제공자 순서로 싣는다. 호스트에 네이티브 질문 묶음이 있으면 엔진이 이 화면을
12
+ 벤더별 탭으로 나눠 보인다(`picker_navigation.split_by_vendor`). 탭의 "직접 입력"
13
+ 을 고르면 다음 화면(`role-model-input:<role>`)에서 모델 id 를 받는다. 기본 후보(프로젝트 `modelDefaults`, 없으면
12
14
  카탈로그 기본값)에서 권장 수만큼 추천하고 제공자 안에서는 기본 후보가 앞이다.
13
15
  호스트 네이티브 선택기의 옵션 한도
14
16
  (claude-code 4, codex 3, grok 15)를 넘으면 체크박스든 단일 선택이든 네이티브
@@ -59,11 +61,14 @@ from .state import (
59
61
  from .prompts import _msg, _opt, _p
60
62
  from .ids import (
61
63
  _MODELS_PREFIX,
62
- _SINGLE_PREFIX,
64
+ _INPUT_PREFIX,
65
+ _ROLE_SELECTION_PREFIXES,
66
+ MODEL_FREE_INPUT_PREFIX,
63
67
  _fixed_single,
64
68
  _role_model_prompt_id,
65
69
  _role_models_prompt_id,
66
70
  _role_prompt_id,
71
+ _role_model_input_prompt_id,
67
72
  )
68
73
 
69
74
  # 선택 역할의 "추가 안 함" 값. 모델 참조는 `<provider>/<model>` 꼴이라 겹치지 않는다.
@@ -71,7 +76,7 @@ ROLE_SKIP_TOKEN = "0"
71
76
 
72
77
  def _step_role(step_id: str) -> str:
73
78
  """역할 선택 step id 가 가리키는 역할. 역할 선택 step 이 아니면 빈 문자열."""
74
- for prefix in (_MODELS_PREFIX, _SINGLE_PREFIX):
79
+ for prefix in _ROLE_SELECTION_PREFIXES:
75
80
  if step_id.startswith(prefix):
76
81
  return step_id[len(prefix):].split(":", 1)[0]
77
82
  return ""
@@ -236,37 +241,73 @@ def _apply_configured_role_defaults(
236
241
  options=[Option(value, value) for value in values],
237
242
  auto_value=",".join(values),
238
243
  )
239
- prompt = (
240
- _model_prompt(state, profile, requirement, context, scopes)
241
- if _fixed_single(requirement)
242
- else _role_models_prompt(state, profile, requirement, context, scopes)
243
- )
244
+ prompt = _manual_role_prompt(state, profile, requirement, context, scopes)
244
245
  if error:
245
246
  prompt.label = _msg(state.workspace_root, "worker_settings", "run_invalid",
246
247
  error=error, label=prompt.label)
247
248
  return prompt
248
249
 
249
250
 
250
- def _role_models_prompt(
251
+ def _provider_of(model_ref: str) -> str:
252
+ return model_ref.split("/", 1)[0]
253
+
254
+
255
+ def _manual_role_prompt(
251
256
  state: WizardState,
252
257
  profile: RoleProfile,
253
258
  requirement: RoleRequirement,
254
259
  context: AssignmentContext,
255
260
  scopes: ModelDefaultScopes,
256
261
  ) -> Prompt:
257
- """역할 하나의 모델 화면 — 실행 가능한 전체 후보를 제공자별로 묶는다.
262
+ """The model screen a user answers for a role, every executable candidate on it."""
263
+ models = _role_model_options(state, profile, requirement, context, scopes)
264
+ if _fixed_single(requirement):
265
+ return _model_prompt(state, requirement, models)
266
+ return _role_models_prompt(state, requirement, models)
267
+
268
+
269
+ def _role_model_options(
270
+ state: WizardState,
271
+ profile: RoleProfile,
272
+ requirement: RoleRequirement,
273
+ context: AssignmentContext,
274
+ scopes: ModelDefaultScopes,
275
+ ) -> list[Option]:
276
+ """Every executable model for the role, in provider order.
258
277
 
259
- 추천은 정렬 전 권장 수만큼의 후보다 — 프로젝트 `modelDefaults`(없으면 카탈로그
260
- 기본값) 순서가 그 근거다. 권장이 0인 선택 역할은 "추가 안 함" 이 추천이다.
278
+ The first `recommended_count` defaults (project `modelDefaults`, else the
279
+ catalog defaults) are recommended, ranked before the provider sort. A
280
+ fixed single role gets only the candidates that still complete the
281
+ assignment, with the first one recommended (`_single_model_options`).
261
282
  """
262
- role = requirement.role
283
+ if _fixed_single(requirement):
284
+ return _single_model_options(state, profile, requirement.role, context, scopes)
263
285
  pool = context.pool
264
286
  _defaults, everything = _available_role_models(
265
287
  state, profile, requirement, context, scopes,
266
288
  )
267
289
  if not everything:
268
290
  _validate_role_selection_feasibility(state, profile, context, scopes)
269
- raise WizardError(f"role {role!r} has no executable model candidates")
291
+ raise WizardError(f"role {requirement.role!r} has no executable model candidates")
292
+ t = _role_models_texts(state, "role_models", requirement)
293
+ options: list[Option] = []
294
+ for index, model_ref in enumerate(everything):
295
+ model = pool.resolve(model_ref)
296
+ options.append(_opt(
297
+ model_ref,
298
+ t["options"]["model"].format(model_ref=model_ref, display=model.display_name),
299
+ recommended=index < requirement.recommended_count,
300
+ ))
301
+ options.sort(key=lambda option: provider_display_order(_provider_of(option.value)))
302
+ return options
303
+
304
+
305
+ def _role_models_prompt(
306
+ state: WizardState,
307
+ requirement: RoleRequirement,
308
+ options: list[Option],
309
+ ) -> Prompt:
310
+ """A role's model screen. An optional role's skip row joins the candidates."""
270
311
  t = _role_models_texts(state, "role_models", requirement)
271
312
  multi = requirement.max_count > 1
272
313
  # "고른 만큼 인스턴스를 띄웁니다" 는 체크박스 문구다 — 최대 1개인 역할(critic)은
@@ -277,21 +318,13 @@ def _role_models_prompt(
277
318
  )
278
319
  optional = requirement.min_count == 0
279
320
  skip_first = optional and requirement.recommended_count == 0
280
- options: list[Option] = []
281
- for index, model_ref in enumerate(everything):
282
- model = pool.resolve(model_ref)
283
- options.append(_opt(
284
- model_ref,
285
- t["options"]["model"].format(model_ref=model_ref, display=model.display_name),
286
- recommended=index < requirement.recommended_count,
287
- ))
288
- options.sort(key=lambda option: provider_display_order(option.value.split("/", 1)[0]))
321
+ options = list(options)
289
322
  if skip_first:
290
323
  options.insert(0, _skip_option(requirement, t, recommended=True))
291
324
  if optional and not skip_first:
292
325
  options.append(_skip_option(requirement, t, recommended=False))
293
326
  return Prompt(
294
- step=_role_models_prompt_id(role),
327
+ step=_role_models_prompt_id(requirement.role),
295
328
  kind="pick",
296
329
  multi=multi,
297
330
  label=label,
@@ -336,21 +369,16 @@ def _single_model_options(
336
369
  if not options:
337
370
  _validate_role_selection_feasibility(state, profile, context, scopes)
338
371
  raise WizardError(f"role {role!r} has no executable model candidates")
339
- options.sort(key=lambda option: provider_display_order(option.value.split("/", 1)[0]))
372
+ options.sort(key=lambda option: provider_display_order(_provider_of(option.value)))
340
373
  return options
341
374
 
342
375
 
343
376
  def _model_prompt(
344
377
  state: WizardState,
345
- profile: RoleProfile,
346
378
  requirement: RoleRequirement,
347
- context: AssignmentContext,
348
- scopes: ModelDefaultScopes,
379
+ options: list[Option],
349
380
  ) -> Prompt:
350
381
  prompt = _p(state.workspace_root, "role_model", role=requirement.role)
351
- options = _single_model_options(
352
- state, profile, requirement.role, context, scopes,
353
- )
354
382
  return Prompt(
355
383
  step=_role_model_prompt_id(requirement.role, 1),
356
384
  kind="pick",
@@ -365,6 +393,7 @@ def _drop_role_selection(state: WizardState, roles: set[str]) -> None:
365
393
  for role in roles:
366
394
  state.role_models.pop(role, None)
367
395
  state.role_counts.pop(role, None)
396
+ state.role_model_drafts.pop(role, None)
368
397
  state.role_sources.pop(role, None)
369
398
  state.role_selection_order = [
370
399
  step_id for step_id in state.role_selection_order
@@ -564,7 +593,7 @@ def _load_context(state: WizardState) -> tuple[AssignmentContext, ModelDefaultSc
564
593
 
565
594
 
566
595
  def next_role_prompt(state: WizardState) -> Prompt | None:
567
- """프로필 순서대로 역할마다 화면 하나 — 답이 없는 첫 역할의 화면을 낸다."""
596
+ """프로필 순서대로 답이 없는 첫 역할의 다음 화면(제공자, 그다음 모델)을 낸다."""
568
597
  if not _identity_ready(state):
569
598
  return None
570
599
  profile = _load_role_profile_for_state(state)
@@ -573,6 +602,8 @@ def next_role_prompt(state: WizardState) -> Prompt | None:
573
602
  _discard_invalid_previous_models(state, profile, requirements, context, scopes)
574
603
  for requirement in requirements:
575
604
  role = requirement.role
605
+ if role in state.role_model_drafts:
606
+ return _model_input_prompt(state, profile, requirement, context, scopes)
576
607
  selected = state.role_models.get(role, [])
577
608
  if _fixed_single(requirement):
578
609
  if not selected:
@@ -594,7 +625,7 @@ def next_role_prompt(state: WizardState) -> Prompt | None:
594
625
  state,
595
626
  {later.role for later in requirements[requirements.index(requirement):]},
596
627
  )
597
- return _role_models_prompt(state, profile, requirement, context, scopes)
628
+ return _manual_role_prompt(state, profile, requirement, context, scopes)
598
629
  _validate_role_selection_feasibility(state, profile, context, scopes)
599
630
  return None
600
631
 
@@ -606,6 +637,113 @@ def _requirement_for(profile: RoleProfile, role: str) -> RoleRequirement:
606
637
  return requirement
607
638
 
608
639
 
640
+ def _picked_values(t: dict, prompt: Prompt, value: str) -> list[str]:
641
+ # 같은 값이 두 번 오면(번호 목록에서 `1,1`) 한 번으로 센다 — 거절할 일이 아니다.
642
+ picked = list(dict.fromkeys(
643
+ item.strip() for item in (value or "").split(",") if item.strip()
644
+ ))
645
+ allowed = {option.value for option in prompt.options}
646
+ unknown = [item for item in picked if item not in allowed]
647
+ if unknown:
648
+ raise WizardError(t["errors"]["unknown_option"].format(values=", ".join(unknown)))
649
+ return picked
650
+
651
+
652
+ def _skip_role(state: WizardState, role: str) -> None:
653
+ state.role_counts[role] = 0
654
+ state.role_models.pop(role, None)
655
+
656
+
657
+ def free_input_providers(values: list[str]) -> tuple[list[str], list[str]]:
658
+ """Split a pick into its chosen values and the providers of ticked "type a model" rows."""
659
+ chosen: list[str] = []
660
+ providers: list[str] = []
661
+ for value in values:
662
+ if value.startswith(MODEL_FREE_INPUT_PREFIX):
663
+ providers.extend(value[len(MODEL_FREE_INPUT_PREFIX):].split("+"))
664
+ else:
665
+ chosen.append(value)
666
+ return chosen, list(dict.fromkeys(providers))
667
+
668
+
669
+ def resolve_typed_models(
670
+ typed: str, providers: list[str], candidates: list[str],
671
+ ) -> list[str]:
672
+ """Typed model ids as candidate refs of those providers.
673
+
674
+ An entry is a full `provider/model` ref or a model id that one provider's
675
+ candidate ends with. Anything else is refused with the refs it could be.
676
+ """
677
+ allowed = [ref for ref in candidates if ref.split("/", 1)[0] in providers]
678
+ resolved: list[str] = []
679
+ for item in (part.strip() for part in typed.split(",")):
680
+ if not item:
681
+ continue
682
+ matches = [ref for ref in allowed if ref == item or ref.split("/", 1)[1] == item]
683
+ if len(matches) != 1:
684
+ raise WizardError(
685
+ f"{item!r} is not one model of {', '.join(providers)}; "
686
+ f"choose from {', '.join(allowed)}"
687
+ )
688
+ resolved.append(matches[0])
689
+ if not resolved:
690
+ raise WizardError(f"type at least one model of {', '.join(providers)}")
691
+ return list(dict.fromkeys(resolved))
692
+
693
+
694
+ def _model_input_prompt(
695
+ state: WizardState,
696
+ profile: RoleProfile,
697
+ requirement: RoleRequirement,
698
+ context: AssignmentContext,
699
+ scopes: ModelDefaultScopes,
700
+ ) -> Prompt:
701
+ draft = state.role_model_drafts[requirement.role]
702
+ candidates = [
703
+ option.value
704
+ for option in _role_model_options(state, profile, requirement, context, scopes)
705
+ if _provider_of(option.value) in draft["providers"]
706
+ ]
707
+ t = _p(
708
+ state.workspace_root, "role_model_input",
709
+ role=requirement.role,
710
+ providers=", ".join(draft["providers"]),
711
+ chosen=", ".join(draft["models"]) or "-",
712
+ candidates=", ".join(candidates),
713
+ )
714
+ return Prompt(
715
+ step=_role_model_input_prompt_id(requirement.role),
716
+ kind="text",
717
+ label=t["label"],
718
+ echo_template=t["echo_template"],
719
+ )
720
+
721
+
722
+ def _submit_model_input(
723
+ state: WizardState,
724
+ profile: RoleProfile,
725
+ requirement: RoleRequirement,
726
+ value: str,
727
+ ) -> str:
728
+ """Join the typed models to the ticked ones and submit them as the role's answer."""
729
+ role = requirement.role
730
+ draft = state.role_model_drafts[role]
731
+ context, scopes = _load_context(state)
732
+ original = _manual_role_prompt(state, profile, requirement, context, scopes)
733
+ typed = resolve_typed_models(
734
+ value, draft["providers"], [option.value for option in original.options],
735
+ )
736
+ del state.role_model_drafts[role]
737
+ try:
738
+ return _submit_role_answer(
739
+ state, profile, requirement, original,
740
+ ",".join(dict.fromkeys([*draft["models"], *typed])),
741
+ )
742
+ except WizardError:
743
+ state.role_model_drafts[role] = draft
744
+ raise
745
+
746
+
609
747
  def _submit_role_models(
610
748
  state: WizardState,
611
749
  profile: RoleProfile,
@@ -617,22 +755,14 @@ def _submit_role_models(
617
755
  role = requirement.role
618
756
  t = _role_models_texts(state, "role_models", requirement)
619
757
  range_text = t["range"]
620
- # 같은 값이 두 번 오면(번호 목록에서 `1,1`) 한 번으로 센다 — 거절할 일이 아니다.
621
- picked = list(dict.fromkeys(
622
- item.strip() for item in (value or "").split(",") if item.strip()
623
- ))
624
- allowed = {option.value for option in prompt.options}
625
- unknown = [item for item in picked if item not in allowed]
626
- if unknown:
627
- raise WizardError(t["errors"]["unknown_option"].format(values=", ".join(unknown)))
758
+ picked = _picked_values(t, prompt, value)
628
759
  models = [item for item in picked if item != ROLE_SKIP_TOKEN]
629
760
  # "추가 안 함" 과 모델을 같이 고르면 모델을 고른 것이다.
761
+ # Vendor tabs carry no skip row: an optional role with nothing ticked is skipped.
630
762
  if not models:
631
- if ROLE_SKIP_TOKEN not in picked:
763
+ if ROLE_SKIP_TOKEN not in picked and requirement.min_count > 0:
632
764
  raise WizardError(t["errors"]["min_one_required"].format(range=range_text))
633
- previous = (state.role_counts.get(role), state.role_models.get(role))
634
- state.role_counts[role] = 0
635
- state.role_models.pop(role, None)
765
+ _skip_role(state, role)
636
766
  return t["echo_variants"]["skipped"]
637
767
  if not requirement.min_count <= len(models) <= requirement.max_count:
638
768
  raise WizardError(t["errors"]["count_out_of_range"].format(
@@ -684,6 +814,24 @@ def _submit_role_prompt(state: WizardState, prompt: Prompt, value: str) -> str:
684
814
  profile = _load_role_profile_for_state(state)
685
815
  role = _step_role(prompt.step)
686
816
  requirement = _requirement_for(profile, role)
817
+ if prompt.step.startswith(_INPUT_PREFIX):
818
+ return _submit_model_input(state, profile, requirement, value)
819
+ picked = [item.strip() for item in (value or "").split(",") if item.strip()]
820
+ chosen, typed_from = free_input_providers(picked)
821
+ if typed_from:
822
+ state.role_model_drafts[role] = {"models": chosen, "providers": typed_from}
823
+ return f"role-models: {role} (typed models next: {', '.join(typed_from)})"
824
+ return _submit_role_answer(state, profile, requirement, prompt, value)
825
+
826
+
827
+ def _submit_role_answer(
828
+ state: WizardState,
829
+ profile: RoleProfile,
830
+ requirement: RoleRequirement,
831
+ prompt: Prompt,
832
+ value: str,
833
+ ) -> str:
834
+ role = requirement.role
687
835
  if prompt.step.startswith(_MODELS_PREFIX):
688
836
  if _fixed_single(requirement):
689
837
  raise WizardError(f"role {role!r} takes exactly one model")
@@ -724,6 +872,7 @@ def _reset_role_selection_from(state: WizardState, target_step: str) -> None:
724
872
  def _clear_role_selection(state: WizardState) -> None:
725
873
  state.role_counts.clear()
726
874
  state.role_models.clear()
875
+ state.role_model_drafts.clear()
727
876
  state.role_selection_order.clear()
728
877
  state.role_sources.clear()
729
878
  state.manual_steps = [
@@ -30,7 +30,7 @@ from okstra_ctl import worktree_registry
30
30
  from okstra_ctl.worktree import is_git_work_tree, main_worktree_path
31
31
  from okstra_ctl.paths import RunRef, task_runs_dir
32
32
  from okstra_ctl.phases.catalog import INPUT_DOCUMENT_TASK_TYPES
33
- from okstra_ctl.run_context import latest_run_inputs
33
+ from okstra_ctl.run_context import latest_run_inputs, latest_run_inputs_document
34
34
  from okstra_ctl.generated_input import names_generated_input_document
35
35
  from okstra_project.state import (
36
36
  StateError,
@@ -633,6 +633,15 @@ def _latest_run_inputs(
633
633
  phase_segment=phase_segment, stage=stage)
634
634
 
635
635
 
636
+ def _latest_run_inputs_document(
637
+ state: WizardState, *, phase_segment: str = "", stage: Optional[int] = None
638
+ ) -> dict:
639
+ """The whole latest run-inputs record, including its static role executions."""
640
+ return latest_run_inputs_document(
641
+ state.project_root, state.task_group, state.task_id,
642
+ phase_segment=phase_segment, stage=stage)
643
+
644
+
636
645
  def _clarification_pick_required(state: WizardState) -> bool:
637
646
  if state.task_type == "release-handoff":
638
647
  report = _suggest_latest_final_report(state)
@@ -3,7 +3,7 @@ from __future__ import annotations
3
3
 
4
4
  from dataclasses import asdict, dataclass, field
5
5
  from pathlib import Path
6
- from typing import Any, Callable, Optional
6
+ from typing import Any, Callable, Optional, TypedDict
7
7
 
8
8
  from okstra_ctl.registry.provider_registry import default_provider_registry
9
9
  from okstra_ctl.model_pool import ModelPool
@@ -27,6 +27,7 @@ from .ids import (
27
27
  S_HANDOFF_STAGE_PICK,
28
28
  _ABORT_OPTION,
29
29
  _SLUG_OK,
30
+ _ROLE_SELECTION_PREFIXES,
30
31
  _STAGE_SCOPED_TASK_TYPES,
31
32
  _role_model_prompt_id,
32
33
  _role_models_prompt_id,
@@ -36,11 +37,20 @@ from .ids import (
36
37
 
37
38
  # ---- Data types ----------------------------------------------------------
38
39
 
40
+ class ModelDraft(TypedDict):
41
+ """Models ticked on a vendor-tab screen and the providers whose models are typed next."""
42
+
43
+ models: list[str]
44
+ providers: list[str]
45
+
46
+
39
47
  @dataclass
40
48
  class WizardState:
41
49
  # role-first canonical model selections
42
50
  role_counts: dict[str, int] = field(default_factory=dict)
43
51
  role_models: dict[str, list[str]] = field(default_factory=dict)
52
+ # Models ticked on a role's model screen while its typed models are pending.
53
+ role_model_drafts: dict[str, ModelDraft] = field(default_factory=dict)
44
54
  role_selection_order: list[str] = field(default_factory=list)
45
55
  role_sources: dict[str, str] = field(default_factory=dict)
46
56
  worker_defaults_snapshot: WorkerDefaultScopes | None = None
@@ -48,6 +58,8 @@ class WizardState:
48
58
  worker_settings_scope: WorkerScope | None = None
49
59
  worker_settings_updates: WorkerDefaultUpdates = field(default_factory=dict)
50
60
  worker_settings_role: str = ""
61
+ worker_settings_choosing: bool = False
62
+ worker_settings_draft: ModelDraft | None = None
51
63
  worker_settings_review: bool = False
52
64
  worker_settings_saved: bool = False
53
65
  worker_settings_answers: int = 0
@@ -239,7 +251,7 @@ class Prompt:
239
251
  self._check_recommendations()
240
252
 
241
253
  def _check_recommendations(self) -> None:
242
- """단일 추천은 하나다. 모델 선택은 제공자 순서, 그 외에는 추천이 앞이다.
254
+ """단일 추천은 하나다. 제공자·모델 선택은 제공자 순서, 그 외에는 추천이 앞이다.
243
255
 
244
256
  실측(2026-09-09, task 선택 화면): 남은 task 세 줄이 전부 `(추천)` 을
245
257
  달고 나왔고, 리드는 산문에서 2번을 권했다. 추천이 여럿이면 라벨은
@@ -251,7 +263,7 @@ class Prompt:
251
263
  될 수 없다.
252
264
  """
253
265
  flags = [option.recommended for option in self.options]
254
- grouped_models = self.step.startswith(("role-models:", "role-model:"))
266
+ grouped_models = self.step.startswith((*_ROLE_SELECTION_PREFIXES, "worker_settings_models"))
255
267
  if any(flags):
256
268
  if self.multi:
257
269
  if not grouped_models and any(flags[index] for index in range(1, len(flags))
@@ -409,36 +421,49 @@ def _initial_cross_verification_requirement(
409
421
  ), None)
410
422
 
411
423
 
412
- def _assigned_models_by_role(payload: dict[str, Any]) -> dict[str, list[tuple[str, str]]]:
413
- """run-inputs 의 `workerAssignments` 를 역할별 (provider, model) 로.
424
+ def _recorded_models_by_role(
425
+ rows: object, *, model_key: str, skip_roles: frozenset[str] = frozenset(),
426
+ ) -> dict[str, list[tuple[str, str]]]:
427
+ """Recorded rows as (provider, model) per role.
414
428
 
415
- 지금 run-inputs 의 `workers` 는 provider 가 아니라 worker id(`claude-planner`)를
416
- 적는다. 그 값으로 `<provider>Model` 을 찾으면 아무 모델도 복원되지 않는다.
429
+ run-inputs `workerAssignments` carry the model as `model`, its
430
+ `staticRoleExecutions` as `modelId`. `workers` names worker ids
431
+ (`claude-planner`), not providers, so it cannot restore a model.
417
432
  """
418
- rows = payload.get("workerAssignments")
419
- assigned: dict[str, list[tuple[str, str]]] = {}
433
+ recorded: dict[str, list[tuple[str, str]]] = {}
420
434
  for row in rows if isinstance(rows, list) else ():
421
435
  if not isinstance(row, dict):
422
436
  continue
423
- role, provider, model = row.get("role"), row.get("provider"), row.get("model")
424
- if isinstance(role, str) and isinstance(provider, str) and provider:
425
- assigned.setdefault(role, []).append(
426
- (provider, model if isinstance(model, str) else "")
427
- )
428
- return assigned
437
+ role, provider, model = row.get("role"), row.get("provider"), row.get(model_key)
438
+ if isinstance(role, str) and role not in skip_roles and isinstance(provider, str) and provider:
439
+ recorded.setdefault(role, []).append((provider, model if isinstance(model, str) else ""))
440
+ return recorded
429
441
 
430
442
 
431
443
  def _role_selections_from_run_inputs(
432
444
  state: WizardState,
433
445
  payload: dict[str, Any],
446
+ static_role_executions: object,
434
447
  ) -> None:
435
- """직전 run-inputs 의 provider·모델 기록을 역할별 모델 선택으로 옮긴다."""
448
+ """직전 run-inputs 의 provider·모델 기록을 역할별 모델 선택으로 옮긴다.
449
+
450
+ `static_role_executions` lists every static role prepare assigned. It is
451
+ complete, so a role it lacks was assigned nobody and restores as zero.
452
+ `workerAssignments` omits the critic, so without the complete record an
453
+ optional role it lacks is asked again rather than taken as zero.
454
+ """
436
455
  profile = _load_role_profile_for_state(state)
437
456
  pool = ModelPool.from_registry(default_provider_registry())
438
457
  cross_requirement = _initial_cross_verification_requirement(profile)
439
- assigned = _assigned_models_by_role(payload)
458
+ planned = _recorded_models_by_role(
459
+ static_role_executions, model_key="modelId", skip_roles=frozenset({"leader"}),
460
+ )
461
+ if planned:
462
+ _restore_recorded_role_selections(state, profile, pool, planned, complete=True)
463
+ return
464
+ assigned = _recorded_models_by_role(payload.get("workerAssignments"), model_key="model")
440
465
  if assigned:
441
- _restore_recorded_role_selections(state, profile, pool, assigned)
466
+ _restore_recorded_role_selections(state, profile, pool, assigned, complete=False)
442
467
  return
443
468
  providers = _legacy_worker_providers(payload)
444
469
  if cross_requirement is not None:
@@ -504,6 +529,8 @@ def _restore_recorded_role_selections(
504
529
  profile: RoleProfile,
505
530
  pool: ModelPool,
506
531
  assigned: dict[str, list[tuple[str, str]]],
532
+ *,
533
+ complete: bool,
507
534
  ) -> None:
508
535
  for requirement in profile.roles:
509
536
  if requirement.dynamic or requirement.role == "leader":
@@ -512,11 +539,14 @@ def _restore_recorded_role_selections(
512
539
  rows = assigned.get(role, [])
513
540
  if not rows and requirement.min_count > 0:
514
541
  continue
542
+ step = _role_prompt_id(requirement)
543
+ if not rows and not complete:
544
+ state.manual_steps.append(step)
545
+ continue
515
546
  models = [
516
547
  model for provider, raw in rows
517
548
  if (model := _legacy_model_ref(pool, provider, role, raw)) is not None
518
549
  ]
519
- step = _role_prompt_id(requirement)
520
550
  if len(models) != len(rows):
521
551
  state.manual_steps.append(step)
522
552
  continue
@@ -568,6 +598,23 @@ def _validate_v2_state_fields(data: dict[str, Any]) -> None:
568
598
  for role, models in role_models.items()
569
599
  ):
570
600
  raise WizardError("wizard state roleModels must map roles to modelRef arrays")
601
+ drafts = data.get("role_model_drafts", {})
602
+ if not isinstance(drafts, dict) or not all(
603
+ isinstance(role, str) and _is_model_draft(draft)
604
+ for role, draft in drafts.items()
605
+ ):
606
+ raise WizardError("wizard state role_model_drafts must map roles to model drafts")
607
+ worker_draft = data.get("worker_settings_draft")
608
+ if worker_draft is not None and not _is_model_draft(worker_draft):
609
+ raise WizardError("wizard state worker_settings_draft must be a model draft")
610
+
611
+
612
+ def _is_model_draft(draft: object) -> bool:
613
+ return isinstance(draft, dict) and all(
614
+ isinstance(draft.get(key), list)
615
+ and all(isinstance(item, str) for item in draft[key])
616
+ for key in ("models", "providers")
617
+ )
571
618
  if not isinstance(selection_order, list) or not all(
572
619
  isinstance(step_id, str) for step_id in selection_order
573
620
  ):
@@ -575,7 +622,7 @@ def _validate_v2_state_fields(data: dict[str, Any]) -> None:
575
622
 
576
623
 
577
624
  def _is_role_selection_step(step_id: str) -> bool:
578
- return step_id.startswith(("role-model:", "role-models:"))
625
+ return step_id.startswith(_ROLE_SELECTION_PREFIXES)
579
626
 
580
627
 
581
628
  def _discard_implicit_leader_selection(state: WizardState) -> None:
@@ -17,7 +17,7 @@ from .state import (
17
17
  _role_selections_from_run_inputs,
18
18
  )
19
19
  from .prompts import _opt, _p
20
- from .sources import _latest_run_inputs, _suggest_latest_final_report
20
+ from .sources import _latest_run_inputs, _latest_run_inputs_document, _suggest_latest_final_report
21
21
  from .steps_analysis import _restore_analysis_evidence_inputs
22
22
 
23
23
 
@@ -87,12 +87,15 @@ def _submit_reuse_previous(state: WizardState, value: str) -> Optional[str]:
87
87
  return "reuse-previous: no (step-by-step re-entry)"
88
88
  state.reuse_previous = True
89
89
  seg = slugify_task_segment(state.task_type)
90
- inputs = _latest_run_inputs(state, phase_segment=seg)
90
+ document = _latest_run_inputs_document(state, phase_segment=seg)
91
+ inputs = document.get("inputs") if isinstance(document.get("inputs"), dict) else {}
91
92
  conversion_payload = dict(inputs)
92
93
  conversion_payload.setdefault("grokModel", _assignment_model(inputs, "grok", "grok"))
93
94
  conversion_payload.setdefault("kimiModel", _assignment_model(inputs, "kimi", "kimi"))
94
95
  _clear_role_selection(state)
95
- _role_selections_from_run_inputs(state, conversion_payload)
96
+ _role_selections_from_run_inputs(
97
+ state, conversion_payload, document.get("staticRoleExecutions"),
98
+ )
96
99
  state.role_sources = {
97
100
  role: "previous" for role in state.role_models.keys() | state.role_counts.keys()
98
101
  }