okstra 0.226.0 → 0.228.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 (103) hide show
  1. package/README.md +2 -1
  2. package/dist/cli-registry.mjs +6 -0
  3. package/dist/cli-registry.mjs.map +1 -1
  4. package/dist/commands/execute/wizard.mjs +12 -15
  5. package/dist/commands/execute/wizard.mjs.map +1 -1
  6. package/docs/architecture/storage-model.md +77 -0
  7. package/docs/cli.md +43 -7
  8. package/docs/project-structure-overview.md +13 -3
  9. package/package.json +1 -1
  10. package/runtime/BUILD.json +2 -2
  11. package/runtime/agents/operations/code-review.json +1 -1
  12. package/runtime/prompts/duties/code-reviewer.json +1 -0
  13. package/runtime/prompts/lead/convergence.md +5 -19
  14. package/runtime/prompts/lead/okstra-lead-contract.md +2 -2
  15. package/runtime/prompts/profiles/_coding-conventions-preflight.md +1 -1
  16. package/runtime/prompts/wizard/prompts.ko.json +44 -0
  17. package/runtime/python/okstra_ctl/adapters/verification_inputs.py +22 -0
  18. package/runtime/python/okstra_ctl/adapters/worker_defaults.py +63 -0
  19. package/runtime/python/okstra_ctl/agent/prompt_cli/cli.py +3 -0
  20. package/runtime/python/okstra_ctl/agent/prompt_cli/corrections.py +5 -0
  21. package/runtime/python/okstra_ctl/analysis_packet.py +52 -21
  22. package/runtime/python/okstra_ctl/approval_decisions.py +30 -1
  23. package/runtime/python/okstra_ctl/approved_plan_stage_extract.py +100 -66
  24. package/runtime/python/okstra_ctl/brief_sources.py +162 -44
  25. package/runtime/python/okstra_ctl/code_review_coverage.py +81 -19
  26. package/runtime/python/okstra_ctl/code_review_scope.py +157 -0
  27. package/runtime/python/okstra_ctl/code_review_target.py +115 -55
  28. package/runtime/python/okstra_ctl/conformance.py +9 -3
  29. package/runtime/python/okstra_ctl/correction_cli.py +6 -5
  30. package/runtime/python/okstra_ctl/correction_round.py +1 -1
  31. package/runtime/python/okstra_ctl/design_surfaces.py +51 -19
  32. package/runtime/python/okstra_ctl/domain/worker_defaults.py +106 -0
  33. package/runtime/python/okstra_ctl/file_size_cap.py +56 -6
  34. package/runtime/python/okstra_ctl/final_report_schema.py +37 -30
  35. package/runtime/python/okstra_ctl/fixed_text.py +31 -9
  36. package/runtime/python/okstra_ctl/implementation_direction.py +18 -0
  37. package/runtime/python/okstra_ctl/initial_prompt_materialization.py +59 -21
  38. package/runtime/python/okstra_ctl/json_registry.py +3 -18
  39. package/runtime/python/okstra_ctl/manager_split.py +201 -84
  40. package/runtime/python/okstra_ctl/model_io/references.py +31 -1
  41. package/runtime/python/okstra_ctl/model_io/renderers.py +30 -1
  42. package/runtime/python/okstra_ctl/model_io_cli.py +9 -0
  43. package/runtime/python/okstra_ctl/path_hints.py +13 -1
  44. package/runtime/python/okstra_ctl/paths.py +4 -0
  45. package/runtime/python/okstra_ctl/phases/final_verification/prior_blockers.py +87 -45
  46. package/runtime/python/okstra_ctl/phases/final_verification/profile.md +2 -2
  47. package/runtime/python/okstra_ctl/phases/final_verification/spec.md +10 -2
  48. package/runtime/python/okstra_ctl/phases/final_verification/validation.py +19 -11
  49. package/runtime/python/okstra_ctl/phases/implementation/instructions/_implementation-deliverable.md +2 -2
  50. package/runtime/python/okstra_ctl/phases/implementation/instructions/_implementation-executor.md +4 -2
  51. package/runtime/python/okstra_ctl/phases/implementation/instructions/_implementation-self-check.md +1 -1
  52. package/runtime/python/okstra_ctl/phases/implementation/instructions/_implementation-verifier.md +5 -3
  53. package/runtime/python/okstra_ctl/phases/implementation/spec.md +14 -0
  54. package/runtime/python/okstra_ctl/phases/implementation_option_selection/authoring.py +2 -1
  55. package/runtime/python/okstra_ctl/phases/implementation_option_selection/profile.md +1 -1
  56. package/runtime/python/okstra_ctl/phases/implementation_option_selection/validation.py +53 -37
  57. package/runtime/python/okstra_ctl/phases/implementation_planning/authoring.py +22 -0
  58. package/runtime/python/okstra_ctl/phases/implementation_planning/instructions/plan-body-verification.md +1 -1
  59. package/runtime/python/okstra_ctl/phases/implementation_planning/profile.md +1 -1
  60. package/runtime/python/okstra_ctl/plan_items.py +9 -11
  61. package/runtime/python/okstra_ctl/ports/verification_inputs.py +17 -0
  62. package/runtime/python/okstra_ctl/ports/worker_defaults.py +25 -0
  63. package/runtime/python/okstra_ctl/prior_planning.py +6 -17
  64. package/runtime/python/okstra_ctl/prior_run_summary.py +35 -0
  65. package/runtime/python/okstra_ctl/qa_commands.py +66 -1
  66. package/runtime/python/okstra_ctl/qa_commands_cli.py +67 -0
  67. package/runtime/python/okstra_ctl/qa_procedures.py +235 -0
  68. package/runtime/python/okstra_ctl/registry/verification_inputs_store.py +8 -0
  69. package/runtime/python/okstra_ctl/registry/worker_defaults_store.py +8 -0
  70. package/runtime/python/okstra_ctl/render.py +10 -0
  71. package/runtime/python/okstra_ctl/report_assembly.py +12 -12
  72. package/runtime/python/okstra_ctl/run.py +123 -6
  73. package/runtime/python/okstra_ctl/stage_done.py +5 -4
  74. package/runtime/python/okstra_ctl/verification_input_ref.py +80 -0
  75. package/runtime/python/okstra_ctl/verification_input_types.py +32 -0
  76. package/runtime/python/okstra_ctl/verification_inputs.py +162 -0
  77. package/runtime/python/okstra_ctl/verification_plan.py +116 -0
  78. package/runtime/python/okstra_ctl/wizard/cli.py +16 -4
  79. package/runtime/python/okstra_ctl/wizard/confirmation.py +21 -0
  80. package/runtime/python/okstra_ctl/wizard/engine.py +25 -3
  81. package/runtime/python/okstra_ctl/wizard/ids.py +23 -0
  82. package/runtime/python/okstra_ctl/wizard/render.py +2 -2
  83. package/runtime/python/okstra_ctl/wizard/roles.py +73 -23
  84. package/runtime/python/okstra_ctl/wizard/state.py +55 -14
  85. package/runtime/python/okstra_ctl/wizard/steps_roles.py +5 -3
  86. package/runtime/python/okstra_ctl/wizard/worker_settings.py +334 -0
  87. package/runtime/python/okstra_ctl/worker_defaults.py +135 -0
  88. package/runtime/python/okstra_ctl/worker_prompt_body.py +12 -6
  89. package/runtime/python/okstra_ctl/worker_prompt_contract.py +5 -1
  90. package/runtime/python/okstra_ctl/worker_prompt_headers.py +50 -1
  91. package/runtime/python/okstra_ctl/write_policy.py +33 -18
  92. package/runtime/python/okstra_project/dirs.py +22 -0
  93. package/runtime/python/okstra_project/resolver.py +10 -0
  94. package/runtime/schemas/final-report-v3.0.schema.json +5 -1
  95. package/runtime/skills/okstra-brief-gen/SKILL.md +10 -4
  96. package/runtime/skills/okstra-code-review/SKILL.md +59 -63
  97. package/runtime/skills/okstra-code-review/references/census-rules.md +14 -2
  98. package/runtime/skills/okstra-code-review/references/review-calibration.md +32 -9
  99. package/runtime/skills/okstra-manager/SKILL.md +2 -2
  100. package/runtime/skills/okstra-run/SKILL.md +21 -1
  101. package/runtime/skills/okstra-setup/SKILL.md +2 -0
  102. package/runtime/skills/okstra-setup/references/project-config.md +2 -0
  103. package/runtime/validators/validate-brief.py +21 -5
