okstra 0.173.0 → 0.175.1

package/runtime/python/okstra_ctl/adapters/hosts/external/relay.md

@@ -2,7 +2,7 @@
 
 ## Scope
 
-This adapter maps the neutral Okstra lead operations to a generic host using Okstra-owned tmux panes. Read it only when the rendered launch prompt selects `leadRuntime=external`.
+This adapter maps the neutral Okstra lead operations to a generic host. Workers run as Okstra-owned CLI wrapper subprocesses; the host is not asked to provide a pane for them. Read it only when the rendered launch prompt selects `leadRuntime=external`.
 
 ## Capability declaration
 
@@ -11,11 +11,11 @@ This adapter maps the neutral Okstra lead operations to a generic host using Oks
 | `runtime` | `external` |
 | `leadRoleLabel` | `Okstra lead` |
 | `userPromptMode` | `host-text` |
-| `workerDispatchBackend` | `tmux-pane` |
-| `initialPromptDeliveryMode` | `lazy-path-reference` |
+| `workerDispatchBackend` | `cli-wrapper` |
+| `initialPromptDeliveryMode` | `eager-include` |
 | `sessionAccounting` | `artifact-only` |
 | `resumeMode` | `artifact-checkpoint` |
-| `teardownMode` | `pane-teardown` |
+| `teardownMode` | `process-cleanup` |
 | `leadEventSource` | `lead-events-jsonl` |
 
 ## Wizard interaction relay

package/runtime/python/okstra_ctl/adapters/hosts/grok/adapter.py

@@ -63,7 +63,7 @@ def create_adapter(
         detector=no_automatic_claim,
         provider_registry=provider_registry,
         host_model_port=host_model_port or NativeExecutionValueHostModelBindingPort(
-            DESCRIPTOR.id,
-            DESCRIPTOR.native_provider_id,
+            host_runtime=DESCRIPTOR.id,
+            native_provider=DESCRIPTOR.native_provider_id,
         ),
     )

package/runtime/python/okstra_ctl/adapters/hosts/kimi/adapter.py

@@ -63,7 +63,7 @@ def create_adapter(
         detector=no_automatic_claim,
         provider_registry=provider_registry,
         host_model_port=host_model_port or NativeExecutionValueHostModelBindingPort(
-            DESCRIPTOR.id,
-            DESCRIPTOR.native_provider_id,
+            host_runtime=DESCRIPTOR.id,
+            native_provider=DESCRIPTOR.native_provider_id,
         ),
     )

package/runtime/python/okstra_ctl/adapters/providers/antigravity/adapter.py

@@ -1,7 +1,14 @@
 """Bundled Antigravity provider catalog."""
 from typing import Any, Mapping
 
-from okstra_ctl.domain.provider import LeadLaunchSpec, ModelSpec, ProviderSpec
+from okstra_ctl.domain.provider import (
+    LeadLaunchSpec,
+    ModelSpec,
+    ProviderSpec,
+    ServedModelAttestation,
+    snapshot_execution_normalizations,
+)
+from okstra_ctl.domain.role import ALL_ROLE_TOKENS
 from okstra_ctl.domain.worker_exec import (
     STREAM_JSON,
     ExecCommand,
@@ -15,24 +22,47 @@ from okstra_ctl.domain.worker_stream import (
     ToolCall,
     ToolResult,
 )
+import okstra_ctl.model_discovery as model_discovery
 
 
-# `agy` needs a tier suffix at dispatch time; model_discovery owns that host
-# specific normalization so catalog display values never reach the CLI.
+# `agy` needs a tier suffix at dispatch time. The provider exposes its
+# normalizer through ProviderSpec so assignment resolution does not branch on
+# provider names.
 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.1-pro": ModelSpec(
+        "gemini-3.1-pro", "Gemini 3.1 Pro", "gemini-3.1-pro",
+        aliases=("gemini 3.1 pro",),
+    ),
     "gemini-3.6-flash": ModelSpec(
-        "Gemini 3.6 Flash", "gemini-3.6-flash", in_picker=True
+        "gemini-3.6-flash", "Gemini 3.6 Flash", "gemini-3.6-flash",
+        aliases=("gemini 3.6 flash",),
     ),
