okstra 0.30.3 → 0.32.0

package/runtime/python/okstra_ctl/run.py

@@ -549,7 +549,7 @@ def prepare_task_bundle(inp: PrepareInputs) -> PrepareOutputs:
         pr_template_source = resolved_tpl.source
 
     # ---- model assignments ----
-    lead_default = _default("OKSTRA_DEFAULT_LEAD_MODEL", "opus")
+    lead_default = _default("OKSTRA_DEFAULT_LEAD_MODEL", "opus-4-6")
     claude_default = _default("OKSTRA_DEFAULT_CLAUDE_MODEL", "sonnet")
     codex_default = _default("OKSTRA_DEFAULT_CODEX_MODEL", "gpt-5.5")
     gemini_default = _default("OKSTRA_DEFAULT_GEMINI_MODEL", "auto")

package/runtime/python/okstra_ctl/wizard.py

@@ -37,6 +37,7 @@ from okstra_ctl.workers import (
     ALLOWED_WORKERS,
     WorkersError,
     normalize_workers,
+    resolve_optional_workers,
     resolve_profile_workers,
     validate_workers_against_profile,
 )
@@ -215,6 +216,7 @@ class WizardState:
     # task-type + dependents
     task_type: str = ""
     profile_workers: list[str] = field(default_factory=list)
+    profile_optional_workers: list[str] = field(default_factory=list)
 
     # brief
     keep_existing_brief: Optional[bool] = None
@@ -278,6 +280,7 @@ class Prompt:
     options: list[Option] = field(default_factory=list)
     help: str = ""
     echo_template: str = ""  # e.g. "task-group: {value}"
+    multi: bool = False  # only meaningful when kind == "pick"
 
     def to_json(self) -> dict[str, Any]:
         return {
@@ -287,6 +290,7 @@ class Prompt:
             "options": [asdict(o) for o in self.options],
             "help": self.help,
             "echoTemplate": self.echo_template,
+            "multi": self.multi,
         }
 
 
@@ -401,6 +405,12 @@ def _load_profile_workers(workspace_root: Path, task_type: str) -> list[str]:
     return resolve_profile_workers(_profile_path(workspace_root, task_type))
 
 
+def _load_profile_optional_workers(
+    workspace_root: Path, task_type: str
+) -> list[str]:
+    return resolve_optional_workers(_profile_path(workspace_root, task_type))
+
+
 def _resolved_roster(state: WizardState) -> list[str]:
     """Effective worker list AFTER override. Implementation: profile default
     (caller never asks for override). Others: override or profile default."""
@@ -628,6 +638,9 @@ def _submit_task_type(state: WizardState, value: str) -> Optional[str]:
     state.profile_workers = _load_profile_workers(
         Path(state.workspace_root), value
     )
+    state.profile_optional_workers = _load_profile_optional_workers(
+        Path(state.workspace_root), value
+    )
     # Reuse-worktree is decided once identity is final. Recompute here so
     # subsequent base-ref step knows whether to apply.
     state.reuse_worktree = _resolve_reuse_worktree(state)
@@ -932,25 +945,43 @@ def _submit_defaults_or_custom(state: WizardState, value: str) -> Optional[str]:
 
 
 def _build_workers_override(state: WizardState) -> Prompt:
-    csv = ",".join(state.profile_workers)
+    """분석 워커 멀티픽. report-writer 는 옵션에서 빼고 항상 결과에 강제
+    포함시킨다(프로필이 report-writer 를 Required 로 가질 때)."""
+    analyser_choices = [
+        w for w in (state.profile_workers + state.profile_optional_workers)
+        if w != "report-writer"
+    ]
+    options: list[Option] = []
+    for w in analyser_choices:
+        is_optional = w in state.profile_optional_workers
+        label = f"{w} (옵션)" if is_optional else w
+        options.append(_opt(value=w, label=label))
     return Prompt(
-        step=S_WORKERS_OVERRIDE, kind="text",
-        label=(f"참여 워커 목록을 쉼표로 구분해서 적어주세요. "
-               f"빈 줄이면 프로필 기본값 [{csv}] 을 그대로 씁니다. "
-               f"사용 가능한 워커: {csv}"),
+        step=S_WORKERS_OVERRIDE, kind="pick", multi=True,
+        label=("참여시킬 분석 워커를 선택해주세요 (최소 1개). "
+               "report-writer 는 항상 포함됩니다."),
+        options=options,
         echo_template="workers: {value}",
     )
 
 
 def _submit_workers_override(state: WizardState, value: str) -> Optional[str]:
-    if not (value or "").strip():
-        state.workers_override = ""
-        return f"workers: (profile default: {','.join(state.profile_workers)})"
+    raw = (value or "").strip()
     try:
-        chosen = normalize_workers(value)
-        validate_workers_against_profile(chosen, state.profile_workers)
+        chosen = normalize_workers(raw) if raw else []
+        if not chosen:
+            raise WizardError("워커를 최소 1개 선택해주세요")
+        validate_workers_against_profile(
+            chosen,
+            state.profile_workers,
+            state.profile_optional_workers,
+        )
     except WorkersError as exc:
         raise WizardError(str(exc))
+    # report-writer 는 프로필이 Required 로 선언했을 때만 강제 포함.
+    if ("report-writer" in state.profile_workers
+            and "report-writer" not in chosen):
+        chosen.append("report-writer")
     state.workers_override = ",".join(chosen)
     return f"workers: {state.workers_override}"
 
@@ -1173,6 +1204,7 @@ STEPS: list[Step] = [
          build=_build_task_pick, submit=_submit_task_pick,
          owns=("is_new_task", "task_group", "task_id", "task_type",
                "existing_brief_path", "profile_workers",
+               "profile_optional_workers",
                "task_group_suggestion", "task_id_suggestion",
                "task_group_pending_text", "task_id_pending_text")),
     Step(S_BRIEF_PATH,
@@ -1228,7 +1260,8 @@ STEPS: list[Step] = [
                             and (s.is_new_task is False or bool(s.task_id))
                             and S_TASK_TYPE not in s.answered),
          build=_build_task_type, submit=_submit_task_type,
-         owns=("task_type", "profile_workers", "reuse_worktree")),
+         owns=("task_type", "profile_workers", "profile_optional_workers",
+               "reuse_worktree")),
     Step(S_BRIEF_KEEP,
          applies=lambda s: (not s.is_new_task
                             and bool(s.existing_brief_path)
@@ -1281,11 +1314,16 @@ STEPS: list[Step] = [
                             and s.use_defaults is None),
          build=_build_defaults_or_custom, submit=_submit_defaults_or_custom,
          owns=("use_defaults",)),
-    # Customize branch — workers override only when non-empty profile + not impl.
+    # Customize branch — workers override only when the profile actually
+    # has analyser-candidate workers (required ∪ optional, minus report-writer).
     Step(S_WORKERS_OVERRIDE,
          applies=lambda s: (s.use_defaults is False
                             and s.task_type != "implementation"
-                            and bool(s.profile_workers)
+                            and any(
+                                w != "report-writer"
+                                for w in (s.profile_workers
+                                          + s.profile_optional_workers)
+                            )
                             and S_WORKERS_OVERRIDE not in s.answered),
          build=_build_workers_override, submit=_submit_workers_override,
          owns=("workers_override",)),
@@ -1446,7 +1484,8 @@ _FIELD_DEFAULTS: dict[str, Any] = {
     "existing_brief_path": "", "task_type": "",
     "task_group_suggestion": "", "task_id_suggestion": "",
     "task_group_pending_text": False, "task_id_pending_text": False,
-    "profile_workers": [], "keep_existing_brief": None,
+    "profile_workers": [], "profile_optional_workers": [],
+    "keep_existing_brief": None,
     "brief_path": "", "reuse_worktree": None, "base_ref": "",
     "base_ref_pending_text": False, "approved_plan_path": "",
     "approved_plan_pending_text": False,

package/runtime/python/okstra_ctl/workers.py

@@ -16,16 +16,20 @@ PROFILE_BULLET_HEADERS = {
     "- Reviewers:",
     "- Analysers:",
 }
+PROFILE_BULLET_HEADERS_OPTIONAL = {
+    "- Optional workers:",
+    "- Optional workers (opt-in via `--workers`):",
+}
 
 
 class WorkersError(Exception):
     """invalid worker selection — surface to user."""
 
 
-def resolve_profile_workers(profile_path: Path) -> list[str]:
-    """`prompts/profiles/<task-type>.md` 본문의 `- Workers:` 섹션 아래
-    sub-bullet 들을 worker id 리스트로 돌려준다.
-    profile 파일이 없거나 섹션이 없으면 빈 리스트.
+def _resolve_workers_under(profile_path: Path, headers: set[str]) -> list[str]:
+    """Generic parser: collect `  - <id> …` sub-bullets under any of `headers`
+    until the next top-level bullet. Returns first token (before any
+    ` — ` / ` -- ` / whitespace) of each captured line.
     """
     if not Path(profile_path).is_file():
         return []
@@ -33,7 +37,7 @@ def resolve_profile_workers(profile_path: Path) -> list[str]:
     out: list[str] = []
     for line in Path(profile_path).read_text(encoding="utf-8").splitlines():
         stripped = line.strip()
-        if stripped in PROFILE_BULLET_HEADERS:
+        if stripped in headers:
             capturing = True
             continue
         if not capturing:
@@ -41,13 +45,40 @@ def resolve_profile_workers(profile_path: Path) -> list[str]:
         if line.startswith("- "):
             break
         if line.startswith("  - "):
-            out.append(line[4:].strip())
+            body = line[4:].strip()
+            token = body.split(" — ", 1)[0].split(" -- ", 1)[0].split()[0]
+            out.append(token)
             continue
         if stripped:
             break
     return out
 
 
+def resolve_profile_workers(profile_path: Path) -> list[str]:
+    """`prompts/profiles/<task-type>.md` 본문의 `- Required workers:` (또는
+    `- Workers:` / `- Reviewers:` / `- Analysers:`) 섹션 아래 sub-bullet 들을
+    worker id 리스트로 돌려준다. profile 파일이 없거나 섹션이 없으면 빈 리스트.
+    """
+    return _resolve_workers_under(profile_path, PROFILE_BULLET_HEADERS)
+
+
+def resolve_optional_workers(profile_path: Path) -> list[str]:
+    r"""`- Optional workers (opt-in via \`--workers\`):` 섹션 아래 sub-bullet
+    들에서 worker id 만 추출한다. (`  - gemini — when added …` → `gemini`)
+    Required 와 중복되는 항목은 제거. ALLOWED_WORKERS 밖 토큰도 제거.
+    """
+    raw = _resolve_workers_under(profile_path, PROFILE_BULLET_HEADERS_OPTIONAL)
+    required = set(resolve_profile_workers(profile_path))
+    seen: set[str] = set()
+    out: list[str] = []
+    for w in raw:
+        if w in required or w in seen or w not in ALLOWED_WORKERS:
+            continue
+        seen.add(w)
+        out.append(w)
+    return out
+
+
 def normalize_workers(value: str) -> list[str]:
     """CSV 입력을 정규화한다.
 
@@ -71,20 +102,23 @@ def normalize_workers(value: str) -> list[str]:
 
 
 def validate_workers_against_profile(
-    workers: list[str], profile_workers: list[str]
+    workers: list[str],
+    profile_workers: list[str],
+    optional_workers: list[str] | None = None,
 ) -> None:
     """프로파일이 `Required workers:` 로 로스터를 선언했다면, 사용자
-    override 가 그 부분집합인지 검증한다.
+    override 가 (required ∪ optional) 의 부분집합인지 검증한다.
 
     `profile_workers` 가 비어 있으면(프로파일이 로스터를 선언하지 않은
-    구버전) 검증을 건너뛴다 — 하위 호환을 위해.
+    구버전) 검증을 건너뛴다.
     """
     if not profile_workers:
         return
-    allowed = set(profile_workers)
+    allowed = set(profile_workers) | set(optional_workers or [])
     extras = [w for w in workers if w not in allowed]
     if extras:
+        allow_str = ",".join(profile_workers + list(optional_workers or []))
         raise WorkersError(
             "workers not allowed by profile roster: "
-            f"{','.join(extras)} (profile allows: {','.join(profile_workers)})"
+            f"{','.join(extras)} (profile allows: {allow_str})"
         )

package/runtime/python/okstra_token_usage/__init__.py

@@ -23,4 +23,8 @@ from .pricing import (
     codex_cost_usd,
     gemini_cost_usd,
 )
-from .report import substitute_final_report
+from .report import (
+    SubstituteRefusedError,
+    populate_and_render,
+    populate_data_token_cells,
+)

package/runtime/python/okstra_token_usage/cli.py

@@ -5,25 +5,53 @@ import argparse
 import json
 import sys
 from pathlib import Path
+
 from .collect import collect
-from .report import SubstituteRefusedError, substitute_final_report
+from .report import (
+    SubstituteRefusedError,
+    populate_and_render,
+)
 
 
 def main() -> int:
     parser = argparse.ArgumentParser(description=__doc__)
-    parser.add_argument("team_state", type=Path, help="Path to team-state JSON file")
-    parser.add_argument("--project-root", type=Path, default=None,
-                        help="Override project root (default: inferred from team-state path)")
-    parser.add_argument("--write", action="store_true",
-                        help="Write the updated team-state back to the same path (default: print to stdout)")
-    parser.add_argument("--summary", action="store_true",
-                        help="Also print a one-line summary to stderr")
-    parser.add_argument("--substitute-final-report", type=Path, default=None,
-                        help="After collecting usage, substitute {{LEAD_TOTAL_TOKENS}} / {{LEAD_BILLABLE_TOKENS}} / "
-                             "{{LEAD_COST_USD}} / {{WORKER_TOTAL_TOKENS}} / {{WORKER_BILLABLE_TOKENS}} / "
-                             "{{WORKER_COST_USD}} / {{GRAND_TOTAL_TOKENS}} / {{GRAND_BILLABLE_TOKENS}} / "
-                             "{{GRAND_COST_USD}} / {{CLI_COST_USD}} placeholders in the given final-report file "
-                             "with concrete values from the freshly computed usageSummary.")
+    parser.add_argument(
+        "team_state",
+        type=Path,
+        help="Path to team-state JSON file",
+    )
+    parser.add_argument(
+        "--project-root",
+        type=Path,
+        default=None,
+        help="Override project root (default: inferred from team-state path)",
+    )
+    parser.add_argument(
+        "--write",
+        action="store_true",
+        help=(
+            "Write the updated team-state back to the same path "
+            "(default: print to stdout)"
+        ),
+    )
+    parser.add_argument(
+        "--summary",
+        action="store_true",
+        help="Also print a one-line summary to stderr",
+    )
+    parser.add_argument(
+        "--substitute-data",
+        type=Path,
+        default=None,
+        help=(
+            "After collecting usage, populate the final-report data.json "
+            "at this path with concrete token / cost / duration values "
+            "from the freshly computed usageSummary, then re-render the "
+            "sibling final-report markdown via the renderer. The data.json "
+            "is the SSOT; the markdown is regenerated from it. "
+            "See schemas/final-report-v1.0.schema.json for the data shape."
+        ),
+    )
     args = parser.parse_args()
 
     if not args.team_state.is_file():
@@ -33,7 +61,9 @@ def main() -> int:
     updated = collect(args.team_state, args.project_root)
 
     if args.write:
-        args.team_state.write_text(json.dumps(updated, indent=2, ensure_ascii=False) + "\n")
+        args.team_state.write_text(
+            json.dumps(updated, indent=2, ensure_ascii=False) + "\n",
+        )
     else:
         json.dump(updated, sys.stdout, indent=2, ensure_ascii=False)
         sys.stdout.write("\n")
@@ -42,7 +72,8 @@ def main() -> int:
         s = updated.get("usageSummary") or {}
         cost = s.get("estimatedCostUsd") or {}
         print(
-            f"raw: lead={s.get('leadTotalTokens', 0):,} workers={s.get('workerTotalTokens', 0):,} "
+            f"raw: lead={s.get('leadTotalTokens', 0):,} "
+            f"workers={s.get('workerTotalTokens', 0):,} "
             f"grand={s.get('grandTotalTokens', 0):,}",
             file=sys.stderr,
         )
@@ -53,36 +84,35 @@ def main() -> int:
             file=sys.stderr,
         )
         print(
-            f"cost USD: lead=${cost.get('lead', 0):.2f} claude-workers=${cost.get('claudeWorkers', 0):.2f} "
-            f"cli-workers=${cost.get('cliWorkers', 0):.2f} grand=${cost.get('grandTotal', 0):.2f}",
+            f"cost USD: lead=${cost.get('lead', 0):.2f} "
+            f"claude-workers=${cost.get('claudeWorkers', 0):.2f} "
+            f"cli-workers=${cost.get('cliWorkers', 0):.2f} "
+            f"grand=${cost.get('grandTotal', 0):.2f}",
+            file=sys.stderr,
+        )
+        print(
+            f"sessions={s.get('sessionsFound', 0)} "
+            f"team={s.get('teamName', '')}",
             file=sys.stderr,
         )
-        print(f"sessions={s.get('sessionsFound', 0)} team={s.get('teamName', '')}", file=sys.stderr)
 
-    if args.substitute_final_report is not None:
+    if args.substitute_data is not None:
         try:
-            replaced = substitute_final_report(args.substitute_final_report, updated)
+            cells_changed, bytes_written = populate_and_render(
+                args.substitute_data,
+                updated,
+            )
         except SubstituteRefusedError as exc:
             print(
                 f"final-report substitution REFUSED: {exc}",
                 file=sys.stderr,
             )
             return 2
-        if replaced < 0:
-            print(
-                f"final-report substitution skipped: file not found at {args.substitute_final_report}",
-                file=sys.stderr,
-            )
-        elif replaced == 0:
-            print(
-                f"final-report substitution: no token placeholders found at {args.substitute_final_report}",
-                file=sys.stderr,
-            )
-        else:
-            print(
-                f"final-report substitution: replaced {replaced} placeholder occurrence(s) in {args.substitute_final_report}",
-                file=sys.stderr,
-            )
+        print(
+            f"final-report substitution: populated {cells_changed} cell(s) in "
+            f"{args.substitute_data}, re-rendered {bytes_written} bytes of markdown.",
+            file=sys.stderr,
+        )
 
     return 0
 

package/runtime/python/okstra_token_usage/pricing.py

@@ -47,6 +47,7 @@ CLAUDE_PRICING = {
 
     # Claude 4 point releases (explicit so future divergence is easy to see).
     "opus-4-7":   (5.0, 6.25, 0.50, 25.0),     # Opus 4.7 (cache prices derived from ratios)
+    "opus-4-6":   (5.0, 6.25, 0.50, 25.0),     # Opus 4.6 (legacy; pricing matches 4.7 per Anthropic)
     "sonnet-4-6": (3.0, 3.75, 0.30, 15.0),     # Sonnet 4.6 (cache prices derived from ratios)
     "haiku-4-5":  (1.0, 1.25, 0.10, 5.0),      # Haiku 4.5  (cache prices derived from ratios)