@@ -218,6 +218,9 @@ def _reverify_scope_line(state: WizardState) -> Optional[str]:
218
218
 
219
219
  def confirmation_block(state: WizardState) -> str:
220
220
  """Human-readable echo of the resolved selections (for the Confirm step)."""
221
+ if state.worker_settings_mode:
222
+ from .worker_settings import worker_settings_summary
223
+ return worker_settings_summary(state)
221
224
  header = _msg(state.workspace_root, "confirmation", "header")
222
225
  lines: list[str] = [header]
223
226
  lines.append(f" task-type : {state.task_type}")
@@ -280,6 +283,10 @@ def confirmation_block(state: WizardState) -> str:
280
283
  for requirement in _selectable_static_requirements(state, profile):
281
284
  count = _selected_role_count(state, requirement)
282
285
  selected = state.role_models.get(requirement.role, [])
286
+ source = _msg(state.workspace_root, "worker_settings",
287
+ "source_" + state.role_sources.get(requirement.role, "once"))
288
+ lines.append(_msg(state.workspace_root, "worker_settings", "run_source",
289
+ role=requirement.role, count=str(count), source=source))
283
290
  for ordinal in range(1, count + 1):
284
291
  model_ref = (
285
292
  selected[ordinal - 1]
@@ -295,6 +302,20 @@ def confirmation_block(state: WizardState) -> str:
295
302
  model=model_ref,
296
303
  ))