-    "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", "Gemini 3.5 Flash", "gemini-3.5-flash",
+        aliases=("gemini 3.5 flash",),
     ),
-    "gemini 3.5 flash": ModelSpec("Gemini 3.5 Flash", "gemini-3.5-flash"),
 }
 
 
+def normalise_served_model(raw_model: str | None) -> ServedModelAttestation:
+    if not raw_model or not raw_model.strip():
+        return ServedModelAttestation.unknown()
+    model_id = raw_model.strip().lower().removeprefix("antigravity/")
+    return ServedModelAttestation(
+        raw_model, f"antigravity/{model_id}", "exact", "provider-output"
+    )
+
+
+def observe_served_model(event: Mapping[str, Any]) -> str | None:
+    if event.get("event") != "init":
+        return None
+    init = event.get("init")
+    if not isinstance(init, Mapping):
+        return None
+    model = init.get("model")
+    return model if isinstance(model, str) and model.strip() else None
+
+
 # The wall-clock cap on one print run, carried over from the wrapper. It is
 # deliberately not derived from the idle budget: an analyser legitimately works
 # for far longer than it goes quiet, so folding the idle budget in here would
@@ -45,6 +75,29 @@ _CALL_STARTED = "ACTIVE"
 _CALL_FINISHED = "DONE"
 
 
