@jini-ai/agent-runtime 0.4.5 → 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/claude-code-models.js

@@ -39,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

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.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;

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

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 }) {

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';

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.

package/dist/detection.js

@@ -16,7 +16,7 @@ import { getRuntimeModelDiscoveryDeps } from './model-discovery-adapters.js';
  * `archived provenance ledger`.
  */
 import { execAgentFile } from './invocation.js';
-import { offlineSnapshot, modelDiscoveryForDef } from './model-discovery.js';
+import { offlineSnapshot, modelDiscoveryForDef } from './model-discovery-native.js';
 import { rememberLiveModels } from './models.js';
 import { installMetaForAgent } from './metadata.js';
 import { AGENT_DEFS } from './registry.js';

package/dist/env.js

@@ -7,7 +7,7 @@
  * sandboxOverlay. The engine must not import a product's config/sandbox subsystems or env names.
  */
 import os from 'node:os';
-import { mergeProxyAwareEnv, resolveSystemProxyEnv } from '@jini-ai/platform';
+import { mergeProxyAwareEnv, resolveSystemProxyEnv } from '@jini-ai/platform/proxy-env';
 import { expandConfiguredEnv } from './paths.js';
 import { resolveAmrOpenCodeExecutable } from './executables.js';
 function stripKeysCaseInsensitive(env, keysToStrip) {

package/dist/executables.js

@@ -24,7 +24,7 @@ import { accessSync, constants, existsSync, statSync } from 'node:fs';
 import { delimiter } from 'node:path';
 import path from 'node:path';
 import { homedir } from 'node:os';
-import { wellKnownUserToolchainBins } from '@jini-ai/platform';
+import { wellKnownUserToolchainBins } from '@jini-ai/platform/toolchain';
 import { expandHomePath } from './paths.js';
 const AGENT_BIN_ENV_KEYS = new Map([
     ['amr', 'VELA_BIN'],

package/dist/index.d.ts

@@ -47,7 +47,7 @@ export * from './telemetry-sink.js';
 export * from './providers/index.js';
 /** ACP + pi-rpc protocol adapters over the shared JSON-line-stream core. See aliases above. */
 export { createJsonLineStream, type AcpMcpServerInput, type AcpPermissionDecision, type AcpPermissionHandler, type AcpPermissionOption, type AcpPermissionRequest, type AcpSessionController, type ModelOption, type AttachAcpSessionOptions, type AccountFailure, type AccountFailureClassifier, buildAcpSessionNewParams, normalizeModels, detectAcpModels, attachAcpSession, noopAccountFailureClassifier, mapPiRpcEvent, attachPiRpcSession, parsePiModels as parsePiRpcModels, type PiRpcSession, type PiRpcSessionOptions, } from './agent-protocol/index.js';
-export * from './model-discovery.js';
+export * from './model-discovery-native.js';
 export { getRuntimeModelDiscoveryDeps, defaultModelDiscoveryDeps, parseClaudeInitializeMetadata, parsePiRpcMetadata } from './model-discovery-adapters.js';
 export * from './runtime-state.js';
 //# sourceMappingURL=index.d.ts.map

package/dist/index.js

@@ -70,7 +70,7 @@ export * from './telemetry-sink.js';
 export * from './providers/index.js';
 /** ACP + pi-rpc protocol adapters over the shared JSON-line-stream core. See aliases above. */
 export { createJsonLineStream, buildAcpSessionNewParams, normalizeModels, detectAcpModels, attachAcpSession, noopAccountFailureClassifier, mapPiRpcEvent, attachPiRpcSession, parsePiModels as parsePiRpcModels, } from './agent-protocol/index.js';
-export * from './model-discovery.js';
+export * from './model-discovery-native.js';
 export { getRuntimeModelDiscoveryDeps, defaultModelDiscoveryDeps, parseClaudeInitializeMetadata, parsePiRpcMetadata } from './model-discovery-adapters.js';
 export * from './runtime-state.js';
 //# sourceMappingURL=index.js.map

package/dist/invocation.js

@@ -13,7 +13,7 @@ import { execFile } from 'node:child_process';
 import { scheduleProbeProcess } from './probe-scheduler.js';
 import os from 'node:os';
 import { promisify } from 'node:util';
-import { createCommandInvocation } from '@jini-ai/platform';
+import { createCommandInvocation } from '@jini-ai/platform/command';
 const execFileP = promisify(execFile);
 // Agent probes (model-list / version / help / auth-status) are short
 // read-only metadata calls that never need the caller's project files.

package/dist/model-discovery-adapters.d.ts

@@ -1,6 +1,5 @@
 import { type AgentRuntimeState } from './runtime-state.js';
-import { type AgentDiscoveryConfiguration } from './model-discovery.js';
-import type { ModelDiscoveryContext, ModelDiscoveryDeps, ModelProbeResult } from './model-discovery-types.js';
+import type { AgentDiscoveryConfiguration, ModelDiscoveryContext, ModelDiscoveryDeps, ModelProbeResult } from './model-discovery-types.js';
 export declare function modelProbeTimeoutMs(agentId: string): number;
 /** Shared CLI-subcommand adapter. Output parsers are pure def-owned functions, not vendor tools. */
 export declare function probeCliSubcommand(context: ModelDiscoveryContext, config: AgentDiscoveryConfiguration, deps: ModelDiscoveryDeps, signal: AbortSignal): Promise<ModelProbeResult>;

package/dist/model-discovery-adapters.js

@@ -4,7 +4,7 @@ import { execFile } from 'node:child_process';
 import { readFile, stat } from 'node:fs/promises';
 import { homedir } from 'node:os';
 import { join, dirname } from 'node:path';
-import { createCommandInvocation } from '@jini-ai/platform';
+import { createCommandInvocation } from '@jini-ai/platform/command';
 import { detectAcpModelMetadata } from './agent-protocol/acp/models.js';
 import { CLAUDE_CODE_INITIALIZE_ARGS, CLAUDE_CODE_INITIALIZE_REQUEST } from './claude-code-models.js';
 import { listProviderModels } from './providers/model-catalog.js';
@@ -12,7 +12,7 @@ import { execAgentFile } from './invocation.js';
 import { scheduleProbeProcess } from './probe-scheduler.js';
 import { probeCopilotSdk, probeDroidSdk } from './model-discovery-sdk.js';
 import { parseSettingsJson, readModelConfiguration } from './model-discovery-config.js';
-import { ModelProbeError, modelIdentityKind, withModelProbeTimeout } from './model-discovery.js';
+import { ModelProbeError, modelIdentityKind, withModelProbeTimeout } from './model-discovery-shared.js';
 const ACP_ARGS = {
     amr: ['agent', 'run', '--runtime', 'opencode'],
     auggie: ['--acp'], cline: ['--acp'], devin: ['--permission-mode', 'dangerous', '--respect-workspace-trust', 'false', 'acp'],

package/dist/model-discovery-native.d.ts

@@ -0,0 +1,14 @@
+/** Native composition and legacy public signatures. Injected hosts import model-discovery instead. */
+import { resolveModelForLaunch as resolvePolicyModelForLaunch, type ModelDiscoveryDefinition } from './model-discovery.js';
+import type { AgentDiscoveryConfiguration, AgentModelDiscoveryPort, ModelDiscoveryContext, ModelDiscoveryDeps } from './model-discovery-types.js';
+export * from './model-discovery.js';
+export declare function createAgentModelDiscovery(agentId: string, configuration: AgentDiscoveryConfiguration): AgentModelDiscoveryPort;
+export declare function modelDiscoveryForDef(def: ModelDiscoveryDefinition): AgentModelDiscoveryPort;
+export declare function resolveModelForLaunch(required: {
+    def: ModelDiscoveryDefinition;
+    context: ModelDiscoveryContext;
+}, { deps, ...optional }?: {
+    deps?: ModelDiscoveryDeps;
+    signal?: AbortSignal;
+}): ReturnType<typeof resolvePolicyModelForLaunch>;
+//# sourceMappingURL=model-discovery-native.d.ts.map

package/dist/model-discovery-native.js

@@ -0,0 +1,22 @@
+/** Native composition and legacy public signatures. Injected hosts import model-discovery instead. */
+import { createAgentModelDiscovery as createPolicyDiscovery, modelDiscoveryForDef as policyDiscoveryForDef, resolveModelForLaunch as resolvePolicyModelForLaunch, } from './model-discovery.js';
+import { defaultModelDiscoveryDeps, modelProbeTimeoutMs, probeAgentCatalog, probeCliCache } from './model-discovery-adapters.js';
+export * from './model-discovery.js';
+/** Reuse the existing probe owners, including their credential, cancellation and cache guards. */
+const nativeModelDiscoveryProbes = {
+    catalog: ({ agentId, context, configuration, deps, signal }, _optional = {}) => probeAgentCatalog(agentId, context, configuration, deps, signal),
+    cliCache: ({ agentId, context, deps, signal }, _optional = {}) => probeCliCache(agentId, context, deps, signal),
+    timeoutMs: ({ agentId }, _optional = {}) => modelProbeTimeoutMs(agentId),
+};
+// These forwarding signatures deliberately retain the published API. New policy APIs use
+// required/optional objects; changing these compatibility wrappers would break existing hosts.
+export function createAgentModelDiscovery(agentId, configuration) {
+    return createPolicyDiscovery({ agentId, configuration, deps: defaultModelDiscoveryDeps, probes: nativeModelDiscoveryProbes });
+}
+export function modelDiscoveryForDef(def) {
+    return policyDiscoveryForDef({ def, deps: defaultModelDiscoveryDeps });
+}
+export function resolveModelForLaunch(required, { deps = defaultModelDiscoveryDeps, ...optional } = {}) {
+    return resolvePolicyModelForLaunch({ ...required, deps }, optional);
+}
+//# sourceMappingURL=model-discovery-native.js.map

package/dist/model-discovery-sdk.js

@@ -1,4 +1,4 @@
-import { ModelProbeError, modelIdentityKind } from './model-discovery.js';
+import { ModelProbeError, modelIdentityKind } from './model-discovery-shared.js';
 export async function probeCopilotSdk(context, signal, optional = {}) {
     const client = await (optional.createClient ?? createCopilotMetadataClient)(context);
     if (signal.aborted) {

package/dist/model-discovery-shared.d.ts

@@ -0,0 +1,14 @@
+/** Shared discovery normalization and timeout/error contracts; no native adapters. */
+import type { RuntimeModelOption } from './types.js';
+import type { DiscoveredModel, ModelCatalogSnapshot } from './model-discovery-types.js';
+export declare function modelIdentityKind(id: string): DiscoveredModel['identityKind'];
+export declare function normalizeDiscoveredModels(models: readonly RuntimeModelOption[]): DiscoveredModel[];
+export declare class ProbeTimeout extends Error {
+}
+/** Cancellation always reaches the effect port. A broken port cannot hold callers indefinitely. */
+export declare function withModelProbeTimeout<T>(work: (signal: AbortSignal) => Promise<T>, timeoutMs: number, parent?: AbortSignal): Promise<T>;
+export declare class ModelProbeError extends Error {
+    readonly code: ModelCatalogSnapshot['diagnostics'][number]['code'];
+    constructor(code: ModelCatalogSnapshot['diagnostics'][number]['code']);
+}
+//# sourceMappingURL=model-discovery-shared.d.ts.map

package/dist/model-discovery-shared.js

@@ -0,0 +1,53 @@
+export function modelIdentityKind(id) {
+    const token = id.slice(id.lastIndexOf('/') + 1);
+    if (/^(default|auto|adaptive|smart|deep|rush|ultimate|premium|balanced|fast|vercel-ai-gateway|grok-build)$/i.test(token) || /(?:^|[-/])gateway$/i.test(id))
+        return 'routing-mode';
+    if (/^(opus|sonnet|haiku|fable|best|latest|claude|gemini|gpt|codex|swe)(?:\[.*\])?$/i.test(token) || /(?:^|[-/])latest$/i.test(id))
+        return 'alias';
+    return 'concrete';
+}
+export function normalizeDiscoveredModels(models) {
+    const seen = new Set();
+    return models.flatMap((row) => {
+        if (!row.id || row.id === 'default' || seen.has(row.id))
+            return [];
+        seen.add(row.id);
+        const model = row;
+        return [{ ...row, identityKind: model.identityKind ?? modelIdentityKind(row.id), ...(model.resolvedId ? { resolvedId: model.resolvedId } : {}) }];
+    });
+}
+export class ProbeTimeout extends Error {
+}
+/** Cancellation always reaches the effect port. A broken port cannot hold callers indefinitely. */
+export async function withModelProbeTimeout(work, timeoutMs, parent) {
+    if (parent?.aborted)
+        throw new ProbeTimeout('Probe cancelled');
+    const controller = new AbortController();
+    let timer;
+    let abortListener;
+    const stopped = new Promise((_resolve, reject) => {
+        abortListener = () => { controller.abort(); reject(new ProbeTimeout('Probe cancelled')); };
+        if (parent?.aborted)
+            abortListener();
+        else
+            parent?.addEventListener('abort', abortListener, { once: true });
+        timer = setTimeout(() => { controller.abort(); reject(new ProbeTimeout('Probe timed out')); }, timeoutMs);
+    });
+    try {
+        return await Promise.race([work(controller.signal), stopped]);
+    }
+    finally {
+        if (timer)
+            clearTimeout(timer);
+        if (abortListener)
+            parent?.removeEventListener('abort', abortListener);
+    }
+}
+export class ModelProbeError extends Error {
+    code;
+    constructor(code) {
+        super(code);
+        this.code = code;
+    }
+}
+//# sourceMappingURL=model-discovery-shared.js.map

package/dist/model-discovery-types.d.ts

@@ -136,4 +136,30 @@ export interface ModelDiscoveryDeps {
     };
     cache: Map<string, ModelCacheEntry>;
 }
+export interface AgentDiscoveryConfiguration {
+    fallbackModels: () => readonly RuntimeModelOption[];
+    parse?: (input: {
+        stdout: string;
+    }) => RuntimeModelOption[] | null;
+    args?: readonly string[];
+}
+/** Host composition selects native probes or substitutes another discovery mechanism. */
+export interface ModelDiscoveryProbes {
+    catalog(required: {
+        agentId: string;
+        context: ModelDiscoveryContext;
+        configuration: AgentDiscoveryConfiguration;
+        deps: ModelDiscoveryDeps;
+        signal: AbortSignal;
+    }, optional?: Record<string, never>): Promise<ModelProbeResult>;
+    cliCache(required: {
+        agentId: string;
+        context: ModelDiscoveryContext;
+        deps: ModelDiscoveryDeps;
+        signal: AbortSignal;
+    }, optional?: Record<string, never>): Promise<ModelProbeResult>;
+    timeoutMs(required: {
+        agentId: string;
+    }, optional?: Record<string, never>): number;
+}
 //# sourceMappingURL=model-discovery-types.d.ts.map

package/dist/model-discovery.d.ts

@@ -1,42 +1,37 @@
 import type { RuntimeModelOption } from './types.js';
-import type { AgentModelDiscoveryPort, DefaultModelResolution, DiscoveredModel, ModelCatalogSnapshot, ModelDiscoveryContext, ModelDiscoveryDeps } from './model-discovery-types.js';
-export * from './model-discovery-types.js';
+import type { AgentModelDiscoveryPort, AgentDiscoveryConfiguration, DefaultModelResolution, ModelCatalogSnapshot, ModelDiscoveryContext, ModelDiscoveryDeps, ModelDiscoveryProbes } from './model-discovery-types.js';
+export { ModelProbeError, modelIdentityKind, normalizeDiscoveredModels, withModelProbeTimeout } from './model-discovery-shared.js';
+export type * from './model-discovery-types.js';
 export declare const MODEL_CATALOG_TTL_MS: number;
 export declare const MODEL_NEGATIVE_TTL_MS = 30000;
-export declare function modelIdentityKind(id: string): DiscoveredModel['identityKind'];
-export declare function normalizeDiscoveredModels(models: readonly RuntimeModelOption[]): DiscoveredModel[];
 /** Hash all launch-affecting state, including env credentials; none of the raw material escapes. */
 export declare function modelLaunchFingerprint(context: ModelDiscoveryContext, configMaterial?: string): string;
-/** Cancellation always reaches the effect port. A broken port cannot hold callers indefinitely. */
-export declare function withModelProbeTimeout<T>(work: (signal: AbortSignal) => Promise<T>, timeoutMs: number, parent?: AbortSignal): Promise<T>;
-export declare class ModelProbeError extends Error {
-    readonly code: ModelCatalogSnapshot['diagnostics'][number]['code'];
-    constructor(code: ModelCatalogSnapshot['diagnostics'][number]['code']);
-}
-export interface AgentDiscoveryConfiguration {
-    fallbackModels: () => readonly RuntimeModelOption[];
-    parse?: (input: {
-        stdout: string;
-    }) => RuntimeModelOption[] | null;
-    args?: readonly string[];
-}
-export declare function createAgentModelDiscovery(agentId: string, configuration: AgentDiscoveryConfiguration): AgentModelDiscoveryPort;
+/** Bind supplied effect ports and probes without loading their native implementations. */
+export declare function createAgentModelDiscovery({ agentId, configuration, deps: suppliedDeps, probes }: {
+    agentId: string;
+    configuration: AgentDiscoveryConfiguration;
+    deps: ModelDiscoveryDeps;
+    probes: ModelDiscoveryProbes;
+}, _optional?: Record<string, never>): AgentModelDiscoveryPort;
 export declare function offlineSnapshot(fingerprint: string, now: number, fallback: readonly RuntimeModelOption[], issue?: ModelCatalogSnapshot['diagnostics'][number]): ModelCatalogSnapshot;
 /** Hosts may supply either discovery port independently; static definitions need no probes. */
-type ModelDiscoveryDefinition = Partial<AgentModelDiscoveryPort> & {
+export type ModelDiscoveryDefinition = Partial<AgentModelDiscoveryPort> & {
     id?: string;
     fallbackModels?: readonly RuntimeModelOption[];
     defaultModelEnvVar?: string;
     supportsCustomModel?: boolean;
     supportsConcreteModelSelection?: boolean;
 };
-export declare function modelDiscoveryForDef(def: ModelDiscoveryDefinition): AgentModelDiscoveryPort;
+export declare function modelDiscoveryForDef({ def, deps: suppliedDeps }: {
+    def: ModelDiscoveryDefinition;
+    deps: ModelDiscoveryDeps;
+}, _optional?: Record<string, never>): AgentModelDiscoveryPort;
 /** Resolve against the actual launch scope, pinning the same ID shown by the picker. */
-export declare function resolveModelForLaunch({ def, context }: {
+export declare function resolveModelForLaunch({ def, context, deps }: {
     def: ModelDiscoveryDefinition;
     context: ModelDiscoveryContext;
+    deps: ModelDiscoveryDeps;
 }, optional?: {
-    deps?: ModelDiscoveryDeps;
     signal?: AbortSignal;
 }): Promise<{
     model: string;

package/dist/model-discovery.js

@@ -1,34 +1,14 @@
 import { createHash } from 'node:crypto';
 import { readModelConfiguration } from './model-discovery-config.js';
-import { defaultModelDiscoveryDeps, probeAgentCatalog, probeCliCache, modelProbeTimeoutMs } from './model-discovery-adapters.js';
-export * from './model-discovery-types.js';
+import { ModelProbeError, ProbeTimeout, modelIdentityKind, normalizeDiscoveredModels, withModelProbeTimeout } from './model-discovery-shared.js';
+export { ModelProbeError, modelIdentityKind, normalizeDiscoveredModels, withModelProbeTimeout } from './model-discovery-shared.js';
 export const MODEL_CATALOG_TTL_MS = 15 * 60_000;
 export const MODEL_NEGATIVE_TTL_MS = 30_000;
 const MAX_CATALOG_SCOPES = 128;
-export function modelIdentityKind(id) {
-    const token = id.slice(id.lastIndexOf('/') + 1);
-    if (/^(default|auto|adaptive|smart|deep|rush|ultimate|premium|balanced|fast|vercel-ai-gateway|grok-build)$/i.test(token) || /(?:^|[-/])gateway$/i.test(id))
-        return 'routing-mode';
-    if (/^(opus|sonnet|haiku|fable|best|latest|claude|gemini|gpt|codex|swe)(?:\[.*\])?$/i.test(token) || /(?:^|[-/])latest$/i.test(id))
-        return 'alias';
-    return 'concrete';
-}
-export function normalizeDiscoveredModels(models) {
-    const seen = new Set();
-    return models.flatMap((row) => {
-        if (!row.id || row.id === 'default' || seen.has(row.id))
-            return [];
-        seen.add(row.id);
-        const model = row;
-        return [{ ...row, identityKind: model.identityKind ?? modelIdentityKind(row.id), ...(model.resolvedId ? { resolvedId: model.resolvedId } : {}) }];
-    });
-}
 /** Hash all launch-affecting state, including env credentials; none of the raw material escapes. */
 export function modelLaunchFingerprint(context, configMaterial = '') {
     return createHash('sha256').update(JSON.stringify({ ...context, env: Object.entries(context.env).sort(([a], [b]) => a.localeCompare(b)), configMaterial })).digest('hex');
 }
-class ProbeTimeout extends Error {
-}
 const probePools = new WeakMap();
 /** One cold catalog probe per host; queued callers keep cancellation responsive. */
 async function boundedProbe(deps, work, signal) {
@@ -61,50 +41,19 @@ async function boundedProbe(deps, work, signal) {
             pool.active -= 1;
     }
 }
-/** Cancellation always reaches the effect port. A broken port cannot hold callers indefinitely. */
-export async function withModelProbeTimeout(work, timeoutMs, parent) {
-    if (parent?.aborted)
-        throw new ProbeTimeout('Probe cancelled');
-    const controller = new AbortController();
-    let timer;
-    let abortListener;
-    const stopped = new Promise((_resolve, reject) => {
-        abortListener = () => { controller.abort(); reject(new ProbeTimeout('Probe cancelled')); };
-        if (parent?.aborted)
-            abortListener();
-        else
-            parent?.addEventListener('abort', abortListener, { once: true });
-        timer = setTimeout(() => { controller.abort(); reject(new ProbeTimeout('Probe timed out')); }, timeoutMs);
-    });
-    try {
-        return await Promise.race([work(controller.signal), stopped]);
-    }
-    finally {
-        if (timer)
-            clearTimeout(timer);
-        if (abortListener)
-            parent?.removeEventListener('abort', abortListener);
-    }
-}
 function diagnostic(error) {
     // Never stringify vendor errors: stderr/HTTP bodies may include credentials or OAuth URLs.
     const code = error instanceof ProbeTimeout ? 'timeout' : error instanceof ModelProbeError ? error.code : 'offline';
     return { code, message: ({ timeout: 'Model discovery timed out or was cancelled.', 'auth-missing': 'CLI credentials are unavailable.', 'unsupported-version': 'Native metadata discovery is unavailable for this version.', 'malformed-response': 'Native metadata contained no usable catalog.', offline: 'Model discovery could not reach its source.' })[code] };
 }
-export class ModelProbeError extends Error {
-    code;
-    constructor(code) {
-        super(code);
-        this.code = code;
-    }
-}
-export function createAgentModelDiscovery(agentId, configuration) {
+/** Bind supplied effect ports and probes without loading their native implementations. */
+export function createAgentModelDiscovery({ agentId, configuration, deps: suppliedDeps, probes }, _optional = {}) {
     async function scoped(context, deps, signal) {
         const config = await withModelProbeTimeout((active) => readModelConfiguration(agentId, context, deps, active), 1000, signal);
         return { config, key: `${agentId}:${modelLaunchFingerprint(context, config.fingerprintMaterial)}` };
     }
     const port = {
-        async discoverModels({ context }, { signal, force = false, staleWhileRevalidate = false, deps = defaultModelDiscoveryDeps } = {}) {
+        async discoverModels({ context }, { signal, force = false, staleWhileRevalidate = false, deps = suppliedDeps } = {}) {
             let state;
             try {
                 state = await scoped(context, deps, signal);
@@ -129,7 +78,7 @@ export function createAgentModelDiscovery(agentId, configuration) {
             // immediately; keep stale provenance and refresh without holding the first user prompt.
             if (staleWhileRevalidate && !cached.good && ['codex', 'opencode', 'claude', 'codebuddy'].includes(agentId)) {
                 try {
-                    const disk = await withModelProbeTimeout(active => probeCliCache(agentId, context, deps, active), 1000, signal);
+                    const disk = await withModelProbeTimeout(active => probes.cliCache({ agentId, context, deps, signal: active }), 1000, signal);
                     const models = normalizeDiscoveredModels(disk.models);
                     if (models.length)
                         cached.good = { models, source: 'cli-cache', coverage: disk.coverage,
@@ -145,7 +94,7 @@ export function createAgentModelDiscovery(agentId, configuration) {
             }
             const pending = (async () => {
                 try {
-                    const result = await boundedProbe(deps, () => withModelProbeTimeout((active) => probeAgentCatalog(agentId, context, configuration, deps, active), modelProbeTimeoutMs(agentId), signal), signal);
+                    const result = await boundedProbe(deps, () => withModelProbeTimeout((active) => probes.catalog({ agentId, context, configuration, deps, signal: active }), probes.timeoutMs({ agentId }), signal), signal);
                     const models = normalizeDiscoveredModels(result.models);
                     if (models.length === 0)
                         throw new ModelProbeError('malformed-response');
@@ -184,7 +133,7 @@ export function createAgentModelDiscovery(agentId, configuration) {
             // catalog while this coalesced, timeout-bounded refresh updates the cache in the background.
             return staleWhileRevalidate && lastGood() || pending;
         },
-        async resolveDefaultModel({ context, catalog }, { signal, deps = defaultModelDiscoveryDeps } = {}) {
+        async resolveDefaultModel({ context, catalog }, { signal, deps = suppliedDeps } = {}) {
             let state;
             try {
                 state = await scoped(context, deps, signal);
@@ -214,9 +163,9 @@ export function createAgentModelDiscovery(agentId, configuration) {
 export function offlineSnapshot(fingerprint, now, fallback, issue) {
     return { models: normalizeDiscoveredModels(fallback), source: 'offline-fallback', freshness: 'offline-fallback', fetchedAt: new Date(now).toISOString(), expiresAt: new Date(now + MODEL_NEGATIVE_TTL_MS).toISOString(), coverage: 'configured', launchFingerprint: fingerprint, diagnostics: issue ? [issue] : [] };
 }
-export function modelDiscoveryForDef(def) {
+export function modelDiscoveryForDef({ def, deps: suppliedDeps }, _optional = {}) {
     return {
-        discoverModels: def.discoverModels?.bind(def) || (async ({ context }, { deps = defaultModelDiscoveryDeps } = {}) => {
+        discoverModels: def.discoverModels?.bind(def) || (async ({ context }, { deps = suppliedDeps } = {}) => {
             const catalog = offlineSnapshot(modelLaunchFingerprint(context), deps.clock.now(), def.fallbackModels || []);
             const configured = def.defaultModelEnvVar && context.env[def.defaultModelEnvVar]?.trim();
             // Static hosts used their first concrete fallback before discovery existed. Preserve
@@ -224,7 +173,7 @@ export function modelDiscoveryForDef(def) {
             const selection = context.model || context.resumedModelId || configured || catalog.models.find(row => row.identityKind === 'concrete')?.id;
             return { ...catalog, ...(selection ? { defaultSelectionId: selection } : {}) };
         }),
-        resolveDefaultModel: def.resolveDefaultModel?.bind(def) || (async ({ context, catalog }, { deps = defaultModelDiscoveryDeps } = {}) => {
+        resolveDefaultModel: def.resolveDefaultModel?.bind(def) || (async ({ context, catalog }, { deps = suppliedDeps } = {}) => {
             if (context.resumeSessionId && !context.resumedModelId && !context.model)
                 return { status: 'unresolved', reason: 'Resumed session model metadata is required.' };
             const configured = def.defaultModelEnvVar && context.env[def.defaultModelEnvVar]?.trim();
@@ -241,16 +190,16 @@ export function modelDiscoveryForDef(def) {
     };
 }
 /** Resolve against the actual launch scope, pinning the same ID shown by the picker. */
-export async function resolveModelForLaunch({ def, context }, optional = {}) {
+export async function resolveModelForLaunch({ def, context, deps }, optional = {}) {
     if (def.supportsConcreteModelSelection === false)
         throw new Error('This CLI cannot pin a concrete starting model.');
-    const discovery = modelDiscoveryForDef(def);
-    const catalog = await discovery.discoverModels({ context }, { ...optional, staleWhileRevalidate: true });
+    const discovery = modelDiscoveryForDef({ def, deps });
+    const catalog = await discovery.discoverModels({ context }, { ...optional, deps, staleWhileRevalidate: true });
     // Custom input is allowed unless the definition explicitly disables it: an unlisted user ID is already
     // the intended launch value. Never substitute a catalog default or reinterpret its spelling.
     const resolution = context.model && def.supportsCustomModel !== false && !catalog.models.some(row => row.id === context.model)
-        ? { status: 'resolved', id: context.model, selectionId: context.model, source: 'config-file', resolvedAt: new Date((optional.deps || defaultModelDiscoveryDeps).clock.now()).toISOString(), launchFingerprint: catalog.launchFingerprint }
-        : await discovery.resolveDefaultModel({ context, catalog }, optional);
+        ? { status: 'resolved', id: context.model, selectionId: context.model, source: 'config-file', resolvedAt: new Date(deps.clock.now()).toISOString(), launchFingerprint: catalog.launchFingerprint }
+        : await discovery.resolveDefaultModel({ context, catalog }, { ...optional, deps });
     if (resolution.status !== 'resolved')
         throw new Error(resolution.reason);
     return { model: resolution.id, catalog, resolution };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jini-ai/agent-runtime",
-  "version": "0.4.5",
+  "version": "0.4.6",
   "description": "Coding-agent runtime adapters: runtime registry, detection, launch, stream parsers, and the ACP/pi-rpc subprocess transport.",
   "license": "Apache-2.0",
   "repository": {
@@ -16,7 +16,21 @@
       ".": "node",
       "./providers/tool-turn": "node",
       "./model-catalog/cache": "universal",
-      "./providers/sse-decode": "universal"
+      "./providers/sse-decode": "universal",
+      "./model-discovery": "node"
+    },
+    "isolation": {
+      "forbidden": {
+        "./model-discovery": [
+          "node:child_process",
+          "child_process",
+          "node:fs",
+          "fs",
+          "./model-discovery-adapters.js",
+          "./model-discovery-native.js",
+          "./model-discovery-sdk.js"
+        ]
+      }
     }
   },
   "type": "module",
@@ -43,6 +57,11 @@
       "types": "./dist/providers/sse-decode.d.ts",
       "import": "./dist/providers/sse-decode.js",
       "default": "./dist/providers/sse-decode.js"
+    },
+    "./model-discovery": {
+      "types": "./dist/model-discovery.d.ts",
+      "import": "./dist/model-discovery.js",
+      "default": "./dist/model-discovery.js"
     }
   },
   "typesVersions": {
@@ -55,6 +74,9 @@
       ],
       "providers/sse-decode": [
         "./dist/providers/sse-decode.d.ts"
+      ],
+      "model-discovery": [
+        "./dist/model-discovery.d.ts"
       ]
     }
   },
@@ -77,19 +99,19 @@
   "devDependencies": {
     "@vitest/coverage-v8": "^2.1.9",
     "@jini-ai/core": "^0.4.0",
-    "@jini-ai/oauth": "^0.2.2",
     "@jini-ai/integrations": "^0.4.2",
-    "@jini-ai/platform": "^0.5.3",
-    "@jini-ai/protocol": "^0.4.4"
+    "@jini-ai/platform": "^0.5.5",
+    "@jini-ai/protocol": "^0.4.4",
+    "@jini-ai/oauth": "^0.2.2"
   },
   "dependencies": {
-    "@jini-ai/core": "^0.4.3"
+    "@jini-ai/core": "^0.4.4"
   },
   "peerDependencies": {
     "@jini-ai/integrations": "^0.4.2",
     "@github/copilot-sdk": "*",
     "@jini-ai/oauth": "^0.2.2",
-    "@jini-ai/platform": "^0.5.3",
+    "@jini-ai/platform": "^0.5.5",
     "@jini-ai/protocol": "^0.4.4"
   },
   "peerDependenciesMeta": {