297
304
  for requirement in profile.roles:
305
+ if not requirement.dynamic and state.role_counts.get(requirement.role) == 0:
306
+ source = state.role_sources.get(requirement.role, "once")
307
+ label = _msg(
308
+ state.workspace_root, "worker_settings", "source_" + source
309
+ )
310
+ lines.append(
311
+ _msg(
312
+ state.workspace_root,
313
+ "worker_settings",
314
+ "run_disabled",
315
+ role=requirement.role,
316
+ source=label,
317
+ )
318
+ )
298
319
  if not requirement.dynamic:
299
320
  continue
300
321
  lines.append(_msg(
@@ -38,9 +38,14 @@ from .picker_navigation import (
38
38
  present_picker,
39
39
  split_picker,
40
40
  )
41
- from .roles import _submit_role_prompt, next_role_prompt
41
+ from .roles import _step_role, _submit_role_prompt, next_role_prompt
42
42
  from .steps_analysis import _advance_design_prep_item
43
43
  from .registry import STEPS, STEP_BY_ID, _ROLE_SELECTION_BOUNDARY
44
+ from .worker_settings import (
45
+ next_worker_settings_prompt,
46
+ remaining_settings_screens,
47
+ submit_worker_settings,
48
+ )
44
49
 
45
50
 
46
51
  # ---- Public API ---------------------------------------------------------
@@ -52,6 +57,7 @@ def init_state(
52
57
  available_functions: Optional[list[str]] = None,
53
58
  preferred_task_key: str = "",
54
59
  requested_task_type: str = "",
60
+ worker_settings: bool = False,
55
61
  ) -> WizardState:
56
62
  """Bootstrap a new wizard state."""
57
63
  if requested_task_type and requested_task_type not in REQUESTABLE_TASK_TYPES:
@@ -68,6 +74,7 @@ def init_state(
68
74
  host_runtime=host_runtime,
69
75
  host_entry_mode=host_entry_mode,
70
76
  available_functions=list(available_functions or []),
77
+ worker_settings_mode=worker_settings,
71
78
  )
72
79
 
73
80
 
@@ -112,8 +119,16 @@ def _is_lone_choice_pick(prompt: Prompt) -> bool:
112
119
 
113
120
 
114
121
  def _apply_answer(state: WizardState, prompt: Prompt, value: str) -> str:
122
+ if state.worker_settings_mode:
123
+ try:
124
+ return submit_worker_settings(state, prompt, value)
125
+ except (ValueError, OSError) as exc:
126
+ raise WizardError(str(exc)) from exc
115
127
  if _is_role_selection_step(prompt.step):
116
128
  echo = _submit_role_prompt(state, prompt, value)
129
+ role = _step_role(prompt.step)
130
+ if prompt.step in state.manual_steps or role not in state.role_sources:
131
+ state.role_sources[role] = "once"
117
132
  if prompt.step not in state.role_selection_order:
118
133
  state.role_selection_order.append(prompt.step)
119
134
  else:
@@ -197,6 +212,8 @@ def _native_picker_screen(state: WizardState, prompt: Prompt) -> Prompt:
197
212
  def _next_prompt_screen(state: WizardState) -> Prompt:
198
213
  if state.aborted:
199
214
  return Prompt(step=S_ABORTED, kind="aborted")
215
+ if state.worker_settings_mode:
216
+ return next_worker_settings_prompt(state)
200
217
  if state.confirmed:
201
218
  return Prompt(step=S_DONE, kind="done")
202
219
  for step in STEPS:
@@ -319,8 +336,13 @@ def _remaining_screens(state: WizardState) -> int:
319
336
 
320
337
 
321
338
  def _screen_progress(state: WizardState) -> dict[str, Any]:
322
- passed = _passed_screens(state)
323
- total = passed + _remaining_screens(state)
339
+ if state.worker_settings_mode:
340
+ passed = state.worker_settings_answers
341
+ remaining_settings = remaining_settings_screens(state)
342
+ total = passed + 1 + remaining_settings
343
+ else:
344
+ passed = _passed_screens(state)
345
+ total = passed + _remaining_screens(state)
324
346
  index = passed + 1
325
347
  remaining = max(0, total - index)
326
348
  suffix = "마지막 단계" if remaining == 0 else f"앞으로 {remaining} 스텝 남음"
@@ -4,6 +4,7 @@ from __future__ import annotations
4
4
  import re
5
5
 
6
6
  from okstra_ctl.analysis_inputs import ANALYSIS_TASK_TYPES
7
+ from okstra_ctl.role_requirements import RoleRequirement
7
8
 
8
9
 
9
10
  # ---- Constants -----------------------------------------------------------
@@ -345,3 +346,25 @@ _REUSE_FILLED_STEPS = (
345
346
  S_ANALYSIS_TARGET_PICK, S_ANALYSIS_TARGET,
346
347
  S_DIRECTIVE_PICK, S_DIRECTIVE, S_RELATED_TASKS_PICK, S_RELATED_TASKS,
347
348
  S_CLARIFICATION_PICK, S_CLARIFICATION)
349
+
350
+
351
+ _MODELS_PREFIX = "role-models:"
352
+ _SINGLE_PREFIX = "role-model:"
353
+
354
+
355
+ def _role_models_prompt_id(role: str) -> str:
356
+ return f"{_MODELS_PREFIX}{role}"
357
+
358
+
359
+ def _role_model_prompt_id(role: str, ordinal: int) -> str:
360
+ return f"{_SINGLE_PREFIX}{role}:{ordinal}"
361
+
362
+
363
+ def _fixed_single(requirement: RoleRequirement) -> bool:
364
+ return requirement.min_count == requirement.max_count == 1
365
+
366
+
367
+ def _role_prompt_id(requirement: RoleRequirement) -> str:
368
+ if _fixed_single(requirement):
369
+ return _role_model_prompt_id(requirement.role, 1)
370
+ return _role_models_prompt_id(requirement.role)
@@ -52,8 +52,6 @@ def render_role_args(state: WizardState) -> list[str]:
52
52
  if requirement.role not in state.role_counts:
53
53
  continue
54
54
  count = state.role_counts[requirement.role]
55
- if count <= 0:
56
- continue
57
55
  role_argv.extend([
58
56
  "--role-count",
59
57
  f"{requirement.role}={count}",
@@ -72,6 +70,8 @@ def render_role_args(state: WizardState) -> list[str]:
72
70
 
73
71
  def render_args(state: WizardState) -> dict[str, Any]:
74
72
  """Convert finalized state into ``okstra render-bundle`` argument map."""
73
+ if state.worker_settings_mode:
74
+ raise WizardError("worker settings cannot launch a task")
75
75
  if state.aborted:
76
76
  raise WizardError(
77
77
  "wizard was aborted by the user — render-args is unavailable"
@@ -36,6 +36,9 @@ from okstra_ctl.registry.provider_registry import provider_display_order
36
36
  from okstra_ctl.dispatch_state import detect_terminal_backend
37
37
  from okstra_ctl.registry.host_registry import default_host_registry
38
38
  from okstra_ctl.model_defaults import ModelDefaultScopes, default_candidates
39
+ from okstra_ctl.domain.worker_defaults import WorkerDefaultError
40
+ from okstra_ctl.worker_defaults import resolve_executable_worker_default
41
+ from okstra_ctl.registry.worker_defaults_store import default_worker_defaults_store
39
42
  from okstra_ctl.model_pool import ModelPool
40
43
  from okstra_ctl.role_requirements import RoleProfile, RoleRequirement
41
44
  from okstra_ctl.run import (
@@ -53,23 +56,19 @@ from .state import (
53
56
  _is_role_selection_step,
54
57
  _load_role_profile_for_state,
55
58
  )
56
- from .prompts import _opt, _p
59
+ from .prompts import _msg, _opt, _p
60
+ from .ids import (
61
+ _MODELS_PREFIX,
62
+ _SINGLE_PREFIX,
63
+ _fixed_single,
64
+ _role_model_prompt_id,
65
+ _role_models_prompt_id,
66
+ _role_prompt_id,
67
+ )
57
68
 
58
69
  # 선택 역할의 "추가 안 함" 값. 모델 참조는 `<provider>/<model>` 꼴이라 겹치지 않는다.
59
70
  ROLE_SKIP_TOKEN = "0"
60
71
 
61
- _MODELS_PREFIX = "role-models:"
62
- _SINGLE_PREFIX = "role-model:"
63
-
64
-
65
- def _role_models_prompt_id(role: str) -> str:
66
- return f"{_MODELS_PREFIX}{role}"
67
-
68
-
69
- def _role_model_prompt_id(role: str, ordinal: int) -> str:
70
- return f"{_SINGLE_PREFIX}{role}:{ordinal}"
71
-
72
-
73
72
  def _step_role(step_id: str) -> str:
74
73
  """역할 선택 step id 가 가리키는 역할. 역할 선택 step 이 아니면 빈 문자열."""
75
74
  for prefix in (_MODELS_PREFIX, _SINGLE_PREFIX):
@@ -78,11 +77,6 @@ def _step_role(step_id: str) -> str:
78
77
  return ""
79
78
 
80
79
 
81
- def _fixed_single(requirement: RoleRequirement) -> bool:
82
- """정확히 한 인스턴스만 두는 역할 — 단일 선택 화면이다."""
83
- return requirement.min_count == requirement.max_count == 1
84
-
85
-
86
80
  def _selected_role_count(
87
81
  state: WizardState,
88
82
  requirement: RoleRequirement,
@@ -215,6 +209,44 @@ def _skip_option(requirement: RoleRequirement, t: dict, *, recommended: bool) ->
215
209
  )
216
210
 
217
211
 
212
+ def _apply_configured_role_defaults(
213
+ state: WizardState,
214
+ requirement: RoleRequirement,
215
+ context: AssignmentContext,
216
+ profile: RoleProfile,
217
+ scopes: ModelDefaultScopes,
218
+ ) -> Prompt:
219
+ configured = None
220
+ error = ""
221
+ try:
222
+ configured = resolve_executable_worker_default(
223
+ requirement,
224
+ state.worker_defaults_snapshot or {},
225
+ context,
226
+ _host_session_context(state),
227
+ )
228
+ except WorkerDefaultError as exc:
229
+ error = str(exc)
230
+ step = _role_prompt_id(requirement)
231
+ if configured is not None and step not in state.manual_steps:
232
+ state.role_sources[requirement.role] = configured.scope
233
+ values = configured.models or (ROLE_SKIP_TOKEN,)
234
+ return Prompt(
235
+ step=step, kind="pick", multi=requirement.max_count > 1,
236
+ options=[Option(value, value) for value in values],
237
+ auto_value=",".join(values),
238
+ )
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
+ if error:
245
+ prompt.label = _msg(state.workspace_root, "worker_settings", "run_invalid",
246
+ error=error, label=prompt.label)
247
+ return prompt
248
+
249
+
218
250
  def _role_models_prompt(
219
251
  state: WizardState,
220
252
  profile: RoleProfile,
@@ -316,13 +348,14 @@ def _model_prompt(
316
348
  scopes: ModelDefaultScopes,
317
349
  ) -> Prompt:
318
350
  prompt = _p(state.workspace_root, "role_model", role=requirement.role)
351
+ options = _single_model_options(
352
+ state, profile, requirement.role, context, scopes,
353
+ )
319
354
  return Prompt(
320
355
  step=_role_model_prompt_id(requirement.role, 1),
321
356
  kind="pick",
322
357
  label=prompt["label"],
323
- options=_single_model_options(
324
- state, profile, requirement.role, context, scopes,
325
- ),
358
+ options=options,
326
359
  echo_template=prompt["echo_template"],
327
360
  )
328
361
 
@@ -332,6 +365,7 @@ def _drop_role_selection(state: WizardState, roles: set[str]) -> None:
332
365
  for role in roles:
333
366
  state.role_models.pop(role, None)
334
367
  state.role_counts.pop(role, None)
368
+ state.role_sources.pop(role, None)
335
369
  state.role_selection_order = [
336
370
  step_id for step_id in state.role_selection_order
337
371
  if _step_role(step_id) not in roles
@@ -376,6 +410,9 @@ def _discard_invalid_previous_models(
376
410
  _drop_role_selection(
377
411
  state, {later.role for later in requirements[index:]},
378
412
  )
413
+ step = _role_prompt_id(requirement)
414
+ if step not in state.manual_steps:
415
+ state.manual_steps.append(step)
379
416
  return
380
417
  prefix[requirement.role] = tuple(selected)
381
418
 
@@ -513,6 +550,10 @@ def _validate_role_selection_feasibility(
513
550
  def _load_context(state: WizardState) -> tuple[AssignmentContext, ModelDefaultScopes]:
514
551
  try:
515
552
  scopes = _model_default_scopes(Path(state.project_root))
553
+ if state.worker_defaults_snapshot is None:
554
+ state.worker_defaults_snapshot = (
555
+ default_worker_defaults_store().load_scopes(Path(state.project_root))
556
+ )
516
557
  except (PrepareError, ValueError) as exc:
517
558
  raise WizardError(str(exc)) from exc
518
559
  context = load_assignment_context(
@@ -535,10 +576,14 @@ def next_role_prompt(state: WizardState) -> Prompt | None:
535
576
  selected = state.role_models.get(role, [])
536
577
  if _fixed_single(requirement):
537
578
  if not selected:
538
- return _model_prompt(state, profile, requirement, context, scopes)
579
+ return _apply_configured_role_defaults(
580
+ state, requirement, context, profile, scopes
581
+ )
539
582
  continue
540
583
  if role not in state.role_counts:
541
- return _role_models_prompt(state, profile, requirement, context, scopes)
584
+ return _apply_configured_role_defaults(
585
+ state, requirement, context, profile, scopes
586
+ )
542
587
  count = state.role_counts[role]
543
588
  if count != len(selected) or not (
544
589
  (0 if requirement.min_count == 0 else requirement.min_count)
@@ -680,6 +725,11 @@ def _clear_role_selection(state: WizardState) -> None:
680
725
  state.role_counts.clear()
681
726
  state.role_models.clear()
682
727
  state.role_selection_order.clear()
728
+ state.role_sources.clear()
729
+ state.manual_steps = [
730
+ step_id for step_id in state.manual_steps
731
+ if not _is_role_selection_step(step_id)
732
+ ]
683
733
  state.answered = [
684
734
  step_id
685
735
  for step_id in state.answered
@@ -7,6 +7,11 @@ from typing import Any, Callable, Optional
7
7
 
8
8
  from okstra_ctl.registry.provider_registry import default_provider_registry
9
9
  from okstra_ctl.model_pool import ModelPool
10
+ from okstra_ctl.domain.worker_defaults import (
11
+ WorkerDefaultScopes,
12
+ WorkerDefaultUpdates,
13
+ WorkerScope,
14
+ )
10
15
  from okstra_ctl.role_requirements import (
11
16
  RoleProfile,
12
17
  RoleProfileError,
@@ -23,6 +28,9 @@ from .ids import (
23
28
  _ABORT_OPTION,
24
29
  _SLUG_OK,
25
30
  _STAGE_SCOPED_TASK_TYPES,
31
+ _role_model_prompt_id,
32
+ _role_models_prompt_id,
33
+ _role_prompt_id,
26
34
  )
27
35
 
28
36
 
@@ -34,6 +42,15 @@ class WizardState:
34
42
  role_counts: dict[str, int] = field(default_factory=dict)
35
43
  role_models: dict[str, list[str]] = field(default_factory=dict)
36
44
  role_selection_order: list[str] = field(default_factory=list)
45
+ role_sources: dict[str, str] = field(default_factory=dict)
46
+ worker_defaults_snapshot: WorkerDefaultScopes | None = None
47
+ worker_settings_mode: bool = False
48
+ worker_settings_scope: WorkerScope | None = None
49
+ worker_settings_updates: WorkerDefaultUpdates = field(default_factory=dict)
50
+ worker_settings_role: str = ""
51
+ worker_settings_review: bool = False
52
+ worker_settings_saved: bool = False
53
+ worker_settings_answers: int = 0
37
54
 
38
55
  # bootstrap
39
56
  workspace_root: str = ""
@@ -148,7 +165,6 @@ class WizardState:
148
165
 
149
166
  # bookkeeping
150
167
  answered: list[str] = field(default_factory=list)
151
- # Steps the user came back to through Edit; their auto_value no longer applies.
152
168
  manual_steps: list[str] = field(default_factory=list)
153
169
 
154
170
  def to_json(self) -> dict[str, Any]:
@@ -420,9 +436,10 @@ def _role_selections_from_run_inputs(
420
436
  pool = ModelPool.from_registry(default_provider_registry())
421
437
  cross_requirement = _initial_cross_verification_requirement(profile)
422
438
  assigned = _assigned_models_by_role(payload)
439
+ if assigned:
440
+ _restore_recorded_role_selections(state, profile, pool, assigned)
441
+ return
423
442
  providers = _legacy_worker_providers(payload)
424
- if cross_requirement is not None and cross_requirement.role in assigned:
425
- providers = [provider for provider, _ in assigned[cross_requirement.role]]
426
443
  if cross_requirement is not None:
427
444
  selected_count = cross_requirement.recommended_count
428
445
  if providers and cross_requirement.min_count < cross_requirement.max_count:
@@ -437,13 +454,8 @@ def _role_selections_from_run_inputs(
437
454
  model.provider_id
438
455
  for model in pool.default_candidates(cross_requirement.role)
439
456
  ]
440
- assigned_models = [model for _, model in assigned.get(cross_requirement.role, ())]
441
- for ordinal, provider in enumerate(providers[:selected_count], start=1):
442
- raw_model = (
443
- assigned_models[ordinal - 1]
444
- if ordinal <= len(assigned_models)
445
- else payload.get(f"{provider}Model", "")
446
- )
457
+ for provider in providers[:selected_count]:
458
+ raw_model = payload.get(f"{provider}Model", "")
447
459
  model_ref = _legacy_model_ref(
448
460
  pool,
449
461
  provider,
@@ -455,7 +467,9 @@ def _role_selections_from_run_inputs(
455
467
  state.role_models.setdefault(cross_requirement.role, []).append(model_ref)
456
468
  if cross_requirement.role in state.role_models:
457
469
  # 여러 인스턴스 역할의 답은 체크박스 한 장이다.
458
- state.role_selection_order.append(f"role-models:{cross_requirement.role}")
470
+ state.role_selection_order.append(
471
+ _role_models_prompt_id(cross_requirement.role)
472
+ )
459
473
 
460
474
  executor = payload.get("executor") or "claude"
461
475
  critic = payload.get("critic") or ""
@@ -475,15 +489,41 @@ def _role_selections_from_run_inputs(
475
489
  if not requirement.dynamic and requirement.min_count > 0
476
490
  }
477
491
  for role, provider, raw_model in provider_rows:
478
- if assigned.get(role):
479
- provider, raw_model = assigned[role][0]
480
492
  if role not in static_roles or not isinstance(provider, str) or not provider:
481
493
  continue
482
494
  model_ref = _legacy_model_ref(pool, provider, role, raw_model)
483
495
  if model_ref is None:
484
496
  continue
485
497
  state.role_models[role] = [model_ref]
486
- state.role_selection_order.append(f"role-model:{role}:1")
498
+ state.role_selection_order.append(_role_model_prompt_id(role, 1))
499
+
500
+
501
+ def _restore_recorded_role_selections(
502
+ state: WizardState,
503
+ profile: RoleProfile,
504
+ pool: ModelPool,
505
+ assigned: dict[str, list[tuple[str, str]]],
506
+ ) -> None:
507
+ for requirement in profile.roles:
508
+ if requirement.dynamic or requirement.role == "leader":
509
+ continue
510
+ role = requirement.role
511
+ rows = assigned.get(role, [])
512
+ if not rows and requirement.min_count > 0:
513
+ continue
514
+ models = [
515
+ model for provider, raw in rows
516
+ if (model := _legacy_model_ref(pool, provider, role, raw)) is not None
517
+ ]
518
+ step = _role_prompt_id(requirement)
519
+ if len(models) != len(rows):
520
+ state.manual_steps.append(step)
521
+ continue
522
+ if models:
523
+ state.role_models[role] = models
524
+ if requirement.min_count != requirement.max_count:
525
+ state.role_counts[role] = len(rows)
526
+ state.role_selection_order.append(step)
487
527
 
488
528
 
489
529
  class StaleWizardStateError(WizardError):
@@ -622,6 +662,7 @@ _FIELD_DEFAULTS: dict[str, Any] = {
622
662
  "selected_stages": "",
623
663
  "handoff_stages": "",
624
664
  "role_counts": {}, "role_models": {}, "role_selection_order": [],
665
+ "role_sources": {},
625
666
  "reuse_previous": None,
626
667
  "directive": "",
627
668
  "directive_pending_text": False,
@@ -9,6 +9,7 @@ from okstra_ctl.phases.feature_analysis.entry import resolve_analysis_target
9
9
  from okstra_ctl.models import UnknownModelError, resolve_model_metadata
10
10
 
11
11
  from .ids import S_REUSE_PREVIOUS, _REUSE_FILLED_STEPS
12
+ from .roles import _clear_role_selection
12
13
  from .state import (
13
14
  Prompt,
14
15
  WizardError,
@@ -90,10 +91,11 @@ def _submit_reuse_previous(state: WizardState, value: str) -> Optional[str]:
90
91
  conversion_payload = dict(inputs)
91
92
  conversion_payload.setdefault("grokModel", _assignment_model(inputs, "grok", "grok"))
92
93
  conversion_payload.setdefault("kimiModel", _assignment_model(inputs, "kimi", "kimi"))
93
- state.role_counts.clear()
94
- state.role_models.clear()
95
- state.role_selection_order.clear()
94
+ _clear_role_selection(state)
96
95
  _role_selections_from_run_inputs(state, conversion_payload)
96
+ state.role_sources = {
97
+ role: "previous" for role in state.role_models.keys() | state.role_counts.keys()
98
+ }
97
99
  directive = inputs.get("directive")
98
100
  state.directive = directive if isinstance(directive, str) else ""
99
101
  related = inputs.get("relatedTasks")