+class AntigravityExecutionNormalizer:
+    """Capture `agy models` once, then normalize the complete catalog."""
+
+    def snapshot(self, models, roles):
+        available = model_discovery.agy_models()
+        return snapshot_execution_normalizations(
+            models,
+            roles,
+            lambda execution, role: model_discovery.normalize_antigravity_execution(
+                execution=execution,
+                role=role,
+                available=available,
+            ),
+        )
+
+
+def normalize_execution(execution: str, role: str) -> str:
+    """Compatibility entry point for direct adapter callers."""
+    return model_discovery.normalize_execution_for_dispatch(
+        provider="antigravity", execution=execution, role=role
+    )
+
+
 def step_update_events(event: Mapping[str, Any]) -> tuple[StreamEvent, ...]:
     """Normalise this CLI's stream-json, which shares no key with the other four.
 
@@ -151,6 +204,7 @@ class AntigravityExecution:
             stdin_text=None,
             stream_format=STREAM_JSON,
             normalise=step_update_events,
+            observe_served_model=observe_served_model,
             cwd=request.project_root,
         )
 
@@ -172,12 +226,26 @@ def create_provider() -> ProviderSpec:
         models=ANTIGRAVITY,
         default_models={
             role: "gemini-3.1-pro"
-            for role in ("lead", "analyser", "critic", "executor", "verifier")
+            for role in (
+                "lead", "analyser", "critic", "designer", "planner", "executor",
+                "verifier", "report-writer", "translator",
+            )
         },
         wrapper="okstra-antigravity-exec.sh",
-        supported_roles=frozenset({"lead", "analyser", "critic", "executor", "verifier"}),
+        supported_roles=ALL_ROLE_TOKENS,
+        execution_capabilities=frozenset(
+            {
+                "lead-session",
+                "worker-artifact-io",
+                "source-readonly",
+                "extended-artifact-authoring",
+                "project-mutation",
+            }
+        ),
         lead_launch=LeadLaunchSpec(
             executable="agy", model_flag="--model", prompt_flag="--prompt-interactive"
         ),
         exec_strategy=AntigravityExecution(),
+        execution_normalizer=AntigravityExecutionNormalizer(),
+        served_model_normalizer=normalise_served_model,
     )

package/runtime/python/okstra_ctl/adapters/providers/claude/adapter.py

@@ -1,5 +1,12 @@
 """Bundled Claude provider catalog."""
-from okstra_ctl.domain.provider import LeadLaunchSpec, ModelSpec, ProviderSpec
+from typing import Any, Mapping
+from okstra_ctl.domain.provider import (
+    LeadLaunchSpec,
+    ModelSpec,
+    ProviderSpec,
+    ServedModelAttestation,
+)
+from okstra_ctl.domain.role import ALL_ROLE_TOKENS
 from okstra_ctl.domain.worker_exec import (
     STREAM_JSON,
     ExecCommand,
@@ -10,32 +17,83 @@ from okstra_ctl.domain.worker_stream import content_block_events
 
 
 CLAUDE = {
-    "fable": ModelSpec("fable", "fable", in_picker=True),
-    "fable-5": ModelSpec("fable-5", "claude-fable-5"),
-    "claude-fable-5": ModelSpec("fable-5", "claude-fable-5"),
-    "opus": ModelSpec("opus", "opus", in_picker=True),
-    "opus-5": ModelSpec("opus-5", "claude-opus-5"),
-    "claude-opus-5": ModelSpec("opus-5", "claude-opus-5"),
-    "opus-4-8": ModelSpec("opus-4-8", "claude-opus-4-8"),
-    "claude-opus-4-8": ModelSpec("opus-4-8", "claude-opus-4-8"),
-    "opus-4-7": ModelSpec("opus-4-7", "claude-opus-4-7"),
-    "claude-opus-4-7": ModelSpec("opus-4-7", "claude-opus-4-7"),
-    "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),
-    "haiku-4-5": ModelSpec("haiku-4-5", "claude-haiku-4-5"),
-    "claude-haiku-4-5": ModelSpec("haiku-4-5", "claude-haiku-4-5"),
-    "claude-haiku-4-5-20251001": ModelSpec(
-        "haiku-4-5", "claude-haiku-4-5-20251001"
+    "fable": ModelSpec(
+        "fable", "fable", "fable", version_kind="channel", channel_family="fable"
+    ),
+    "fable-5": ModelSpec(
+        "fable-5", "fable-5", "claude-fable-5", aliases=("claude-fable-5",),
+        channel_family="fable",
+    ),
+    "opus": ModelSpec(
+        "opus", "opus", "opus", version_kind="channel", channel_family="opus"
+    ),
+    "opus-5": ModelSpec(
+        "opus-5", "opus-5", "claude-opus-5", aliases=("claude-opus-5",),
+        channel_family="opus",
+    ),
+    "opus-4-8": ModelSpec(
+        "opus-4-8", "opus-4-8", "claude-opus-4-8", aliases=("claude-opus-4-8",),
+        channel_family="opus",
+    ),
+    "opus-4-7": ModelSpec(
+        "opus-4-7", "opus-4-7", "claude-opus-4-7", aliases=("claude-opus-4-7",),
+        channel_family="opus",
+    ),
+    "opus-4-6": ModelSpec(
+        "opus-4-6", "opus-4-6", "claude-opus-4-6", aliases=("claude-opus-4-6",),
+        channel_family="opus",
+    ),
+    "sonnet": ModelSpec(
+        "sonnet", "sonnet", "sonnet", version_kind="channel", channel_family="sonnet"
+    ),
+    "sonnet-5": ModelSpec(
+        "sonnet-5", "sonnet-5", "claude-sonnet-5", aliases=("claude-sonnet-5",),
+        channel_family="sonnet",
+    ),
+    "sonnet-4-6": ModelSpec(
+        "sonnet-4-6", "sonnet-4-6", "claude-sonnet-4-6", aliases=("claude-sonnet-4-6",),
+        channel_family="sonnet",
+    ),
+    "haiku": ModelSpec(
+        "haiku", "haiku", "haiku", version_kind="channel", channel_family="haiku"
+    ),
+    "haiku-4-5": ModelSpec(
+        "haiku-4-5", "haiku-4-5", "claude-haiku-4-5", aliases=("claude-haiku-4-5",),
+        channel_family="haiku",
+    ),
+    "haiku-4-5-20251001": ModelSpec(
+        "haiku-4-5-20251001", "haiku-4-5", "claude-haiku-4-5-20251001",
+        channel_family="haiku",
     ),
 }
 
 
+def normalise_served_model(raw_model: str | None) -> ServedModelAttestation:
+    if not raw_model or not raw_model.strip():
+        return ServedModelAttestation.unknown()
+    model_id = raw_model.strip().lower().removeprefix("claude-")
+    spec = CLAUDE.get(model_id)
+    level = (
+        "channel"
+        if spec is not None and spec.version_kind == "channel"
+        else "exact"
+    )
+    return ServedModelAttestation(
+        raw_model, f"claude/{model_id}", level, "provider-output"
+    )
+
+
+def observe_served_model(event: Mapping[str, Any]) -> str | None:
+    if event.get("type") == "system" and event.get("subtype") == "init":
+        model = event.get("model")
+        return model if isinstance(model, str) and model.strip() else None
+    message = event.get("message")
+    if isinstance(message, Mapping):
+        model = message.get("model")
+        return model if isinstance(model, str) and model.strip() else None
+    return None
+
+
 # Opening the approval gate for a non-interactive run. Without it this CLI
 # auto-denies any tool call outside the seeded allowlist and the worker silently
 # routes around the denial, which reads as a thinner analysis rather than as a
@@ -54,6 +112,11 @@ class ClaudeExecution:
 
     def build_command(self, request: WorkerExecRequest) -> ExecCommand:
         argv = ["claude", "-p", "--model", request.model]
+        # The dispatcher's id, not the CLI's own: it is what team-state records,
+        # so token collection reads this worker's jsonl instead of guessing at
+        # `agentName` — which a pane-dispatched CLI never writes.
+        if request.session_id:
+            argv += ["--session-id", request.session_id]
         for directory in request.policy.write_scope:
             if directory != request.project_root:
                 argv += ["--add-dir", str(directory)]
@@ -68,6 +131,7 @@ class ClaudeExecution:
             stdin_text=request.prompt_text,
             stream_format=STREAM_JSON,
             normalise=content_block_events,
+            observe_served_model=observe_served_model,
             cwd=request.project_root,
         )
 
@@ -92,13 +156,23 @@ def create_provider() -> ProviderSpec:
             "lead": "opus",
             "analyser": "opus",
             "critic": "opus",
+            "designer": "opus",
+            "planner": "opus",
             "executor": "opus",
             "verifier": "opus",
             "report-writer": "sonnet",
+            "translator": "sonnet",
         },
         wrapper="okstra-claude-exec.sh",
-        supported_roles=frozenset(
-            {"lead", "analyser", "critic", "executor", "verifier", "report-writer"}
+        supported_roles=ALL_ROLE_TOKENS,
+        execution_capabilities=frozenset(
+            {
+                "lead-session",
+                "worker-artifact-io",
+                "source-readonly",
+                "extended-artifact-authoring",
+                "project-mutation",
+            }
         ),
         lead_launch=LeadLaunchSpec(
             executable="claude",
@@ -107,4 +181,5 @@ def create_provider() -> ProviderSpec:
             resume_session_id_flag="--resume",
         ),
         exec_strategy=ClaudeExecution(),
+        served_model_normalizer=normalise_served_model,
     )

package/runtime/python/okstra_ctl/adapters/providers/codex/adapter.py

@@ -1,28 +1,64 @@
 """Bundled Codex provider catalog."""
-from okstra_ctl.domain.provider import LeadLaunchSpec, ModelSpec, ProviderSpec
+from okstra_ctl.domain.provider import (
+    LeadLaunchSpec,
+    ModelSpec,
+    ProviderSpec,
+    ServedModelAttestation,
+    snapshot_execution_normalizations,
+)
+from okstra_ctl.domain.role import ALL_ROLE_TOKENS
 from okstra_ctl.domain.worker_exec import (
     TEXT,
     ExecCommand,
     PolicySupport,
     WorkerExecRequest,
 )
+import okstra_ctl.model_discovery as model_discovery
 
 
 CODEX = {
     # ChatGPT-account hosts serve this model without per-token billing.
-    "gpt-5.6-sol": ModelSpec("gpt-5.6-sol", "gpt-5.6-sol", None, in_picker=True),
-    "gpt-5.6": ModelSpec("gpt-5.6", "gpt-5.6", (5.00, 0.50, 30.0), in_picker=True),
-    "gpt-5.5": ModelSpec("gpt-5.5", "gpt-5.5", (5.00, 0.50, 30.0), in_picker=True),
-    "gpt-5.4": ModelSpec("gpt-5.4", "gpt-5.4", (2.50, 0.25, 15.00), in_picker=True),
-    "gpt-5.4-mini": ModelSpec(
-        "gpt-5.4-mini", "gpt-5.4-mini", (0.75, 0.075, 4.50), in_picker=True
-    ),
-    "gpt-5.3-codex": ModelSpec("gpt-5.4", "gpt-5.4"),
-    "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"),
+    "gpt-5.6-sol": ModelSpec("gpt-5.6-sol", "gpt-5.6-sol", "gpt-5.6-sol"),
+    "gpt-5.6": ModelSpec("gpt-5.6", "gpt-5.6", "gpt-5.6", pricing=(5.00, 0.50, 30.0)),
+    "gpt-5.5": ModelSpec("gpt-5.5", "gpt-5.5", "gpt-5.5", pricing=(5.00, 0.50, 30.0)),
+    "gpt-5.4": ModelSpec("gpt-5.4", "gpt-5.4", "gpt-5.4", aliases=("gpt-5.3-codex",), pricing=(2.50, 0.25, 15.00)),
+    "gpt-5.4-mini": ModelSpec("gpt-5.4-mini", "gpt-5.4-mini", "gpt-5.4-mini", pricing=(0.75, 0.075, 4.50)),
+    "gpt-5.2": ModelSpec("gpt-5.2", "gpt-5.2", "gpt-5.2", pricing=(1.75, 0.175, 14.0)),
+    "codex-auto-review": ModelSpec("codex-auto-review", "codex-auto-review", "codex-auto-review", selectable=False),
 }
 
 
+def normalise_served_model(raw_model: str | None) -> ServedModelAttestation:
+    if not raw_model or not raw_model.strip():
+        return ServedModelAttestation.unknown()
+    model_id = raw_model.strip().lower().removeprefix("codex/")
+    return ServedModelAttestation(
+        raw_model, f"codex/{model_id}", "exact", "provider-output"
+    )
+
+
+class CodexExecutionNormalizer:
+    """Capture Codex model availability once, then normalize the catalog."""
+
+    def snapshot(self, models, roles):
+        available = model_discovery.codex_availability()
+        return snapshot_execution_normalizations(
+            models,
+            roles,
+            lambda execution, _role: model_discovery.normalize_codex_execution(
+                execution=execution,
+                available=available,
+            ),
+        )
+
+
+def normalize_execution(execution: str, role: str) -> str:
+    """Compatibility entry point for direct adapter callers."""
+    return model_discovery.normalize_execution_for_dispatch(
+        provider="codex", execution=execution, role=role
+    )
+
+
 class CodexExecution:
     """codex CLI invocation.
 
