@agentclientprotocol/codex-acp 2.5.1-preview.7 → 2.5.1-preview.8

package/dist/index.js

@@ -32522,6 +32522,7 @@ var AcpClientDelivery = class {
   sessionRequests = /* @__PURE__ */ new Map();
   closedSessions = /* @__PURE__ */ new Set();
   urlElicitations = /* @__PURE__ */ new Map();
+  sessionSetups = /* @__PURE__ */ new Map();
   sendElicitationCompletion;
   /** v2's direct send path shares URL scope tracking without routing back through its v1 view. */
   setElicitationCompletionTransport(send) {
@@ -32534,9 +32535,56 @@ var AcpClientDelivery = class {
   openSession(sessionId) {
     this.closedSessions.delete(sessionId);
   }
+  /** A new session cannot open client UI until its setup response has been written. */
+  beginSessionSetup(sessionId) {
+    if (this.sessionSetups.has(sessionId)) return;
+    let release;
+    const ready = new Promise((resolve) => {
+      release = resolve;
+    });
+    this.sessionSetups.set(sessionId, { ready, release });
+  }
+  sessionSetupReady(sessionId) {
+    return this.sessionSetups.get(sessionId)?.ready ?? null;
+  }
+  captureSessionSetupRelease(sessionId) {
+    const setup = this.sessionSetups.get(sessionId);
+    return () => {
+      if (setup && this.sessionSetups.get(sessionId) === setup) this.finishSessionSetup(sessionId);
+    };
+  }
+  finishSessionSetup(sessionId) {
+    const setup = this.sessionSetups.get(sessionId);
+    this.sessionSetups.delete(sessionId);
+    setup?.release();
+  }
+  waitForSessionSetup(sessionId, signal) {
+    const ready = this.sessionSetupReady(sessionId);
+    if (!ready) return null;
+    return new Promise((resolve, reject) => {
+      const cancelled = () => reject(RequestError.requestCancelled(void 0, `Session ${sessionId} setup was cancelled`));
+      if (signal?.aborted) {
+        cancelled();
+        return;
+      }
+      signal?.addEventListener("abort", cancelled, { once: true });
+      void ready.then(() => {
+        signal?.removeEventListener("abort", cancelled);
+        if (signal?.aborted || !this.canRequestSession(sessionId)) cancelled();
+        else resolve();
+      });
+    });
+  }
+  disposeSessionSetups() {
+    for (const sessionId of this.sessionSetups.keys()) {
+      this.closedSessions.add(sessionId);
+      this.cancelSessionRequests(sessionId);
+    }
+  }
   /** Final teardown updates have been sent. Nothing else may publish for this session lifetime. */
   closeSession(sessionId) {
     this.closedSessions.add(sessionId);
+    this.finishSessionSetup(sessionId);
     for (const [id, scope] of this.urlElicitations) {
       if (scope.sessionId === sessionId) this.urlElicitations.delete(id);
     }
@@ -32590,10 +32638,11 @@ var AcpClientDelivery = class {
     for (const controller of this.sessionRequests.get(sessionId) ?? []) {
       controller.abort(RequestError.requestCancelled(void 0, `Session ${sessionId} is closing`));
     }
+    this.finishSessionSetup(sessionId);
   }
   sendRequest(method, params, options) {
     const sessionId = clientRequestSessionId(method, params);
-    return this.withElicitationRequest(method, params, () => sessionId === null ? this.client.request(method, params, options) : this.sendSessionRequest(sessionId, method, params, options));
+    return sessionId === null ? this.withElicitationRequest(method, params, () => this.client.request(method, params, options)) : this.sendSessionRequest(sessionId, method, params, options);
   }
   /** Direct v2 requests and the shared v1-shaped path keep the same URL scope. */
   withElicitationRequest(method, params, send) {
@@ -32623,7 +32672,13 @@ var AcpClientDelivery = class {
     requests.add(controller);
     const cancellationSignal = options?.cancellationSignal ? AbortSignal.any([options.cancellationSignal, controller.signal]) : controller.signal;
     try {
-      return await this.client.request(method, params, { ...options, cancellationSignal });
+      const setup = this.waitForSessionSetup(sessionId, cancellationSignal);
+      if (setup) await setup;
+      return await this.withElicitationRequest(
+        method,
+        params,
+        () => this.client.request(method, params, { ...options, cancellationSignal })
+      );
     } finally {
       requests.delete(controller);
       if (requests.size === 0) this.sessionRequests.delete(sessionId);
@@ -32679,8 +32734,12 @@ var AcpV2Connection = class {
         if (sessionId !== null && this.sessionDelivery && !this.sessionDelivery.canRequestSession(sessionId)) {
           return Promise.reject(RequestError.requestCancelled(void 0, `Session ${sessionId} is closing or closed`));
         }
-        const send = () => client.request(method, params, options);
-        return this.sessionDelivery?.withElicitationRequest(method, params, send) ?? send();
+        const send = () => {
+          const request = () => client.request(method, params, options);
+          return this.sessionDelivery?.withElicitationRequest(method, params, request) ?? request();
+        };
+        const setup = sessionId === null ? null : this.sessionDelivery?.waitForSessionSetup(sessionId, options?.cancellationSignal);
+        return setup ? setup.then(send) : send();
       }
     };
   }
@@ -40012,6 +40071,16 @@ function failure2(serverName, message) {
 
 // src/mcp/McpSessionStartup.ts
 var McpSessionStartup = class {
+  constructor(connection, codexAcpClient, runWithProcessCheck, signIn, capabilities, isSessionOpen, waitForSessionSetup = () => null) {
+    this.waitForSessionSetup = waitForSessionSetup;
+    this.connection = connection;
+    this.codexAcpClient = codexAcpClient;
+    this.runWithProcessCheck = runWithProcessCheck;
+    this.signIn = signIn;
+    this.capabilities = capabilities;
+    this.isSessionOpen = isSessionOpen;
+  }
+  waitForSessionSetup;
   connection;
   codexAcpClient;
   runWithProcessCheck;
@@ -40020,14 +40089,6 @@ var McpSessionStartup = class {
   /** True when the session is open and does not close. */
   isSessionOpen;
   pendingSessions = /* @__PURE__ */ new Map();
-  constructor(connection, codexAcpClient, runWithProcessCheck, signIn, capabilities, isSessionOpen) {
-    this.connection = connection;
-    this.codexAcpClient = codexAcpClient;
-    this.runWithProcessCheck = runWithProcessCheck;
-    this.signIn = signIn;
-    this.capabilities = capabilities;
-    this.isSessionOpen = isSessionOpen;
-  }
   /**
    * Starts the startup wait of the session and publishes the report when the startup ends.
    * It returns a promise only when it waits for the startup, and returns null otherwise.
@@ -40055,6 +40116,9 @@ var McpSessionStartup = class {
     this.pendingSessions.get(sessionId)?.abort.abort();
     this.pendingSessions.delete(sessionId);
   }
+  dispose() {
+    for (const sessionId of this.pendingSessions.keys()) this.close(sessionId);
+  }
   isPending(sessionId) {
     return this.pendingSessions.has(sessionId);
   }
@@ -40092,6 +40156,8 @@ var McpSessionStartup = class {
     }
     try {
       const mcpStartup = await pendingStartup.startup;
+      const setup = this.waitForSessionSetup(sessionId, pendingStartup.abort.signal);
+      if (setup) await setup;
       if (!this.isSessionOpen(sessionId) || this.pendingSessions.get(sessionId) !== pendingStartup) {
         return;
       }
@@ -40998,7 +41064,7 @@ var package_default = {
   publishConfig: {
     access: "public"
   },
-  version: "2.5.1-preview.7",
+  version: "2.5.1-preview.8",
   description: "",
   main: "dist/index.js",
   bin: {
@@ -49761,6 +49827,7 @@ var CodexAcpServer = class {
   connection;
   mcpServerSignIn;
   clientDelivery;
+  setupResponseOrdering = false;
   /** ACP protocol version of the connection this agent serves, fixed by the protocol router. */
   protocolVersion;
   /** The v2 client handle; `null` on a v1 connection. */
@@ -49884,7 +49951,8 @@ var CodexAcpServer = class {
       (operation) => this.runWithProcessCheck(operation),
       this.mcpServerSignIn,
       () => this.capabilities,
-      (sessionId) => this.sessions.has(sessionId) && !this.sessionIsClosing(sessionId)
+      (sessionId) => this.sessions.has(sessionId) && !this.sessionIsClosing(sessionId),
+      (sessionId, signal) => this.clientDelivery.waitForSessionSetup(sessionId, signal)
     );
     this.defaultAuthRequest = defaultAuthRequest ?? null;
     this.codexProcessState = codexProcessState ?? null;
@@ -49924,6 +49992,10 @@ var CodexAcpServer = class {
       const state = this.sessions.get(sessionId);
       return state ? this.subagentModels(state) : null;
     };
+    const setupReady = this.clientDelivery.sessionSetupReady(sessionId);
+    const transition = this.sessions.get(sessionId)?.subagentTransition;
+    const ready = setupReady ? Promise.all([setupReady, transition]).then(() => {
+    }) : transition;
     const router = this.usesStandardSubagents() ? new StandardSubagentEventRouter(
       sessionId,
       session,
@@ -49931,7 +50003,7 @@ var CodexAcpServer = class {
       release,
       this.capabilities,
       replay,
-      this.sessions.get(sessionId)?.subagentTransition,
+      ready,
       (id) => this.codexAcpClient.appServerClient.runningTurnId(id),
       models,
       {
@@ -50000,13 +50072,30 @@ var CodexAcpServer = class {
     check2();
     return check2;
   }
-  afterSessionSetupResponse(sessionId) {
-    const router = this.sessions.get(sessionId)?.subagents;
-    if (!(router instanceof StandardSubagentEventRouter) || this.sessionIsClosing(sessionId)) return Promise.resolve();
-    this.codexAcpClient.redispatchSessionNotifications(sessionId, router.releaseReplay(), () => router.publishReplaySnapshots());
-    return this.codexAcpClient.waitForSessionNotifications(sessionId).catch((error62) => {
-      logger.error("Failed to release child traffic after session setup", error62);
-    });
+  /** Direct method callers have no transport response-write boundary. */
+  observeSessionSetupResponses() {
+    this.setupResponseOrdering = true;
+    return () => {
+      this.mcpSessionStartup.dispose();
+      this.clientDelivery.disposeSessionSetups();
+    };
+  }
+  captureSessionCreationPublication(sessionId) {
+    return this.clientDelivery.captureSessionSetupRelease(sessionId);
+  }
+  captureSessionSetupPublication(sessionId) {
+    const session = this.sessions.get(sessionId);
+    const release = this.clientDelivery.captureSessionSetupRelease(sessionId);
+    return async () => {
+      release();
+      if (!session || this.sessions.get(sessionId) !== session || this.sessionIsClosing(sessionId)) return;
+      const router = session.subagents;
+      if (!(router instanceof StandardSubagentEventRouter)) return;
+      this.codexAcpClient.redispatchSessionNotifications(sessionId, router.releaseReplay(), () => router.publishReplaySnapshots());
+      await this.codexAcpClient.waitForSessionNotifications(sessionId).catch((error62) => {
+        logger.error("Failed to release child traffic after session setup", error62);
+      });
+    };
   }
   async interruptStandardChildren(session) {
     if (!(session.subagents instanceof StandardSubagentEventRouter)) return;
@@ -50536,6 +50625,7 @@ You have been logged out. Please try again.`);
     const sessionMcpServers = this.resolveSessionMcpServers(requestedMcpServers, operation === "resume");
     const currentModel = this.findCurrentModel(models, currentModelId);
     const currentModelSupportsFast = modelSupportsFast(currentModel);
+    if (this.setupResponseOrdering && operation !== "resume") this.clientDelivery.beginSessionSetup(sessionId);
     const sessionState = {
       sessionId,
       currentModelId,
@@ -54449,7 +54539,7 @@ var AcpResponseDelivery = class {
           if ("method" in message || message.id === null) return;
           const callback = this.callbacks.get(message.id);
           this.callbacks.delete(message.id);
-          callback?.();
+          callback?.("result" in message);
         },
         close: async () => {
           const writer = stream.writable.getWriter();
@@ -54542,7 +54632,15 @@ function createRouter(createAgent, responses) {
   const setups = /* @__PURE__ */ new Map();
   const setup = (sessionId, requestId, operation, signal) => {
     const agent3 = getAgent({ sessionId });
-    if (!agent3.usesStandardSubagents()) return operation();
+    if (!agent3.usesStandardSubagents()) {
+      return operation().then((result) => {
+        const publish = agent3.captureSessionSetupPublication(sessionId);
+        responses.afterWrite(requestId, (successful) => {
+          if (successful) void publish();
+        });
+        return result;
+      });
+    }
     const assertCurrent = agent3.captureSessionSetup(sessionId);
     const state = setups.get(sessionId) ?? { tail: Promise.resolve(), publication: Promise.resolve(), epoch: 0, pending: 0 };
     setups.set(sessionId, state);
@@ -54560,7 +54658,7 @@ function createRouter(createAgent, responses) {
     state.tail = state.tail.catch(() => {
     }).then(async () => {
       let registered = false;
-      let succeeded = false;
+      let publish = null;
       try {
         for (; ; ) {
           const publication = state.publication;
@@ -54569,14 +54667,14 @@ function createRouter(createAgent, responses) {
         }
         if (signal.aborted) throw new RequestError(-32800, "Session setup was cancelled");
         assertCurrent();
-        responses.afterWrite(requestId, () => {
-          if (epoch === state.epoch && succeeded) state.publication = agent3.afterSessionSetupResponse(sessionId);
+        responses.afterWrite(requestId, (successful) => {
+          if (successful && epoch === state.epoch && publish) state.publication = publish();
           void state.publication.then(finish, finish);
         });
         registered = true;
         const result = await operation();
         if (signal.aborted) throw new RequestError(-32800, "Session setup was cancelled");
-        succeeded = true;
+        publish = agent3.captureSessionSetupPublication(sessionId);
         resolve(result);
       } catch (error62) {
         reject(error62);
@@ -54585,18 +54683,29 @@ function createRouter(createAgent, responses) {
     });
     return response;
   };
+  const createdSetup = async (requestId, operation) => {
+    const agent3 = getAgent();
+    const result = await operation();
+    const publish = agent3.captureSessionCreationPublication(result.sessionId);
+    responses.afterWrite(requestId, (successful) => {
+      if (successful) publish();
+    });
+    return result;
+  };
   const attachAgent = (agent3, signal) => {
     codexAcpServer = agent3;
+    const stopSetupPublication = agent3.observeSessionSetupResponses();
     signal.addEventListener("abort", () => {
       setups.clear();
+      stopSetupPublication();
       agent3.sessionIndex.dispose();
       if (codexAcpServer === agent3) {
         codexAcpServer = null;
       }
     });
   };
-  const v1Agent = agent({ name: package_default.name }).onConnect((connection) => attachAgent(createAgent(connection.client), connection.signal)).onRequest(methods.agent.initialize, (ctx) => getAgent().initialize(ctx.params)).onRequest(methods.agent.session.new, (ctx) => getAgentForPaths(ctx.params).newSession(ctx.params)).onRequest(methods.agent.session.load, (ctx) => setup(ctx.params.sessionId, ctx.requestId, () => getAgentForPaths(ctx.params).loadSession(ctx.params), ctx.signal)).onRequest(methods.agent.session.fork, (ctx) => getAgentForPaths(ctx.params).forkSession(ctx.params)).onRequest(methods.agent.session.list, (ctx) => getAgentForPaths({ cwd: ctx.params.cwd ?? null }).listSessions(ctx.params)).onRequest(methods.agent.session.delete, (ctx) => getAgent(ctx.params).deleteSession(ctx.params)).onRequest(methods.agent.session.resume, (ctx) => setup(ctx.params.sessionId, ctx.requestId, () => getAgentForPaths(ctx.params).resumeSession(ctx.params), ctx.signal)).onRequest(methods.agent.session.close, (ctx) => getAgent(ctx.params).closeSession(ctx.params)).onRequest(methods.agent.session.setMode, (ctx) => getAgent(ctx.params).setSessionMode(ctx.params)).onRequest(methods.agent.session.setConfigOption, (ctx) => getAgent(ctx.params).setSessionConfigOption(ctx.params)).onRequest(methods.agent.authenticate, (ctx) => getAgent().authenticate(ctx.params, ctx.requestId)).onRequest(methods.agent.logout, (ctx) => getAgent().logout(ctx.params)).onRequest(methods.agent.providers.list, (ctx) => getAgent().listProviders(ctx.params)).onRequest(methods.agent.providers.set, (ctx) => getAgent().setProvider(ctx.params)).onRequest(methods.agent.providers.disable, (ctx) => getAgent().disableProvider(ctx.params)).onRequest(methods.agent.session.prompt, (ctx) => getAgent(ctx.params).prompt(ctx.params, ctx.signal)).onNotification(methods.agent.session.cancel, (ctx) => getAgent().cancel(ctx.params)).onRequest("authentication/status", emptyExtensionParamsParser, (ctx) => getAgent().extMethod("authentication/status", ctx.params)).onRequest("authentication/logout", emptyExtensionParamsParser, (ctx) => getAgent().extMethod("authentication/logout", ctx.params)).onRequest(LEGACY_SET_SESSION_MODEL_METHOD, legacySetSessionModelParamsParser, (ctx) => getAgent(ctx.params).extMethod(LEGACY_SET_SESSION_MODEL_METHOD, ctx.params)).onRequest(SESSION_STEERING_METHOD, sessionSteerParamsParser, (ctx) => getAgent(ctx.params).extMethod(SESSION_STEERING_METHOD, ctx.params)).onRequest(ASYNC_TASK_STOP_METHOD, asyncTaskStopParamsParser, (ctx) => getAgent(ctx.params).extMethod(ASYNC_TASK_STOP_METHOD, ctx.params)).onRequest(CODEX_HOOKS_LIST_METHOD, hooksListParamsParser, (ctx) => getAgent().listHooks(ctx.params.cwd)).onRequest(CODEX_HOOKS_TRUST_METHOD, hooksTrustParamsParser, (ctx) => getAgent().trustHooks(ctx.params.cwd, ctx.params.hooks)).onRequest(GOAL_CONTROL_METHOD, goalControlParamsParser, (ctx) => getAgent(ctx.params).extMethod(GOAL_CONTROL_METHOD, ctx.params)).onRequest(SESSION_RENAME_METHOD, sessionRenameParamsParser, (ctx) => getAgent(ctx.params).sessionIndex.rename(ctx.params)).onRequest(SESSION_BATCH_GET_METHOD, sessionBatchGetParamsParser, (ctx) => getAgent().sessionIndex.batchGet(ctx.params)).onRequest(SESSION_ARCHIVE_METHOD, sessionArchiveParamsParser, (ctx) => getAgent(ctx.params).sessionIndex.setArchived(ctx.params, true)).onRequest(SESSION_UNARCHIVE_METHOD, sessionArchiveParamsParser, (ctx) => getAgent(ctx.params).sessionIndex.setArchived(ctx.params, false)).onRequest(SESSION_LIST_SUBSCRIBE_METHOD, sessionListSubscriptionParamsParser, (ctx) => getAgent().sessionIndex.subscribeList(ctx.params)).onRequest(SESSION_LIST_UNSUBSCRIBE_METHOD, sessionListSubscriptionParamsParser, (ctx) => getAgent().sessionIndex.unsubscribeList(ctx.params));
-  const v2Agent = agent2({ name: package_default.name }).onConnect((connection) => attachAgent(createAgent(new AcpV2Connection(connection.client)), connection.signal)).onRequest(methods2.agent.initialize, (ctx) => getAgent().initializeV2(ctx.params)).onRequest(methods2.agent.session.new, (ctx) => getAgentForPaths(ctx.params).newSessionV2(ctx.params)).onRequest(methods2.agent.session.list, (ctx) => getAgentForPaths({ cwd: ctx.params.cwd ?? null }).listSessions(ctx.params)).onRequest(methods2.agent.session.delete, (ctx) => getAgent(ctx.params).deleteSession(ctx.params)).onRequest(methods2.agent.session.resume, (ctx) => setup(ctx.params.sessionId, ctx.requestId, () => getAgentForPaths(ctx.params).resumeSessionV2(ctx.params), ctx.signal)).onRequest(methods2.agent.session.fork, (ctx) => getAgentForPaths(ctx.params).forkSessionV2(ctx.params)).onRequest(methods2.agent.session.close, (ctx) => getAgent(ctx.params).closeSession(ctx.params)).onRequest(methods2.agent.session.setConfigOption, (ctx) => getAgent(ctx.params).setSessionConfigOptionV2(ctx.params)).onRequest(methods2.agent.auth.login, (ctx) => getAgent().authenticateV2(ctx.params, ctx.requestId)).onRequest(methods2.agent.auth.logout, (ctx) => getAgent().logoutV2(ctx.params)).onRequest(methods2.agent.session.prompt, (ctx) => getAgent(ctx.params).promptV2(ctx.params, ctx.signal)).onNotification(methods2.agent.session.cancel, (ctx) => getAgent().cancel(ctx.params)).onRequest(methods2.agent.providers.list, (ctx) => getAgent().listProviders(ctx.params)).onRequest(methods2.agent.providers.set, (ctx) => getAgent().setProvider(ctx.params)).onRequest(methods2.agent.providers.disable, (ctx) => getAgent().disableProvider(ctx.params)).onRequest(SESSION_STEERING_METHOD, sessionSteerParamsParser, (ctx) => getAgent(ctx.params).extMethod(SESSION_STEERING_METHOD, ctx.params)).onRequest(GOAL_CONTROL_METHOD, goalControlParamsParser, (ctx) => getAgent(ctx.params).extMethod(GOAL_CONTROL_METHOD, ctx.params)).onRequest(ASYNC_TASK_STOP_METHOD, asyncTaskStopParamsParser, (ctx) => getAgent(ctx.params).extMethod(ASYNC_TASK_STOP_METHOD, ctx.params)).onRequest(SESSION_RENAME_METHOD, sessionRenameParamsParser, (ctx) => getAgent(ctx.params).sessionIndex.rename(ctx.params)).onRequest(SESSION_BATCH_GET_METHOD, sessionBatchGetParamsParser, (ctx) => getAgent().sessionIndex.batchGet(ctx.params)).onRequest(SESSION_ARCHIVE_METHOD, sessionArchiveParamsParser, (ctx) => getAgent(ctx.params).sessionIndex.setArchived(ctx.params, true)).onRequest(SESSION_UNARCHIVE_METHOD, sessionArchiveParamsParser, (ctx) => getAgent(ctx.params).sessionIndex.setArchived(ctx.params, false)).onRequest(SESSION_LIST_SUBSCRIBE_METHOD, sessionListSubscriptionParamsParser, (ctx) => getAgent().sessionIndex.subscribeList(ctx.params)).onRequest(SESSION_LIST_UNSUBSCRIBE_METHOD, sessionListSubscriptionParamsParser, (ctx) => getAgent().sessionIndex.unsubscribeList(ctx.params));
+  const v1Agent = agent({ name: package_default.name }).onConnect((connection) => attachAgent(createAgent(connection.client), connection.signal)).onRequest(methods.agent.initialize, (ctx) => getAgent().initialize(ctx.params)).onRequest(methods.agent.session.new, (ctx) => createdSetup(ctx.requestId, () => getAgentForPaths(ctx.params).newSession(ctx.params))).onRequest(methods.agent.session.load, (ctx) => setup(ctx.params.sessionId, ctx.requestId, () => getAgentForPaths(ctx.params).loadSession(ctx.params), ctx.signal)).onRequest(methods.agent.session.fork, (ctx) => createdSetup(ctx.requestId, () => getAgentForPaths(ctx.params).forkSession(ctx.params))).onRequest(methods.agent.session.list, (ctx) => getAgentForPaths({ cwd: ctx.params.cwd ?? null }).listSessions(ctx.params)).onRequest(methods.agent.session.delete, (ctx) => getAgent(ctx.params).deleteSession(ctx.params)).onRequest(methods.agent.session.resume, (ctx) => setup(ctx.params.sessionId, ctx.requestId, () => getAgentForPaths(ctx.params).resumeSession(ctx.params), ctx.signal)).onRequest(methods.agent.session.close, (ctx) => getAgent(ctx.params).closeSession(ctx.params)).onRequest(methods.agent.session.setMode, (ctx) => getAgent(ctx.params).setSessionMode(ctx.params)).onRequest(methods.agent.session.setConfigOption, (ctx) => getAgent(ctx.params).setSessionConfigOption(ctx.params)).onRequest(methods.agent.authenticate, (ctx) => getAgent().authenticate(ctx.params, ctx.requestId)).onRequest(methods.agent.logout, (ctx) => getAgent().logout(ctx.params)).onRequest(methods.agent.providers.list, (ctx) => getAgent().listProviders(ctx.params)).onRequest(methods.agent.providers.set, (ctx) => getAgent().setProvider(ctx.params)).onRequest(methods.agent.providers.disable, (ctx) => getAgent().disableProvider(ctx.params)).onRequest(methods.agent.session.prompt, (ctx) => getAgent(ctx.params).prompt(ctx.params, ctx.signal)).onNotification(methods.agent.session.cancel, (ctx) => getAgent().cancel(ctx.params)).onRequest("authentication/status", emptyExtensionParamsParser, (ctx) => getAgent().extMethod("authentication/status", ctx.params)).onRequest("authentication/logout", emptyExtensionParamsParser, (ctx) => getAgent().extMethod("authentication/logout", ctx.params)).onRequest(LEGACY_SET_SESSION_MODEL_METHOD, legacySetSessionModelParamsParser, (ctx) => getAgent(ctx.params).extMethod(LEGACY_SET_SESSION_MODEL_METHOD, ctx.params)).onRequest(SESSION_STEERING_METHOD, sessionSteerParamsParser, (ctx) => getAgent(ctx.params).extMethod(SESSION_STEERING_METHOD, ctx.params)).onRequest(ASYNC_TASK_STOP_METHOD, asyncTaskStopParamsParser, (ctx) => getAgent(ctx.params).extMethod(ASYNC_TASK_STOP_METHOD, ctx.params)).onRequest(CODEX_HOOKS_LIST_METHOD, hooksListParamsParser, (ctx) => getAgent().listHooks(ctx.params.cwd)).onRequest(CODEX_HOOKS_TRUST_METHOD, hooksTrustParamsParser, (ctx) => getAgent().trustHooks(ctx.params.cwd, ctx.params.hooks)).onRequest(GOAL_CONTROL_METHOD, goalControlParamsParser, (ctx) => getAgent(ctx.params).extMethod(GOAL_CONTROL_METHOD, ctx.params)).onRequest(SESSION_RENAME_METHOD, sessionRenameParamsParser, (ctx) => getAgent(ctx.params).sessionIndex.rename(ctx.params)).onRequest(SESSION_BATCH_GET_METHOD, sessionBatchGetParamsParser, (ctx) => getAgent().sessionIndex.batchGet(ctx.params)).onRequest(SESSION_ARCHIVE_METHOD, sessionArchiveParamsParser, (ctx) => getAgent(ctx.params).sessionIndex.setArchived(ctx.params, true)).onRequest(SESSION_UNARCHIVE_METHOD, sessionArchiveParamsParser, (ctx) => getAgent(ctx.params).sessionIndex.setArchived(ctx.params, false)).onRequest(SESSION_LIST_SUBSCRIBE_METHOD, sessionListSubscriptionParamsParser, (ctx) => getAgent().sessionIndex.subscribeList(ctx.params)).onRequest(SESSION_LIST_UNSUBSCRIBE_METHOD, sessionListSubscriptionParamsParser, (ctx) => getAgent().sessionIndex.unsubscribeList(ctx.params));
+  const v2Agent = agent2({ name: package_default.name }).onConnect((connection) => attachAgent(createAgent(new AcpV2Connection(connection.client)), connection.signal)).onRequest(methods2.agent.initialize, (ctx) => getAgent().initializeV2(ctx.params)).onRequest(methods2.agent.session.new, (ctx) => createdSetup(ctx.requestId, () => getAgentForPaths(ctx.params).newSessionV2(ctx.params))).onRequest(methods2.agent.session.list, (ctx) => getAgentForPaths({ cwd: ctx.params.cwd ?? null }).listSessions(ctx.params)).onRequest(methods2.agent.session.delete, (ctx) => getAgent(ctx.params).deleteSession(ctx.params)).onRequest(methods2.agent.session.resume, (ctx) => setup(ctx.params.sessionId, ctx.requestId, () => getAgentForPaths(ctx.params).resumeSessionV2(ctx.params), ctx.signal)).onRequest(methods2.agent.session.fork, (ctx) => createdSetup(ctx.requestId, () => getAgentForPaths(ctx.params).forkSessionV2(ctx.params))).onRequest(methods2.agent.session.close, (ctx) => getAgent(ctx.params).closeSession(ctx.params)).onRequest(methods2.agent.session.setConfigOption, (ctx) => getAgent(ctx.params).setSessionConfigOptionV2(ctx.params)).onRequest(methods2.agent.auth.login, (ctx) => getAgent().authenticateV2(ctx.params, ctx.requestId)).onRequest(methods2.agent.auth.logout, (ctx) => getAgent().logoutV2(ctx.params)).onRequest(methods2.agent.session.prompt, (ctx) => getAgent(ctx.params).promptV2(ctx.params, ctx.signal)).onNotification(methods2.agent.session.cancel, (ctx) => getAgent().cancel(ctx.params)).onRequest(methods2.agent.providers.list, (ctx) => getAgent().listProviders(ctx.params)).onRequest(methods2.agent.providers.set, (ctx) => getAgent().setProvider(ctx.params)).onRequest(methods2.agent.providers.disable, (ctx) => getAgent().disableProvider(ctx.params)).onRequest(SESSION_STEERING_METHOD, sessionSteerParamsParser, (ctx) => getAgent(ctx.params).extMethod(SESSION_STEERING_METHOD, ctx.params)).onRequest(GOAL_CONTROL_METHOD, goalControlParamsParser, (ctx) => getAgent(ctx.params).extMethod(GOAL_CONTROL_METHOD, ctx.params)).onRequest(ASYNC_TASK_STOP_METHOD, asyncTaskStopParamsParser, (ctx) => getAgent(ctx.params).extMethod(ASYNC_TASK_STOP_METHOD, ctx.params)).onRequest(SESSION_RENAME_METHOD, sessionRenameParamsParser, (ctx) => getAgent(ctx.params).sessionIndex.rename(ctx.params)).onRequest(SESSION_BATCH_GET_METHOD, sessionBatchGetParamsParser, (ctx) => getAgent().sessionIndex.batchGet(ctx.params)).onRequest(SESSION_ARCHIVE_METHOD, sessionArchiveParamsParser, (ctx) => getAgent(ctx.params).sessionIndex.setArchived(ctx.params, true)).onRequest(SESSION_UNARCHIVE_METHOD, sessionArchiveParamsParser, (ctx) => getAgent(ctx.params).sessionIndex.setArchived(ctx.params, false)).onRequest(SESSION_LIST_SUBSCRIBE_METHOD, sessionListSubscriptionParamsParser, (ctx) => getAgent().sessionIndex.subscribeList(ctx.params)).onRequest(SESSION_LIST_UNSUBSCRIBE_METHOD, sessionListSubscriptionParamsParser, (ctx) => getAgent().sessionIndex.unsubscribeList(ctx.params));
   return agentProtocolRouter().withV1(v1Agent).withV2(v2Agent);
 }
 

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "2.5.1-preview.7",
+  "version": "2.5.1-preview.8",
   "description": "",
   "main": "dist/index.js",
   "bin": {