@jini-ai/agent-runtime 0.4.4 → 0.4.6

package/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 0.4.6 — 2026-10-13
+
+- New `./model-discovery` subpath: the discovery policy with injected `deps` and `probes` (`createAgentModelDiscovery({ agentId, configuration, deps, probes })`, `modelDiscoveryForDef({ def, deps })`, `resolveModelForLaunch({ def, context, deps })`). It loads no child_process/fs or native adapters. The root keeps the published scalar signatures, wired to the native probes.
+- Platform helpers come from the narrow platform subpaths; peer `@jini-ai/platform` floor is now `^0.5.5`.
+
 ## 0.4.3 — 2026-10-08
 
 - Desktop 0.1.13 release fixes: see commits a2659d24 (admin), 5695a7c3 (chat, agent-runtime), 8ad4ac5c (devops).

package/dist/agent-protocol/acp/models.d.ts

@@ -1,3 +1,12 @@
+/** @module agent-protocol/acp/models
+ * ACP model detection, normalisation, and config-option selection. The primary
+ * export `detectAcpModels` spawns an ACP subprocess, performs the
+ * `initialize` + `session/new` handshake, and returns the available model list.
+ * Consumed by runtime adapter definitions. Depends on the core JSON-line
+ * stream and acp/types, acp/constants, acp/json, acp/rpc, and
+ * acp/session-params.
+ */
+import { spawn } from 'node:child_process';
 import type { UnknownRecord } from './types.js';
 /** A single model entry exposed to the daemon's model-selection UI and to `session/set_model` calls. */
 export interface ModelOption {
@@ -22,6 +31,8 @@ export interface DetectAcpModelsOptions {
     defaultModelOption?: ModelOption;
     signal?: AbortSignal;
     onSessionResult?: (result: UnknownRecord) => void;
+    /** Process effect port; metadata tests use a child fake rather than replacing modules. */
+    spawnProcess?: typeof spawn;
 }
 /**
  * Normalises a raw config-option field value to a lowercase, whitespace- and

package/dist/agent-protocol/acp/models.js

@@ -191,10 +191,10 @@ export function currentModelFromSessionResult(result) {
  * @returns A promise resolving to the available `ModelOption[]`.
  */
 export async function detectAcpModels(requiredArgs, optionalArgs = {}) {
-    const { bin, args, cwd = process.cwd(), env = process.env, timeoutMs = DEFAULT_TIMEOUT_MS, clientName = 'agent-runtime-detect', clientVersion = 'runtime-adapter', defaultModelOption = { id: 'default', label: 'Default (CLI config)' }, signal, onSessionResult, } = { ...optionalArgs, ...requiredArgs };
+    const { bin, args, cwd = process.cwd(), env = process.env, timeoutMs = DEFAULT_TIMEOUT_MS, clientName = 'agent-runtime-detect', clientVersion = 'runtime-adapter', defaultModelOption = { id: 'default', label: 'Default (CLI config)' }, signal, onSessionResult, spawnProcess = spawn, } = { ...optionalArgs, ...requiredArgs };
     const effectiveTimeoutMs = resolveAcpTimeoutMs(env, timeoutMs);
     return await new Promise((resolve, reject) => {
-        const child = spawn(bin, args, {
+        const child = spawnProcess(bin, args, {
             cwd,
             stdio: ['pipe', 'pipe', 'pipe'],
             env: { ...env },
@@ -202,6 +202,7 @@ export async function detectAcpModels(requiredArgs, optionalArgs = {}) {
         child.stdout.setEncoding('utf8');
         child.stderr.setEncoding('utf8');
         let settled = false;
+        let closed = false;
         let stderrBuf = '';
         let stdoutBytes = 0;
         let expectedId = 1;
@@ -223,7 +224,14 @@ export async function detectAcpModels(requiredArgs, optionalArgs = {}) {
             const killTimer = setTimeout(() => { if (child.exitCode === null)
                 child.kill('SIGKILL'); }, 250);
             killTimer.unref();
-            fn(value);
+            // The process scheduler must retain its slot until exit, including the SIGKILL grace
+            // period. Returning at metadata receipt would overlap this child with the next probe.
+            if (closed) {
+                clearTimeout(killTimer);
+                fn(value);
+            }
+            else
+                child.once('close', () => { clearTimeout(killTimer); fn(value); });
         };
         const fail = (message) => {
             finish(reject, new Error(message));
@@ -289,6 +297,7 @@ export async function detectAcpModels(requiredArgs, optionalArgs = {}) {
         });
         child.on('error', (err) => fail(`spawn failed: ${err.message}`));
         child.on('close', (code, signal) => {
+            closed = true;
             parser.flush();
             if (!settled) {
                 const errTail = stderrBuf.trim();

package/dist/capabilities.d.ts

@@ -1,9 +1,2 @@
-/**
- * @module capabilities
- *
- * Per-agent `--help`-probed capability flags, cached by agent id. Ported
- * verbatim from OD's `apps/daemon/src/runtimes/capabilities.ts`.
- */
-import type { RuntimeCapabilityMap } from './types.js';
-export declare const agentCapabilities: Map<string, RuntimeCapabilityMap>;
+export declare const agentCapabilities: Map<string, import("./types.js").RuntimeCapabilityMap>;
 //# sourceMappingURL=capabilities.d.ts.map

package/dist/capabilities.js

@@ -1,2 +1,9 @@
-export const agentCapabilities = new Map();
+/**
+ * @module capabilities
+ *
+ * Per-agent `--help`-probed capability flags, cached by agent id. Ported
+ * verbatim from OD's `apps/daemon/src/runtimes/capabilities.ts`.
+ */
+import { defaultRuntimeState } from './runtime-state.js';
+export const agentCapabilities = defaultRuntimeState.capabilities;
 //# sourceMappingURL=capabilities.js.map

package/dist/claude-code-models.d.ts

@@ -1,3 +1,4 @@
+import { type AgentRuntimeState } from './runtime-state.js';
 import type { RuntimeEnv, RuntimeModelOption } from './types.js';
 /** The single stdin line that asks the CLI for its initialize payload (which carries `models`). */
 export declare const CLAUDE_CODE_INITIALIZE_REQUEST = "{\"type\":\"control_request\",\"request_id\":\"jini-model-probe\",\"request\":{\"subtype\":\"initialize\"}}\n";
@@ -58,5 +59,16 @@ export declare function setClaudeCodeModelIoForTesting(io: ClaudeCodeModelIo | n
  * @complexity O(f + l) plus, at most once per {@link CLAUDE_CODE_MODEL_CACHE_TTL_MS} per cache key,
  * one CLI spawn bounded by {@link CLAUDE_CODE_INIT_TIMEOUT_MS} and one file read.
  */
-export declare function loadClaudeCodeModels(bin: string, env: RuntimeEnv, _fallbackModels: readonly RuntimeModelOption[], now?: () => number): Promise<RuntimeModelOption[] | null>;
+export interface ClaudeCodeModelsOptions {
+    state?: AgentRuntimeState;
+    io?: ClaudeCodeModelIo;
+    now?: () => number;
+}
+export declare function loadClaudeCodeModels(required: {
+    bin: string;
+    env: RuntimeEnv;
+    fallbackModels?: readonly RuntimeModelOption[];
+}, optional?: ClaudeCodeModelsOptions): Promise<RuntimeModelOption[] | null>;
+/** Published positional form remains additive compatibility. */
+export declare function loadClaudeCodeModels(bin: string, env: RuntimeEnv, fallbackModels: readonly RuntimeModelOption[], now?: () => number): Promise<RuntimeModelOption[] | null>;
 //# sourceMappingURL=claude-code-models.d.ts.map

package/dist/claude-code-models.js

@@ -1,3 +1,4 @@
+import { defaultRuntimeState } from './runtime-state.js';
 /**
  * @module claude-code-models
  *
@@ -38,7 +39,7 @@ import { createHash } from 'node:crypto';
 import { readFile } from 'node:fs/promises';
 import os from 'node:os';
 import { join } from 'node:path';
-import { createCommandInvocation } from '@jini-ai/platform';
+import { createCommandInvocation } from '@jini-ai/platform/command';
 import { sanitizeCustomModel } from './models.js';
 /** A spawn costs ~2.5s and the picker list only moves when Claude Code updates or the server's
  *  "additional" options change, so one answer is trusted for this long per process. Failures are
@@ -193,7 +194,7 @@ const defaultIo = {
     readConfigFile: (path) => readFile(path, 'utf8').catch(() => null),
 };
 let activeIo = defaultIo;
-const cache = new Map();
+const cache = defaultRuntimeState.claudeModels;
 /** Test-only: install fake I/O (or `null` to restore the real one) and clear the process cache. */
 export function setClaudeCodeModelIoForTesting(io) {
     activeIo = io ?? defaultIo;
@@ -209,13 +210,13 @@ function cacheKeyFor(bin, env) {
     return `${bin}\u0000${resolveClaudeConfigPath(env)}\u0000${fingerprint}`;
 }
 /** Source (1), then source (2). Never rejects. */
-async function discoverClaudeCodeModels(bin, env) {
+async function discoverClaudeCodeModels(bin, env, io) {
     try {
-        const stdout = await activeIo.runInitialize(bin, env);
+        const stdout = await io.runInitialize(bin, env);
         const fromCli = stdout ? parseClaudeInitializeModels(stdout) : null;
         if (fromCli)
             return fromCli;
-        const raw = await activeIo.readConfigFile(resolveClaudeConfigPath(env));
+        const raw = await io.readConfigFile(resolveClaudeConfigPath(env));
         const cached = raw === null ? null : parseClaudeCodePickerCache(raw);
         if (!cached?.ok)
             return null;
@@ -227,21 +228,18 @@ async function discoverClaudeCodeModels(bin, env) {
         return null;
     }
 }
-/**
- * Returns the `claude` model list from the CLI's own picker catalog, or `null` when discovery fails. Needs no API key.
- *
- * @param bin - The resolved `claude` (or fork) binary detection found.
- * @param env - The composed environment for the agent — what a spawn would actually see.
- * @param _fallbackModels - Compatibility argument; packaged rows are offline fallback only.
- * @param now - Injectable clock for TTL tests.
- * @complexity O(f + l) plus, at most once per {@link CLAUDE_CODE_MODEL_CACHE_TTL_MS} per cache key,
- * one CLI spawn bounded by {@link CLAUDE_CODE_INIT_TIMEOUT_MS} and one file read.
- */
-export async function loadClaudeCodeModels(bin, env, _fallbackModels, now = Date.now) {
+export async function loadClaudeCodeModels(required, optional = {}, _fallbackModels = [], clock = Date.now) {
+    const bin = typeof required === 'string' ? required : required.bin;
+    const env = typeof required === 'string' ? optional : required.env;
+    const options = typeof required === 'string' ? {} : optional;
+    const state = options.state ?? defaultRuntimeState;
+    const cache = state.claudeModels;
+    const io = options.io ?? (state === defaultRuntimeState ? activeIo : defaultIo);
+    const now = options.now ?? clock;
     const key = cacheKeyFor(bin, env);
     const cached = cache.get(key);
     const pending = cached && cached.expiresAt > now() ? cached.value : null;
-    const value = pending ?? discoverClaudeCodeModels(bin, env);
+    const value = pending ?? discoverClaudeCodeModels(bin, env, io);
     if (!pending)
         cache.set(key, { expiresAt: now() + CLAUDE_CODE_MODEL_CACHE_TTL_MS, value });
     const live = await value;

package/dist/claude-segment-usage.d.ts

@@ -1,6 +1,8 @@
-/** Claude result totals are per segment. Aborted results can zero counters already streamed. */
-export declare function createClaudeSegmentUsage(_required: Record<string, never>, { nowMs }?: {
+/** Token counters are per segment; Claude's dollar counter spans the session.
+ * Aborted results can zero counters already streamed. */
+export declare function createClaudeSegmentUsage(_required: Record<string, never>, { nowMs, costBasis }?: {
     nowMs?: () => number;
+    costBasis?: 'session' | 'run';
 }): {
     observe: ({ messageId, usage }: {
         messageId: string;
@@ -10,10 +12,15 @@ export declare function createClaudeSegmentUsage(_required: Record<string, never
         result: Record<string, unknown>;
         interrupted: boolean;
     }, _optional?: {}) => {
+        cumulativeCostUsd?: number;
+        costSessionId?: string;
         usage: {} | null;
         costUsd: {} | null;
         durationMs: {} | null;
     };
+    setSession: ({ id }: {
+        id: unknown;
+    }, _optional?: {}) => void;
     hasObserved: () => boolean;
 };
 //# sourceMappingURL=claude-segment-usage.d.ts.map

package/dist/claude-segment-usage.js

@@ -1,7 +1,14 @@
-/** Claude result totals are per segment. Aborted results can zero counters already streamed. */
-export function createClaudeSegmentUsage(_required, { nowMs = Date.now } = {}) {
+/** Token counters are per segment; Claude's dollar counter spans the session.
+ * Aborted results can zero counters already streamed. */
+export function createClaudeSegmentUsage(_required, { nowMs = Date.now, costBasis = 'session' } = {}) {
     const messages = new Map();
     let startedAt = nowMs();
+    let sessionId;
+    /** Capture the CLI's identity so durable chat usage can reconcile resumed runs. */
+    function setSession({ id }, _optional = {}) {
+        if (typeof id === 'string' && id.length > 0)
+            sessionId = id;
+    }
     /** Merge cumulative counters for one message; wrappers repeat the same streamed usage.
      * O(k) per snapshot in k reported counters; retained state is O(m·k) for m messages in a segment. */
     function observe({ messageId, usage }, _optional = {}) {
@@ -40,8 +47,17 @@ export function createClaudeSegmentUsage(_required, { nowMs = Date.now } = {}) {
             : messages.size || interrupted ? Math.max(0, endedAt - startedAt) : duration ?? null;
         messages.clear();
         startedAt = endedAt;
-        return { usage: Object.keys(usage).length ? usage : result.usage ?? null, costUsd, durationMs };
+        // Preserve the cumulative snapshot rather than calling it a per-run charge. A zeroed
+        // aborted result still uses the existing model-cost fallback for its interrupted segment.
+        const cumulative = costBasis === 'session' && sessionId !== undefined &&
+            typeof costUsd === 'number' && Number.isFinite(costUsd) && costUsd >= 0 &&
+            !(interrupted && result.total_cost_usd === 0);
+        return { usage: Object.keys(usage).length ? usage : result.usage ?? null,
+            costUsd: cumulative ? null : costUsd, durationMs,
+            ...(costBasis === 'session' && sessionId !== undefined ? { costSessionId: sessionId } : {}),
+            ...(cumulative ? { cumulativeCostUsd: costUsd } : {}),
+        };
     }
-    return { observe, finish, hasObserved: () => messages.size > 0 };
+    return { observe, finish, setSession, hasObserved: () => messages.size > 0 };
 }
 //# sourceMappingURL=claude-segment-usage.js.map

package/dist/claude-stream.d.ts

@@ -82,6 +82,8 @@ export type ClaudeStreamEvent = {
     type: 'usage';
     usage: unknown;
     costUsd: unknown;
+    cumulativeCostUsd?: number;
+    costSessionId?: string;
     durationMs: unknown;
     stopReason: string | null;
 } | {
@@ -159,6 +161,8 @@ interface ClaudeStreamHandlerOptions {
     suppressHtmlArtifactsAfterFileWrite?: boolean;
     /** Clock used only when an interrupted segment omits its duration. */
     nowMs?: () => number;
+    /** Claude's results span a session; compatible CLIs can retain per-run cost semantics. */
+    costBasis?: 'session' | 'run';
 }
 export declare function createClaudeStreamHandler({ onEvent }: {
     onEvent: EventSink;

package/dist/claude-stream.js

@@ -339,7 +339,10 @@ export function emitAssistantErrorIfPresent(obj, content, onEvent) {
 }
 export function createClaudeStreamHandler({ onEvent }, options = {}) {
     let buffer = '';
-    const segmentUsage = createClaudeSegmentUsage({}, options.nowMs === undefined ? {} : { nowMs: options.nowMs });
+    const segmentUsage = createClaudeSegmentUsage({}, {
+        ...(options.nowMs === undefined ? {} : { nowMs: options.nowMs }),
+        ...(options.costBasis === undefined ? {} : { costBasis: options.costBasis }),
+    });
     // Per-content-block scratch, keyed by `${messageId}:${blockIndex}`.
     const blocks = new Map();
     // Tool uses already emitted from streamed `input_json_delta` data OR full wrappers.
@@ -682,6 +685,7 @@ export function createClaudeStreamHandler({ onEvent }, options = {}) {
     function handleObject(obj) {
         if (!isRecord(obj))
             return;
+        segmentUsage.setSession({ id: obj.session_id });
         switch (obj.type) {
             case 'system':
                 handleSystemMessage(obj, onEvent);

package/dist/defs/aider.js

@@ -1,4 +1,4 @@
-import { createAgentModelDiscovery } from '../model-discovery.js';
+import { createAgentModelDiscovery } from '../model-discovery-native.js';
 import { DEFAULT_MODEL_OPTION } from './shared.js';
 export const aiderAgentDef = {
     // UNVERIFIED live integration locally; source/category and limits are documented in model-discovery-adapters.ts.

package/dist/defs/amp.js

@@ -1,4 +1,4 @@
-import { createAgentModelDiscovery } from '../model-discovery.js';
+import { createAgentModelDiscovery } from '../model-discovery-native.js';
 import { DEFAULT_MODEL_OPTION } from './shared.js';
 // Amp CLI (https://ampcode.com) is a full agentic coding CLI, argv-shaped
 // much like Claude Code: it has a headless execute mode and emits a

package/dist/defs/amr.js

@@ -1,4 +1,4 @@
-import { createAgentModelDiscovery } from '../model-discovery.js';
+import { createAgentModelDiscovery } from '../model-discovery-native.js';
 import { execAgentFile } from './shared.js';
 const AMR_MODELS_TIMEOUT_MS = 10_000;
 const AMR_MODELS_RETRY_DELAYS_MS = [250, 750];

package/dist/defs/antigravity.js

@@ -1,4 +1,4 @@
-import { createAgentModelDiscovery } from '../model-discovery.js';
+import { createAgentModelDiscovery } from '../model-discovery-native.js';
 import { redactOAuthUrls } from '@jini-ai/oauth';
 import { DEFAULT_MODEL_OPTION } from './shared.js';
 // `agy` v1.1.24 has a real `--model <id>` flag (`agy --help`: "Model for the current CLI

package/dist/defs/auggie.js

@@ -1,4 +1,4 @@
-import { createAgentModelDiscovery } from '../model-discovery.js';
+import { createAgentModelDiscovery } from '../model-discovery-native.js';
 /**
  * @module defs/auggie
  *

package/dist/defs/claude.d.ts

@@ -37,9 +37,11 @@ export declare const claudeAgentDef: {
     promptViaStdin: true;
     promptInputFormat: "stream-json";
     streamFormat: string;
+    usageCostBasis: "session";
     externalMcpInjection: "claude-mcp-json";
     env: {
         ENABLE_TOOL_SEARCH: string;
+        CLAUDE_CODE_PRINT_BG_WAIT_CEILING_MS: string;
     };
     systemPromptDelivery: {
         strategy: "append-flag";

package/dist/defs/claude.js

@@ -1,4 +1,4 @@
-import { createAgentModelDiscovery } from '../model-discovery.js';
+import { createAgentModelDiscovery } from '../model-discovery-native.js';
 /**
  * Claude Code has no dedicated image-attachment flag. imageDelivery: 'prompt-path' makes the
  * executor append local image paths to the prompt and add their directories to extraAllowedDirs;
@@ -157,7 +157,7 @@ export const claudeAgentDef = {
     // default), which has no length cap. Mirrors the codex/opencode/
     // cursor/qwen entries below.
     buildArgs: ({ prompt: _prompt, imagePaths: _imagePaths }, { extraAllowedDirs = [], options = {}, runtimeContext = {} } = {}) => {
-        const caps = agentCapabilities.get('claude') || {};
+        const caps = (options.capabilities ?? agentCapabilities.get('claude')) || {};
         // `--input-format stream-json` lets the daemon stream multiple JSONL
         // messages into stdin instead of closing it after the initial prompt,
         // keeping the turn open so the daemon can stream further user messages
@@ -243,6 +243,7 @@ export const claudeAgentDef = {
     promptViaStdin: true,
     promptInputFormat: 'stream-json',
     streamFormat: 'claude-stream-json',
+    usageCostBasis: 'session',
     // Claude Code auto-loads `.mcp.json` from the project cwd at spawn,
     // so the daemon writes the user's external MCP servers there before
     // launching (server.ts handles the cwd guard).
@@ -254,7 +255,14 @@ export const claudeAgentDef = {
     // code.claude.com/docs/en/mcp ("`false` — All MCP tools loaded upfront, no deferral"); verified
     // in the installed 2.1.283 binary (a defined-falsy value selects the "standard" tool mode).
     // A default only: a run's own env can still set ENABLE_TOOL_SEARCH (see agent-executor).
-    env: { ENABLE_TOOL_SEARCH: 'false' },
+    env: {
+        ENABLE_TOOL_SEARCH: 'false',
+        // 2026-10-10 plannie incident: the CLI stopped two background theme subagents ten minutes
+        // after the reply ended. Installed Claude Code 2.1.296 confirms 0 waits indefinitely.
+        // Complements the daemon's stdin hold while background tasks run (agent-executor/events.ts).
+        // A default only: the host can override it through the run's explicit env passthrough.
+        CLAUDE_CODE_PRINT_BG_WAIT_CEILING_MS: '0',
+    },
     // Formerly inline in `buildArgs` above (see the comment there) — moved to the declarative
     // shape every def now uses to receive `RuntimeBuildOptions.systemPromptOverlay`. Same flag,
     // same probe gate (`capabilityFlags['--append-system-prompt']` above), same "append, never

package/dist/defs/cline.js

@@ -1,4 +1,4 @@
-import { createAgentModelDiscovery } from '../model-discovery.js';
+import { createAgentModelDiscovery } from '../model-discovery-native.js';
 /**
  * @module defs/cline
  *

package/dist/defs/codebuddy.js

@@ -1,4 +1,4 @@
-import { createAgentModelDiscovery } from '../model-discovery.js';
+import { createAgentModelDiscovery } from '../model-discovery-native.js';
 import { agentCapabilities } from '../capabilities.js';
 import { buildClaudeMcpConfigArgs, DEFAULT_MODEL_OPTION } from './shared.js';
 // Codebuddy Code (https://www.codebuddy.cn) — a Claude Code–compatible CLI
@@ -79,7 +79,7 @@ export const codebuddyAgentDef = {
         { id: 'max', label: 'Max' },
     ],
     buildArgs: ({ prompt: _prompt, imagePaths: _imagePaths }, { extraAllowedDirs = [], options = {}, runtimeContext = {} } = {}) => {
-        const caps = agentCapabilities.get('codebuddy') || {};
+        const caps = (options.capabilities ?? agentCapabilities.get('codebuddy')) || {};
         // Same stdin strategy as Claude Code: `--input-format stream-json`
         // enables JSONL stdin so the daemon can answer AskUserQuestion tool
         // calls. `--output-format stream-json` gives us SSE-style events.

package/dist/defs/codex.js

@@ -1,4 +1,4 @@
-import { createAgentModelDiscovery } from '../model-discovery.js';
+import { createAgentModelDiscovery } from '../model-discovery-native.js';
 /** CODEX_SANDBOX_MODE and CODEX_DISABLE_PLUGINS are adapter-scoped operator overrides;
  * no product-specific environment naming is required. */
 import { DEFAULT_MODEL_OPTION, clampCodexReasoning } from './shared.js';

package/dist/defs/copilot.js

@@ -1,4 +1,4 @@
-import { createAgentModelDiscovery } from '../model-discovery.js';
+import { createAgentModelDiscovery } from '../model-discovery-native.js';
 import { DEFAULT_MODEL_OPTION } from './shared.js';
 export const copilotAgentDef = {
     // UNVERIFIED live integration locally; source/category and limits are documented in model-discovery-adapters.ts.

package/dist/defs/crush.js

@@ -1,4 +1,4 @@
-import { createAgentModelDiscovery } from '../model-discovery.js';
+import { createAgentModelDiscovery } from '../model-discovery-native.js';
 /**
  * @module defs/crush
  *

package/dist/defs/cursor-agent.js

@@ -1,4 +1,4 @@
-import { createAgentModelDiscovery } from '../model-discovery.js';
+import { createAgentModelDiscovery } from '../model-discovery-native.js';
 import { DEFAULT_MODEL_OPTION } from './shared.js';
 import { agentCapabilities } from '../capabilities.js';
 export function parseCursorAgentModels({ stdout }) {
@@ -67,7 +67,7 @@ export const cursorAgentDef = {
     // which then surfaces as "your message only contains '-'". Keep stdin
     // piped for prompt delivery, but do not append a fake prompt arg.
     buildArgs: ({ prompt: _prompt, imagePaths: _imagePaths }, { extraAllowedDirs: _extra, options = {}, runtimeContext = {} } = {}) => {
-        const caps = agentCapabilities.get('cursor-agent') || {};
+        const caps = (options.capabilities ?? agentCapabilities.get('cursor-agent')) || {};
         const args = [];
         args.push('--print', '--output-format', 'stream-json', '--stream-partial-output');
         // See `RuntimeBuildOptions.permissionMode`'s doc: bypass is the default

package/dist/defs/deepseek.js

@@ -1,4 +1,4 @@
-import { createAgentModelDiscovery } from '../model-discovery.js';
+import { createAgentModelDiscovery } from '../model-discovery-native.js';
 import { DEFAULT_MODEL_OPTION } from './shared.js';
 export const deepseekAgentDef = {
     // UNVERIFIED live integration locally; source/category and limits are documented in model-discovery-adapters.ts.

package/dist/defs/devin.js

@@ -1,4 +1,4 @@
-import { createAgentModelDiscovery } from '../model-discovery.js';
+import { createAgentModelDiscovery } from '../model-discovery-native.js';
 import { detectAcpModels, DEFAULT_MODEL_OPTION } from './shared.js';
 export const devinAgentDef = {
     // UNVERIFIED live integration locally; source/category and limits are documented in model-discovery-adapters.ts.

package/dist/defs/droid.js

@@ -1,4 +1,4 @@
-import { createAgentModelDiscovery } from '../model-discovery.js';
+import { createAgentModelDiscovery } from '../model-discovery-native.js';
 /**
  * @module defs/droid
  *

package/dist/defs/goose.js

@@ -1,4 +1,4 @@
-import { createAgentModelDiscovery } from '../model-discovery.js';
+import { createAgentModelDiscovery } from '../model-discovery-native.js';
 /**
  * @module defs/goose
  *

package/dist/defs/grok-build.js

@@ -1,4 +1,4 @@
-import { createAgentModelDiscovery } from '../model-discovery.js';
+import { createAgentModelDiscovery } from '../model-discovery-native.js';
 import { DEFAULT_MODEL_OPTION } from './shared.js';
 const GROK_MODEL_ID_RE = /^(?:[*•-]\s*|(?=grok-))([a-z0-9][a-z0-9./_:@\[\]-]*)(?:\s+\(default\))?\s*$/i;
 export function parseGrokBuildModels({ stdout }) {

package/dist/defs/hermes.js

@@ -1,4 +1,4 @@
-import { createAgentModelDiscovery } from '../model-discovery.js';
+import { createAgentModelDiscovery } from '../model-discovery-native.js';
 import { detectAcpModels, DEFAULT_MODEL_OPTION } from './shared.js';
 export const hermesAgentDef = {
     // UNVERIFIED live integration locally; source/category and limits are documented in model-discovery-adapters.ts.

package/dist/defs/kilo.js

@@ -1,4 +1,4 @@
-import { createAgentModelDiscovery } from '../model-discovery.js';
+import { createAgentModelDiscovery } from '../model-discovery-native.js';
 import { detectAcpModels, DEFAULT_MODEL_OPTION } from './shared.js';
 export const kiloAgentDef = {
     // UNVERIFIED live integration locally; source/category and limits are documented in model-discovery-adapters.ts.

package/dist/defs/kimi.js

@@ -1,4 +1,4 @@
-import { createAgentModelDiscovery } from '../model-discovery.js';
+import { createAgentModelDiscovery } from '../model-discovery-native.js';
 import { detectAcpModels, DEFAULT_MODEL_OPTION } from './shared.js';
 export const kimiAgentDef = {
     // UNVERIFIED live integration locally; source/category and limits are documented in model-discovery-adapters.ts.

package/dist/defs/kiro.js

@@ -1,4 +1,4 @@
-import { createAgentModelDiscovery } from '../model-discovery.js';
+import { createAgentModelDiscovery } from '../model-discovery-native.js';
 import { detectAcpModels, DEFAULT_MODEL_OPTION } from './shared.js';
 export const kiroAgentDef = {
     // UNVERIFIED live integration locally; source/category and limits are documented in model-discovery-adapters.ts.

package/dist/defs/mimo.js

@@ -1,4 +1,4 @@
-import { createAgentModelDiscovery } from '../model-discovery.js';
+import { createAgentModelDiscovery } from '../model-discovery-native.js';
 import { DEFAULT_MODEL_OPTION } from './shared.js';
 export const mimoAgentDef = {
     // UNVERIFIED live integration locally; source/category and limits are documented in model-discovery-adapters.ts.

package/dist/defs/opencode.js

@@ -1,4 +1,4 @@
-import { createAgentModelDiscovery } from '../model-discovery.js';
+import { createAgentModelDiscovery } from '../model-discovery-native.js';
 import { DEFAULT_MODEL_OPTION, parseLineSeparatedModels } from './shared.js';
 import { agentCapabilities } from '../capabilities.js';
 const SKIP_PERMISSIONS_FLAG = '--dangerously-skip-permissions';
@@ -58,7 +58,7 @@ export const opencodeAgentDef = {
         // (`skipPermissions`, probed from `--help` text) AND whether the caller wants it — see
         // `RuntimeBuildOptions.permissionMode`'s doc. Bypass remains the default (unchanged
         // behavior) unless a caller explicitly opts into a restricted run.
-        if (agentCapabilities.get('opencode')?.skipPermissions && options.permissionMode !== 'restricted') {
+        if ((options.capabilities ?? agentCapabilities.get('opencode'))?.skipPermissions && options.permissionMode !== 'restricted') {
             args.push(SKIP_PERMISSIONS_FLAG);
         }
         // Capture-style resume: OpenCode mints its own session id (reported on

package/dist/defs/pi.js

@@ -1,4 +1,4 @@
-import { createAgentModelDiscovery } from '../model-discovery.js';
+import { createAgentModelDiscovery } from '../model-discovery-native.js';
 import path from 'node:path';
 import { DEFAULT_MODEL_OPTION, execAgentFile, parsePiModels } from './shared.js';
 export const piAgentDef = {

package/dist/defs/qoder.js

@@ -1,4 +1,4 @@
-import { createAgentModelDiscovery } from '../model-discovery.js';
+import { createAgentModelDiscovery } from '../model-discovery-native.js';
 import path from 'node:path';
 import { DEFAULT_MODEL_OPTION } from './shared.js';
 export const qoderAgentDef = {

package/dist/defs/qwen.js

@@ -1,4 +1,4 @@
-import { createAgentModelDiscovery } from '../model-discovery.js';
+import { createAgentModelDiscovery } from '../model-discovery-native.js';
 import { DEFAULT_MODEL_OPTION } from './shared.js';
 export const qwenAgentDef = {
     // UNVERIFIED live integration locally; source/category and limits are documented in model-discovery-adapters.ts.

package/dist/defs/reasonix.js

@@ -1,4 +1,4 @@
-import { createAgentModelDiscovery } from '../model-discovery.js';
+import { createAgentModelDiscovery } from '../model-discovery-native.js';
 /** Reasonix's declarative definition stays product-neutral (R5, checkEngineBoundaries).
  * Per-run system overlays use REASONIX_ACP_SYSTEM_APPEND via the shared systemPromptDelivery
  * dispatch and computeChildEnv. Static def.env is computed once and cannot carry host/per-run

package/dist/defs/trae-cli.js

@@ -1,4 +1,4 @@
-import { createAgentModelDiscovery } from '../model-discovery.js';
+import { createAgentModelDiscovery } from '../model-discovery-native.js';
 import { detectAcpModels, DEFAULT_MODEL_OPTION } from './shared.js';
 export const traeCliAgentDef = {
     // UNVERIFIED live integration locally; source/category and limits are documented in model-discovery-adapters.ts.

package/dist/defs/vibe.js

@@ -1,4 +1,4 @@
-import { createAgentModelDiscovery } from '../model-discovery.js';
+import { createAgentModelDiscovery } from '../model-discovery-native.js';
 import { detectAcpModels, DEFAULT_MODEL_OPTION } from './shared.js';
 export const vibeAgentDef = {
     // UNVERIFIED live integration locally; source/category and limits are documented in model-discovery-adapters.ts.