@@ -64,11 +100,18 @@ def create_provider() -> ProviderSpec:
         models=CODEX,
         default_models={
             role: "gpt-5.6-sol"
-            for role in ("lead", "analyser", "critic", "executor", "verifier", "report-writer")
+            for role in ("lead", "analyser", "critic", "designer", "planner", "executor", "verifier", "report-writer", "translator")
         },
         wrapper="okstra-codex-exec.sh",
-        supported_roles=frozenset(
-            {"lead", "analyser", "critic", "executor", "verifier", "report-writer"}
+        supported_roles=ALL_ROLE_TOKENS,
+        execution_capabilities=frozenset(
+            {
+                "lead-session",
+                "worker-artifact-io",
+                "source-readonly",
+                "extended-artifact-authoring",
+                "project-mutation",
+            }
         ),
         lead_launch=LeadLaunchSpec(
             executable="codex",
@@ -81,4 +124,6 @@ def create_provider() -> ProviderSpec:
             ),
         ),
         exec_strategy=CodexExecution(),
+        execution_normalizer=CodexExecutionNormalizer(),
+        served_model_normalizer=normalise_served_model,
     )

package/runtime/python/okstra_ctl/adapters/providers/grok/adapter.py

@@ -1,5 +1,12 @@
 """Bundled Grok provider catalog."""
