@moxt-ai/mobius 0.0.6 → 0.0.8

package/dist/acp/session-manager.js

@@ -1,6 +1,6 @@
 import { spawn } from "node:child_process";
 import { methods, ndJsonStream, PROTOCOL_VERSION, } from "@agentclientprotocol/sdk";
-import { AGENT_CONTENT_KIND, decodeAgentPromptResponse, MOBIUS_PROTOCOL_VERSION, SESSION_COMMANDS_UPDATED_KIND, SESSION_CONFIG_UPDATED_KIND, SESSION_ELICITATION_REQUESTED_KIND, SESSION_ELICITATION_RESOLVED_KIND, SESSION_INFO_UPDATED_KIND, SESSION_PERMISSION_REQUESTED_KIND, SESSION_PERMISSION_RESOLVED_KIND, SESSION_USAGE_UPDATED_KIND, } from "@moxt-ai/mobius-protocol";
+import { AGENT_CONTENT_KIND, decodeAgentPromptResponse, SESSION_COMMANDS_UPDATED_KIND, SESSION_CONFIG_UPDATED_KIND, SESSION_ELICITATION_REQUESTED_KIND, SESSION_ELICITATION_RESOLVED_KIND, SESSION_INFO_UPDATED_KIND, SESSION_PERMISSION_REQUESTED_KIND, SESSION_PERMISSION_RESOLVED_KIND, SESSION_USAGE_UPDATED_KIND, } from "@moxt-ai/mobius-protocol";
 import { revalidateExecutable, stopProcessTree, } from "../process/executable.js";
 import { AcpActivityTracker, isProgressMessage, normalizeContentBlock, } from "./activity.js";
 import { createAcpClient } from "./create-client.js";
@@ -44,6 +44,12 @@ export class AcpExecutionError extends Error {
         this.name = "AcpExecutionError";
     }
 }
