okstra 0.146.1 → 0.148.0

package/runtime/python/okstra_ctl/models.py

@@ -6,14 +6,14 @@ role default = one ROLE_DEFAULTS line here.
 from __future__ import annotations
 
 from dataclasses import dataclass
-from typing import Optional
+from typing import Mapping, Optional
 
 
 @dataclass(frozen=True)
 class ModelSpec:
     display: str
     execution: str
-    pricing: Optional[tuple] = None   # codex only: (input, cached_input, output) USD/1M
+    pricing: Optional[tuple[float, float, float]] = None
     in_picker: bool = False           # exposed in the wizard 3-option picker
 
 
@@ -31,6 +31,8 @@ CLAUDE = {
     "opus-4-6": ModelSpec("opus-4-6", "claude-opus-4-6"),
     "claude-opus-4-6": ModelSpec("opus-4-6", "claude-opus-4-6"),
     "sonnet": ModelSpec("sonnet", "sonnet", in_picker=True),
+    "sonnet-5": ModelSpec("sonnet-5", "claude-sonnet-5", in_picker=True),
+    "claude-sonnet-5": ModelSpec("sonnet-5", "claude-sonnet-5"),
     "sonnet-4-6": ModelSpec("sonnet-4-6", "claude-sonnet-4-6"),
     "claude-sonnet-4-6": ModelSpec("sonnet-4-6", "claude-sonnet-4-6"),
     "haiku": ModelSpec("haiku", "haiku", in_picker=True),
@@ -47,6 +49,8 @@ CLAUDE = {
 ANTIGRAVITY = {
     "gemini-3.1-pro": ModelSpec("Gemini 3.1 Pro", "gemini-3.1-pro", in_picker=True),
     "gemini 3.1 pro": ModelSpec("Gemini 3.1 Pro", "gemini-3.1-pro"),
+    "gemini-3.6-flash": ModelSpec("Gemini 3.6 Flash", "gemini-3.6-flash", in_picker=True),
+    "gemini 3.6 flash": ModelSpec("Gemini 3.6 Flash", "gemini-3.6-flash"),
     "gemini-3.5-flash": ModelSpec("Gemini 3.5 Flash", "gemini-3.5-flash", in_picker=True),
     "gemini 3.5 flash": ModelSpec("Gemini 3.5 Flash", "gemini-3.5-flash"),
 }
@@ -61,12 +65,111 @@ CODEX = {
     "gpt-5.2": ModelSpec("gpt-5.2", "gpt-5.2", (1.75, 0.175, 14.0)),
     "codex-auto-review": ModelSpec("codex-auto-review", "codex-auto-review"),
 }
-PROVIDER_MAPPINGS = {"claude": CLAUDE, "antigravity": ANTIGRAVITY, "codex": CODEX}
+GROK = {
+    "grok-build-0.1": ModelSpec(
+        "grok-build-0.1", "grok-build-0.1", (1.00, 0.20, 2.00), in_picker=True,
+    ),
+    "grok-4.5": ModelSpec(
+        "grok-4.5", "grok-4.5", (2.00, 0.30, 6.00), in_picker=True,
+    ),
+}
+KIMI = {
+    "kimi-k2.7-code": ModelSpec(
+        "Kimi K2.7 Code", "kimi-k2.7-code", (0.95, 0.19, 4.00), in_picker=True,
+    ),
+    "kimi k2.7 code": ModelSpec("Kimi K2.7 Code", "kimi-k2.7-code"),
+    "kimi-for-coding": ModelSpec(
+        "Kimi K2.7 Code", "kimi-for-coding", in_picker=True,
+    ),
+    "kimi-k3": ModelSpec(
+        "Kimi K3", "kimi-k3", (3.00, 0.30, 15.00), in_picker=True,
+    ),
+    "kimi k3": ModelSpec("Kimi K3", "kimi-k3"),
+    "k3": ModelSpec("Kimi K3", "k3", in_picker=True),
+    "k3-256k": ModelSpec("Kimi K3 256K", "k3-256k", in_picker=True),
+    "kimi k3 256k": ModelSpec("Kimi K3 256K", "k3-256k"),
+}
+
+ANALYSIS_ROLES = frozenset({"analyser", "critic"})
+IMPLEMENTATION_ROLES = frozenset({"executor", "verifier"})
+
+
+@dataclass(frozen=True)
+class ProviderSpec:
+    provider: str
+    display_label: str
+    models: Mapping[str, ModelSpec]
+    default_models: Mapping[str, str]
+    wrapper: str
+    supported_roles: frozenset[str]
 
-# ROLE-keyed (not provider): 1:1 with run.py recommended_role_models. "lead" uses
-# the claude provider; "report-writer" resolves via the claude provider too.
-# report-writer defaults below the lead tier on purpose: it does not vote in
-# convergence, and its wall-clock is dominated by sheer report generation.
+
+PROVIDERS = {
+    "claude": ProviderSpec(
+        provider="claude",
+        display_label="Claude",
+        models=CLAUDE,
+        default_models={
+            "lead": "opus",
+            "analyser": "opus",
+            "critic": "opus",
+            "executor": "opus",
+            "verifier": "opus",
+            "report-writer": "sonnet",
+        },
+        wrapper="okstra-claude-exec.sh",
+        supported_roles=frozenset(
+            {"lead", "analyser", "critic", "executor", "verifier", "report-writer"}
+        ),
+    ),
+    "antigravity": ProviderSpec(
+        provider="antigravity",
+        display_label="Antigravity",
+        models=ANTIGRAVITY,
+        default_models={role: "gemini-3.1-pro" for role in (
+            "lead", "analyser", "critic", "executor", "verifier",
+        )},
+        wrapper="okstra-antigravity-exec.sh",
+        supported_roles=frozenset(
+            {"lead", "analyser", "critic", "executor", "verifier"}
+        ),
+    ),
+    "codex": ProviderSpec(
+        provider="codex",
+        display_label="Codex",
+        models=CODEX,
+        default_models={role: "gpt-5.6-sol" for role in (
+            "lead", "analyser", "critic", "executor", "verifier", "report-writer",
+        )},
+        wrapper="okstra-codex-exec.sh",
+        supported_roles=frozenset(
+            {"lead", "analyser", "critic", "executor", "verifier", "report-writer"}
+        ),
+    ),
+    "grok": ProviderSpec(
+        provider="grok",
+        display_label="Grok",
+        models=GROK,
+        default_models={"analyser": "grok-build-0.1", "critic": "grok-4.5"},
+        wrapper="okstra-grok-exec.sh",
+        supported_roles=ANALYSIS_ROLES,
+    ),
+    "kimi": ProviderSpec(
+        provider="kimi",
+        display_label="Kimi",
+        models=KIMI,
+        default_models={"analyser": "kimi-k2.7-code", "critic": "kimi-k3"},
+        wrapper="okstra-kimi-exec.sh",
+        supported_roles=ANALYSIS_ROLES,
+    ),
+}
+
+PROVIDER_MAPPINGS = {
+    provider: spec.models for provider, spec in PROVIDERS.items()
+}
+
+# Legacy role-keyed compatibility defaults. Canonical assignments resolve a
+# provider first and then use ProviderSpec.default_models for that role.
 ROLE_DEFAULTS = {
     "lead": "opus", "claude": "opus", "codex": "gpt-5.6-sol",
     "antigravity": "gemini-3.1-pro", "report-writer": "sonnet",
@@ -83,6 +186,51 @@ class UnknownModelError(ValueError):
     """raw_value 가 provider mapping 에 등록되어 있지 않을 때 발생."""
 
 
+class UnknownProviderError(ValueError):
+    """Raised when a requested provider is absent from the registry."""
+
+
+def provider_spec(provider: str) -> ProviderSpec:
+    """Return one registered provider or fail before assignment/dispatch."""
+    normalized = (provider or "").strip().lower()
+    try:
+        return PROVIDERS[normalized]
+    except KeyError as exc:
+        allowed = ", ".join(PROVIDERS)
+        raise UnknownProviderError(
+            f"unknown provider {provider!r}. Allowed values: {allowed}"
+        ) from exc
+
+
+def provider_ids(role: str | None = None) -> list[str]:
+    """Registered provider ids, optionally filtered by functional role."""
+    if not role:
+        return list(PROVIDERS)
+    return [
+        provider for provider, spec in PROVIDERS.items()
+        if role in spec.supported_roles
+    ]
+
+
+def provider_supports_role(provider: str, role: str) -> bool:
+    """Whether the provider has passed the registry gate for a role."""
+    return role in provider_spec(provider).supported_roles
+
+
+def provider_wrappers(role: str | None = None) -> dict[str, str]:
+    """Provider-to-wrapper mapping derived from capability entries."""
+    return {
+        provider: PROVIDERS[provider].wrapper
+        for provider in provider_ids(role)
+        if PROVIDERS[provider].wrapper
+    }
+
+
+def provider_default_model(provider: str, role: str) -> Optional[str]:
+    """Resolve a provider's explicit default for one functional role."""
+    return provider_spec(provider).default_models.get(role)
+
+
 def resolve_model_metadata(
     *, provider: str, raw_value: str, default_display: str, default_execution: str,
 ) -> ModelAssignment:
@@ -120,6 +268,6 @@ def default_model(role: str) -> Optional[str]:
 
 
 def catalog_pricing(provider: str) -> dict:
-    """Selectable-model pricing for a provider (codex only carries pricing)."""
+    """Selectable-model pricing as (input, cached input, output) USD/1M."""
     mapping = PROVIDER_MAPPINGS.get(provider, {})
     return {alias: spec.pricing for alias, spec in mapping.items() if spec.pricing is not None}

package/runtime/python/okstra_ctl/path_hints.py

@@ -13,6 +13,7 @@ from okstra_project.dirs import (
 )
 
 from .paths import runs_dir_of, task_manifest_file, task_timeline_file
+from .worker_artifacts import artifacts_from_context
 
 RUN_CONTEXT_KIND = "run-context"
 RUN_CONTEXT_SCHEMA_VERSION = "2.0"
@@ -162,7 +163,7 @@ def _compact_active_workers(payload: Mapping[str, Any]) -> list[dict[str, Any]]:
 def _compact_active_worker(worker: Mapping[str, Any]) -> dict[str, Any]:
     keep = (
         "workerId", "role", "agent", "agentLabel", "model",
-        "modelExecutionValue", "attemptRequired",
+        "provider", "runner", "modelExecutionValue", "attemptRequired",
     )
     return {key: worker.get(key, "") for key in keep}
 
@@ -242,19 +243,19 @@ def _hydrate_active_worker(
 ) -> dict[str, Any]:
     worker_id = str(worker.get("workerId", ""))
     hydrated = dict(worker)
-    hydrated["promptPath"] = ctx.get(_worker_path_key(worker_id, "prompt"), "")
-    hydrated["resultPath"] = ctx.get(_worker_path_key(worker_id, "result"), "")
+    paths = artifacts_from_context(ctx, relative=True).get(worker_id, {})
+    hydrated["promptPath"] = paths.get("promptPath", "")
+    hydrated["resultPath"] = paths.get("resultPath", "")
     return hydrated
 
 
 def _hydrate_active_error_logs(ctx: Mapping[str, str]) -> dict[str, Any]:
+    artifacts = artifacts_from_context(ctx, relative=True)
     return {
         "runErrorsLogPath": ctx.get("RUN_ERRORS_LOG_RELATIVE_PATH", ""),
         "sidecarsByWorkerId": {
-            "claude": ctx.get("CLAUDE_WORKER_ERRORS_SIDECAR_RELATIVE_PATH", ""),
-            "codex": ctx.get("CODEX_WORKER_ERRORS_SIDECAR_RELATIVE_PATH", ""),
-            "antigravity": ctx.get("ANTIGRAVITY_WORKER_ERRORS_SIDECAR_RELATIVE_PATH", ""),
-            "report-writer": ctx.get("REPORT_WRITER_WORKER_ERRORS_SIDECAR_RELATIVE_PATH", ""),
+            worker_id: paths["errorsSidecarPath"]
+            for worker_id, paths in artifacts.items()
         },
     }
 
@@ -268,23 +269,6 @@ def _hydrate_active_source_artifacts(ctx: Mapping[str, str]) -> dict[str, str]:
     }
 
 
-def _worker_path_key(worker_id: str, kind: str) -> str:
-    by_worker = {
-        "claude": ("CLAUDE_WORKER_PROMPT_RELATIVE_PATH", "CLAUDE_WORKER_RESULT_RELATIVE_PATH"),
-        "codex": ("CODEX_WORKER_PROMPT_RELATIVE_PATH", "CODEX_WORKER_RESULT_RELATIVE_PATH"),
-        "antigravity": (
-            "ANTIGRAVITY_WORKER_PROMPT_RELATIVE_PATH",
-            "ANTIGRAVITY_WORKER_RESULT_RELATIVE_PATH",
-        ),
-        "report-writer": (
-            "REPORT_WRITER_WORKER_PROMPT_RELATIVE_PATH",
-            "REPORT_WRITER_WORKER_RESULT_RELATIVE_PATH",
-        ),
-    }
-    index = 0 if kind == "prompt" else 1
-    return by_worker.get(worker_id, ("", ""))[index]
-
-
 def _compact_run_hints(ctx: Mapping[str, Any]) -> dict[str, Any]:
     return {
         "runRoot": ctx.get("RUN_DIR_RELATIVE_PATH", ""),
@@ -421,7 +405,7 @@ def _run_files(
         "run_manifest_file": run_manifests / f"run-manifest{suffixes['manifests']}.json",
         "run_context_file": run_manifests / f"run-context-{task_type_segment}-{sequences['manifests']}.json",
         "run_inputs_file": run_manifests / f"run-inputs-{task_type_segment}-{sequences['manifests']}.json",
-        "run_prompt_snapshot": run_prompts / f"claude-execution-prompt{suffixes['prompts']}.md",
+        "run_prompt_snapshot": run_prompts / f"lead-execution-prompt{suffixes['prompts']}.md",
         "claude_worker_prompt": run_prompts / f"claude-worker-prompt{suffixes['prompts']}.md",
         "codex_worker_prompt": run_prompts / f"codex-worker-prompt{suffixes['prompts']}.md",
         "antigravity_worker_prompt": run_prompts / f"antigravity-worker-prompt{suffixes['prompts']}.md",

package/runtime/python/okstra_ctl/paths.py

@@ -485,7 +485,7 @@ def compute_run_paths(
     run_file_suffix = suffixes["reports"]
 
     run_manifest_file = run_manifests / f"run-manifest{suffixes['manifests']}.json"
-    run_prompt_snapshot = run_prompts / f"claude-execution-prompt{suffixes['prompts']}.md"
+    run_prompt_snapshot = run_prompts / f"lead-execution-prompt{suffixes['prompts']}.md"
     claude_worker_prompt = run_prompts / f"claude-worker-prompt{suffixes['prompts']}.md"
     codex_worker_prompt = run_prompts / f"codex-worker-prompt{suffixes['prompts']}.md"
     antigravity_worker_prompt = run_prompts / f"antigravity-worker-prompt{suffixes['prompts']}.md"