-from okstra_ctl.domain.provider import LeadLaunchSpec, ModelSpec, ProviderSpec
+from typing import Any, Mapping
+from okstra_ctl.domain.provider import (
+    LeadLaunchSpec,
+    ModelSpec,
+    ProviderSpec,
+    ServedModelAttestation,
+)
+from okstra_ctl.domain.role import ALL_ROLE_TOKENS
 from okstra_ctl.domain.worker_exec import (
     STREAM_JSON,
     ExecCommand,
@@ -10,12 +17,31 @@ from okstra_ctl.domain.worker_stream import content_block_events
 
 
 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),
+    "grok-4.6": ModelSpec("grok-4.6", "grok-4.6", "grok-4.6", pricing=(2.00, 0.50, 6.00)),
+    "grok-4.5": ModelSpec("grok-4.5", "grok-4.5", "grok-4.5", pricing=(2.00, 0.30, 6.00)),
+    "grok-build-0.1": ModelSpec("grok-build-0.1", "grok-build-0.1", "grok-build-0.1", pricing=(1.00, 0.20, 2.00)),
 }
 
+
+def normalise_served_model(raw_model: str | None) -> ServedModelAttestation:
+    if not raw_model or not raw_model.strip():
+        return ServedModelAttestation.unknown()
+    model_id = raw_model.strip().lower().removeprefix("grok/")
+    return ServedModelAttestation(
+        raw_model, f"grok/{model_id}", "exact", "provider-output"
+    )
+
+
+def observe_served_model(event: Mapping[str, Any]) -> str | None:
+    model = event.get("model")
+    if isinstance(model, str) and model.strip():
+        return model
+    message = event.get("message")
+    if isinstance(message, Mapping):
+        model = message.get("model")
+        return model if isinstance(model, str) and model.strip() else None
+    return None
+
 GROK_LEAD_LAUNCH = LeadLaunchSpec(
     executable="grok",
     model_flag="--model",
@@ -48,6 +74,7 @@ class GrokExecution:
             stdin_text=None,
             stream_format=STREAM_JSON,
             normalise=content_block_events,
+            observe_served_model=observe_served_model,
             cwd=cwd,
         )
 