+class RetryableAcpInitializationError extends AcpExecutionError {
+    constructor(cause) {
+        super("ACP agent initialization failed", { cause });
+        this.name = "RetryableAcpInitializationError";
+    }
+}
 function readableWebStream(input) {
     let streamOpen = true;
     return new ReadableStream({
@@ -631,32 +637,41 @@ class AcpProcessSession {
         const stream = ndJsonStream(createWritableAcpStream(stdin), readableWebStream(stdout));
         this.#connection = createAcpClient(this).connect(stream);
     }
-    static start = async (options, getObserver, store) => {
-        options.signal.throwIfAborted();
-        const [adapterUnchanged, agentUnchanged] = await Promise.all([
-            revalidateExecutable(options.agent.adapterIdentity),
-            revalidateExecutable(options.agent.agentIdentity),
-        ]);
-        options.signal.throwIfAborted();
-        if (!adapterUnchanged || !agentUnchanged) {
-            throw new AcpExecutionError("The local Agent runtime changed; restart Mobius before starting a new conversation", {}, "agent_runtime_changed");
-        }
-        const runtime = new AcpProcessSession(options.agent, options.cwd, options.additionalDirectories, options.sessionId, getObserver, store);
-        try {
-            await runtime.initialize(options.signal, options.origin);
-            return runtime;
-        }
-        catch (error) {
-            await runtime.closeProcess();
+    static async #start(options, getObserver, store, initialize) {
+        for (let attempt = 1; attempt <= 2; attempt += 1) {
             options.signal.throwIfAborted();
-            if (error instanceof AcpExecutionError) {
-                throw error;
+            const [adapterUnchanged, agentUnchanged] = await Promise.all([
+                revalidateExecutable(options.agent.adapterIdentity),
+                revalidateExecutable(options.agent.agentIdentity),
+            ]);
+            options.signal.throwIfAborted();
+            if (!adapterUnchanged || !agentUnchanged) {
+                throw new AcpExecutionError("The local Agent runtime changed; restart Mobius before starting a new conversation", {}, "agent_runtime_changed");
+            }
+            const runtime = new AcpProcessSession(options.agent, options.cwd, options.additionalDirectories, options.sessionId, getObserver, store);
+            try {
+                await initialize(runtime);
+                return runtime;
+            }
+            catch (error) {
+                await runtime.closeProcess();
+                options.signal.throwIfAborted();
+                if (error instanceof RetryableAcpInitializationError && attempt === 1) {
+                    console.warn(`[${options.agent.id}-acp] ACP agent initialization failed; retrying once`);
+                    continue;
+                }
+                if (error instanceof AcpExecutionError) {
+                    throw error;
+                }
+                throw new AcpExecutionError("ACP agent initialization failed", {
+                    cause: error,
+                });
             }
-            throw new AcpExecutionError("ACP agent initialization failed", {
-                cause: error,
-            });
         }
-    };
+        throw new AcpExecutionError("ACP agent initialization failed");
+    }
+    static start = async (options, getObserver, store) => await AcpProcessSession.#start(options, getObserver, store, async (runtime) => await runtime.initialize(options.signal, options.origin));
+    static startNativeSessionBrowser = async (options, getObserver, store) => await AcpProcessSession.#start(options, getObserver, store, async (runtime) => await runtime.#initializeAgent(options.signal));
     belongsTo = (agentId, cwd, additionalDirectories) => this.#agentId === agentId &&
         this.#cwd === cwd &&
         arraysEqual(this.#additionalDirectories, additionalDirectories);
@@ -682,7 +697,7 @@ class AcpProcessSession {
             this.#replay = { kind: "idle" };
         }
     };
-    initialize = async (signal, origin) => {
+    async #initializeAgent(signal) {
         const initialized = await this.race(this.#connection.agent.request(methods.agent.initialize, {
             clientCapabilities: {
                 elicitation: { form: {}, url: {} },
@@ -691,7 +706,10 @@ class AcpProcessSession {
             },
             clientInfo: { name: "mobius", version: "0.0.3" },
             protocolVersion: PROTOCOL_VERSION,
-        }, { cancellationSignal: signal }), "ACP agent exited during initialization", signal);
+        }, { cancellationSignal: signal }), "ACP agent exited during initialization", signal).catch((cause) => {
+            signal.throwIfAborted();
+            throw new RetryableAcpInitializationError(cause);
+        });
         if (initialized.protocolVersion !== PROTOCOL_VERSION) {
             throw new AcpExecutionError("ACP agent selected an unsupported protocol version", {}, "unsupported_acp_protocol");
         }
@@ -701,6 +719,9 @@ class AcpProcessSession {
             initialized.agentInfo?.name ??
             this.#agentId, 255);
         this.#agentVersion = truncate(initialized.agentInfo?.version ?? "", 128);
+    }
+    initialize = async (signal, origin) => {
+        await this.#initializeAgent(signal);
         const stored = origin?.kind === "import"
             ? new FoundAcpStoredSession(new AcpStoredSession(this.#mobiusSessionId, this.#agentId, nativeSessionIdSchema.parse(origin.nativeSessionId), this.#cwd, this.#additionalDirectories, true))
             : this.#store.read(this.#mobiusSessionId);
@@ -899,7 +920,6 @@ class AcpProcessSession {
                     _meta: result._meta ?? null,
                     commandId: options.commandId,
                     kind: SESSION_USAGE_UPDATED_KIND,
-                    protocolVersion: MOBIUS_PROTOCOL_VERSION,
                     sessionId: this.#mobiusSessionId,
                     source: "prompt",
                     usage: result.usage ?? null,
@@ -950,7 +970,6 @@ class AcpProcessSession {
             kind: SESSION_PERMISSION_RESOLVED_KIND,
             optionId: options.outcome === "selected" ? options.optionId : "",
             outcome: options.outcome,
-            protocolVersion: MOBIUS_PROTOCOL_VERSION,
             sessionId: this.#mobiusSessionId,
         });
     };
@@ -985,7 +1004,6 @@ class AcpProcessSession {
             action: options.action,
             interactionId: options.interactionId,
             kind: SESSION_ELICITATION_RESOLVED_KIND,
-            protocolVersion: MOBIUS_PROTOCOL_VERSION,
             sessionId: this.#mobiusSessionId,
         });
     };
@@ -1014,7 +1032,6 @@ class AcpProcessSession {
                 interactionId,
                 kind: SESSION_PERMISSION_REQUESTED_KIND,
                 options,
-                protocolVersion: MOBIUS_PROTOCOL_VERSION,
                 sessionId: this.#mobiusSessionId,
                 title: truncate(request.toolCall.title ?? "Permission required", 500),
                 toolCallId: truncate(request.toolCall.toolCallId, 255),
@@ -1059,7 +1076,6 @@ class AcpProcessSession {
                 kind: SESSION_ELICITATION_REQUESTED_KIND,
                 message: truncate(request.message, 2_000),
                 mode: request.mode,
-                protocolVersion: MOBIUS_PROTOCOL_VERSION,
                 sessionId: this.#mobiusSessionId,
                 url: request.mode === "url" &&
                     typeof Reflect.get(request, "url") === "string"
@@ -1083,7 +1099,6 @@ class AcpProcessSession {
             action: "complete",
             interactionId,
             kind: SESSION_ELICITATION_RESOLVED_KIND,
-            protocolVersion: MOBIUS_PROTOCOL_VERSION,
             sessionId: this.#mobiusSessionId,
         });
     };
@@ -1125,7 +1140,6 @@ class AcpProcessSession {
                     contentId: `content-${crypto.randomUUID()}`,
                     kind: AGENT_CONTENT_KIND,
                     messageId: truncate(update.messageId ?? "", 255),
-                    protocolVersion: MOBIUS_PROTOCOL_VERSION,
                     sessionId: this.#mobiusSessionId,
                 });
             }
