@jini-ai/daemon 0.5.2 → 0.5.4

package/CHANGELOG.md

@@ -1,3 +1,14 @@
+## 0.5.4 — pending release
+
+- Re-export the canonical core surface-exchange contracts and parameter constants. Store and ask/report behavior are unchanged; requires core 0.4.2.
+
+## 0.5.3 — 2026-10-06
+
+- Message attachments reach every runtime: new `prepareMessageAttachments` / `messageContentWithImages` (+ `MessageAttachmentImage`, `MessageAttachmentSource`, `MessageAttachmentReader`) turn claimed refs into image pixels for providers and a file notice for non-images.
+- `AttachmentStore.listPendingForOwner({ ownerId }, { runId })`: with the claiming `runId`, that run's own claimed attachments stay discoverable (owner match still required); without it, behavior is unchanged.
+- The agent executor reports the CLI session id on an early `status` event so hosts can checkpoint a run before it ends; run lifecycle carries it through.
+- Requires `@jini-ai/protocol` ^0.4.1 and `@jini-ai/agent-runtime` ^0.4.1.
+
 ## 0.5.2 — 2026-10-06
 
 - No slow-run notice while a delegated tool waits on a surface: the first `emitSurface` of a call suspends the notice and the call's end resumes it. Suspensions are counted, so with two calls in flight the first to finish does not re-arm the notice over the other's open form; `resume()` drops suspensions left by an ended run.

package/dist/agent-executor/contracts.d.ts

@@ -1,12 +1,13 @@
-import { type spawn as nodeSpawn, type ChildProcess } from 'node:child_process';
-import { type Principal } from '@jini-ai/core';
-import { type RunAgentPayload, type RunErrorPayload } from '@jini-ai/protocol';
-import { type applyAgentLaunchEnv, type ensureAgentCapabilities, type getAgentDef, type resolveAgentLaunch, type attachAcpSession, type attachPiRpcSession, type prepareAgentLogFile, type preparePromptFileForAgent, type AcpMcpServerInput, type AcpPermissionHandler, type PromptAugmenter } from '@jini-ai/agent-runtime';
-import { type createCommandInvocation, type listProcessSnapshots, type ProcessSnapshot, type StopProcessesResult } from '@jini-ai/platform';
-import { type RunByteJournal } from '../continuation/journal.js';
-import { type RunRetrySideEffectState } from '../run/core/index.js';
-import { type ToolExecutor } from '../tool-executor.js';
-import { type RunLifecycle } from '../run-lifecycle.js';
+import type { MessageAttachmentImage } from '../attachment-content.js';
+import type { spawn as nodeSpawn, ChildProcess } from 'node:child_process';
+import type { Principal } from '@jini-ai/core';
+import type { RunAgentPayload, RunErrorPayload } from '@jini-ai/protocol';
+import type { applyAgentLaunchEnv, ensureAgentCapabilities, resolveModelForLaunch, getAgentDef, resolveAgentLaunch, attachAcpSession, attachPiRpcSession, prepareAgentLogFile, preparePromptFileForAgent, AcpMcpServerInput, AcpPermissionHandler, PromptAugmenter } from '@jini-ai/agent-runtime';
+import type { createCommandInvocation, listProcessSnapshots, ProcessSnapshot, StopProcessesResult } from '@jini-ai/platform';
+import type { RunByteJournal } from '../continuation/journal.js';
+import type { RunRetrySideEffectState } from '../run/core/index.js';
+import type { ToolExecutor } from '../tool-executor.js';
+import type { RunLifecycle } from '../run-lifecycle.js';
 /**
  * A parsed, loosely-typed event as produced by one of `@jini-ai/agent-runtime`'s
  * four stream-parser factories — each parser's `onEvent` callback receives
@@ -55,15 +56,13 @@ export type AgentExecutorCompatibility = {
  * produce plus defensively malformed/non-record input.
  *
  * `'agent'`'s optional `sessionId` (gap 5, session resume — see
- * `RunEndPayload.sessionRef`'s doc in `@jini-ai/protocol`) is a daemon-internal
- * side channel, not part of the `RunAgentPayload` wire payload itself:
- * OpenCode's `sessionID`/Codex's `thread_id`/Qoder's and Claude's
- * `session_id` all arrive on a `'status'` event alongside fields
- * `RunAgentPayload`'s `'status'` variant already models (`label`/`model`/
- * `ttftMs`/`detail`) but has no room for a session id itself — surfacing it
- * here lets a lifecycle-wiring function capture it into a local variable and
- * thread it into its own terminal `finish()` call, without widening the
- * public wire protocol just to carry a value that only this module reads.
+ * `RunEndPayload.sessionRef`'s doc in `@jini-ai/protocol`) remains a daemon-internal
+ * side channel for lifecycle wiring to capture the locator and thread it into
+ * its terminal `finish()` call. The `'status'` wire payload also carries
+ * `sessionId` so durable hosts can persist it immediately, before a process
+ * crash can prevent the terminal `end` event from arriving. OpenCode's
+ * `sessionID`/Codex's `thread_id`/Qoder's and Claude's `session_id` are normalized
+ * by their stream parsers into this shared locator.
  *
  * `'turn-end'`'s optional `stopReason` (gap 3, capability-routed
  * continuation transport) is the same kind of internal side channel: the
@@ -91,7 +90,7 @@ export type AgentRuntimeEventTranslation = {
     readonly kind: 'ignored';
 };
 /** Machine-readable failure reasons `run()` can reject with — every one is preceded by a `lifecycle.finish({status:'failed'})` call (see index.ts module doc's Invariant section). */