@@ -65,12 +92,31 @@ def create_provider() -> ProviderSpec:
         display_label="Grok",
         models=GROK,
         default_models={
-            "lead": "grok-build-0.1",
-            "analyser": "grok-build-0.1",
-            "critic": "grok-4.5",
+            role: "grok-4.6"
+            for role in (
+                "lead",
+                "analyser",
+                "critic",
+                "designer",
+                "planner",
+                "executor",
+                "verifier",
+                "report-writer",
+                "translator",
+            )
         },
         wrapper="okstra-grok-exec.sh",
-        supported_roles=frozenset({"lead", "analyser", "critic"}),
+        supported_roles=ALL_ROLE_TOKENS,
+        execution_capabilities=frozenset(
+            {
+                "lead-session",
+                "worker-artifact-io",
+                "source-readonly",
+                "extended-artifact-authoring",
+                "project-mutation",
+            }
+        ),
         lead_launch=GROK_LEAD_LAUNCH,
         exec_strategy=GrokExecution(),
+        served_model_normalizer=normalise_served_model,
     )

package/runtime/python/okstra_ctl/adapters/providers/kimi/adapter.py

@@ -1,5 +1,12 @@
 """Bundled Kimi provider catalog."""
-from okstra_ctl.domain.provider import LeadLaunchSpec, ModelSpec, ProviderSpec
+from typing import Any, Mapping
+from okstra_ctl.domain.provider import (
+    LeadLaunchSpec,
+    ModelSpec,
+    ProviderSpec,
+    ServedModelAttestation,
+)
+from okstra_ctl.domain.role import ALL_ROLE_TOKENS
 from okstra_ctl.domain.worker_exec import (
     STREAM_JSON,
     ExecCommand,
@@ -10,18 +17,33 @@ from okstra_ctl.domain.worker_stream import content_block_events
 
 
 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"),
+    "kimi-k2.7-code": ModelSpec("kimi-k2.7-code", "Kimi K2.7 Code", "kimi-k2.7-code", aliases=("kimi k2.7 code",), pricing=(0.95, 0.19, 4.00)),
+    "kimi-for-coding": ModelSpec("kimi-for-coding", "Kimi K2.7 Code", "kimi-for-coding"),
+    "kimi-k3": ModelSpec("kimi-k3", "Kimi K3", "kimi-k3", aliases=("kimi k3",), pricing=(3.00, 0.30, 15.00)),
+    "k3": ModelSpec("k3", "Kimi K3", "k3"),
+    "k3-256k": ModelSpec("k3-256k", "Kimi K3 256K", "k3-256k", aliases=("kimi k3 256k",)),
 }
 