@@ -1170,7 +1184,6 @@ class AcpProcessSession {
             await this.#getObserver().onCommands({
                 commands,
                 kind: SESSION_COMMANDS_UPDATED_KIND,
-                protocolVersion: MOBIUS_PROTOCOL_VERSION,
                 sessionId: this.#mobiusSessionId,
             });
             return;
@@ -1196,7 +1209,6 @@ class AcpProcessSession {
             }
             await this.#getObserver().onInfo({
                 kind: SESSION_INFO_UPDATED_KIND,
-                protocolVersion: MOBIUS_PROTOCOL_VERSION,
                 sessionId: this.#mobiusSessionId,
                 title: this.#sessionTitle,
                 updatedAt: this.#sessionUpdatedAt,
@@ -1209,7 +1221,6 @@ class AcpProcessSession {
                 costCurrency: truncate(update.cost?.currency ?? "", 16),
                 hasCost: update.cost !== undefined && update.cost !== null,
                 kind: SESSION_USAGE_UPDATED_KIND,
-                protocolVersion: MOBIUS_PROTOCOL_VERSION,
                 sessionId: this.#mobiusSessionId,
                 size: Math.max(0, Math.trunc(update.size)),
                 source: "context",
@@ -1269,7 +1280,6 @@ class AcpProcessSession {
         await this.#getObserver().onConfig({
             configOptions: this.#configOptions,
             kind: SESSION_CONFIG_UPDATED_KIND,
-            protocolVersion: MOBIUS_PROTOCOL_VERSION,
             requestId: `agent-update-${crypto.randomUUID()}`,
             sessionId: this.#mobiusSessionId,
         });
@@ -1285,7 +1295,6 @@ class AcpProcessSession {
             kind: SESSION_PERMISSION_RESOLVED_KIND,
             optionId: "",
             outcome: "cancelled",
-            protocolVersion: MOBIUS_PROTOCOL_VERSION,
             sessionId: this.#mobiusSessionId,
         });
     };
@@ -1299,7 +1308,6 @@ class AcpProcessSession {
             action: "cancel",
             interactionId,
             kind: SESSION_ELICITATION_RESOLVED_KIND,
-            protocolVersion: MOBIUS_PROTOCOL_VERSION,
             sessionId: this.#mobiusSessionId,
         });
     };
@@ -1319,7 +1327,6 @@ class AcpProcessSession {
                 action: "cancel",
                 interactionId,
                 kind: SESSION_ELICITATION_RESOLVED_KIND,
-                protocolVersion: MOBIUS_PROTOCOL_VERSION,
                 sessionId: this.#mobiusSessionId,
             });
         }
