@agentclientprotocol/codex-acp 2.5.1-preview.14 → 2.5.1-preview.16

package/dist/index.js

@@ -41315,6 +41315,7 @@ var AgentMode = class _AgentMode {
 
 // src/CodexAcpClient.ts
 import path10 from "node:path";
+import { isDeepStrictEqual } from "node:util";
 
 // package.json
 var package_default = {
@@ -41322,7 +41323,7 @@ var package_default = {
   publishConfig: {
     access: "public"
   },
-  version: "2.5.1-preview.14",
+  version: "2.5.1-preview.16",
   description: "",
   main: "dist/index.js",
   bin: {
@@ -41703,6 +41704,83 @@ function isUnknownRecord(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 
+// src/RequestCancellation.ts
+function throwIfRequestCancelled(signal) {
+  if (signal?.aborted) throw RequestError.requestCancelled();
+}
+function withRequestCancellation(operation, signal) {
+  if (!signal) return operation;
+  return new Promise((resolve, reject) => {
+    const cancelled = () => {
+      signal.removeEventListener("abort", cancelled);
+      reject(RequestError.requestCancelled());
+    };
+    if (signal.aborted) cancelled();
+    else signal.addEventListener("abort", cancelled, { once: true });
+    void operation.then((value) => {
+      signal.removeEventListener("abort", cancelled);
+      if (signal.aborted) cancelled();
+      else resolve(value);
+    }, (error62) => {
+      signal.removeEventListener("abort", cancelled);
+      reject(error62);
+    });
+  });
+}
+
+// src/CodexAccountLogin.ts
+async function runAccountLogin(client, params, show, signal) {
+  throwIfRequestCancelled(signal);
+  let expectedId;
+  const buffered = [];
+  let complete;
+  let endWait;
+  const notified = new Promise((resolve, reject) => {
+    complete = resolve;
+    endWait = reject;
+  });
+  const accept = (event) => {
+    if (expectedId === void 0) buffered.push(event);
+    else if ((event.loginId ?? null) === expectedId) complete(event);
+  };
+  const listener = client.connection.onNotification("account/login/completed", accept);
+  const completed = client.waitWhileConnected("account/login/completed", notified);
+  void completed.catch(() => {
+  });
+  let response = null;
+  let finished2 = false;
+  try {
+    response = await client.accountLogin(params);
+    expectedId = "loginId" in response ? response.loginId : null;
+    for (const event of buffered) accept(event);
+    buffered.length = 0;
+    throwIfRequestCancelled(signal);
+    const first = await withRequestCancellation(Promise.race([
+      completed.then((result2) => ({ type: "completed", result: result2 })),
+      show(response).then((accepted) => ({ type: "shown", accepted }))
+    ]), signal);
+    if (first.type === "completed") {
+      finished2 = true;
+      return first.result.success;
+    }
+    if (!first.accepted) return false;
+    const result = await withRequestCancellation(completed, signal);
+    finished2 = true;
+    return result.success;
+  } finally {
+    if (!finished2 && response && "loginId" in response) {
+      await client.accountLoginCancel({ loginId: response.loginId }).catch((error62) => {
+        logger.error("Failed to cancel Codex account login", error62);
+      });
+    } else if (signal?.aborted && response && expectedId === null) {
+      await completed.catch(() => {
+      });
+    }
+    endWait(new Error("Account login has ended"));
+    listener.dispose();
+  }
+}
+
 // src/ClientSystemPrompt.ts
 function clientSystemPromptText(value) {
   if (value == null) return void 0;
@@ -41858,7 +41936,7 @@ var CodexAcpClient = class _CodexAcpClient {
    * routing). `authStatus` reports only the agent-owned one.
    */
   gatewayConfigSource;
-  pendingLoginCompleted = null;
+  authenticationTail = Promise.resolve();
   pendingAccountUpdated = null;
   sessionNotificationQueues = /* @__PURE__ */ new Map();
   subagents;
@@ -41918,48 +41996,46 @@ var CodexAcpClient = class _CodexAcpClient {
   getHomePath() {
     return this.configPath;
   }
-  async authenticate(authRequest, urlElicitationRequester) {
+  authenticate(authRequest, urlElicitationRequester, signal) {
     if (!isCodexAuthRequest(authRequest)) {
-      throw RequestError.invalidParams();
+      return Promise.reject(RequestError.invalidParams());
     }
+    const run = this.authenticationTail.then(() => this.authenticateOnce(authRequest, urlElicitationRequester, signal));
+    this.authenticationTail = run.then(() => {
+    }, () => {
+    });
+    return withRequestCancellation(run, signal);
+  }
+  async authenticateOnce(authRequest, urlElicitationRequester, signal) {
+    throwIfRequestCancelled(signal);
     this.gatewayConfig = null;
     this.gatewayConfigSource = null;
     switch (authRequest.methodId) {
       case "api-key":
-        return await this.authenticateWithApiKey(authRequest);
+        return await this.authenticateWithApiKey(authRequest, signal);
       case "chat-gpt":
-        return await this.authenticateWithChatGpt();
+        return await this.authenticateWithChatGpt(signal);
       case "chat-gpt-device-code":
-        return await this.authenticateWithChatGptDeviceCode(urlElicitationRequester);
+        return await this.authenticateWithChatGptDeviceCode(urlElicitationRequester, signal);
       case "gateway":
         return this.authenticateWithGateway(authRequest);
     }
   }
-  async authenticateWithApiKey(authRequest) {
+  async authenticateWithApiKey(authRequest, signal) {
     const apiKey = authRequest._meta?.["api-key"]?.apiKey ?? this.readApiKeyFromEnv();
-    const loginCompletedPromise = this.awaitNextLoginCompleted();
-    loginCompletedPromise.catch(() => {
-    });
-    await this.codexClient.accountLogin({
-      type: "apiKey",
-      apiKey
-    });
-    const result = await loginCompletedPromise;
-    return result.success;
+    return runAccountLogin(this.codexClient, { type: "apiKey", apiKey }, async () => true, signal);
   }
-  async authenticateWithChatGpt() {
+  async authenticateWithChatGpt(signal) {
     if (await this.hasWorkingChatGptLogin()) {
+      throwIfRequestCancelled(signal);
       return true;
     }
-    const loginCompletedPromise = this.awaitNextLoginCompleted();
-    loginCompletedPromise.catch(() => {
-    });
-    const loginResponse = await this.codexClient.accountLogin({ type: "chatgpt" });
-    if (loginResponse.type == "chatgpt") {
-      await open_default(loginResponse.authUrl);
-    }
-    const result = await loginCompletedPromise;
-    return result.success;
+    return runAccountLogin(this.codexClient, { type: "chatgpt" }, async (response) => {
+      if (response.type !== "chatgpt") return false;
+      throwIfRequestCancelled(signal);
+      await open_default(response.authUrl);
+      return true;
+    }, signal);
   }
   /**
    * Reads with a token refresh whether the agent has a ChatGPT login that a new login does not need to replace.
@@ -41985,56 +42061,27 @@ var CodexAcpClient = class _CodexAcpClient {
       throw error62;
     }
   }
-  async authenticateWithChatGptDeviceCode(urlElicitationRequester) {
+  async authenticateWithChatGptDeviceCode(urlElicitationRequester, signal) {
     if (await this.hasWorkingChatGptLogin()) {
+      throwIfRequestCancelled(signal);
       return true;
     }
     if (!urlElicitationRequester) {
       throw RequestError.invalidRequest(void 0, "Device code authentication requires URL elicitation support");
     }
-    const loginCompletedPromise = this.awaitNextLoginCompleted();
-    loginCompletedPromise.catch(() => {
-    });
-    const loginResponse = await this.codexClient.accountLogin({ type: "chatgptDeviceCode" });
-    if (loginResponse.type !== "chatgptDeviceCode") {
-      return false;
-    }
-    const elicitationResponsePromise = Promise.resolve(urlElicitationRequester.elicitUrl({
-      url: loginResponse.verificationUrl,
-      message: `Sign in to ChatGPT and enter this code: ${loginResponse.userCode}`,
-      elicitationId: loginResponse.loginId
-    }));
     try {
-      const first = await Promise.race([
-        loginCompletedPromise.then((result2) => ({
-          type: "loginCompleted",
-          result: result2
-        })),
-        elicitationResponsePromise.then((response) => ({
-          type: "elicitationResponse",
-          response
-        }))
-      ]);
-      if (first.type === "loginCompleted") {
-        await urlElicitationRequester.completeElicitation();
-        return first.result.success;
-      }
-      if (!CreateElicitationResponse.isAccept(first.response)) {
-        await this.codexClient.accountLoginCancel({ loginId: loginResponse.loginId });
-        throw RequestError.requestCancelled(
-          { methodId: "chat-gpt-device-code", action: first.response.action },
-          "ChatGPT device code sign-in was cancelled"
-        );
-      }
-      const result = await loginCompletedPromise;
-      await urlElicitationRequester.completeElicitation();
-      return result.success;
-    } catch (error62) {
-      if (this.codexClient.connectionLoss.lost) {
-        await Promise.resolve(urlElicitationRequester.completeElicitation()).catch(() => {
+      return await runAccountLogin(this.codexClient, { type: "chatgptDeviceCode" }, async (response) => {
+        if (response.type !== "chatgptDeviceCode") return false;
+        const answer = await urlElicitationRequester.elicitUrl({
+          url: response.verificationUrl,
+          message: `Sign in to ChatGPT and enter this code: ${response.userCode}`,
+          elicitationId: response.loginId
         });
-      }
-      throw error62;
+        return CreateElicitationResponse.isAccept(answer);
+      }, signal);
+    } finally {
+      await urlElicitationRequester.completeElicitation().catch(() => {
+      });
     }
   }
   authenticateWithGateway(authRequest) {
@@ -42158,9 +42205,9 @@ var CodexAcpClient = class _CodexAcpClient {
     if (!URL.canParse(request.baseUrl) || !["http:", "https:"].includes(new URL(request.baseUrl).protocol)) {
       throw RequestError.invalidParams({ baseUrl: request.baseUrl }, "baseUrl must be an http(s) URL");
     }
-    const previous = this.gatewayConfigSource === "acpProviders" ? this.gatewayConfig : null;
+    const previousListing = this.hasProviderRouting(gatewayConfig) ? this.gatewayConfig?.listedModels ?? null : null;
     try {
-      gatewayConfig.listedModels = previous?.listedModels && sameGatewayRouting(previous, gatewayConfig) ? previous.listedModels : await listGatewayModels(gatewayConfig.config.base_url, gatewayConfig.config.http_headers);
+      gatewayConfig.listedModels = previousListing ?? await listGatewayModels(gatewayConfig.config.base_url, gatewayConfig.config.http_headers);
     } catch (error62) {
       if (error62 instanceof GatewayListingError) {
         throw RequestError.internalError(
@@ -42172,6 +42219,10 @@ var CodexAcpClient = class _CodexAcpClient {
     }
     return gatewayConfig;
   }
+  /** Whether `providers/set` already applied the provider config of `gatewayConfig`. */
+  hasProviderRouting(gatewayConfig) {
+    return this.gatewayConfigSource === "acpProviders" && this.gatewayConfig !== null && sameProviderConfig(this.gatewayConfig, gatewayConfig);
+  }
   /** `providers/set`: replaces the routing with a configuration from {@link prepareProvider}. */
   setProvider(gatewayConfig) {
     this.gatewayConfigSource = "acpProviders";
@@ -42887,20 +42938,6 @@ var CodexAcpClient = class _CodexAcpClient {
   async listSkills(params) {
     return withoutUnsupportedSkills(await this.codexClient.listSkills(params ?? {}));
   }
-  async awaitNextLoginCompleted() {
-    if (this.pendingLoginCompleted !== null) {
-      return await this.pendingLoginCompleted;
-    }
-    this.pendingLoginCompleted = this.awaitSingleNotification(
-      "account/login/completed",
-      (event) => event
-    );
-    try {
-      return await this.pendingLoginCompleted;
-    } finally {
-      this.pendingLoginCompleted = null;
-    }
-  }
   async awaitNextAccountUpdated() {
     if (this.pendingAccountUpdated !== null) {
       return await this.pendingAccountUpdated;
@@ -43112,10 +43149,8 @@ function buildGatewayConfig(params) {
     listedModels: null
   };
 }
-function sameGatewayRouting(left, right) {
-  const leftHeaders = Object.entries(left.config.http_headers);
-  const rightHeaders = right.config.http_headers;
-  return left.config.base_url === right.config.base_url && left.config.wire_api === right.config.wire_api && leftHeaders.length === Object.keys(rightHeaders).length && leftHeaders.every(([name, value]) => rightHeaders[name] === value);
+function sameProviderConfig(left, right) {
+  return left.modelProvider === right.modelProvider && isDeepStrictEqual(left.config, right.config);
 }
 function readMetaAdditionalRoots(meta3) {
   const rawRoots = meta3?.["additionalRoots"];
@@ -50033,6 +50068,7 @@ var CodexAcpServer = class {
   mcpServerSignIn;
   clientDelivery;
   setupResponseOrdering = false;
+  initializeResponseDelivery = "direct";
   /** ACP protocol version of the connection this agent serves, fixed by the protocol router. */
   protocolVersion;
   /** The v2 client handle; `null` on a v1 connection. */
@@ -50096,6 +50132,8 @@ var CodexAcpServer = class {
   recovery;
   initializeRequest = null;
   providerUpdate = null;
+  /** The last provider update failed, so the app-server may not run the routing of the agent. */
+  providerUpdateFailed = false;
   /**
    * Numbers `providers/set` and `providers/disable` requests in arrival order. A listing finishing after a newer
    * request was applied is dropped; a newer request that failed drops nothing.
@@ -51550,41 +51588,53 @@ You have been logged out. Please try again.`);
       ...this.createSessionSetupResponseV2(this.getSessionState(sessionId))
     };
   }
-  async authenticate(_params, requestId) {
+  async authenticate(_params, requestId, signal) {
     logger.log("Authenticate request received");
+    throwIfRequestCancelled(signal);
     const appServer = this.ensureAppServer();
-    if (appServer) await appServer;
-    const elicitationRequester = this.createUrlElicitationRequester(requestId);
-    const isAuthenticated = await this.runWithProcessCheck(() => this.codexAcpClient.authenticate(_params, elicitationRequester));
-    if (!isAuthenticated) {
-      logger.log("Authenticate request failed");
-      throw RequestError.authRequired({ methodId: _params.methodId }, "Sign-in did not complete");
-    }
-    await this.refreshAuthState(this.getAuthProviderForAuthenticateRequest(_params));
-    logger.log("Authenticate request completed");
-    return {};
+    if (appServer) await withRequestCancellation(appServer, signal);
+    const elicitationRequester = this.createUrlElicitationRequester(requestId, signal);
+    try {
+      const isAuthenticated = await this.runWithProcessCheck(() => this.codexAcpClient.authenticate(_params, elicitationRequester, signal));
+      throwIfRequestCancelled(signal);
+      if (!isAuthenticated) {
+        logger.log("Authenticate request failed");
+        throw RequestError.authRequired({ methodId: _params.methodId }, "Sign-in did not complete");
+      }
+      await withRequestCancellation(this.refreshAuthState(this.getAuthProviderForAuthenticateRequest(_params)), signal);
+      logger.log("Authenticate request completed");
+      return {};
+    } finally {
+      await elicitationRequester?.completeElicitation().catch(() => {
+      });
+    }
   }
-  createUrlElicitationRequester(requestId) {
+  createUrlElicitationRequester(requestId, signal) {
     if (requestId == null || !clientSupportsUrlElicitation(this.clientCapabilities)) {
       return void 0;
     }
+    const lifetime = new AbortController();
+    const cancellationSignal = signal ? AbortSignal.any([signal, lifetime.signal]) : lifetime.signal;
     let elicitationId = null;
     return {
-      elicitUrl: (request) => {
+      elicitUrl: async (request) => {
         elicitationId = request.elicitationId;
-        return this.connection.request(methods.client.elicitation.create, {
+        const response = await this.connection.request(methods.client.elicitation.create, {
           mode: "url",
           requestId,
           ...request
-        });
+        }, { cancellationSignal });
+        if (!CreateElicitationResponse.isAccept(response)) elicitationId = null;
+        return response;
       },
       completeElicitation: async () => {
         if (elicitationId === null) {
           return;
         }
-        await this.connection.notify(methods.client.elicitation.complete, {
-          elicitationId
-        });
+        const completedId = elicitationId;
+        elicitationId = null;
+        lifetime.abort();
+        await this.connection.notify(methods.client.elicitation.complete, { elicitationId: completedId });
       }
     };
   }
@@ -51597,11 +51647,11 @@ You have been logged out. Please try again.`);
     logger.log("Logout request completed");
   }
   /** v2 `auth/login`: same params as v1 `authenticate`, only the method name changed. */
-  async authenticateV2(params, requestId) {
+  async authenticateV2(params, requestId, signal) {
     if (!getCodexAuthMethodsV2(this.clientCapabilities).some((method) => method.methodId === params.methodId)) {
       throw RequestError.invalidParams(void 0, `Unsupported authentication method: ${params.methodId}`);
     }
-    return await this.authenticate(params, requestId);
+    return await this.authenticate(params, requestId, signal);
   }
   /** v2 `auth/logout`: same params as v1 `logout`, only the method name changed. */
   async logoutV2(params) {
@@ -51619,6 +51669,11 @@ You have been logged out. Please try again.`);
       return {};
     }
     this.appliedProviderRequest = request;
+    if (this.codexAcpClient.hasProviderRouting(gatewayConfig) && !this.providerUpdateFailed) {
+      logger.log("providers/set unchanged: the app-server is not restarted");
+      await this.waitForProviderUpdate();
+      return {};
+    }
     this.codexAcpClient.setProvider(gatewayConfig);
     await this.enqueueProviderUpdate((client) => client.setProvider(gatewayConfig));
     return {};
@@ -51716,6 +51771,11 @@ You have been logged out. Please try again.`);
       }
     });
     this.providerUpdate = update;
+    update.then(() => {
+      this.providerUpdateFailed = false;
+    }, () => {
+      this.providerUpdateFailed = true;
+    });
     this.recovery?.settleReplacement(update);
     try {
       await update;
@@ -51864,16 +51924,23 @@ You have been logged out. Please try again.`);
    * Schedules the connection's first `_auth/status_update`: one account read,
    * pushed whatever it says, including `none`.
    *
-   * The push must not overtake the `initialize` response. The JSON-RPC layer
-   * writes that response in the microtask that resolves {@link initialize}, so
-   * the read starts from a check-phase callback, which always runs after it.
-   * `initialize` itself never waits for the read.
+   * Routed connections publish at the response-write boundary. Direct callers
+   * have no transport boundary, so they retain the asynchronous fallback.
    *
    * "Unconditional" costs nothing extra here: nothing has been pushed yet on
    * this connection, so {@link setAuthStatus} cannot suppress this one.
    */
   publishFirstAuthStatusAfterResponse() {
-    setImmediate(() => void this.publishAuthStatusRead());
+    if (this.initializeResponseDelivery === "direct") {
+      setImmediate(() => void this.publishAuthStatusRead());
+    }
+  }
+  observeInitializeResponse() {
+    this.initializeResponseDelivery = "pending";
+  }
+  afterInitializeResponse() {
+    this.initializeResponseDelivery = "written";
+    void this.publishAuthStatusRead();
   }
   /**
    * Reads the agent-owned identity and pushes it.
@@ -51957,6 +52024,7 @@ You have been logged out. Please try again.`);
    */
   async applyAccountUpdated(notification) {
     this.lastReadAccount = accountFromUpdated(notification, this.lastReadAccount);
+    if (this.initializeResponseDelivery === "pending") return;
     try {
       if (this.codexAcpClient.getAuthGatewayProviderName() !== null) {
         return;
@@ -51987,6 +52055,7 @@ You have been logged out. Please try again.`);
    */
   async setAuthStatus(next) {
     this.authStatusVersion += 1;
+    if (this.initializeResponseDelivery === "pending") return;
     if (sameAuthStatus(this.currentAuthStatus, next)) {
       return;
     }
@@ -54881,6 +54950,7 @@ function createRouter(createAgent, responses) {
   };
   const attachAgent = (agent3, signal) => {
     codexAcpServer = agent3;
+    agent3.observeInitializeResponse();
     const stopSetupPublication = agent3.observeSessionSetupResponses();
     signal.addEventListener("abort", () => {
       setups.clear();
@@ -54891,8 +54961,16 @@ function createRouter(createAgent, responses) {
       }
     });
   };
-  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));
+  const initialize = async (requestId, operation) => {
+    const agent3 = getAgent();
+    const result = await operation();
+    responses.afterWrite(requestId, (successful) => {
+      if (successful) agent3.afterInitializeResponse();
+    });
+    return result;
+  };
+  const v1Agent = agent({ name: package_default.name }).onConnect((connection) => attachAgent(createAgent(connection.client), connection.signal)).onRequest(methods.agent.initialize, (ctx) => initialize(ctx.requestId, () => 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, ctx.signal)).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) => initialize(ctx.requestId, () => 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, ctx.signal)).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.14",
+  "version": "2.5.1-preview.16",
   "description": "",
   "main": "dist/index.js",
   "bin": {