factory-factory 0.4.4 → 0.4.6

package/dist/src/backend/services/session/service/acp/acp-runtime-events.d.ts

@@ -1,4 +1,5 @@
 import type { RequestPermissionRequest, SessionNotification } from '@agentclientprotocol/sdk';
+import type { SubagentsChangedParams } from '../../../../../shared/acp-protocol/subagents.js';
 export type AcpSessionUpdateEvent = {
     type: 'acp_session_update';
     update: SessionNotification['update'];
@@ -8,5 +9,10 @@ export type AcpPermissionRequestEvent = {
     requestId: string;
     params: RequestPermissionRequest;
 };
-export type AcpRuntimeEvent = AcpSessionUpdateEvent | AcpPermissionRequestEvent;
+export type AcpSubagentsChangedEvent = {
+    type: 'acp_subagents_changed';
+    subagentId: string;
+    change: SubagentsChangedParams['change'];
+};
+export type AcpRuntimeEvent = AcpSessionUpdateEvent | AcpPermissionRequestEvent | AcpSubagentsChangedEvent;
 //# sourceMappingURL=acp-runtime-events.d.ts.map

package/dist/src/backend/services/session/service/acp/acp-runtime-events.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"acp-runtime-events.d.ts","sourceRoot":"","sources":["../../../../../../../src/backend/services/session/service/acp/acp-runtime-events.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,wBAAwB,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAE9F,MAAM,MAAM,qBAAqB,GAAG;IAClC,IAAI,EAAE,oBAAoB,CAAC;IAC3B,MAAM,EAAE,mBAAmB,CAAC,QAAQ,CAAC,CAAC;CACvC,CAAC;AAEF,MAAM,MAAM,yBAAyB,GAAG;IACtC,IAAI,EAAE,wBAAwB,CAAC;IAC/B,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,wBAAwB,CAAC;CAClC,CAAC;AAEF,MAAM,MAAM,eAAe,GAAG,qBAAqB,GAAG,yBAAyB,CAAC"}
+{"version":3,"file":"acp-runtime-events.d.ts","sourceRoot":"","sources":["../../../../../../../src/backend/services/session/service/acp/acp-runtime-events.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,wBAAwB,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAC9F,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,iCAAiC,CAAC;AAE9E,MAAM,MAAM,qBAAqB,GAAG;IAClC,IAAI,EAAE,oBAAoB,CAAC;IAC3B,MAAM,EAAE,mBAAmB,CAAC,QAAQ,CAAC,CAAC;CACvC,CAAC;AAEF,MAAM,MAAM,yBAAyB,GAAG;IACtC,IAAI,EAAE,wBAAwB,CAAC;IAC/B,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,wBAAwB,CAAC;CAClC,CAAC;AAEF,MAAM,MAAM,wBAAwB,GAAG;IACrC,IAAI,EAAE,uBAAuB,CAAC;IAC9B,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,sBAAsB,CAAC,QAAQ,CAAC,CAAC;CAC1C,CAAC;AAEF,MAAM,MAAM,eAAe,GACvB,qBAAqB,GACrB,yBAAyB,GACzB,wBAAwB,CAAC"}

package/dist/src/backend/services/session/service/acp/acp-runtime-manager.d.ts

@@ -1,11 +1,16 @@
 import { type ContentBlock, type SessionConfigOption } from '@agentclientprotocol/sdk';
+import { type SubagentBrowseCapability, type SubagentListParams, type SubagentListResult, type SubagentReadParams, type SubagentReadResult } from '../../../../../shared/acp-protocol/subagents.js';
 import type { AcpPermissionBridge } from './acp-permission-bridge.js';
 import { AcpProcessHandle } from './acp-process-handle.js';
 import type { AcpRuntimeEvent } from './acp-runtime-events.js';
 import type { AcpClientOptions } from './types.js';
 export declare class PromptTimeoutError extends Error {
+    readonly timeoutMs: number;
     constructor(sessionId: string, timeoutMs: number);
 }
+export declare class AcpBrowseSessionUnavailableError extends Error {
+    constructor(message: string, options?: ErrorOptions);
+}
 export type AcpRuntimeCreatedCallback = (sessionId: string, client: AcpProcessHandle, context: {
     workspaceId: string;
     workingDir: string;
@@ -20,8 +25,10 @@ export type AcpRuntimeEventHandlers = {
 };
 export declare class AcpRuntimeManager {
     private readonly sessions;
+    private readonly browseOnlySessions;
     private readonly pendingCreation;
     private readonly stoppingInProgress;
+    private readonly stopOperations;
     private readonly managedStopChildren;
     private readonly creationLocks;
     private readonly lockRefCounts;
@@ -43,17 +50,26 @@ export declare class AcpRuntimeManager {
     setOnClientCreated(callback: AcpRuntimeCreatedCallback): void;
     isStopInProgress(sessionId: string): boolean;
     getClient(sessionId: string): AcpProcessHandle | undefined;
+    getBrowseClient(sessionId: string): AcpProcessHandle | undefined;
+    isBrowseOnlySession(sessionId: string): boolean;
     getPendingClient(sessionId: string): Promise<AcpProcessHandle> | undefined;
+    getSubagentBrowseCapability(sessionId: string): SubagentBrowseCapability | null;
+    listSubagents(sessionId: string, input: Omit<SubagentListParams, 'sessionId'>): Promise<SubagentListResult>;
+    readSubagentTranscript(sessionId: string, input: Omit<SubagentReadParams, 'sessionId'>): Promise<SubagentReadResult>;
+    private requireSubagentBrowseHandle;
     getOrCreateClient(sessionId: string, options: AcpClientOptions, handlers: AcpRuntimeEventHandlers, context: {
         workspaceId: string;
         workingDir: string;
     }): Promise<AcpProcessHandle>;
+    private promoteForActiveUse;
+    private recordClientPurpose;
+    private clearBrowseOnlyPurposeIfUnused;
     private createClient;
     private cleanupFailedClientCreation;
     private abortClientCreationIfStopping;
     private createShutdownError;
     private createStopRequestedError;
-    private beginShutdown;
+    beginShutdown(): string[];
     private beginSessionStop;
     private createShutdownSignal;
     private createSessionStopSignal;
@@ -62,14 +78,17 @@ export declare class AcpRuntimeManager {
     private notifyClientCreated;
     private wireChildErrorHandler;
     private createOrResumeSession;
+    private tryLoadStoredSession;
+    private logLoadSessionFailure;
     stopClient(sessionId: string): Promise<void>;
+    private stopClientOnce;
     sendPrompt(sessionId: string, prompt: ContentBlock[], timeoutMs?: number): Promise<{
         stopReason: string;
     }>;
     private escalatePromptTimeout;
     private isCurrentPromptTimeoutHandle;
     private clearPromptInFlight;
-    cancelPrompt(sessionId: string): Promise<void>;
+    cancelPrompt(sessionId: string): Promise<boolean>;
     setConfigOption(sessionId: string, configId: string, value: string): Promise<SessionConfigOption[]>;
     setSessionMode(sessionId: string, modeId: string): Promise<SessionConfigOption[]>;
     setSessionModel(sessionId: string, modelId: string): Promise<SessionConfigOption[]>;

package/dist/src/backend/services/session/service/acp/acp-runtime-manager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"acp-runtime-manager.d.ts","sourceRoot":"","sources":["../../../../../../../src/backend/services/session/service/acp/acp-runtime-manager.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"acp-runtime-manager.d.ts","sourceRoot":"","sources":["../../../../../../../src/backend/services/session/service/acp/acp-runtime-manager.ts"],"names":[],"mappings":"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"}

package/dist/src/backend/services/session/service/acp/acp-runtime-manager.js

@@ -2,7 +2,9 @@ import { spawn } from 'node:child_process';
 import { Readable, Writable } from 'node:stream';
 import { ClientSideConnection, ndJsonStream, PROTOCOL_VERSION, } from '@agentclientprotocol/sdk';
 import pLimit from 'p-limit';
+import { z } from 'zod';
 import { createLogger, getCurrentProcessEnv } from '../../../../../backend/services/logger.service.js';
+import { SUBAGENTS_LIST_METHOD, SUBAGENTS_READ_METHOD, subagentListParamsSchema, subagentListResultSchema, subagentReadParamsSchema, subagentReadResultSchema, } from '../../../../../shared/acp-protocol/subagents.js';
 import { AcpClientHandler } from './acp-client-handler.js';
 import { AcpProcessHandle } from './acp-process-handle.js';
 import { createAcpSpawnError, hasUsableWorkingDir, resolveAcpBinary, resolveInternalCodexAcpSpawnCommand, withTimeout, } from './acp-runtime-spawn.js';
@@ -10,11 +12,27 @@ import { requireSessionConfigOptions } from './acp-session-config-options.js';
 import { createNormalizedAcpReadableStream, normalizeUnknownError } from './acp-stream-normalizer.js';
 const logger = createLogger('acp-runtime-manager');
 export class PromptTimeoutError extends Error {
+    timeoutMs;
     constructor(sessionId, timeoutMs) {
         super(`ACP prompt timed out after ${timeoutMs}ms for session ${sessionId}`);
+        this.timeoutMs = timeoutMs;
         this.name = 'PromptTimeoutError';
     }
 }
+export class AcpBrowseSessionUnavailableError extends Error {
+    constructor(message, options) {
+        super(message, options);
+        this.name = 'AcpBrowseSessionUnavailableError';
+    }
+}
+class AcpSubagentBrowseError extends Error {
+    code;
+    constructor(code, message, options) {
+        super(message, options);
+        this.code = code;
+        this.name = 'AcpSubagentBrowseError';
+    }
+}
 function resolveAutoApprovePolicy(preset) {
     if (preset === 'YOLO' || preset === 'RELAXED') {
         return 'all';
@@ -22,9 +40,20 @@ function resolveAutoApprovePolicy(preset) {
     return 'none';
 }
 const DEFAULT_ACP_STARTUP_TIMEOUT_MS = 30_000;
+function getAcpErrorMetadata(error) {
+    const code = typeof error.code === 'number' || typeof error.code === 'string' ? error.code : undefined;
+    return {
+        ...(code !== undefined ? { code } : {}),
+        ...(typeof error.data !== 'undefined' ? { data: error.data } : {}),
+    };
+}
 function getAcpErrorLogDetails(error) {
     if (error instanceof Error) {
-        return { message: error.message };
+        const maybe = error;
+        return {
+            message: error.message,
+            ...getAcpErrorMetadata(maybe),
+        };
     }
     if (typeof error === 'object' && error !== null) {
         const maybe = error;
@@ -38,11 +67,9 @@ function getAcpErrorLogDetails(error) {
                     return String(error);
                 }
             })();
-        const code = typeof maybe.code === 'number' || typeof maybe.code === 'string' ? maybe.code : undefined;
         return {
             message,
-            ...(code !== undefined ? { code } : {}),
-            ...(typeof maybe.data !== 'undefined' ? { data: maybe.data } : {}),
+            ...getAcpErrorMetadata(maybe),
         };
     }
     return { message: String(error) };
@@ -51,6 +78,48 @@ function isMethodNotFoundError(error) {
     const details = getAcpErrorLogDetails(error);
     return details.code === -32_601 || details.message.includes('Method not found');
 }
+function subagentBrowseMessage(operation, kind) {
+    const subject = operation === 'list' ? 'Sub-agent list' : 'Sub-agent transcript';
+    if (kind === 'invalid') {
+        return `Invalid ${subject.toLowerCase()} request.`;
+    }
+    if (kind === 'not_found') {
+        return `${subject} not found for this session.`;
+    }
+    if (kind === 'protocol') {
+        return `${subject} is unavailable because the provider returned an invalid response.`;
+    }
+    return `${subject} request failed.`;
+}
+function normalizeSubagentBrowseError(error, operation) {
+    if (error instanceof AcpSubagentBrowseError) {
+        return error;
+    }
+    if (error instanceof z.ZodError) {
+        return new AcpSubagentBrowseError('PRECONDITION_FAILED', subagentBrowseMessage(operation, 'protocol'), { cause: error });
+    }
+    const details = getAcpErrorLogDetails(error);
+    if (details.code === -32_602) {
+        return new AcpSubagentBrowseError('INVALID_INPUT', subagentBrowseMessage(operation, 'invalid'), { cause: error });
+    }
+    if (details.code === -32_002) {
+        return new AcpSubagentBrowseError('NOT_FOUND', subagentBrowseMessage(operation, 'not_found'), {
+            cause: error,
+        });
+    }
+    if (details.code === -32_601) {
+        return new AcpSubagentBrowseError('PRECONDITION_FAILED', 'Sub-agent browsing is unavailable for this session.', { cause: error });
+    }
+    if (details.code === -32_000) {
+        return new AcpSubagentBrowseError('PRECONDITION_FAILED', 'Provider authentication is required for sub-agent browsing.', { cause: error });
+    }
+    if (details.code === -32_603 || details.code === -32_600 || details.code === -32_700) {
+        return new AcpSubagentBrowseError('PRECONDITION_FAILED', subagentBrowseMessage(operation, 'protocol'), { cause: error });
+    }
+    return new AcpSubagentBrowseError('INTERNAL_ERROR', subagentBrowseMessage(operation, 'failed'), {
+        cause: error,
+    });
+}
 async function raceWithSoftTimeout(promise, timeoutMs) {
     let timeout;
     const timeoutPromise = new Promise((resolve) => {
@@ -68,8 +137,10 @@ async function raceWithSoftTimeout(promise, timeoutMs) {
 }
 export class AcpRuntimeManager {
     sessions = new Map();
+    browseOnlySessions = new Set();
     pendingCreation = new Map();
     stoppingInProgress = new Set();
+    stopOperations = new Map();
     managedStopChildren = new WeakSet();
     creationLocks = new Map();
     lockRefCounts = new Map();
@@ -101,12 +172,70 @@ export class AcpRuntimeManager {
         return this.stoppingInProgress.has(sessionId);
     }
     getClient(sessionId) {
+        if (this.browseOnlySessions.has(sessionId)) {
+            return undefined;
+        }
+        return this.getBrowseClient(sessionId);
+    }
+    getBrowseClient(sessionId) {
         const handle = this.sessions.get(sessionId);
         return handle?.isRunning() ? handle : undefined;
     }
+    isBrowseOnlySession(sessionId) {
+        return this.browseOnlySessions.has(sessionId);
+    }
     getPendingClient(sessionId) {
         return this.pendingCreation.get(sessionId);
     }
+    getSubagentBrowseCapability(sessionId) {
+        return this.getBrowseClient(sessionId)?.getSubagentBrowseCapability() ?? null;
+    }
+    async listSubagents(sessionId, input) {
+        const handle = this.requireSubagentBrowseHandle(sessionId);
+        const parsedParams = subagentListParamsSchema.safeParse({
+            ...input,
+            sessionId: handle.providerSessionId,
+        });
+        if (!parsedParams.success) {
+            throw new AcpSubagentBrowseError('INVALID_INPUT', subagentBrowseMessage('list', 'invalid'), {
+                cause: parsedParams.error,
+            });
+        }
+        try {
+            const response = await handle.connection.extMethod(SUBAGENTS_LIST_METHOD, parsedParams.data);
+            return subagentListResultSchema.parse(response);
+        }
+        catch (error) {
+            throw normalizeSubagentBrowseError(error, 'list');
+        }
+    }
+    async readSubagentTranscript(sessionId, input) {
+        const handle = this.requireSubagentBrowseHandle(sessionId);
+        const parsedParams = subagentReadParamsSchema.safeParse({
+            ...input,
+            sessionId: handle.providerSessionId,
+        });
+        if (!parsedParams.success) {
+            throw new AcpSubagentBrowseError('INVALID_INPUT', subagentBrowseMessage('transcript', 'invalid'), { cause: parsedParams.error });
+        }
+        try {
+            const response = await handle.connection.extMethod(SUBAGENTS_READ_METHOD, parsedParams.data);
+            return subagentReadResultSchema.parse(response);
+        }
+        catch (error) {
+            throw normalizeSubagentBrowseError(error, 'transcript');
+        }
+    }
+    requireSubagentBrowseHandle(sessionId) {
+        const handle = this.getBrowseClient(sessionId);
+        if (!handle) {
+            throw new AcpSubagentBrowseError('PRECONDITION_FAILED', 'Sub-agent browsing requires a running parent session.');
+        }
+        if (!handle.getSubagentBrowseCapability()) {
+            throw new AcpSubagentBrowseError('PRECONDITION_FAILED', 'Sub-agent browsing is unavailable for this session.');
+        }
+        return handle;
+    }
     getOrCreateClient(sessionId, options, handlers, context) {
         if (this.isShuttingDown) {
             return Promise.reject(this.createShutdownError(sessionId));
@@ -124,17 +253,21 @@ export class AcpRuntimeManager {
                 if (this.isShuttingDown) {
                     throw this.createShutdownError(sessionId);
                 }
-                const existing = this.sessions.get(sessionId);
+                const existing = this.getBrowseClient(sessionId);
                 if (existing?.isRunning()) {
+                    this.promoteForActiveUse(sessionId, options);
                     logger.debug('Returning existing running ACP client', { sessionId });
                     return existing;
                 }
                 const pending = this.pendingCreation.get(sessionId);
                 if (pending) {
                     logger.debug('Waiting for pending ACP client creation', { sessionId });
-                    return await pending;
+                    const handle = await pending;
+                    this.promoteForActiveUse(sessionId, options);
+                    return handle;
                 }
                 logger.info('Creating new ACP client', { sessionId, provider: options.provider });
+                this.recordClientPurpose(sessionId, options);
                 const createPromise = this.createClient(sessionId, options, handlers, context);
                 this.pendingCreation.set(sessionId, createPromise);
                 try {
@@ -142,6 +275,7 @@ export class AcpRuntimeManager {
                 }
                 finally {
                     this.pendingCreation.delete(sessionId);
+                    this.clearBrowseOnlyPurposeIfUnused(sessionId);
                 }
             }
             finally {
@@ -157,6 +291,23 @@ export class AcpRuntimeManager {
             }
         });
     }
+    promoteForActiveUse(sessionId, options) {
+        if (options.purpose !== 'browse') {
+            this.browseOnlySessions.delete(sessionId);
+        }
+    }
+    recordClientPurpose(sessionId, options) {
+        if (options.purpose === 'browse') {
+            this.browseOnlySessions.add(sessionId);
+            return;
+        }
+        this.browseOnlySessions.delete(sessionId);
+    }
+    clearBrowseOnlyPurposeIfUnused(sessionId) {
+        if (!(this.sessions.has(sessionId) || this.pendingCreation.has(sessionId))) {
+            this.browseOnlySessions.delete(sessionId);
+        }
+    }
     async createClient(sessionId, options, handlers, context) {
         if (this.isShuttingDown) {
             throw this.createShutdownError(sessionId);
@@ -307,6 +458,7 @@ export class AcpRuntimeManager {
         });
         handle.configOptions = sessionInfo.configOptions;
         this.sessions.set(sessionId, handle);
+        this.recordClientPurpose(sessionId, options);
         this.wireChildExitHandler(sessionId, child, handlers);
         await this.notifyClientCreated(sessionId, handle, context, handlers);
         return handle;
@@ -358,14 +510,19 @@ export class AcpRuntimeManager {
         return new Error(`ACP session stop requested; cannot create client ${sessionId}`);
     }
     beginShutdown() {
-        if (this.isShuttingDown) {
-            return;
-        }
-        this.isShuttingDown = true;
-        for (const rejectShutdown of this.shutdownWaiters) {
-            rejectShutdown();
+        const sessionIds = new Set([
+            ...this.sessions.keys(),
+            ...this.pendingCreation.keys(),
+            ...this.creationLocks.keys(),
+        ]);
+        if (!this.isShuttingDown) {
+            this.isShuttingDown = true;
+            for (const rejectShutdown of this.shutdownWaiters) {
+                rejectShutdown();
+            }
+            this.shutdownWaiters.clear();
         }
-        this.shutdownWaiters.clear();
+        return [...sessionIds];
     }
     beginSessionStop(sessionId) {
         this.stoppingInProgress.add(sessionId);
@@ -426,19 +583,23 @@ export class AcpRuntimeManager {
     wireChildExitHandler(sessionId, child, handlers) {
         child.on('exit', async (code) => {
             if (this.shouldSkipChildExitHandler(sessionId, child, code)) {
+                this.clearBrowseOnlyPurposeIfUnused(sessionId);
                 return;
             }
             this.pendingCreation.delete(sessionId);
-            if (handlers.onExit) {
-                try {
+            try {
+                if (handlers.onExit) {
                     await handlers.onExit(sessionId, code);
                 }
-                catch (error) {
-                    logger.warn('Failed to handle ACP exit event', {
-                        sessionId,
-                        error: error instanceof Error ? error.message : String(error),
-                    });
-                }
+            }
+            catch (error) {
+                logger.warn('Failed to handle ACP exit event', {
+                    sessionId,
+                    error: error instanceof Error ? error.message : String(error),
+                });
+            }
+            finally {
+                this.clearBrowseOnlyPurposeIfUnused(sessionId);
             }
         });
     }
@@ -506,42 +667,21 @@ export class AcpRuntimeManager {
     }
     async createOrResumeSession(connection, sessionId, options, agentCapabilities) {
         const storedId = options.resumeProviderSessionId;
-        const canResume = agentCapabilities.loadSession === true && !!storedId;
+        const browseOnly = options.purpose === 'browse';
         const mcpServers = (options.mcpServers ?? []).map((s) => ({
             name: s.name,
             command: s.command,
             args: s.args,
             env: Object.entries(s.env).map(([name, value]) => ({ name, value })),
         }));
-        if (canResume && storedId) {
-            let loadResult = null;
-            try {
-                loadResult = await connection.loadSession({
-                    sessionId: storedId,
-                    cwd: options.workingDir,
-                    mcpServers,
-                });
-            }
-            catch (error) {
-                const details = getAcpErrorLogDetails(error);
-                logger.warn('loadSession failed, falling back to newSession', {
-                    sessionId,
-                    storedProviderSessionId: storedId,
-                    error: details.message,
-                    ...(details.code !== undefined ? { errorCode: details.code } : {}),
-                    ...(typeof details.data !== 'undefined' ? { errorData: details.data } : {}),
-                });
-            }
-            if (loadResult !== null) {
-                logger.info('ACP session resumed via loadSession', {
-                    sessionId,
-                    providerSessionId: storedId,
-                });
-                return {
-                    providerSessionId: storedId,
-                    configOptions: requireSessionConfigOptions(options.provider, 'loadSession', loadResult),
-                };
-            }
+        const resumed = await this.tryLoadStoredSession(connection, sessionId, options, agentCapabilities, mcpServers);
+        if (resumed) {
+            return resumed;
+        }
+        if (browseOnly) {
+            throw new AcpBrowseSessionUnavailableError(storedId
+                ? 'Provider does not support restoring this session for sub-agent browsing.'
+                : 'Stored provider session is required for sub-agent browsing.');
         }
         const sessionResult = await connection.newSession({
             cwd: options.workingDir,
@@ -556,11 +696,62 @@ export class AcpRuntimeManager {
             configOptions: requireSessionConfigOptions(options.provider, 'newSession', sessionResult),
         };
     }
-    async stopClient(sessionId) {
-        if (this.stoppingInProgress.has(sessionId)) {
+    async tryLoadStoredSession(connection, sessionId, options, agentCapabilities, mcpServers) {
+        const storedId = options.resumeProviderSessionId;
+        if (!(agentCapabilities.loadSession === true && storedId)) {
+            return null;
+        }
+        let loadResult;
+        try {
+            loadResult = await connection.loadSession({
+                sessionId: storedId,
+                cwd: options.workingDir,
+                mcpServers,
+            });
+        }
+        catch (error) {
+            this.logLoadSessionFailure(sessionId, storedId, error, options.purpose === 'browse');
+            if (options.purpose === 'browse') {
+                throw new AcpBrowseSessionUnavailableError('Provider failed to restore this session for sub-agent browsing.', { cause: error });
+            }
+            return null;
+        }
+        logger.info('ACP session resumed via loadSession', {
+            sessionId,
+            providerSessionId: storedId,
+        });
+        return {
+            providerSessionId: storedId,
+            configOptions: requireSessionConfigOptions(options.provider, 'loadSession', loadResult),
+        };
+    }
+    logLoadSessionFailure(sessionId, storedProviderSessionId, error, browseOnly) {
+        const details = getAcpErrorLogDetails(error);
+        logger.warn(browseOnly ? 'Browse-only loadSession failed' : 'loadSession failed', {
+            sessionId,
+            storedProviderSessionId,
+            error: details.message,
+            ...(details.code !== undefined ? { errorCode: details.code } : {}),
+            ...(typeof details.data !== 'undefined' ? { errorData: details.data } : {}),
+            ...(!browseOnly ? { fallback: 'newSession' } : {}),
+        });
+    }
+    stopClient(sessionId) {
+        const existingStop = this.stopOperations.get(sessionId);
+        if (existingStop) {
             logger.debug('ACP session stop already in progress', { sessionId });
-            return;
+            return existingStop;
         }
+        let trackedStop;
+        trackedStop = this.stopClientOnce(sessionId).finally(() => {
+            if (this.stopOperations.get(sessionId) === trackedStop) {
+                this.stopOperations.delete(sessionId);
+            }
+        });
+        this.stopOperations.set(sessionId, trackedStop);
+        return trackedStop;
+    }
+    async stopClientOnce(sessionId) {
         const pendingCreation = this.pendingCreation.get(sessionId);
         const initialHandle = this.sessions.get(sessionId);
         if (!(initialHandle || pendingCreation)) {
@@ -612,6 +803,7 @@ export class AcpRuntimeManager {
             const current = this.sessions.get(sessionId);
             if (current === stoppedHandle) {
                 this.sessions.delete(sessionId);
+                this.browseOnlySessions.delete(sessionId);
             }
         }
     }
@@ -702,13 +894,15 @@ export class AcpRuntimeManager {
     async cancelPrompt(sessionId) {
         const handle = this.sessions.get(sessionId);
         if (!handle) {
-            return;
+            return false;
         }
-        if (handle.isPromptInFlight) {
-            await handle.connection.cancel({
-                sessionId: handle.providerSessionId,
-            });
+        if (!handle.isPromptInFlight) {
+            return false;
         }
+        await handle.connection.cancel({
+            sessionId: handle.providerSessionId,
+        });
+        return true;
     }
     async setConfigOption(sessionId, configId, value) {
         const handle = this.sessions.get(sessionId);
@@ -825,8 +1019,7 @@ export class AcpRuntimeManager {
         return this.sessions.entries();
     }
     isSessionRunning(sessionId) {
-        const handle = this.sessions.get(sessionId);
-        return handle?.isRunning() ?? false;
+        return this.getClient(sessionId) !== undefined;
     }
     isSessionWorking(sessionId) {
         const handle = this.sessions.get(sessionId);