@@ -1327,6 +1334,10 @@ class AcpProcessSession {
 }
 export class AcpSessionManager {
     #nativeOperations = new Set();
+    #nativeBrowserObserver = new NullAcpSessionObserver();
+    #nativeBrowserPreparing = new Map();
+    #nativeBrowserSessions = new Map();
+    #nativeBrowserStore = new MemoryAcpSessionStore();
     #activeSessionIds = new Set();
     #cancellationRequests = new Set();
     #preparing = new Map();
@@ -1340,6 +1351,37 @@ export class AcpSessionManager {
     setObserver = (observer) => {
         this.#observer = observer;
     };
+    async #startNativeBrowserPreparation(options) {
+        const operation = (async () => {
+            try {
+                const runtime = await AcpProcessSession.startNativeSessionBrowser(options, () => this.#nativeBrowserObserver, this.#nativeBrowserStore);
+                this.#nativeBrowserSessions.set(options.sessionId, runtime);
+                return runtime;
+            }
+            finally {
+                this.#nativeBrowserPreparing.delete(options.sessionId);
+            }
+        })();
+        this.#nativeBrowserPreparing.set(options.sessionId, operation);
+        return await operation;
+    }
+    async #replaceNativeBrowserPreparation(existing, options) {
+        const operation = (async () => {
+            try {
+                this.#nativeBrowserSessions.delete(options.sessionId);
+                await existing.close();
+                this.#nativeBrowserStore.remove(options.sessionId);
+                const runtime = await AcpProcessSession.startNativeSessionBrowser(options, () => this.#nativeBrowserObserver, this.#nativeBrowserStore);
+                this.#nativeBrowserSessions.set(options.sessionId, runtime);
+                return runtime;
+            }
+            finally {
+                this.#nativeBrowserPreparing.delete(options.sessionId);
+            }
+        })();
+        this.#nativeBrowserPreparing.set(options.sessionId, operation);
+        return await operation;
+    }
     async #startPreparation(options) {
         const operation = (async () => {
             try {
@@ -1400,6 +1442,29 @@ export class AcpSessionManager {
         const runtime = await this.#startPreparation(options);
         return runtime.prepared();
     };
+    prepareNativeSessionBrowser = async (options) => {
+        const pending = this.#nativeBrowserPreparing.get(options.sessionId);
+        if (pending !== undefined) {
+            const runtime = await pending;
+            if (runtime.belongsTo(options.agent.id, options.cwd, options.additionalDirectories)) {
+                return runtime.prepared();
+            }
+            return await this.prepareNativeSessionBrowser(options);
+        }
+        const existing = this.#nativeBrowserSessions.get(options.sessionId);
+        if (existing !== undefined) {
+            if (existing.belongsTo(options.agent.id, options.cwd, options.additionalDirectories)) {
+                return existing.prepared();
+            }
+            if (!existing.canRebind()) {
+                throw new AcpExecutionError("The agent or workspace cannot change after a conversation has started", {}, "session_identity_mismatch");
+            }
+            const runtime = await this.#replaceNativeBrowserPreparation(existing, options);
+            return runtime.prepared();
+        }
+        const runtime = await this.#startNativeBrowserPreparation(options);
+        return runtime.prepared();
+    };
     configureSession = async (options) => {
         const runtime = await this.ensureSession(options);
         return await runtime.configure(options);
@@ -1467,8 +1532,10 @@ export class AcpSessionManager {
     };
     close = async () => {
         const sessions = [...this.#sessions.values()];
+        const nativeBrowserSessions = [...this.#nativeBrowserSessions.values()];
         this.#sessions.clear();
-        await Promise.all(sessions.map(async (session) => await session.close()));
+        this.#nativeBrowserSessions.clear();
+        await Promise.all([...sessions, ...nativeBrowserSessions].map(async (session) => await session.close()));
     };
     ensureSession = async (options) => {
         const existing = this.#sessions.get(options.sessionId);
@@ -1485,7 +1552,22 @@ export class AcpSessionManager {
         }
         return started;
     };
-    listNativeSessions = async (options, cursor) => await (await this.ensureSession(options)).listNativeSessions(cursor, options.signal);
+    async #ensureNativeSessionBrowser(options) {
+        const existing = this.#nativeBrowserSessions.get(options.sessionId);
+        if (existing !== undefined) {
+            if (!existing.belongsTo(options.agent.id, options.cwd, options.additionalDirectories)) {
+                throw new AcpExecutionError("The agent or workspace cannot change after a conversation has started", {}, "session_identity_mismatch");
+            }
+            return existing;
+        }
+        await this.prepareNativeSessionBrowser(options);
+        const started = this.#nativeBrowserSessions.get(options.sessionId);
+        if (started === undefined) {
+            throw new AcpExecutionError("ACP native session browser did not start");
+        }
+        return started;
+    }
+    listNativeSessions = async (options, cursor) => await (await this.#ensureNativeSessionBrowser(options)).listNativeSessions(cursor, options.signal);
     openNativeSession = async (options, origin) => {
         const key = `${options.agent.id}:${origin.nativeSessionId}`;
         if (this.#nativeOperations.has(key))
@@ -1554,7 +1636,7 @@ export class AcpSessionManager {
         }
     };
     deleteNativeSession = async (options, nativeSessionId) => {
-        const runtime = await this.ensureSession(options);
+        const runtime = await this.#ensureNativeSessionBrowser(options);
         const key = `${options.agent.id}:${nativeSessionId}`;
         const linked = this.#store.findNative(options.agent.id, nativeSessionId);
         if (this.#nativeOperations.has(key) ||
@@ -1574,7 +1656,8 @@ export class AcpSessionManager {
             await runtime.deleteNativeSession(nativeSessionId, options.signal);
             const deleted = this.#store.markDeleted(options.agent.id, nativeSessionId);
             if (runtime.nativeSessionId() === nativeSessionId) {
-                this.#sessions.delete(options.sessionId);
+                this.#nativeBrowserSessions.delete(options.sessionId);
+                this.#nativeBrowserStore.remove(options.sessionId);
                 await runtime.close();
             }
             return deleted;