+
+def normalise_served_model(raw_model: str | None) -> ServedModelAttestation:
+    if not raw_model or not raw_model.strip():
+        return ServedModelAttestation.unknown()
+    model_id = raw_model.strip().lower().removeprefix("kimi/")
+    return ServedModelAttestation(
+        raw_model, f"kimi/{model_id}", "exact", "provider-output"
+    )
+
+
+def observe_served_model(event: Mapping[str, Any]) -> str | None:
+    model = event.get("model")
+    if isinstance(model, str) and model.strip():
+        return model
+    message = event.get("message")
+    if isinstance(message, Mapping):
+        model = message.get("model")
+        return model if isinstance(model, str) and model.strip() else None
+    return None
+
 KIMI_LEAD_LAUNCH = LeadLaunchSpec(
     executable="kimi",
     model_flag="--model",
@@ -52,6 +74,7 @@ class KimiExecution:
             stdin_text=None,
             stream_format=STREAM_JSON,
             normalise=content_block_events,
+            observe_served_model=observe_served_model,
             cwd=cwd,
         )
 
@@ -72,9 +95,25 @@ def create_provider() -> ProviderSpec:
             "lead": "kimi-k2.7-code",
             "analyser": "kimi-k2.7-code",
             "critic": "kimi-k3",
+            "designer": "kimi-k2.7-code",
+            "planner": "kimi-k2.7-code",
+            "executor": "kimi-k2.7-code",
+            "verifier": "kimi-k2.7-code",
+            "report-writer": "kimi-k2.7-code",
+            "translator": "kimi-k2.7-code",
         },
         wrapper="okstra-kimi-exec.sh",
-        supported_roles=frozenset({"lead", "analyser", "critic"}),
+        supported_roles=ALL_ROLE_TOKENS,
+        execution_capabilities=frozenset(
+            {
+                "lead-session",
+                "worker-artifact-io",
+                "source-readonly",
+                "extended-artifact-authoring",
+                "project-mutation",
+            }
+        ),
         lead_launch=KIMI_LEAD_LAUNCH,
         exec_strategy=KimiExecution(),
+        served_model_normalizer=normalise_served_model,
     )

package/runtime/python/okstra_ctl/agent_activity.py

@@ -113,7 +113,11 @@ def _activity_row(event: LeadEvent) -> dict[str, Any]:
         or _ACTIVITY_ID_RE.fullmatch(activity_id) is None
     ):
         raise ActivityProjectionError(f"invalid activityId: {activity_id}")
-    return {key: details[key] for key in ACTIVITY_FIELDS}
+    from okstra_ctl.execution_identity import stored_identity
+
+    row = {key: details[key] for key in ACTIVITY_FIELDS}
+    row.update(stored_identity(details))
+    return row
 
 
 def _validate_activity_order(rows: Sequence[Mapping[str, Any]]) -> None: