@borgee/agents-host 0.2.33 → 0.2.44

package/dist/providers/claude/cli-client.js

@@ -6,7 +6,18 @@ import { assertClaudeCommandCompatibility, DEFAULT_CLAUDE_COMMAND, isLegacyClaud
 import { PROTOCOL_VERSION, client, methods, ndJsonStream, } from '@agentclientprotocol/sdk';
 import { HostLogger, summarizeChildStderr, summarizeError } from '../../debug.js';
 import { resolveCopilotPermissionResponse } from '../../policy/copilot-permission.js';
+import { buildSkillManualLines } from '../../context/skill-manual.js';
+import { IDLE_BACKEND_SHUTDOWN_DISABLED_MS, IdleBackendShutdownScheduler, } from '../idle-backend-shutdown.js';
 const SESSION_TAINTED_ERRORS = new WeakSet();
+const IDLE_BACKEND_STOPPED_MESSAGE = 'Claude ACP backend stopped after idle timeout';
+/**
+ * A fatal teardown has callers waiting on it, so it force-kills quickly. An
+ * idle recycle has nobody waiting, and the CLIs unlink their on-disk session
+ * locks during SIGTERM cleanup — a lock left behind by SIGKILL makes the next
+ * restore believe the session is still in use (github/copilot-cli#3255). So the
+ * idle path trades latency nobody observes for a clean exit.
+ */
+const DEFAULT_IDLE_SHUTDOWN_GRACE_PERIOD_MS = 5_000;
 const DEFAULT_SHUTDOWN_GRACE_PERIOD_MS = 250;
 const DEFAULT_SHUTDOWN_FORCE_KILL_WAIT_MS = 250;
 const DEFAULT_SESSION_CAPABILITIES = {
@@ -20,7 +31,10 @@ const DEFAULT_RUNTIME = {
     ndJsonStream,
     methods,
     protocolVersion: PROTOCOL_VERSION,
+    fetch,
     cwd: process.cwd(),
+    idleBackendShutdownMs: IDLE_BACKEND_SHUTDOWN_DISABLED_MS,
+    idleShutdownGracePeriodMs: DEFAULT_IDLE_SHUTDOWN_GRACE_PERIOD_MS,
     shutdownGracePeriodMs: DEFAULT_SHUTDOWN_GRACE_PERIOD_MS,
     shutdownForceKillWaitMs: DEFAULT_SHUTDOWN_FORCE_KILL_WAIT_MS,
 };
@@ -30,6 +44,25 @@ function hasVisibleText(value) {
 function normalizeError(error) {
     return error instanceof Error ? error : new Error(String(error));
 }
+function isAbsoluteHttpUrl(value) {
+    return value.startsWith('http://') || value.startsWith('https://');
+}
+function resolveHostedAttachmentUrl(rawUrl, borgeeBaseUrl) {
+    if (isAbsoluteHttpUrl(rawUrl)) {
+        return rawUrl;
+    }
+    const base = borgeeBaseUrl.replace(/\/$/, '');
+    const path = rawUrl.startsWith('/') ? rawUrl : `/${rawUrl}`;
+    return `${base}${path}`;
+}
+function isSameOrigin(left, right) {
+    try {
+        return new URL(left).origin === new URL(right).origin;
+    }
+    catch {
+        return false;
+    }
+}
 function parsePersistedSessionRecord(rawValue) {
     const trimmed = rawValue.trim();
     if (trimmed.startsWith('{')) {
@@ -156,7 +189,7 @@ class ClaudeProgressCollector {
         this.onProgress({ text });
     }
 }
-function createDeferredTurn(channelId, prompt, sessionPersistence, promptContext, options) {
+function createDeferredTurn(channelId, preparedTurn, sessionPersistence, options) {
     let settled = false;
     let resolvePromise;
     let rejectPromise;
@@ -166,9 +199,8 @@ function createDeferredTurn(channelId, prompt, sessionPersistence, promptContext
     });
     return {
         channelId,
-        prompt,
+        preparedTurn,
         sessionPersistence,
-        promptContext,
         options,
         promise,
         resolve(value) {
@@ -192,6 +224,9 @@ function resolveSessionRouting(turn) {
         persistence: turn.providerSessionRouting?.persistence ?? 'persistent',
     };
 }
+function asImagePart(part) {
+    return part.type === 'image' ? part : null;
+}
 function asObject(value) {
     return typeof value === 'object' && value !== null ? value : null;
 }
@@ -255,25 +290,18 @@ function resolveClaudeLaunch(command, args, baseCwd) {
         args: args.map((arg) => (isRelativePathLike(arg) ? resolve(baseCwd, arg) : arg)),
     };
 }
-function buildClaudeSessionSystemPrompt(promptContext) {
+export function buildClaudeSessionSystemPrompt(promptContext) {
     if (!promptContext) {
         return undefined;
     }
     const lines = [];
-    if (promptContext.channelContextPayloadPath) {
-        lines.push('Channel-scoped local context is available for this session.');
-        lines.push(`Channel context payload: ${promptContext.channelContextPayloadPath}`);
+    // Every command the CLI carries needs the gateway credential file, so the session names it only
+    // when one exists; otherwise the model is handed an invocation template it cannot fill.
+    if (promptContext.skillRuntime && promptContext.gatewayCredentialPath) {
+        lines.push(...buildSkillManualLines(promptContext.skillRuntime));
     }
-    if (promptContext.skillRuntime) {
-        lines.push(`Skill guide: ${promptContext.skillRuntime.skillMarkdownPath}`);
-        lines.push(`Node bootstrap CLI: node ${promptContext.skillRuntime.nodeCliPath} --context ${promptContext.channelContextPayloadPath} --print-bootstrap`);
-        lines.push(`Python bootstrap CLI: python3 ${promptContext.skillRuntime.pythonCliPath} --context ${promptContext.channelContextPayloadPath} --print-bootstrap`);
-    }
-    if (promptContext.localhostGateway && promptContext.gatewayAuthPath) {
-        lines.push(`Gateway auth sidecar for this session: ${promptContext.gatewayAuthPath}`);
-        if (promptContext.localhostGateway.baseUrl) {
-            lines.push(`Loopback gateway base URL: ${promptContext.localhostGateway.baseUrl}`);
-        }
+    if (promptContext.localhostGateway && promptContext.gatewayCredentialPath) {
+        lines.push(`Gateway credential file for this session: ${promptContext.gatewayCredentialPath}`);
     }
     if (promptContext.taskWorkspace) {
         lines.push(`Task-scoped writable workspace root: ${promptContext.taskWorkspace.rootPath}.`);
@@ -300,20 +328,32 @@ function resolveSessionAdditionalDirectories(promptContext) {
     if (promptContext?.channelContextPayloadPath) {
         directories.add(dirname(promptContext.channelContextPayloadPath));
     }
-    if (promptContext?.gatewayAuthPath) {
-        directories.add(dirname(promptContext.gatewayAuthPath));
+    if (promptContext?.gatewayCredentialPath) {
+        directories.add(dirname(promptContext.gatewayCredentialPath));
     }
     if (promptContext?.skillRuntime?.skillDirectoryPath) {
         directories.add(promptContext.skillRuntime.skillDirectoryPath);
     }
     return directories.size > 0 ? [...directories].sort((left, right) => left.localeCompare(right)) : undefined;
 }
+/**
+ * A session carries its scope from `session/new`: the directories it may read, plus the append that
+ * names the CLI manual and this channel's gateway credential file. The credential file sits in the
+ * channel context directory the payload already contributes, so its absence is invisible in the
+ * directory set alone — without the path itself in the key, a session opened while the credential
+ * write failed keeps an append that never names the CLI for as long as the session lives.
+ */
 function resolveSessionVisibilityKey(promptContext) {
     const additionalDirectories = resolveSessionAdditionalDirectories(promptContext);
     if (!additionalDirectories) {
         return undefined;
     }
-    return JSON.stringify({ additionalDirectories });
+    return JSON.stringify({
+        additionalDirectories,
+        ...(promptContext?.gatewayCredentialPath
+            ? { gatewayCredentialPath: promptContext.gatewayCredentialPath }
+            : {}),
+    });
 }
 function buildSessionRequest(cwd, promptContext, additionalDirectories) {
     const meta = buildClaudeSessionMeta(promptContext);
@@ -357,8 +397,17 @@ export class ClaudeCliClient {
     sessionStore;
     resolveSessionStoreAgentId;
     logger;
+    imageInputConfig;
     runtime;
     channels = new Map();
+    /**
+     * The provider session currently bound to channelId, or undefined before a
+     * turn has opened one. Surfaced so agents-host can record which session
+     * worked a task without the agent being asked to report its own id.
+     */
+    sessionIdForChannel(channelId) {
+        return this.channels.get(channelId)?.session?.sessionId;
+    }
     persistedSessions = new Map();
     closingSessions = new WeakSet();
     pendingSessionStarts = new Set();
@@ -371,7 +420,13 @@ export class ClaudeCliClient {
     startPromise;
     shutdownPromise;
     childExitPromise;
-    resolveChildExit;
+    /**
+     * Bumped on every spawn so the `exit` / `connection.closed` handlers of a
+     * backend we deliberately recycled stay silent instead of latching a fatal
+     * error onto the client that already owns its successor.
+     */
+    backendGeneration = 0;
+    idleShutdownPromise;
     fatalError = null;
     disposing = false;
     backendClosed = false;
@@ -379,15 +434,27 @@ export class ClaudeCliClient {
     sessionStoreLoadPromise = null;
     sessionStoreWriteQueue = Promise.resolve();
     sessionCapabilities = DEFAULT_SESSION_CAPABILITIES;
+    idleBackendShutdown;
     childStderr = '';
-    constructor(command, args = [], runtimeOverrides = {}, sessionStore, resolveSessionStoreAgentId = () => undefined, logger = new HostLogger()) {
+    constructor(command, args = [], runtimeOverrides = {}, sessionStore, resolveSessionStoreAgentId = () => undefined, logger = new HostLogger(), imageInputConfig = {}) {
         this.command = command;
         this.args = args;
         this.sessionStore = sessionStore;
         this.resolveSessionStoreAgentId = resolveSessionStoreAgentId;
         this.logger = logger;
+        this.imageInputConfig = imageInputConfig;
         this.runtime = { ...DEFAULT_RUNTIME, ...runtimeOverrides };
         assertClaudeCommandCompatibility(command, args, 'Claude provider runtime');
+        this.idleBackendShutdown = new IdleBackendShutdownScheduler({
+            idleShutdownMs: this.runtime.idleBackendShutdownMs,
+            isIdle: () => this.isBackendIdle(),
+            shutdown: () => this.shutdownIdleBackend(),
+            onShutdownFailed: (error) => {
+                this.logger.error('failed to stop the idle Claude ACP backend', {
+                    error: summarizeError(error),
+                });
+            },
+        });
         this.fatalPromise = new Promise((_, reject) => {
             this.rejectFatalPromise = reject;
         });
@@ -397,18 +464,26 @@ export class ClaudeCliClient {
         if (this.fatalError) {
             throw this.fatalError;
         }
-        const preparedTurn = typeof channelIdOrTurn === 'string'
+        const preparedTurnBase = typeof channelIdOrTurn === 'string'
             ? {
                 channelId: channelIdOrTurn,
+                incomingContent: '',
+                incomingParts: [],
                 prompt: typeof promptOrOptions === 'string' ? promptOrOptions : '',
             }
             : channelIdOrTurn;
+        const preparedTurn = {
+            ...preparedTurnBase,
+            incomingContent: preparedTurnBase.incomingContent ?? '',
+            incomingParts: preparedTurnBase.incomingParts ?? [],
+        };
         const options = typeof channelIdOrTurn === 'string'
             ? maybeOptions
             : promptOrOptions;
         const sessionRouting = resolveSessionRouting(preparedTurn);
         const state = this.getOrCreateChannelState(sessionRouting.key, preparedTurn.channelId, sessionRouting.persistence);
-        const turn = createDeferredTurn(preparedTurn.channelId, preparedTurn.prompt, sessionRouting.persistence, preparedTurn.promptContext, options);
+        this.idleBackendShutdown.cancel();
+        const turn = createDeferredTurn(preparedTurn.channelId, preparedTurn, sessionRouting.persistence, options);
         state.queue.push(turn);
         this.processChannelQueue(sessionRouting.key, state);
         return turn.promise;
@@ -416,12 +491,17 @@ export class ClaudeCliClient {
     async dispose() {
         const error = new Error('Claude ACP backend stopped');
         this.disposing = true;
+        this.idleBackendShutdown.cancel();
         this.logger?.debug('stopping Claude ACP backend');
         const closed = this.connection?.closed ?? Promise.resolve();
         this.failAll(error);
         let thrown;
         try {
-            await Promise.all([closed, this.shutdownPromise ?? Promise.resolve()]);
+            await Promise.all([
+                closed,
+                this.idleShutdownPromise ?? Promise.resolve(),
+                this.shutdownPromise ?? Promise.resolve(),
+            ]);
         }
         catch (disposeError) {
             thrown = disposeError;
@@ -442,6 +522,12 @@ export class ClaudeCliClient {
         if (this.fatalError) {
             throw this.fatalError;
         }
+        if (this.idleShutdownPromise) {
+            await this.idleShutdownPromise;
+            if (this.fatalError) {
+                throw this.fatalError;
+            }
+        }
         if (!this.startPromise) {
             this.startPromise = this.startBackend();
         }
@@ -454,6 +540,8 @@ export class ClaudeCliClient {
         }
     }
     async startBackend() {
+        const generation = ++this.backendGeneration;
+        const ownsCurrentBackend = () => (this.backendGeneration === generation && !this.disposing);
         const launch = resolveClaudeLaunch(this.command, this.args, this.runtime.cwd);
         this.childStderr = '';
         this.logger?.debug('starting Claude ACP process', {
@@ -473,13 +561,20 @@ export class ClaudeCliClient {
         });
         child.stderr.resume();
         this.logger?.debug('spawned Claude ACP process', { pid: child.pid });
+        let resolveChildExit;
+        this.childExitPromise = new Promise((resolve) => {
+            resolveChildExit = resolve;
+        });
         child.once('error', (error) => {
             this.logger?.debugError('Claude ACP process error', error);
+            if (!ownsCurrentBackend()) {
+                return;
+            }
             this.failAll(new Error(`Claude ACP process error: ${normalizeError(error).message}`));
         });
         child.once('exit', (code, signal) => {
-            this.resolveChildExit?.();
-            if (this.disposing) {
+            resolveChildExit();
+            if (!ownsCurrentBackend()) {
                 this.logger?.debug('Claude ACP process exited during shutdown', { code, signal });
                 return;
             }
@@ -493,9 +588,6 @@ export class ClaudeCliClient {
             });
             this.failAll(failure);
         });
-        this.childExitPromise = new Promise((resolveChildExit) => {
-            this.resolveChildExit = resolveChildExit;
-        });
         const output = Writable.toWeb(child.stdin);
         const input = Readable.toWeb(child.stdout);
         const stream = this.runtime.ndJsonStream(output, input);
@@ -505,7 +597,7 @@ export class ClaudeCliClient {
         const connection = app.connect(stream);
         this.connection = connection;
         void connection.closed.then(() => {
-            if (!this.disposing) {
+            if (ownsCurrentBackend()) {
                 this.logger?.debugError('Claude ACP connection closed unexpectedly');
                 this.failAll(new Error('Claude ACP connection closed unexpectedly'));
             }
@@ -563,14 +655,15 @@ export class ClaudeCliClient {
                     }
                     state.activeTurn = turn;
                     try {
-                        state.cwd = this.resolveSessionCwd(turn.promptContext);
-                        state.visibilityKey = resolveSessionVisibilityKey(turn.promptContext);
+                        state.cwd = this.resolveSessionCwd(turn.preparedTurn.promptContext);
+                        state.visibilityKey = resolveSessionVisibilityKey(turn.preparedTurn.promptContext);
                         await this.ensureStarted();
                         await this.recycleSessionIfScopeChanged(channelId, state);
-                        const session = await this.getOrCreateSession(channelId, state, turn.promptContext);
+                        const session = await this.getOrCreateSession(channelId, state, turn.preparedTurn.promptContext);
                         let reply;
                         try {
-                            reply = await this.runTurn(session, turn.prompt, turn.options);
+                            const promptInput = await this.buildPromptInput(turn.preparedTurn);
+                            reply = await this.runTurn(session, promptInput, turn.options);
                         }
                         catch (error) {
                             if (isSessionTainted(error)) {
@@ -604,6 +697,9 @@ export class ClaudeCliClient {
                 if (state.queue.length > 0 && !this.fatalError) {
                     this.processChannelQueue(channelId, state);
                 }
+                else {
+                    this.idleBackendShutdown.reconcile();
+                }
             }
         })();
     }
@@ -807,6 +903,7 @@ export class ClaudeCliClient {
         }
         this.fatalError = error;
         this.rejectFatalPromise(error);
+        this.idleBackendShutdown.cancel();
         for (const [channelId, state] of this.channels.entries()) {
             state.activeTurn?.reject(error);
             for (const turn of state.queue) {
@@ -1020,6 +1117,64 @@ export class ClaudeCliClient {
             return;
         }
         this.backendClosed = true;
+        await this.closeBackendProcess(error, this.runtime.shutdownGracePeriodMs);
+    }
+    /**
+     * Backend teardown without the fatal latch: the client stays usable and
+     * `ensureStarted()` spawns a replacement process on the next turn. Only safe
+     * while `isBackendIdle()` holds, because every channel's live ACP session is
+     * dropped here and no turn is ever replayed onto its successor.
+     */
+    async shutdownIdleBackend() {
+        // Detach the running backend before any signal reaches it, so its own exit
+        // and connection-closed handlers read this teardown as deliberate instead
+        // of latching a fatal error on a client that stays usable.
+        this.backendGeneration += 1;
+        const error = new Error(IDLE_BACKEND_STOPPED_MESSAGE);
+        const sessions = [];
+        for (const [channelId, state] of [...this.channels.entries()]) {
+            if (state.session) {
+                sessions.push(state.session);
+            }
+            state.session = undefined;
+            state.sessionCwd = undefined;
+            state.sessionVisibilityKey = undefined;
+            this.channels.delete(channelId);
+        }
+        this.logger?.debug('stopping idle Claude ACP backend', {
+            channels: sessions.length,
+            idleShutdownMs: this.runtime.idleBackendShutdownMs,
+        });
+        for (const session of sessions) {
+            this.closeSession(session);
+        }
+        const idleShutdownPromise = this.closeBackendProcess(error, this.runtime.idleShutdownGracePeriodMs).finally(() => {
+            this.startPromise = undefined;
+            this.childExitPromise = undefined;
+            this.sessionCapabilities = DEFAULT_SESSION_CAPABILITIES;
+            this.idleShutdownPromise = undefined;
+        });
+        this.idleShutdownPromise = idleShutdownPromise;
+        await idleShutdownPromise;
+    }
+    isBackendIdle() {
+        if (this.disposing || this.fatalError || this.backendClosed || this.idleShutdownPromise) {
+            return false;
+        }
+        if (!this.child) {
+            return false;
+        }
+        if (this.pendingSessionStarts.size > 0) {
+            return false;
+        }
+        for (const state of this.channels.values()) {
+            if (state.activeTurn || state.queue.length > 0 || state.sessionPromise || state.processing) {
+                return false;
+            }
+        }
+        return true;
+    }
+    async closeBackendProcess(error, gracePeriodMs) {
         const connection = this.connection;
         const child = this.child;
         await this.waitForPendingSessionStarts();
@@ -1031,9 +1186,9 @@ export class ClaudeCliClient {
             return;
         }
         const childExitPromise = this.childExitPromise ?? Promise.resolve();
-        this.logger?.debug('sending SIGTERM to Claude ACP process');
+        this.logger?.debug('sending SIGTERM to Claude ACP process', { gracePeriodMs });
         child.kill('SIGTERM');
-        const exitedAfterTerm = await this.waitForChildExit(childExitPromise, this.runtime.shutdownGracePeriodMs);
+        const exitedAfterTerm = await this.waitForChildExit(childExitPromise, gracePeriodMs);
         if (exitedAfterTerm) {
             this.logger?.debug('Claude ACP process exited after SIGTERM');
             this.child = undefined;
@@ -1082,4 +1237,37 @@ export class ClaudeCliClient {
             }
         }
     }
+    async buildPromptInput(turn) {
+        const imageParts = turn.incomingParts.map(asImagePart).filter((part) => part !== null);
+        if (imageParts.length === 0) {
+            return turn.prompt;
+        }
+        const imageBlocks = await Promise.all(imageParts.map(async (part) => this.fetchImageBlock(part.attachment.url, part.attachment.contentType)));
+        return [
+            { type: 'text', text: turn.prompt },
+            ...imageBlocks,
+        ];
+    }
+    async fetchImageBlock(rawUrl, contentType) {
+        const baseUrl = this.imageInputConfig.borgeeBaseUrl?.trim();
+        const agentApiKey = this.imageInputConfig.agentApiKey?.trim();
+        if (!baseUrl || !agentApiKey) {
+            throw new Error('Claude image input requires Borgee base URL and agent API key');
+        }
+        const resolvedUrl = resolveHostedAttachmentUrl(rawUrl, baseUrl);
+        if (!isSameOrigin(resolvedUrl, baseUrl)) {
+            throw new Error(`Claude image input only supports Borgee-origin attachments: ${resolvedUrl}`);
+        }
+        const init = { headers: { Authorization: `Bearer ${agentApiKey}` } };
+        const response = await this.runtime.fetch(resolvedUrl, init);
+        if (!response.ok) {
+            throw new Error(`Claude image fetch failed with ${response.status} ${response.statusText}`.trim());
+        }
+        const blob = Buffer.from(await response.arrayBuffer()).toString('base64');
+        return {
+            type: 'image',
+            mimeType: contentType,
+            data: blob,
+        };
+    }
 }

package/dist/providers/codex/adapter.d.ts

@@ -1,10 +1,12 @@
-import type { ProviderAdapter } from '../provider-adapter.js';
+import { type ProviderAdapter } from '../provider-adapter.js';
 import type { ProviderGenerateOptions, ProviderInput, ProviderReply } from '../../types.js';
 import { ProviderTurnPreparer } from '../../context/turn-preparation.js';
 import { CodexCliClient } from './cli-client.js';
+export declare const CODEX_HOSTED_PROVIDER_CAPABILITIES: import("../provider-adapter.js").ProviderCapabilities;
 export declare class CodexProviderAdapter implements ProviderAdapter {
     private readonly cli;
     private readonly turnPreparer;
+    readonly capabilities: import("../provider-adapter.js").ProviderCapabilities;
     constructor(cli: CodexCliClient, turnPreparer: ProviderTurnPreparer);
     generateReply(input: ProviderInput, options?: ProviderGenerateOptions): Promise<ProviderReply>;
     dispose(): Promise<void>;

package/dist/providers/codex/adapter.js

@@ -1,7 +1,17 @@
+import { createHostedProviderCapabilities } from '../provider-adapter.js';
 import { createAwaitingUserProgressHandler, parseProviderReply } from '../awaiting-user.js';
+export const CODEX_HOSTED_PROVIDER_CAPABILITIES = createHostedProviderCapabilities({
+    imageInputTransport: {
+        source: 'transport-derived',
+        support: 'supported',
+        reason: 'real-media-delivered',
+        delivery: ['blob'],
+    },
+});
 export class CodexProviderAdapter {
     cli;
     turnPreparer;
+    capabilities = CODEX_HOSTED_PROVIDER_CAPABILITIES;
     constructor(cli, turnPreparer) {
         this.cli = cli;
         this.turnPreparer = turnPreparer;
@@ -11,7 +21,9 @@ export class CodexProviderAdapter {
         const text = await this.cli.generateReply(preparedTurn, {
             onProgress: createAwaitingUserProgressHandler(options?.onProgress),
         });
-        return parseProviderReply(text);
+        // Read the session AFTER the turn: a first turn on a channel opens the
+        // session as it runs, so before this point there is nothing to report.
+        return { ...parseProviderReply(text), sessionId: this.cli.sessionIdForChannel(input.channelId) };
     }
     async dispose() {
         await this.cli.dispose();

package/dist/providers/codex/cli-client.d.ts

@@ -11,6 +11,8 @@ interface CodexAcpRuntime {
     protocolVersion: typeof PROTOCOL_VERSION;
     cwd: string;
     idleSessionTtlMs: number;
+    idleBackendShutdownMs: number;
+    idleShutdownGracePeriodMs: number;
     shutdownGracePeriodMs: number;
     shutdownForceKillWaitMs: number;
     readFile(path: string, options?: {
@@ -26,6 +28,11 @@ interface CodexAcpRuntime {
         mode?: number;
     }): Promise<void>;
     unlink(path: string): Promise<void>;
+    fetch(input: string | URL, init?: RequestInit): Promise<Response>;
+}
+interface CodexHostedImageInputConfig {
+    borgeeBaseUrl?: string;
+    agentApiKey?: string;
 }
 export declare class CodexCliClient {
     private readonly command;
@@ -33,8 +40,15 @@ export declare class CodexCliClient {
     private readonly sessionStore?;
     private readonly resolveSessionStoreAgentId;
     private readonly logger;
+    private readonly imageInputConfig;
     private readonly runtime;
     private readonly channels;
+    /**
+     * The provider session currently bound to channelId, or undefined before a
+     * turn has opened one. Surfaced so agents-host can record which session
+     * worked a task without the agent being asked to report its own id.
+     */
+    sessionIdForChannel(channelId: string): string | undefined;
     private readonly persistedSessions;
     private readonly closingSessions;
     private readonly pendingSessionStarts;
@@ -47,7 +61,13 @@ export declare class CodexCliClient {
     private startPromise?;
     private shutdownPromise?;
     private childExitPromise?;
-    private resolveChildExit?;
+    /**
+     * Bumped on every spawn so the `exit` / `connection.closed` handlers of a
+     * backend we deliberately recycled stay silent instead of latching a fatal
+     * error onto the client that already owns its successor.
+     */
+    private backendGeneration;
+    private idleShutdownPromise?;
     private fatalError;
     private disposing;
     private backendClosed;
@@ -55,7 +75,8 @@ export declare class CodexCliClient {
     private sessionStoreLoadPromise;
     private sessionStoreWriteQueue;
     private sessionCapabilities;
-    constructor(command: string, args?: string[], runtimeOverrides?: Partial<CodexAcpRuntime>, sessionStore?: CodexChannelSessionStore | undefined, resolveSessionStoreAgentId?: () => string | undefined, logger?: DebugLogger);
+    private readonly idleBackendShutdown;
+    constructor(command: string, args?: string[], runtimeOverrides?: Partial<CodexAcpRuntime>, sessionStore?: CodexChannelSessionStore | undefined, resolveSessionStoreAgentId?: () => string | undefined, logger?: DebugLogger, imageInputConfig?: CodexHostedImageInputConfig);
     generateReply(turn: PreparedProviderTurnInput, options?: ProviderGenerateOptions): Promise<string>;
     generateReply(channelId: string, prompt: string, options?: ProviderGenerateOptions): Promise<string>;
     dispose(): Promise<void>;
@@ -75,9 +96,11 @@ export declare class CodexCliClient {
     private resolveProjectedContextDirectory;
     private buildProjectedPromptContext;
     private copyProjectedFile;
-    private pruneProjectedGatewayAuthFiles;
+    private pruneProjectedGatewayCredentials;
     private refreshProjectedPromptContextBestEffort;
     private rewritePromptContextPaths;
+    private buildPromptInput;
+    private fetchImageBlock;
     private runTurn;
     private raceWithFatal;
     private invalidateSession;
@@ -96,6 +119,15 @@ export declare class CodexCliClient {
     private trackSessionStoreOperation;
     private evictIdleChannel;
     private shutdownBackend;
+    /**
+     * Backend teardown without the fatal latch: the client stays usable and
+     * `ensureStarted()` spawns a replacement process on the next turn. Only safe
+     * while `isBackendIdle()` holds, because every channel's live ACP session is
+     * dropped here and no turn is ever replayed onto its successor.
+     */
+    private shutdownIdleBackend;
+    private isBackendIdle;
+    private closeBackendProcess;
     private waitForPendingSessionStarts;
     private waitForPendingSessionCloses;
     private waitForChildExit;