-export type AgentExecutorErrorCode = 'AGENT_PERMISSION_MODE_INVALID' | 'AGENT_NOT_FOUND' | 'AGENT_RUNTIME_UNSUPPORTED' | 'AGENT_BINARY_NOT_RESOLVED' | 'AGENT_SPAWN_FAILED' | 'AGENT_PROMPT_TOO_LARGE';
+export type AgentExecutorErrorCode = 'AGENT_MODEL_UNRESOLVED' | 'AGENT_PERMISSION_MODE_INVALID' | 'AGENT_NOT_FOUND' | 'AGENT_RUNTIME_UNSUPPORTED' | 'AGENT_BINARY_NOT_RESOLVED' | 'AGENT_SPAWN_FAILED' | 'AGENT_PROMPT_TOO_LARGE';
 /** Thrown by `AgentExecutor.run()` on every failure path — never a bare `Error`, so callers can branch on `.code` instead of parsing `.message`. */
 export declare class AgentExecutorError extends Error {
     readonly code: AgentExecutorErrorCode;
@@ -129,6 +128,8 @@ export interface AgentExecutorRunInput {
      * the top of `run()` in `launch.ts`.
      */
     readonly imagePaths?: readonly string[];
+    /** Host-prepared pixels from the shared attachment reader, for structured message delivery. */
+    readonly imageContents?: readonly MessageAttachmentImage[];
     /** Additional host-validated directories the runtime may read. */
     readonly extraAllowedDirs?: readonly string[];
     /** Trusted root that must contain pi-rpc image paths after realpath resolution. */
@@ -192,7 +193,7 @@ export interface AgentExecutor {
      * underlying run is always already transitioned to `'failed'` via
      * `lifecycle.finish()` before this rejects (see index.ts module doc's Invariant).
      */
-    run(requiredArgs: Pick<AgentExecutorRunInput, "runId" | "agentId" | "prompt" | "cwd">, optionalArgs?: Pick<AgentExecutorRunInput, "model" | "reasoning" | "permissionMode" | "imagePaths" | "extraAllowedDirs" | "uploadRoot" | "credentialEnv" | "env" | "resumeSessionId" | "newSessionId" | "disallowedTools" | "allowedTools" | "settingSources" | "settings">): Promise<void>;
+    run(requiredArgs: Pick<AgentExecutorRunInput, "runId" | "agentId" | "prompt" | "cwd">, optionalArgs?: Pick<AgentExecutorRunInput, "model" | "reasoning" | "permissionMode" | "imagePaths" | "imageContents" | "extraAllowedDirs" | "uploadRoot" | "credentialEnv" | "env" | "resumeSessionId" | "newSessionId" | "disallowedTools" | "allowedTools" | "settingSources" | "settings">): Promise<void>;
 }
 /** Process discovery is a getter; process collection and stopping accept explicit host inputs. */
 export type CollectProcessTreePidsPort = (args: {
@@ -230,6 +231,9 @@ export interface AgentCleanupFailureContext {
 }
 /** A small handle `writePromptToStdin` uses to close stdin exactly once, shared with the `turn_end`-triggered close inside {@link wireChildLifecycle}. */
 export interface StdinCloseHandle {
+    /** Prepared pixels ride on the initial stdin message without reopening filesystem tools or
+     * serializing base64 into text. Native argv/ACP/pi transports keep their existing image path. */
+    imageContents?: readonly MessageAttachmentImage[];
     closeStdinOnce(): void;
     /** Journals a sent-to-stdin byte chunk, queued through the same FIFO {@link wireChildLifecycle} already uses for emitted events. No-op when no journal was configured (see `CreateAgentExecutorOptions.journal`). */
     recordSentBytes(content: string): void;
@@ -539,6 +543,8 @@ export interface FailureClassificationContext {
 export type ClassifyFailure = (context: FailureClassificationContext) => boolean | Promise<boolean>;
 export interface CreateAgentExecutorOptions {
     readonly lifecycle: RunLifecycle;
+    /** Resolves/pins the concrete starting model against the actual launch scope. */
+    readonly resolveModelForLaunch?: typeof resolveModelForLaunch;
     /** @default the real `@jini-ai/agent-runtime` registry lookup */
     readonly getAgentDef?: typeof getAgentDef;
     /** @default the real `@jini-ai/agent-runtime` launch resolver */

package/dist/agent-executor/contracts.js

@@ -1,12 +1,3 @@
-import {} from 'node:child_process';
-import {} from '@jini-ai/core';
-import {} from '@jini-ai/protocol';
-import {} from '@jini-ai/agent-runtime';
-import {} from '@jini-ai/platform';
-import {} from '../continuation/journal.js';
-import {} from '../run/core/index.js';
-import {} from '../tool-executor.js';
-import {} from '../run-lifecycle.js';
 export const SUPPORTED_STREAM_FORMATS = [
     'claude-stream-json',
     'json-event-stream',

package/dist/agent-executor/event-translation.d.ts

@@ -1,5 +1,5 @@
-import { type RunAgentPayload, type RunErrorPayload } from '@jini-ai/protocol';
-import { type AgentRuntimeEventTranslation } from './contracts.js';
+import type { RunAgentPayload, RunErrorPayload } from '@jini-ai/protocol';
+import type { AgentRuntimeEventTranslation } from './contracts.js';
 /**
  * Narrows a parsed `usage` event's `usage` sub-object (`{input_tokens?, output_tokens?}`) — the one
  * piece of {@link translateUsagePayload} with real nested branching (an optional container holding

package/dist/agent-executor/event-translation.js

@@ -1,5 +1,3 @@
-import {} from '@jini-ai/protocol';
-import {} from './contracts.js';
 import { isRecord, asString, asOptionalString, } from './values.js';
 function asOptionalNumber(value) {
     return typeof value === 'number' ? value : undefined;
@@ -62,6 +60,7 @@ export function translateStatusEvent({ rawEvent }) {
             ...(model !== undefined ? { model } : {}),
             ...(ttftMs !== undefined ? { ttftMs } : {}),
             ...(detail !== undefined ? { detail } : {}),
+            ...(sessionId !== undefined ? { sessionId } : {}),
         },
         ...(sessionId !== undefined ? { sessionId } : {}),
     };

package/dist/agent-executor/events.d.ts

@@ -1,8 +1,9 @@
-import { type ChildProcess } from 'node:child_process';
+import type { ModelCatalogSnapshot } from '@jini-ai/agent-runtime';
+import type { ChildProcess } from 'node:child_process';
 import { attachAcpSession, attachPiRpcSession, type AcpPermissionHandler, type RuntimeAgentDef } from '@jini-ai/agent-runtime';
-import { type RunByteJournal } from '../continuation/journal.js';
-import { type RunLifecycle } from '../run-lifecycle.js';
-import { type ChildDrivenStreamFormat, type TerminateChildTreeDeps, type AgentCleanupFailureContext, type StdinCloseHandle, type ContinuationOptions, type McpBridgeDelivery, type ClassifyFailure, type FailBeforeSpawn } from './contracts.js';
+import type { RunByteJournal } from '../continuation/journal.js';
+import type { RunLifecycle } from '../run-lifecycle.js';
+import type { ChildDrivenStreamFormat, TerminateChildTreeDeps, AgentCleanupFailureContext, StdinCloseHandle, ContinuationOptions, McpBridgeDelivery, ClassifyFailure, FailBeforeSpawn } from './contracts.js';
 /** Default sink when a host does not supply `onCleanupFailure`: still observable, never silent. Redacted per SEC-007 (a spawn/permission error can embed paths/host detail). */
 export declare function defaultCleanupFailureSink(context: AgentCleanupFailureContext): void;
 /**
@@ -22,6 +23,8 @@ export declare function defaultCleanupFailureSink(context: AgentCleanupFailureCo
  */
 export declare const DEFAULT_BUFFERED_STDOUT_MAX_BYTES: number;
 interface WireChildLifecycleContext extends TerminateChildTreeDeps {
+    readonly startingModel?: string;
+    readonly modelCatalog?: ModelCatalogSnapshot;
     readonly runId: string;
     readonly def: RuntimeAgentDef;
     readonly streamFormat: ChildDrivenStreamFormat;
@@ -141,6 +144,7 @@ interface RunAcpDispatchInput {
     readonly prompt: string;
     readonly cwd: string;
     readonly model: string | undefined;
+    readonly modelCatalog?: ModelCatalogSnapshot;
     readonly imagePaths: readonly string[];
     readonly envFormat: 'array' | 'map' | undefined;
     readonly mcpBridge: McpBridgeDelivery | null;
@@ -168,6 +172,7 @@ interface RunPiRpcDispatchInput {
     readonly prompt: string;
     readonly cwd: string;
     readonly model: string | undefined;
+    readonly modelCatalog?: ModelCatalogSnapshot;
     readonly imagePaths: readonly string[];
     readonly uploadRoot: string | undefined;
 }

package/dist/agent-executor/events.js

@@ -1,18 +1,20 @@
-import {} from 'node:child_process';
+import { createModelReceiptTracker } from './model-receipts.js';
+import { messageContentWithImages } from '../attachment-content.js';
 import { redactSecrets, } from '@jini-ai/core';
-import {} from '@jini-ai/protocol';
 import { createClaudeStreamHandler, createCopilotStreamHandler, createJsonEventStreamHandler, createQoderStreamHandler, attachAcpSession, attachPiRpcSession, } from '@jini-ai/agent-runtime';
 import { collectProcessTreePids, listProcessSnapshots, stopProcesses, } from '@jini-ai/platform';
 import { classifyRunCloseStatus, } from '../close-status.js';
 import { resolveContinuationTransport, } from '../continuation/continuation-transport.js';
-import {} from '../continuation/journal.js';
 import { resultContent, } from '../delegated-tool-bridge.js';
 import { extractResultMedia, } from '../tool-result-media.js';
-import {} from '../run-lifecycle.js';
-import {} from './contracts.js';
 import { translateAgentRuntimeEvent, translateAcpError, applyAgentTranslationSideEffects, } from './event-translation.js';
 import { errorMessage, } from './values.js';
 import { MCP_BRIDGE_UNAVAILABLE, unavailableJiniBridgeStatus, bridgeUnavailableMessage, } from './mcp-bridge.js';
+/** Carry PID only on structured status so the host can record its OS start identity early.
+ * A PID alone is never proof of death; hosts verify PID reuse before native continuation. */
+function statusWithChildIdentity({ payload, childPid }, _optional = {}) {
+    return { ...payload, ...(payload.type === 'status' && childPid !== undefined ? { childPid } : {}) };
+}
 /**
  * Selects and constructs the real stream-parser handler for a supported
  * `streamFormat`. `json-event-stream` additionally dispatches on
@@ -254,6 +256,7 @@ function bufferedStdoutTruncationNotice(droppedBytes, maxBytes) {
  */
 export function wireChildLifecycle(ctx) {
     const { runId, def, streamFormat, child, lifecycle, journal, continuation, classifyFailure } = ctx;
+    const modelReceipt = createModelReceiptTracker(ctx.startingModel, ctx.modelCatalog?.models);
     let stdinClosed = false;
     let cancelRequested = false;
     let emitQueue = Promise.resolve();
@@ -300,6 +303,8 @@ export function wireChildLifecycle(ctx) {
             }
         });
     }
+    if (ctx.startingModel)
+        enqueueEmit(() => lifecycle.emit({ runId, input: { event: 'agent', data: { type: 'status', label: 'starting_model', model: ctx.startingModel } } }));
     function closeStdinOnce() {
         if (stdinClosed)
             return;
@@ -393,6 +398,9 @@ export function wireChildLifecycle(ctx) {
                 return;
             const translation = translateAgentRuntimeEvent({ rawEvent: rawEvent });
             if (translation.kind === 'agent') {
+                const receipt = modelReceipt(translation.payload);
+                if (receipt)
+                    enqueueEmit(() => lifecycle.emit({ runId, input: { event: 'agent', data: receipt } }));
                 if (translation.sessionId !== undefined)
                     capturedSessionId = translation.sessionId;
                 if (!bridgeChecked && translation.payload.type === 'status' && translation.payload.label === 'initializing') {
@@ -411,7 +419,7 @@ export function wireChildLifecycle(ctx) {
                     translation.payload.delta.length > 0) {
                     userVisibleOutputSeen = true;
                 }
-                enqueueEmit(() => lifecycle.emit({ runId: runId, input: { event: 'agent', data: translation.payload } }));
+                enqueueEmit(() => lifecycle.emit({ runId: runId, input: { event: 'agent', data: statusWithChildIdentity({ payload: translation.payload, childPid: ctx.child.pid }, {}) } }));
             }
             else if (translation.kind === 'error') {
                 enqueueEmit(() => lifecycle.emit({ runId: runId, input: { event: 'error', data: translation.payload } }));
@@ -564,6 +572,7 @@ export function wireChildLifecycle(ctx) {
  * success.
  */
 function wireAcpLifecycle(ctx) {
+    const modelReceipt = createModelReceiptTracker(ctx.model, ctx.modelCatalog?.models);
     const { runId, agentId, child, lifecycle, journal, classifyFailure } = ctx;
     let cancelRequested = false;
     let emitQueue = Promise.resolve();
@@ -583,6 +592,8 @@ function wireAcpLifecycle(ctx) {
             }
         });
     }
+    if (ctx.model)
+        enqueueEmit(() => lifecycle.emit({ runId, input: { event: 'agent', data: { type: 'status', label: 'starting_model', model: ctx.model } } }));
     child.stdout?.on('data', (chunk) => {
         const text = chunk.toString('utf8');
         if (journal)
@@ -626,6 +637,9 @@ function wireAcpLifecycle(ctx) {
             if (event === 'agent') {
                 const translation = translateAgentRuntimeEvent({ rawEvent: payload });
                 if (translation.kind === 'agent') {
+                    const receipt = modelReceipt(translation.payload);
+                    if (receipt)
+                        enqueueEmit(() => lifecycle.emit({ runId, input: { event: 'agent', data: receipt } }));
                     applyAgentTranslationSideEffects({ payload: translation.payload, sessionId: translation.sessionId, sink: {
                             onSessionId: ({ sessionId }) => { capturedSessionId = sessionId; },
                             onToolCall: () => { toolCallSeen = true; },
@@ -668,6 +682,7 @@ function wireAcpLifecycle(ctx) {
  * multi-turn tool continuation, resumable session ids, etc.).
  */
 function wirePiRpcLifecycle(ctx) {
+    const modelReceipt = createModelReceiptTracker(ctx.model, ctx.modelCatalog?.models);
     const { runId, agentId, child, lifecycle, journal, classifyFailure } = ctx;
     let cancelRequested = false;
     let emitQueue = Promise.resolve();
@@ -687,6 +702,8 @@ function wirePiRpcLifecycle(ctx) {
             }
         });
     }
+    if (ctx.model)
+        enqueueEmit(() => lifecycle.emit({ runId, input: { event: 'agent', data: { type: 'status', label: 'starting_model', model: ctx.model } } }));
     child.stdout?.on('data', (chunk) => {
         const text = chunk.toString('utf8');
         if (journal)
@@ -729,6 +746,9 @@ function wirePiRpcLifecycle(ctx) {
     session = ctx.attachPiRpcSession({ child: ctx.child, prompt: ctx.prompt, send({ payload }) {
             const translation = translateAgentRuntimeEvent({ rawEvent: payload });
             if (translation.kind === 'agent') {
+                const receipt = modelReceipt(translation.payload);
+                if (receipt)
+                    enqueueEmit(() => lifecycle.emit({ runId, input: { event: 'agent', data: receipt } }));
                 if (translation.sessionId !== undefined)
                     capturedSessionId = translation.sessionId;
                 if (translation.payload.type === 'tool_use') {
@@ -769,7 +789,7 @@ export function writePromptToStdin(def, child, prompt, handle) {
     if (!stdin)
         return;
     if (def.promptInputFormat === 'stream-json') {
-        const line = JSON.stringify({ type: 'user', message: { role: 'user', content: [{ type: 'text', text: prompt }] } });
+        const line = JSON.stringify({ type: 'user', message: { role: 'user', content: messageContentWithImages({ prompt, images: handle.imageContents ?? [] }, {}) } });
         stdin.write(`${line}\n`, 'utf8');
         handle.recordSentBytes(prompt);
         return;
@@ -789,6 +809,7 @@ export async function runAcpDispatch({ input, deps }) {
             prompt: input.prompt,
             cwd: input.cwd,
             model: input.model,
+            ...(input.modelCatalog ? { modelCatalog: input.modelCatalog } : {}),
             imagePaths: input.imagePaths,
             envFormat: input.envFormat,
             // Mechanism 2 of 5 — see `WireAcpLifecycleContext.mcpServers`. `undefined` for any def that
@@ -825,6 +846,7 @@ export async function runPiRpcDispatch({ input, deps }) {
             prompt: input.prompt,
             cwd: input.cwd,
             model: input.model,
+            ...(input.modelCatalog ? { modelCatalog: input.modelCatalog } : {}),
             imagePaths: input.imagePaths,
             uploadRoot: input.uploadRoot,
             attachPiRpcSession: deps.attachPiRpcSession,

package/dist/agent-executor/handoff.d.ts

@@ -1,4 +1,4 @@
-import { type RuntimeAgentDef, type RuntimeLockHold } from '@jini-ai/agent-runtime';
+import type { RuntimeAgentDef, RuntimeLockHold } from '@jini-ai/agent-runtime';
 /**
  * Phase 7: acquires a `runtimeLock` def's process-global mutex before `buildArgs` runs — see
  * `RuntimeLock`'s own doc for the concrete race. A no-op (`undefined`) for the 23 of 24 defs with no

package/dist/agent-executor/handoff.js

@@ -1,4 +1,3 @@
-import {} from '@jini-ai/agent-runtime';
 /**
  * Phase 7: acquires a `runtimeLock` def's process-global mutex before `buildArgs` runs — see
  * `RuntimeLock`'s own doc for the concrete race. A no-op (`undefined`) for the 23 of 24 defs with no

package/dist/agent-executor/launch.d.ts

@@ -370,6 +370,6 @@ export declare function confirmChildSpawned({ input, deps }: {
  * @complexity `run()`'s own setup is O(1); steady-state cost is the chosen stream parser's.
  * @overallScore 100/100
  */
-export declare function createAgentExecutor(requiredArgs: Pick<CreateAgentExecutorOptions, "lifecycle">, optionalArgs?: Pick<CreateAgentExecutorOptions, "getAgentDef" | "resolveAgentLaunch" | "ensureAgentCapabilities" | "applyAgentLaunchEnv" | "createCommandInvocation" | "spawn" | "attachAcpSession" | "acpPermissionHandler" | "attachPiRpcSession" | "preparePromptFileForAgent" | "prepareAgentLogFile" | "listProcessSnapshots" | "collectProcessTreePids" | "stopProcesses" | "onCleanupFailure" | "journal" | "continuation" | "classifyFailure" | "mcpJsonInjection" | "claudeConfigDirIsolation" | "claudeConfigDirIsolationEnabled" | "bufferedStdoutMaxBytes" | "promptAugmenter">): AgentExecutor;
+export declare function createAgentExecutor(requiredArgs: Pick<CreateAgentExecutorOptions, "lifecycle">, optionalArgs?: Pick<CreateAgentExecutorOptions, "getAgentDef" | "resolveAgentLaunch" | "resolveModelForLaunch" | "ensureAgentCapabilities" | "applyAgentLaunchEnv" | "createCommandInvocation" | "spawn" | "attachAcpSession" | "acpPermissionHandler" | "attachPiRpcSession" | "preparePromptFileForAgent" | "prepareAgentLogFile" | "listProcessSnapshots" | "collectProcessTreePids" | "stopProcesses" | "onCleanupFailure" | "journal" | "continuation" | "classifyFailure" | "mcpJsonInjection" | "claudeConfigDirIsolation" | "claudeConfigDirIsolationEnabled" | "bufferedStdoutMaxBytes" | "promptAugmenter">): AgentExecutor;
 export {};
 //# sourceMappingURL=launch.d.ts.map

package/dist/agent-executor/launch.js

@@ -2,7 +2,7 @@ import { spawn as nodeSpawn, } from 'node:child_process';
 import { promises as fsPromises, } from 'node:fs';
 import { tmpdir, } from 'node:os';
 import { join, } from 'node:path';
-import { agentCapabilities, applyAgentLaunchEnv, ensureAgentCapabilities, getAgentDef, resolveAgentLaunch, attachAcpSession, attachPiRpcSession, checkPromptArgvBudget, checkWindowsCmdShimCommandLineBudget, checkWindowsDirectExeCommandLineBudget, prepareAgentLogFile, preparePromptFileForAgent, } from '@jini-ai/agent-runtime';
+import { agentCapabilities, applyAgentLaunchEnv, ensureAgentCapabilities, resolveModelForLaunch, getAgentDef, resolveAgentLaunch, attachAcpSession, attachPiRpcSession, checkPromptArgvBudget, checkWindowsCmdShimCommandLineBudget, checkWindowsDirectExeCommandLineBudget, prepareAgentLogFile, preparePromptFileForAgent, } from '@jini-ai/agent-runtime';
 import { collectProcessTreePids, createCommandInvocation, listProcessSnapshots, stopProcesses, } from '@jini-ai/platform';
 import { applyImagePromptDelivery, } from '../image-prompt-delivery.js';
 import { SUPPORTED_STREAM_FORMATS, AgentExecutorError, } from './contracts.js';
@@ -706,6 +706,23 @@ export function createAgentExecutor(requiredArgs, optionalArgs = {}) {
         const resolvedEnv = { ...(def.env ?? {}), ...resolveRunEnv({ input: input, hostEnv: process.env }) };
         const launch = await resolveLaunch({ input: { runId: input.runId, def, resolvedEnv }, deps: { resolveAgentLaunch: resolveAgentLaunchFn, failBeforeSpawn } });
         const spawnEnv = applyAgentLaunchEnvFn({ env: { ...resolvedEnv }, launch });
+        // Resolve from the launch environment before staging or sending any prompt. Pin the same
+        // concrete ID that the picker displays; an opaque native route cannot silently start a run.
+        let modelCatalog;
+        try {
+            const selection = await (options.resolveModelForLaunch ?? resolveModelForLaunch)({ def, context: {
+                    executable: launch.launchPath, cwd: input.cwd, env: spawnEnv,
+                    ...(input.model && input.model !== 'default' ? { model: input.model } : {}),
+                    ...(input.resumeSessionId ? { resumeSessionId: input.resumeSessionId } : {}),
+                    ...(input.settingSources ? { settingSources: input.settingSources } : {}),
+                    ...(input.settings ? { settings: input.settings } : {}),
+                } });
+            input.model = selection.model;
+            modelCatalog = selection.catalog;
+        }
+        catch {
+            return failBeforeSpawn({ runId: input.runId, code: 'AGENT_MODEL_UNRESOLVED', message: 'AgentExecutor: pick a concrete model; the starting model could not be resolved for this launch.' });
+        }
         // Fill the def's `--help` capability gate before `buildArgs` reads it. Without this, only a
         // host that happened to call `detectAgents` in THIS process ever had the gate filled, so e.g.
         // `claude` never got `--include-partial-messages` (no streamed text). Probes once per binary;
@@ -898,6 +915,8 @@ export function createAgentExecutor(requiredArgs, optionalArgs = {}) {
         const formatForStdin = { streamFormat };
         const stdinHandle = isStdinDrivenFormat(formatForStdin)
             ? wireChildLifecycle({
+                startingModel: input.model,
+                modelCatalog,
                 runId: input.runId,
                 def,
                 streamFormat: formatForStdin.streamFormat,
@@ -937,6 +956,7 @@ export function createAgentExecutor(requiredArgs, optionalArgs = {}) {
                     prompt: `${overlayDelivery.promptPrefix}${input.prompt}`,
                     cwd: input.cwd,
                     model: input.model,
+                    modelCatalog,
                     imagePaths: input.imagePaths ?? [],
                     envFormat: def.acpMcpEnvFormat,
                     mcpBridge,
@@ -967,6 +987,7 @@ export function createAgentExecutor(requiredArgs, optionalArgs = {}) {
                     prompt: `${overlayDelivery.promptPrefix}${input.prompt}`,
                     cwd: input.cwd,
                     model: input.model,
+                    modelCatalog,
                     imagePaths: input.imagePaths ?? [],
                     uploadRoot: input.uploadRoot,
                 }, deps: {
@@ -994,6 +1015,8 @@ export function createAgentExecutor(requiredArgs, optionalArgs = {}) {
         // fallback strategy, so their prefix is genuinely non-empty; what makes stdin the wrong
         // channel for them is the def's declared transport, not the strategy.
         const stdinPrompt = def.promptViaStdin === true ? overlayDelivery.prompt : imageDelivery.prompt;
+        if (input.imageContents !== undefined)
+            stdinHandle.imageContents = input.imageContents;
         writePromptToStdin(def, child, stdinPrompt, stdinHandle);
     }
     return { run };

package/dist/agent-executor/mcp-bridge.d.ts

@@ -1,5 +1,5 @@
-import { type AcpMcpServerInput, type RuntimeAgentDef } from '@jini-ai/agent-runtime';
-import { type McpJsonInjectionOptions, type McpJsonServerEntry, type McpBridgeDelivery, type PreparedCodexHome, type PreparedClaudeConfigDir, type ClaudeConfigDirIsolationOptions, type FailBeforeSpawn } from './contracts.js';
+import type { AcpMcpServerInput, RuntimeAgentDef } from '@jini-ai/agent-runtime';
+import type { McpJsonInjectionOptions, McpJsonServerEntry, McpBridgeDelivery, PreparedCodexHome, PreparedClaudeConfigDir, ClaudeConfigDirIsolationOptions, FailBeforeSpawn } from './contracts.js';
 /** The run-error code a run gets when its CLI reports the injected `jini` bridge as anything but connected. */
 export declare const MCP_BRIDGE_UNAVAILABLE = "MCP_BRIDGE_UNAVAILABLE";
 /**

package/dist/agent-executor/mcp-bridge.js

@@ -1,9 +1,7 @@
 import { promises as fsPromises, } from 'node:fs';
 import { homedir, tmpdir, } from 'node:os';
 import { join, } from 'node:path';
-import {} from '@jini-ai/agent-runtime';
 import { isRecord, errorMessage, } from './values.js';
-import {} from './contracts.js';
 const JINI_MCP_SERVER_KEY = 'jini';
 /** The run-error code a run gets when its CLI reports the injected `jini` bridge as anything but connected. */
 export const MCP_BRIDGE_UNAVAILABLE = 'MCP_BRIDGE_UNAVAILABLE';

package/dist/agent-executor/model-receipts.d.ts

@@ -0,0 +1,6 @@
+import type { RunAgentPayload } from '@jini-ai/protocol';
+import { type DiscoveredModel } from '@jini-ai/agent-runtime';
+/** Status metadata comes from CLI/RPC frames, never generated text. Dedupe repeats and record
+ * each observed transition separately so durable run events can describe model switches. */
+export declare function createModelReceiptTracker(startingModel?: string, models?: readonly DiscoveredModel[]): (payload: RunAgentPayload) => RunAgentPayload | null;
+//# sourceMappingURL=model-receipts.d.ts.map

package/dist/agent-executor/model-receipts.js

@@ -0,0 +1,26 @@
+import { modelIdentityKind } from '@jini-ai/agent-runtime';
+/** Status metadata comes from CLI/RPC frames, never generated text. Dedupe repeats and record
+ * each observed transition separately so durable run events can describe model switches. */
+export function createModelReceiptTracker(startingModel, models = []) {
+    // The catalog is launch-scoped evidence. Normalize both the pinned and reported names
+    // so a CLI's alias/display spelling does not fabricate a durable model transition.
+    const normalize = (id) => {
+        const row = models.find(model => model.id === id) || models.find(model => model.label === id);
+        return row?.resolvedId || row?.id || id;
+    };
+    let current = startingModel && normalize(startingModel);
+    return (payload) => {
+        if (payload.type !== 'status' || !payload.model || typeof payload.model !== 'string')
+            return null;
+        const observed = normalize(payload.model);
+        if (modelIdentityKind(observed) !== 'concrete')
+            return null;
+        if (observed === current)
+            return null;
+        const prior = current;
+        current = observed;
+        return { type: 'status', label: prior ? 'model_switch' : 'observed_model', model: current,
+            ...(prior ? { previousModel: prior, detail: `Previous model: ${prior}` } : {}) };
+    };
+}
+//# sourceMappingURL=model-receipts.js.map