@agentclientprotocol/codex-acp 2.5.1-preview.3 → 2.5.1-preview.5

package/dist/index.js

@@ -25039,6 +25039,8 @@ var zSubagentUpdate = object({
   description: defaultOnError(string2().nullish(), () => void 0),
   capabilities: defaultOnError(zSubagentSessionCapabilities.nullish(), () => void 0),
   state: defaultOnError(zStateUpdate.nullish(), () => void 0),
+  cwd: string2().nullish(),
+  additionalDirectories: array(string2()).nullish(),
   _meta: defaultOnError(record(string2(), unknown()).nullish(), () => void 0)
 });
 var zSessionMessage = object({
@@ -25501,6 +25503,17 @@ var zCancelRequestNotification = object({
 
 // node_modules/@agentclientprotocol/sdk/dist/core/jsonrpc.js
 var CANCEL_REQUEST_METHOD = "$/cancel_request";
+function treatSessionNotFoundAsSuccess(method, response, success2) {
+  if (method !== "session/close" && method !== "session/delete") {
+    return response;
+  }
+  return response.catch((error62) => {
+    if (error62 instanceof RequestError && error62.code === -32002) {
+      return success2();
+    }
+    throw error62;
+  });
+}
 function isRequestMessage(value) {
   return isJsonRpcEnvelope(value) && "id" in value && typeof value["method"] === "string" && isJsonRpcId(value["id"]);
 }
@@ -25533,28 +25546,6 @@ function isJsonRpcId(value) {
 function isResponseShapedMessage(value) {
   return isRecord(value) && !("method" in value) && ("id" in value || "result" in value || "error" in value);
 }
-function isResponseBatch(batch) {
-  let hasValidCall = false;
-  let hasValidResponse = false;
-  let hasCallShape = false;
-  let hasResponseShape = false;
-  for (const entry of batch) {
-    hasValidCall ||= isRequestMessage(entry) || isNotificationMessage(entry);
-    hasValidResponse ||= isResponseMessage(entry);
-    if (!isRecord(entry)) {
-      continue;
-    }
-    hasCallShape ||= "method" in entry;
-    hasResponseShape ||= "result" in entry || "error" in entry;
-  }
-  if (hasValidCall) {
-    return false;
-  }
-  if (hasValidResponse) {
-    return true;
-  }
-  return hasResponseShape && !hasCallShape;
-}
 function cancelRequestId(params) {
   if (!isRecord(params) || !isJsonRpcId(params["requestId"])) {
     return void 0;
@@ -25686,7 +25677,6 @@ var RequestResponder = class {
     });
   }
 };
-var requestBatchSizes = /* @__PURE__ */ new WeakMap();
 var nullIdResponders = /* @__PURE__ */ new WeakSet();
 function isV2RequestId(value) {
   return typeof value === "string" || Number.isInteger(value);
@@ -25695,9 +25685,6 @@ function respondWithNullId(responder, error62) {
   nullIdResponders.add(responder);
   return responder.respondWithError(error62);
 }
-function requestBatchSize(responder) {
-  return requestBatchSizes.get(responder);
-}
 var HandlerRegistration = class {
   disposeHandler;
   active = true;
@@ -25744,12 +25731,6 @@ var ConnectionContext = class {
   sendNotification(method, params) {
     return this.connection.sendNotification(method, params);
   }
-  /**
-   * Sends a non-empty JSON-RPC batch in one transport message.
-   */
-  sendBatch(entries) {
-    return this.connection.sendBatch(entries);
-  }
   /**
    * Sends a protocol-level request cancellation notification.
    */
@@ -25789,7 +25770,6 @@ var Connection = class {
   retryQueue = [];
   context = new ConnectionContext(this);
   receiveReader;
-  allowBatches = true;
   constructor(requestHandlerOrStream, notificationHandlerOrHandlers, streamOrOptions, options) {
     if (typeof requestHandlerOrStream === "function") {
       const requestHandler = requestHandlerOrStream;
@@ -25879,7 +25859,7 @@ var Connection = class {
       return rejectedPromise(this.closedReason());
     }
     const request = this.prepareRequest(method, params, mapResponse, options);
-    const requestSent = this.sendWireMessage(request.message);
+    const requestSent = this.sendMessage(request.message);
     void requestSent.catch(() => {
     });
     if (options.cancellationSignal?.aborted) {
@@ -25887,60 +25867,6 @@ var Connection = class {
     }
     return request.response;
   }
-  /**
-   * Sends a non-empty JSON-RPC batch in one transport message.
-   *
-   * Requests and notifications are processed independently by the peer, and
-   * array position does not establish processing order. Callers **MUST NOT**
-   * batch messages whose correctness depends on their relative order, such as
-   * two `session/update` notifications for the same entity; send those as
-   * separate messages instead. The returned tuple preserves the input order:
-   * request entries resolve to their mapped response, while notification
-   * entries resolve to `undefined`.
-   */
-  sendBatch(entries) {
-    if (this.abortController.signal.aborted) {
-      return rejectedPromise(this.closedReason());
-    }
-    if (!this.allowBatches) {
-      return rejectedPromise(new TypeError("JSON-RPC batches are not supported on this connection"));
-    }
-    if (entries.length === 0) {
-      return rejectedPromise(new TypeError("JSON-RPC batch must contain at least one entry"));
-    }
-    const messages = [];
-    const cancellations = [];
-    const outputs = [];
-    for (const entry of entries) {
-      if (entry.kind === "notification") {
-        messages.push({
-          jsonrpc: "2.0",
-          method: entry.method,
-          params: entry.params
-        });
-        outputs.push(Promise.resolve(void 0));
-        continue;
-      }
-      const request = this.prepareRequest(entry.method, entry.params, entry.mapResponse, entry.options);
-      messages.push(request.message);
-      outputs.push(request.response);
-      cancellations.push({
-        signal: entry.options?.cancellationSignal,
-        cancel: request.cancel
-      });
-    }
-    const batch = messages;
-    const batchSent = this.sendWireMessage(batch);
-    for (const cancellation of cancellations) {
-      if (cancellation.signal?.aborted) {
-        cancellation.cancel();
-      }
-    }
-    const response = Promise.all([batchSent, ...outputs]).then(([, ...resolved]) => resolved);
-    response.catch(() => {
-    });
-    return response;
-  }
   /**
    * Sends a protocol-level request cancellation notification.
    */
@@ -25954,7 +25880,7 @@ var Connection = class {
     if (this.abortController.signal.aborted) {
       return rejectedPromise(this.closedReason());
     }
-    return this.sendWireMessage({ jsonrpc: "2.0", method, params });
+    return this.sendMessage({ jsonrpc: "2.0", method, params });
   }
   prepareRequest(method, params, mapResponse, options = {}) {
     const id = this.nextRequestId++;
@@ -26021,7 +25947,6 @@ var Connection = class {
     this.stream = stream;
     this.staticHandlers = handlers;
     this.fallbackHandlers = [...options?.fallbackHandlers ?? []];
-    this.allowBatches = options?.allowBatches ?? true;
     this.closedPromise = new Promise((resolve) => {
       this.abortController.signal.addEventListener("abort", () => resolve());
     });
@@ -26054,7 +25979,7 @@ var Connection = class {
           if (done) {
             break;
           }
-          this.receiveWireMessage(message);
+          this.receiveUnvalidatedMessage(message);
         }
       } finally {
         if (this.receiveReader === reader) {
@@ -26068,68 +25993,20 @@ var Connection = class {
       this.close(closeError);
     }
   }
-  receiveWireMessage(message) {
+  receiveUnvalidatedMessage(message) {
     if (Array.isArray(message)) {
-      if (!this.allowBatches) {
-        this.close(new TypeError("JSON-RPC batches are not supported on this connection"));
-        return;
-      }
-      this.receiveBatch(message);
+      void this.sendMessage(protocolErrorResponse(RequestError.invalidRequest(void 0, "JSON-RPC batches are not supported"))).catch(() => {
+      });
       return;
     }
     if (!isRequestMessage(message) && !isNotificationMessage(message) && !isResponseShapedMessage(message)) {
-      void this.sendWireMessage(protocolErrorResponse(RequestError.invalidRequest(message))).catch(() => {
+      void this.sendMessage(protocolErrorResponse(RequestError.invalidRequest(message))).catch(() => {
       });
       return;
     }
     this.receiveMessage(message);
   }
-  receiveBatch(batch) {
-    if (batch.length === 0) {
-      void this.sendWireMessage(protocolErrorResponse(RequestError.invalidRequest(batch))).catch(() => {
-      });
-      return;
-    }
-    const responseBatch = isResponseBatch(batch);
-    const responseCount = responseBatch ? 0 : batch.reduce((count, message) => count + (isNotificationMessage(message) ? 0 : 1), 0);
-    let remaining = responseCount;
-    let remainingNotifications = batch.reduce((count, message) => count + (isNotificationMessage(message) ? 1 : 0), 0);
-    let responseSent = false;
-    const responses = [];
-    const sendResponsesIfReady = async () => {
-      if (responseSent || remaining !== 0 || remainingNotifications !== 0 || responses.length === 0) {
-        return;
-      }
-      responseSent = true;
-      await this.sendWireMessage(responses);
-    };
-    const collectResponse = async (response) => {
-      responses.push(response);
-      remaining -= 1;
-      await sendResponsesIfReady();
-    };
-    for (const message of batch) {
-      if (responseBatch) {
-        if (isResponseShapedMessage(message)) {
-          this.receiveMessage(message);
-        }
-        continue;
-      }
-      if (!isRequestMessage(message) && !isNotificationMessage(message)) {
-        void collectResponse(protocolErrorResponse(RequestError.invalidRequest(message))).catch(() => {
-        });
-        continue;
-      }
-      const processing = this.receiveMessage(message, isRequestMessage(message) ? collectResponse : void 0, batch.length);
-      if (isNotificationMessage(message)) {
-        void processing.finally(() => {
-          remainingNotifications -= 1;
-          void sendResponsesIfReady().catch((error62) => this.close(error62));
-        });
-      }
-    }
-  }
-  receiveMessage(message, sendResponse, batchSize) {
+  receiveMessage(message) {
     if (this.abortController.signal.aborted) {
       return Promise.resolve();
     }
@@ -26141,7 +26018,7 @@ var Connection = class {
       if (!("id" in message)) {
         this.handleProtocolNotification(message);
       }
-      return this.processIncomingMessage(this.toIncomingMessage(message, sendResponse, batchSize)).catch((error62) => this.close(error62));
+      return this.processIncomingMessage(this.toIncomingMessage(message)).catch((error62) => this.close(error62));
     } else if ("id" in message) {
       this.handleResponse(message);
     } else {
@@ -26196,7 +26073,7 @@ var Connection = class {
       }
     }
   }
-  toIncomingMessage(message, sendResponse, batchSize) {
+  toIncomingMessage(message) {
     if ("id" in message) {
       const abortController = new AbortController();
       this.incomingRequests.set(message.id, abortController);
@@ -26211,11 +26088,8 @@ var Connection = class {
           id: nullIdResponders.has(responder) ? null : message.id,
           ...result
         };
-        return sendResponse ? sendResponse(response) : this.sendWireMessage(response);
+        return this.sendMessage(response);
       }, abortController.signal, finishRequest);
-      if (batchSize !== void 0) {
-        requestBatchSizes.set(responder, batchSize);
-      }
       return {
         kind: "request",
         method: message.method,
@@ -26266,7 +26140,7 @@ var Connection = class {
   closedReason() {
     return this.abortController.signal.reason ?? new Error("ACP connection closed");
   }
-  async sendWireMessage(message) {
+  async sendMessage(message) {
     if (this.abortController.signal.aborted) {
       return rejectedPromise(this.closedReason());
     }
@@ -26678,7 +26552,9 @@ function ndJsonStream(output2, input2, options = {}) {
           await writeJson(protocolErrorResponse(RequestError.parseError()));
           return;
         }
-        if (isRecord(message) || Array.isArray(message)) {
+        if (Array.isArray(message)) {
+          await writeJson(protocolErrorResponse(RequestError.invalidRequest(void 0, "JSON-RPC batches are not supported")));
+        } else if (isRecord(message)) {
           controller.enqueue(message);
         } else {
           await writeJson(protocolErrorResponse(RequestError.invalidRequest(message)));
@@ -27080,7 +26956,7 @@ var ClientContext = class _ClientContext extends AcpContext {
   }
   request(method, params, options) {
     const spec = agentRequestSpecsByMethod[method];
-    return this.sendRequest(method, params, spec?.mapResponse, options);
+    return treatSessionNotFoundAsSuccess(method, this.sendRequest(method, params, spec?.mapResponse, options), () => spec?.mapResponse ? spec.mapResponse({}) : {});
   }
   notify(method, params) {
     return this.sendNotification(method, params);
@@ -27544,7 +27420,6 @@ function runConnectHandlers(connection, handlers) {
 var appBuilder = /* @__PURE__ */ Symbol("appBuilder");
 var runAgentConnectHandlers = /* @__PURE__ */ Symbol("runAgentConnectHandlers");
 var runClientConnectHandlers = /* @__PURE__ */ Symbol("runClientConnectHandlers");
-var stableConnectionOptions = { allowBatches: false };
 function agent(options) {
   return new AgentApp(options);
 }
@@ -27660,7 +27535,7 @@ var AgentApp = class {
       return state2;
     }
     const [thisStream, peerStream] = memoryStreamPair();
-    const peerRawConnection = target[appBuilder]().connect(peerStream, stableConnectionOptions);
+    const peerRawConnection = target[appBuilder]().connect(peerStream);
     const peerConnection = clientConnection(peerRawConnection);
     const state = this.openStreamConnection(thisStream);
     void state.rawConnection.closed.then(() => peerConnection.close());
@@ -27676,7 +27551,7 @@ var AgentApp = class {
     return state;
   }
   openStreamConnection(stream) {
-    const rawConnection = this.builder.connect(stream, stableConnectionOptions);
+    const rawConnection = this.builder.connect(stream);
     return {
       rawConnection,
       connection: agentConnection(rawConnection, this.connectHandlers)
@@ -27778,7 +27653,7 @@ var ClientApp = class {
       return state2;
     }
     const [thisStream, peerStream] = memoryStreamPair();
-    const peerRawConnection = target[appBuilder]().connect(peerStream, stableConnectionOptions);
+    const peerRawConnection = target[appBuilder]().connect(peerStream);
     const peerConnection = agentConnection(peerRawConnection);
     const state = this.openStreamConnection(thisStream);
     void state.rawConnection.closed.then(() => peerConnection.close());
@@ -27794,7 +27669,7 @@ var ClientApp = class {
     return state;
   }
   openStreamConnection(stream) {
-    const rawConnection = this.builder.connect(stream, stableConnectionOptions);
+    const rawConnection = this.builder.connect(stream);
     return {
       rawConnection,
       connection: clientConnection(rawConnection, this.connectHandlers)
@@ -28201,7 +28076,7 @@ var zRole2 = union([
 ]);
 var zAnnotations2 = object({
   audience: defaultOnError(vecSkipError(zRole2).nullish(), () => void 0),
-  lastModified: defaultOnError(iso_exports.datetime({ offset: true }).nullish(), () => void 0),
+  lastModified: defaultOnError(string2().nullish(), () => void 0),
   priority: defaultOnError(number2().gte(0).lte(1).nullish(), () => void 0),
   _meta: defaultOnError(record(string2(), unknown()).nullish(), () => void 0)
 });
@@ -28530,9 +28405,9 @@ var zElicitationPropertySchema2 = preserveCustomPayload(union([
   }), "type", ["array", "boolean", "integer", "number", "string"])
 ]), "type", ["array", "boolean", "integer", "number", "string"]);
 var zElicitationSchema2 = object({
-  type: zElicitationSchemaType2.optional().default("object"),
+  type: zElicitationSchemaType2,
   title: defaultOnError(string2().nullish(), () => void 0),
-  properties: record(string2(), zElicitationPropertySchema2).optional().default({}),
+  properties: record(string2(), zElicitationPropertySchema2),
   required: array(string2()).nullish(),
   description: defaultOnError(string2().nullish(), () => void 0),
   _meta: defaultOnError(record(string2(), unknown()).nullish(), () => void 0)
@@ -28757,8 +28632,8 @@ var zSessionConfigSelectGroup2 = object({
   _meta: defaultOnError(record(string2(), unknown()).nullish(), () => void 0)
 });
 var zSessionConfigSelectOptions2 = union([
-  array(zSessionConfigSelectOption2),
-  array(zSessionConfigSelectGroup2)
+  array(zSessionConfigSelectOption2).min(1),
+  array(zSessionConfigSelectGroup2).min(1)
 ]);
 var zSessionConfigSelect2 = object({
   currentValue: zSessionConfigValueId2,
@@ -28821,7 +28696,7 @@ var zNewSessionResponse2 = object({
 var zSessionInfo2 = object({
   sessionId: zSessionId2,
   cwd: zAbsolutePath,
-  additionalDirectories: array(zAbsolutePath).optional(),
+  additionalDirectories: defaultOnNull(array(zAbsolutePath), () => []).optional(),
   title: defaultOnError(string2().nullish(), () => void 0),
   updatedAt: defaultOnError(iso_exports.datetime({ offset: true }).nullish(), () => void 0),
   _meta: defaultOnError(record(string2(), unknown()).nullish(), () => void 0)
@@ -28875,10 +28750,24 @@ var zErrorCode2 = union([
     error: "Invalid value: Expected int32 to be <= 2147483647"
   })
 ]);
+var zUnsupportedProtocolVersionErrorData = object({
+  requested: zProtocolVersion2,
+  supported: array(zProtocolVersion2),
+  _meta: defaultOnError(record(string2(), unknown()).nullish(), () => void 0)
+});
+var zSessionNotFoundErrorData = object({
+  sessionId: zSessionId2,
+  _meta: defaultOnError(record(string2(), unknown()).nullish(), () => void 0)
+});
+var zErrorData = union([
+  zUnsupportedProtocolVersionErrorData,
+  zSessionNotFoundErrorData,
+  unknown()
+]);
 var zError2 = object({
   code: zErrorCode2,
   message: string2(),
-  data: defaultOnError(unknown().optional(), () => void 0)
+  data: defaultOnError(zErrorData.nullish(), () => void 0)
 });
 var zAgentResponse2 = union([
   object({
@@ -28902,7 +28791,7 @@ var zAgentResponse2 = union([
     ])
   }),
   object({
-    id: union([wideInt(), string2()]),
+    id: union([wideInt(), string2()]).nullable(),
     error: zError2
   })
 ]);
@@ -29114,7 +29003,7 @@ var zSessionInfoUpdate2 = object({
 });
 var zCost2 = object({
   amount: number2(),
-  currency: string2().regex(/^[A-Z]{3}$/),
+  currency: string2(),
   _meta: defaultOnError(record(string2(), unknown()).nullish(), () => void 0)
 });
 var zUsageUpdate2 = object({
@@ -29168,6 +29057,8 @@ var zSubagentUpdate2 = object({
   description: defaultOnError(string2().nullish(), () => void 0),
   capabilities: defaultOnError(zSubagentSessionCapabilities2.nullish(), () => void 0),
   state: defaultOnError(zStateUpdate2.nullish(), () => void 0),
+  cwd: zAbsolutePath.nullish(),
+  additionalDirectories: array(zAbsolutePath).nullish(),
   _meta: defaultOnError(record(string2(), unknown()).nullish(), () => void 0)
 });
 var zSessionMessage2 = object({
@@ -29489,7 +29380,7 @@ var zSetSessionConfigOptionRequest2 = preserveCustomPayload(intersection(union([
 })), "type", ["boolean", "id"]);
 var zPromptRequest2 = object({
   sessionId: zSessionId2,
-  prompt: array(zContentBlock2),
+  prompt: array(zContentBlock2).min(1),
   _meta: defaultOnError(record(string2(), unknown()).nullish(), () => void 0)
 });
 var zClientRequest2 = object({
@@ -29540,7 +29431,8 @@ var zElicitationContentValue2 = union([
   wideInt(),
   number2(),
   boolean2(),
-  array(string2())
+  array(string2()),
+  unknown()
 ]);
 var zElicitationAcceptAction2 = object({
   content: record(string2(), zElicitationContentValue2).nullish()
@@ -29591,7 +29483,7 @@ var zClientResponse2 = union([
     ])
   }),
   object({
-    id: union([wideInt(), string2()]),
+    id: union([wideInt(), string2()]).nullable(),
     error: zError2
   })
 ]);
@@ -29618,10 +29510,6 @@ var zCancelRequestNotification2 = object({
   requestId: zRequestId2,
   _meta: defaultOnError(record(string2(), unknown()).nullish(), () => void 0)
 });
-var zProtocolLevelNotification = object({
-  method: string2(),
-  params: zCancelRequestNotification2.nullish()
-});
 
 // node_modules/@agentclientprotocol/sdk/dist/v2/unstable/schema/guards.gen.js
 function tagOf2(value, key) {
@@ -29955,6 +29843,31 @@ var StateUpdate2 = {
     return typeof tag === "string" && !["idle", "requires_action", "running", "unknown"].includes(tag);
   }
 };
+var CreateElicitationResponse2 = {
+  /** Narrow to the `accept` variant, validating its payload. */
+  isAccept(value) {
+    return tagOf2(value, "action") === "accept" && zGuardCreateElicitationResponseAccept2.safeParse(value).success;
+  },
+  /** Narrow to the `decline` variant, validating its payload. */
+  isDecline(value) {
+    return tagOf2(value, "action") === "decline" && zGuardCreateElicitationResponseDecline2.safeParse(value).success;
+  },
+  /** Narrow to the `cancel` variant, validating its payload. */
+  isCancel(value) {
+    return tagOf2(value, "action") === "cancel" && zGuardCreateElicitationResponseCancel2.safeParse(value).success;
+  },
+  /**
+   * Narrow to a custom or future variant: the `action` tag matches no known variant.
+   *
+   * TypeScript keeps the known variants in the narrowed union (they are
+   * structural subtypes of the catch-all), so read vendor payload keys
+   * via a widening cast: `(value as Record<string, unknown>).someKey`.
+   */
+  isCustom(value) {
+    const tag = tagOf2(value, "action");
+    return typeof tag === "string" && !["accept", "cancel", "decline"].includes(tag);
+  }
+};
 
 // node_modules/@agentclientprotocol/sdk/dist/protocol-router.js
 var INITIALIZE_METHOD = "initialize";
@@ -30002,104 +29915,127 @@ var AgentProtocolRouter = class {
   }
   async route(stream, lifecycle) {
     const reader = stream.readable.getReader();
-    let first;
-    try {
-      first = await reader.read();
-    } catch (error62) {
-      reader.releaseLock();
-      throw error62;
-    }
-    if (first.done) {
-      reader.releaseLock();
-      await closeWritable(stream.writable);
-      lifecycle.finish();
-      return;
-    }
-    const firstMessage = first.value;
-    if (shouldCloseWithoutResponse(firstMessage)) {
-      await closeWithoutResponse(reader, stream.writable, RequestError.invalidRequest("first ACP message must be an initialize request"));
-      lifecycle.finish();
-      return;
-    }
-    let batchedInitialize = false;
-    let message = firstMessage;
-    if (Array.isArray(firstMessage)) {
-      if (firstMessage.length === 1 && isRequestMessage(firstMessage[0]) && firstMessage[0].method === INITIALIZE_METHOD) {
-        batchedInitialize = true;
-        message = firstMessage[0];
-      } else {
-        await rejectInitialize(reader, stream.writable, null, RequestError.invalidRequest("first ACP message must be an initialize request"));
+    for (; ; ) {
+      let next;
+      try {
+        next = await reader.read();
+      } catch (error62) {
+        reader.releaseLock();
+        throw error62;
+      }
+      if (next.done) {
+        reader.releaseLock();
+        await closeWritable(stream.writable);
         lifecycle.finish();
         return;
       }
+      const routed = this.routeInitialize(next.value);
+      if ("reject" in routed) {
+        if (routed.reject) {
+          await writeMessage(stream.writable, {
+            jsonrpc: "2.0",
+            id: routed.reject.id,
+            error: errorResponse(routed.reject.error)
+          });
+        }
+        continue;
+      }
+      const { selected, initialize } = routed;
+      const routedStream = {
+        readable: routedReadable(reader, initialize, lifecycle),
+        writable: stream.writable
+      };
+      const agent3 = selected === PROTOCOL_V2 ? this.v2 : this.v1;
+      if (!agent3) {
+        throw new Error("selected ACP protocol implementation is not configured");
+      }
+      try {
+        const connection = agent3.connect(routedStream, {
+          deferConnectHandlers: true
+        });
+        lifecycle.attach(connection);
+      } catch (error62) {
+        try {
+          await reader.cancel(error62);
+        } catch {
+        } finally {
+          reader.releaseLock();
+        }
+        throw error62;
+      }
+      return;
+    }
+  }
+  /**
+   * Decides how to handle a message received before initialization: route a
+   * valid `initialize`, ignore notifications and responses, or reject it.
+   */
+  routeInitialize(message) {
+    if (Array.isArray(message)) {
+      return {
+        reject: {
+          id: null,
+          error: RequestError.invalidRequest(void 0, "JSON-RPC batches are not supported")
+        }
+      };
+    }
+    if (isNotificationMessage(message) || isResponseShapedMessage(message)) {
+      return { reject: void 0 };
     }
     if (!isRequestMessage(message)) {
-      await rejectInitialize(reader, stream.writable, null, RequestError.invalidRequest("first ACP message must be an initialize request"));
-      lifecycle.finish();
-      return;
+      return {
+        reject: {
+          id: null,
+          error: RequestError.invalidRequest("first ACP message must be an initialize request")
+        }
+      };
     }
     if (message.method !== INITIALIZE_METHOD) {
-      await rejectInitialize(reader, stream.writable, message.id, RequestError.invalidRequest("first ACP request must be initialize"), batchedInitialize);
-      lifecycle.finish();
-      return;
+      return {
+        reject: {
+          id: message.id,
+          error: RequestError.invalidRequest("first ACP request must be initialize")
+        }
+      };
     }
     if (!isJsonObject(message.params)) {
-      await rejectInitialize(reader, stream.writable, message.id, invalidProtocolVersion(), batchedInitialize);
-      lifecycle.finish();
-      return;
+      return { reject: { id: message.id, error: invalidProtocolVersion() } };
     }
     const requested = message.params["protocolVersion"];
     if (!isProtocolVersion(requested)) {
-      await rejectInitialize(reader, stream.writable, message.id, invalidProtocolVersion(), batchedInitialize);
-      lifecycle.finish();
-      return;
+      return { reject: { id: message.id, error: invalidProtocolVersion() } };
     }
     const selected = this.selectProtocol(requested);
     if (!selected) {
-      await rejectInitialize(reader, stream.writable, message.id, RequestError.unsupportedProtocolVersion(requested, [
-        ...this.v1 ? [PROTOCOL_V1] : [],
-        ...this.v2 ? [PROTOCOL_V2] : []
-      ]), batchedInitialize);
-      lifecycle.finish();
-      return;
+      return {
+        reject: {
+          id: message.id,
+          error: RequestError.unsupportedProtocolVersion(requested, [
+            ...this.v1 ? [PROTOCOL_V1] : [],
+            ...this.v2 ? [PROTOCOL_V2] : []
+          ])
+        }
+      };
     }
     if (selected === PROTOCOL_V2 && !isV2RequestId(message.id)) {
-      await rejectInitialize(reader, stream.writable, null, RequestError.invalidRequest(void 0, "ACP v2 request IDs must be strings or integers"), batchedInitialize);
-      lifecycle.finish();
-      return;
+      return {
+        reject: {
+          id: null,
+          error: RequestError.invalidRequest(void 0, "ACP v2 request IDs must be strings or integers")
+        }
+      };
     }
-    let params;
     try {
-      params = rewriteInitializeParams(message.params, requested, selected);
+      const params = rewriteInitializeParams(message.params, requested, selected);
+      return { selected, initialize: { ...message, params } };
     } catch (error62) {
       const detail = error62 instanceof Error ? error62.message : String(error62);
-      await rejectInitialize(reader, stream.writable, message.id, RequestError.invalidParams(`invalid initialize params: ${detail}`), batchedInitialize);
-      lifecycle.finish();
-      return;
-    }
-    const initialize = { ...message, params };
-    const routedInitialize = batchedInitialize && selected === PROTOCOL_V2 ? [initialize] : initialize;
-    const routedStream = {
-      readable: routedReadable(reader, routedInitialize, lifecycle),
-      writable: batchedInitialize && selected === PROTOCOL_V1 ? batchInitializeResponseWritable(stream.writable, message.id) : stream.writable
-    };
-    const agent3 = selected === PROTOCOL_V2 ? this.v2 : this.v1;
-    if (!agent3) {
-      throw new Error("selected ACP protocol implementation is not configured");
-    }
-    try {
-      const connection = agent3.connect(routedStream, {
-        deferConnectHandlers: true
-      });
-      lifecycle.attach(connection);
-    } catch (error62) {
-      try {
-        await reader.cancel(error62);
-      } catch {
-      } finally {
-        reader.releaseLock();
-      }
-      throw error62;
+      return {
+        reject: {
+          id: message.id,
+          error: RequestError.invalidParams(`invalid initialize params: ${detail}`)
+        }
+      };
     }
   }
   selectProtocol(requested) {
@@ -30115,12 +30051,6 @@ var AgentProtocolRouter = class {
     return void 0;
   }
 };
-function shouldCloseWithoutResponse(message) {
-  if (!Array.isArray(message)) {
-    return isNotificationMessage(message) || isResponseShapedMessage(message);
-  }
-  return message.length > 0 && (isResponseBatch(message) || message.every((item) => isNotificationMessage(item) || isResponseMessage(item)));
-}
 function agentProtocolRouter() {
   return new AgentProtocolRouter();
 }
@@ -30216,56 +30146,12 @@ function routedReadable(source, initialize, lifecycle) {
     }
   });
 }
-function batchInitializeResponseWritable(destination, initializeId) {
-  let responseFramed = false;
-  return new WritableStream({
-    async write(message) {
-      let outgoing = message;
-      if (!responseFramed && !Array.isArray(message) && isResponseShapedMessage(message) && "id" in message && message.id === initializeId) {
-        responseFramed = true;
-        outgoing = [message];
-      }
-      const writer = destination.getWriter();
-      try {
-        await writer.write(outgoing);
-      } finally {
-        writer.releaseLock();
-      }
-    },
-    close: () => closeWritable(destination),
-    abort: (reason) => abortWritable(destination, reason)
-  });
-}
-async function rejectInitialize(reader, writable, id, error62, batched = false) {
-  const response = {
-    jsonrpc: "2.0",
-    id,
-    error: errorResponse(error62)
-  };
+async function writeMessage(writable, message) {
   const writer = writable.getWriter();
   try {
-    await writer.write(batched ? [response] : response);
-    await writer.close();
+    await writer.write(message);
   } finally {
     writer.releaseLock();
-    try {
-      await reader.cancel(error62);
-    } finally {
-      reader.releaseLock();
-    }
-  }
-}
-async function closeWithoutResponse(reader, writable, reason) {
-  const writer = writable.getWriter();
-  try {
-    await writer.close();
-  } finally {
-    writer.releaseLock();
-    try {
-      await reader.cancel(reason);
-    } finally {
-      reader.releaseLock();
-    }
   }
 }
 function errorResponse(error62) {
@@ -30405,11 +30291,6 @@ function assertUnrecognizedV2Method(method, kind) {
     throw new TypeError(`Cannot replace the built-in ACP v2 ${kind} parser for '${method}'`);
   }
 }
-function assertV2BatchMethods(entries, requestMethods, notificationMethods) {
-  for (const entry of entries) {
-    assertV2MethodDirection(entry.method, entry.kind === "request" ? requestMethods : notificationMethods, entry.kind, entry.kind === "notification");
-  }
-}
 var UNKNOWN_IMPLEMENTATION2 = {
   name: "unknown",
   version: "unknown"
@@ -30530,14 +30411,32 @@ var InitializationState = class {
     this.attempt.resolve();
   }
   /**
-   * Fails the initialize attempt in progress, or the connection before it has
-   * been initialized. A failed repeat keeps the previous initialization.
+   * Whether an `initialize` exchange has completed, including while a repeat
+   * is in progress.
+   */
+  get hasInitialized() {
+    return this.snapshot !== void 0 && this.phase !== "failed";
+  }
+  /**
+   * Fails the initialize attempt in progress. A failed repeat keeps the
+   * previous initialization; a failed first attempt leaves the connection
+   * uninitialized so `initialize` can be sent again.
+   */
+  failAttempt() {
+    if (this.phase !== "initializing") {
+      return;
+    }
+    this.phase = this.snapshot ? "initialized" : "uninitialized";
+    this.request = void 0;
+    this.attempt.resolve();
+  }
+  /**
+   * Fails initialization for good, such as when the connection closes before
+   * it was initialized. A failed repeat keeps the previous initialization.
    */
   fail(error62) {
     if (this.phase === "initializing" && this.snapshot) {
-      this.phase = "initialized";
-      this.request = void 0;
-      this.attempt.resolve();
+      this.failAttempt();
       return;
     }
     if (this.phase === "uninitialized" || this.phase === "initializing") {
@@ -30561,7 +30460,10 @@ var InitializationState = class {
       return Promise.resolve();
     }
     if (this.phase === "initializing") {
-      return this.snapshot ? this.attempt.promise.then(() => this.waitUntilInitialized(method)) : this.barrier.promise.then(() => {
+      return this.attempt.promise.then(() => this.waitUntilInitialized(method));
+    }
+    if (this.phase === "failed") {
+      return this.barrier.promise.then(() => {
       });
     }
     return Promise.reject(initializationUnavailable(method));
@@ -30586,10 +30488,8 @@ function initializationState(cx) {
 function initializationUnavailable(method) {
   return RequestError.invalidRequest(`ACP v2 connection must be initialized before '${method}'`);
 }
-async function blockUninitializedIncoming(message, state) {
-  const error62 = initializationUnavailable(message.method);
-  state.fail(error62);
-  return rejectIncoming(message, error62);
+async function blockUninitializedIncoming(message) {
+  return rejectIncoming(message, initializationUnavailable(message.method));
 }
 async function rejectIncoming(message, error62) {
   if (message.kind === "request") {
@@ -30609,10 +30509,14 @@ async function waitUntilInitializedIncoming(message, state) {
     return Handled.no(message);
   }
   if (state.status === "initializing") {
-    await state.waitUntilInitialized(message.method);
+    try {
+      await state.waitUntilInitialized(message.method);
+    } catch {
+      return blockUninitializedIncoming(message);
+    }
     return Handled.no(message);
   }
-  return blockUninitializedIncoming(message, state);
+  return blockUninitializedIncoming(message);
 }
 function agentInitializationGuard() {
   return {
@@ -30623,8 +30527,8 @@ function agentInitializationGuard() {
       }
       const state = initializationState(cx);
       if (message.kind === "notification") {
-        if (message.method === PROTOCOL_METHODS2.cancel_request) {
-          return state.status === "initializing" || state.status === "initialized" ? Handled.yes() : blockUninitializedIncoming(message, state);
+        if (message.method === PROTOCOL_METHODS2.cancel_request || !state.hasInitialized) {
+          return Handled.yes();
         }
         return waitUntilInitializedIncoming(message, state);
       }
@@ -30633,33 +30537,17 @@ function agentInitializationGuard() {
         if (beginError) {
           return rejectIncoming(message, beginError);
         }
-        const batchSize = requestBatchSize(message.responder);
-        if (batchSize !== void 0 && batchSize !== 1) {
-          const error62 = RequestError.invalidRequest("ACP v2 initialize must be the only entry in its batch");
-          state.fail(error62);
-          return rejectIncoming(message, error62);
+        if (state.status === "initialized" && readInitializeProtocolVersion(message.params) < PROTOCOL_VERSION2) {
+          return rejectIncoming(message, RequestError.invalidRequest(void 0, `a repeated initialize must request protocol version ${PROTOCOL_VERSION2} or later`));
         }
-        let request;
-        try {
-          if (state.status === "initialized" && readInitializeProtocolVersion(message.params) < PROTOCOL_VERSION2) {
-            return rejectIncoming(message, RequestError.invalidRequest(void 0, `a repeated initialize must request protocol version ${PROTOCOL_VERSION2} or later`));
-          }
-          request = parseV2InitializeRequest(message.params);
-        } catch (error62) {
-          state.fail(error62);
-          throw error62;
-        }
-        state.begin(request);
+        state.begin(parseV2InitializeRequest(message.params));
         return Handled.no(message);
       }
       if (state.status === "initialized") {
         state.noteRequest();
         return Handled.no(message);
       }
-      if (state.status === "initializing") {
-        return rejectIncoming(message, initializationUnavailable(message.method));
-      }
-      return blockUninitializedIncoming(message, state);
+      return blockUninitializedIncoming(message);
     },
     describe: () => "agent-initialization"
   };
@@ -30673,7 +30561,7 @@ function clientInitializationGuard() {
       }
       const state = initializationState(cx);
       if (message.kind === "notification" && message.method === PROTOCOL_METHODS2.cancel_request) {
-        return state.status === "initializing" || state.status === "initialized" ? Handled.yes() : blockUninitializedIncoming(message, state);
+        return Handled.yes();
       }
       return waitUntilInitializedIncoming(message, state);
     },
@@ -30683,25 +30571,6 @@ function clientInitializationGuard() {
 function parseRequestResponse(spec, response) {
   return parseParams(spec.response, response);
 }
-function normalizeV2Batch(entries, requestSpecs, onInitializeResponse) {
-  return entries.map((entry) => {
-    if (entry.kind !== "request") {
-      return entry;
-    }
-    const spec = requestSpecs[entry.method];
-    const mapResponse = entry.mapResponse;
-    return {
-      ...entry,
-      mapResponse: spec ? (response) => {
-        const parsed = parseRequestResponse(spec, response);
-        if (onInitializeResponse && entry.method === AGENT_METHODS2.initialize) {
-          onInitializeResponse(parsed);
-        }
-        return mapResponse ? mapResponse(parsed) : parsed;
-      } : mapResponse
-    };
-  });
-}
 function isStream2(value) {
   return typeof value === "object" && value !== null && "readable" in value && "writable" in value;
 }
@@ -30719,6 +30588,7 @@ function memoryStreamPair2() {
     }
   ];
 }
+var MCP_TRANSPORT_CAPABILITIES = Object.keys(zMcpCapabilities2.shape).filter((key) => key !== "_meta");
 var methods2 = {
   agent: {
     initialize: AGENT_METHODS2.initialize,
@@ -30764,6 +30634,7 @@ var methods2 = {
   }
 };
 var startActiveSession2 = /* @__PURE__ */ Symbol("startActiveSession");
+var routeActiveSessionUpdate = /* @__PURE__ */ Symbol("routeActiveSessionUpdate");
 var AcpContext2 = class {
   cx;
   currentRequestId;
@@ -30808,10 +30679,6 @@ var AcpContext2 = class {
     return this.cx.sendNotification(method, params);
   }
   /** @internal */
-  sendBatch(entries) {
-    return this.cx.sendBatch(entries);
-  }
-  /** @internal */
   addDynamicHandler(handler) {
     return this.cx.addDynamicHandler(handler);
   }
@@ -30833,13 +30700,6 @@ var AgentContext2 = class _AgentContext extends AcpContext2 {
     assertV2MethodDirection(method, clientNotificationSpecsByMethod2, "notification", true);
     return this.initializationLifecycle.waitUntilInitialized(method).then(() => this.sendNotification(method, params));
   }
-  /**
-   * Sends requests and notifications to the client as one JSON-RPC batch.
-   */
-  batch(entries) {
-    assertV2BatchMethods(entries, clientRequestSpecsByMethod2, clientNotificationSpecsByMethod2);
-    return this.initializationLifecycle.waitUntilInitialized("batch").then(() => this.sendBatch(normalizeV2Batch(entries, clientRequestSpecsByMethod2)));
-  }
 };
 var ClientContext2 = class _ClientContext extends AcpContext2 {
   closeOnInitializationFailure;
@@ -30878,14 +30738,14 @@ var ClientContext2 = class _ClientContext extends AcpContext2 {
     } else {
       closeSignal.addEventListener("abort", failUpdatesOnClose);
     }
-    const sessionRegistration = sessionUpdateRouter2(this.connectionContext).attach(response, updates);
-    const closeRegistration = new HandlerRegistration(() => {
+    const registrations = [];
+    const session = ActiveSession2.create(this, response, updates, registrations);
+    registrations.push(sessionUpdateRouter2(this.connectionContext).attach(response, {
+      enqueue: (message) => session[routeActiveSessionUpdate](message)
+    }), new HandlerRegistration(() => {
       closeSignal.removeEventListener("abort", failUpdatesOnClose);
-    });
-    return ActiveSession2.create(this, response, updates, [
-      sessionRegistration,
-      closeRegistration
-    ]);
+    }));
+    return session;
   }
   request(method, params, options) {
     assertV2MethodDirection(method, agentRequestSpecsByMethod2, "request");
@@ -30895,25 +30755,36 @@ var ClientContext2 = class _ClientContext extends AcpContext2 {
       const { wire: request, parsed } = normalizeOutgoingV2InitializeRequest(params);
       state.begin(parsed);
       let response;
+      let unusableResponse = false;
       try {
         response = this.sendRequest(method, request, (value) => {
-          const parsed2 = parseRequestResponse(spec, value);
-          state.complete(parsed2);
-          return parsed2;
+          try {
+            const parsed2 = parseRequestResponse(spec, value);
+            state.complete(parsed2);
+            return parsed2;
+          } catch (error62) {
+            unusableResponse = true;
+            throw error62;
+          }
         }, options);
       } catch (error62) {
         this.failInitialization(error62);
         throw error62;
       }
       void response.catch((error62) => {
-        if (state.status !== "initialized") {
-          this.failInitialization(error62);
+        if (state.status === "initializing") {
+          if (unusableResponse) {
+            this.failInitialization(error62);
+          } else {
+            state.failAttempt();
+          }
         }
       });
       return response;
     }
     state.noteRequest();
-    return state.waitUntilInitialized(method).then(() => this.sendRequest(method, params, spec ? (response) => parseRequestResponse(spec, response) : void 0, options));
+    const mapResponse = spec ? (response) => parseRequestResponse(spec, response) : void 0;
+    return state.waitUntilInitialized(method).then(() => treatSessionNotFoundAsSuccess(method, this.sendRequest(method, params, mapResponse, options), () => mapResponse ? mapResponse({}) : {}));
   }
   /**
    * Fails an initialize attempt. Closes the connection unless a previous
@@ -30930,41 +30801,6 @@ var ClientContext2 = class _ClientContext extends AcpContext2 {
     assertV2MethodDirection(method, agentNotificationSpecsByMethod2, "notification", true);
     return this.initializationLifecycle.waitUntilInitialized(method).then(() => this.sendNotification(method, params));
   }
-  /**
-   * Sends requests and notifications to the agent as one JSON-RPC batch.
-   */
-  batch(entries) {
-    assertV2BatchMethods(entries, agentRequestSpecsByMethod2, agentNotificationSpecsByMethod2);
-    const initializeEntries = entries.filter((entry) => entry.kind === "request" && entry.method === AGENT_METHODS2.initialize);
-    if (initializeEntries.length > 0) {
-      if (entries.length !== 1 || initializeEntries.length !== 1) {
-        return Promise.reject(RequestError.invalidRequest("ACP v2 initialize must be the only entry in its batch"));
-      }
-      const state = this.initializationLifecycle;
-      const { wire: request, parsed } = normalizeOutgoingV2InitializeRequest(initializeEntries[0].params);
-      state.begin(parsed);
-      const normalizedEntries = [
-        { ...initializeEntries[0], params: request }
-      ];
-      let response;
-      try {
-        response = this.sendBatch(normalizeV2Batch(normalizedEntries, agentRequestSpecsByMethod2, (value) => state.complete(value)));
-      } catch (error62) {
-        this.failInitialization(error62);
-        throw error62;
-      }
-      void response.catch((error62) => {
-        if (state.status !== "initialized") {
-          this.failInitialization(error62);
-        }
-      });
-      return response;
-    }
-    if (entries.some((entry) => entry.kind === "request")) {
-      this.initializationLifecycle.noteRequest();
-    }
-    return this.initializationLifecycle.waitUntilInitialized("batch").then(() => this.sendBatch(normalizeV2Batch(entries, agentRequestSpecsByMethod2)));
-  }
 };
 var AcpConnectionHandle2 = class {
   connection;
@@ -31168,11 +31004,13 @@ var ActiveSession2 = class _ActiveSession {
   sessionResponse;
   updates;
   registrations;
+  currentConfigOptions;
   constructor(cx, sessionResponse, updates, registrations) {
     this.cx = cx;
     this.sessionResponse = sessionResponse;
     this.updates = updates;
     this.registrations = registrations;
+    this.currentConfigOptions = sessionResponse.configOptions ?? void 0;
   }
   /** @internal */
   static create(cx, sessionResponse, updates, registrations) {
@@ -31185,10 +31023,16 @@ var ActiveSession2 = class _ActiveSession {
     return this.sessionResponse.sessionId;
   }
   /**
-   * Configuration options returned when the session was created, if provided.
+   * Current configuration options for this session, if the agent provided any.
+   *
+   * Starts with the `configOptions` from `session/new`. It is replaced with the
+   * full list from each `config_option_update` routed to this session (applied
+   * when the notification arrives, before it is read with `nextUpdate()`) and
+   * from each `setConfigOption(...)` response. Updates stop after `dispose()`.
+   * `newSessionResponse.configOptions` keeps the original `session/new` value.
    */
   get configOptions() {
-    return this.sessionResponse.configOptions;
+    return this.currentConfigOptions;
   }
   /**
    * Metadata returned when the session was created.
@@ -31206,18 +31050,45 @@ var ActiveSession2 = class _ActiveSession {
    * Sends a prompt to this session.
    *
    * Strings are converted to one text content block. A single content block is
-   * wrapped in an array. The returned promise resolves with the inserted user
-   * message's ID once the agent inserts it into the ACP conversation, not when
-   * processing finishes. Session updates remain independent of this request;
-   * an idle `state_update` does not establish that this message was processed.
-   * Rejection is reported only by this promise, not by the session update queue.
+   * wrapped in an array. A prompt must contain at least one block. The returned
+   * promise resolves with the inserted user message's ID once the agent
+   * inserts it into the ACP conversation, not when processing finishes.
+   *
+   * A prompt may be sent while the agent is working. The agent inserts it
+   * right away or holds it and inserts it later, in the order received; the
+   * promise stays pending until then. Aborting `options.cancellationSignal`
+   * withdraws a held prompt, and `session/cancel` or `session/close` answer
+   * held prompts with `-32800`. `session/cancel` does not affect a prompt sent
+   * after it.
+   *
+   * Session updates remain independent of this request and have no fixed
+   * order relative to its response; an idle `state_update` does not establish
+   * that this message was processed. Rejection is reported only by this
+   * promise, not by the session update queue.
    */
   prompt(prompt, options) {
+    const blocks = this.promptBlocks(prompt);
+    if (blocks.length === 0) {
+      return Promise.reject(new TypeError("A prompt must contain at least one content block"));
+    }
     return this.cx.request(AGENT_METHODS2.session_prompt, {
       sessionId: this.sessionId,
-      prompt: this.promptBlocks(prompt)
+      prompt: blocks
     }, options);
   }
+  /**
+   * Sets a configuration option for this session with
+   * `session/set_config_option`.
+   *
+   * The response carries the agent's complete `configOptions` list, which
+   * replaces `configOptions` on this session. For example,
+   * `session.setConfigOption({ configId: "model", type: "id", value: "fast" })`.
+   */
+  async setConfigOption(request, options) {
+    const response = await this.cx.request(AGENT_METHODS2.session_set_config_option, { ...request, sessionId: this.sessionId }, options);
+    this.currentConfigOptions = response.configOptions;
+    return response;
+  }
   /**
    * Reads the next update or stop message for this session.
    *
@@ -31269,6 +31140,13 @@ var ActiveSession2 = class _ActiveSession {
       }
     }
   }
+  /** @internal */
+  [routeActiveSessionUpdate](message) {
+    if (SessionUpdate.isConfigOptionUpdate(message.update)) {
+      this.currentConfigOptions = message.update.configOptions;
+    }
+    this.updates.enqueue(message);
+  }
   /**
    * Stops routing updates to this active-session helper.
    *
@@ -31570,7 +31448,7 @@ var AgentApp2 = class {
       beforeResponse: (_params, response, cx) => {
         initializationState(cx).complete(mapV2InitializeResponse(response));
       },
-      onError: (cx, error62) => initializationState(cx).fail(error62)
+      onError: (cx) => initializationState(cx).failAttempt()
     } : void 0);
     return this;
   }
@@ -32166,6 +32044,9 @@ function toV2CreateElicitationRequest(request) {
 function toV1CreateElicitationResponse(response) {
   return response;
 }
+function toV2CreateElicitationResponse(response) {
+  return response;
+}
 function elicitationSessionId(request) {
   const sessionId = request.sessionId;
   return typeof sessionId === "string" ? sessionId : void 0;
@@ -33469,58 +33350,62 @@ var BINARY_PROBE_LENGTH = 8e3;
 var NO_NEWLINE_MARKER = "\";
 var HUNK_HEADER = /^@@ -(\d+)(?:,(\d+))? \+(\d+)(?:,(\d+))? @@/;
 var REGULAR_FILE_MODE = "100644";
-function createUpdateGitPatch(oldPath, newPath, diff) {
+function createUpdateGitPatch(oldPath, newPath, diff, style = "relative") {
   const hunks = hunkText(diff);
   if (hunks === null || isBinary(hunks)) return null;
-  const oldName = gitPath(oldPath);
-  const newName = gitPath(newPath);
-  const headers = [`diff --git ${quotedGitName("a/", oldName)} ${quotedGitName("b/", newName)}`];
+  const oldName = gitPath(oldPath, style);
+  const newName = gitPath(newPath, style);
+  const oldPrefix = style === "absolute" ? "" : "a/";
+  const newPrefix = style === "absolute" ? "" : "b/";
+  const headers = [`diff --git ${quotedGitName(oldPrefix, oldName)} ${quotedGitName(newPrefix, newName)}`];
   if (oldName !== newName) {
     headers.push(`rename from ${quotedGitName("", oldName)}`, `rename to ${quotedGitName("", newName)}`);
   }
-  headers.push(fileHeader("---", "a/", oldName), fileHeader("+++", "b/", newName));
+  headers.push(fileHeader("---", oldPrefix, oldName), fileHeader("+++", newPrefix, newName));
   return limited(`${headers.join("\n")}
 ${hunks}`);
 }
-function createRenameGitPatch(oldPath, newPath) {
-  const oldName = gitPath(oldPath);
-  const newName = gitPath(newPath);
+function createRenameGitPatch(oldPath, newPath, style = "relative") {
+  const oldName = gitPath(oldPath, style);
+  const newName = gitPath(newPath, style);
   if (oldName === newName) return null;
   return limited([
-    `diff --git ${quotedGitName("a/", oldName)} ${quotedGitName("b/", newName)}`,
+    `diff --git ${quotedGitName(style === "absolute" ? "" : "a/", oldName)} ${quotedGitName(style === "absolute" ? "" : "b/", newName)}`,
     "similarity index 100%",
     `rename from ${quotedGitName("", oldName)}`,
     `rename to ${quotedGitName("", newName)}`,
     ""
   ].join("\n"));
 }
-function createAddedFileGitPatch(filePath, text) {
-  return createWholeFilePatch(filePath, text, "added");
+function createAddedFileGitPatch(filePath, text, style = "relative") {
+  return createWholeFilePatch(filePath, text, "added", style);
 }
-function createDeletedFileGitPatch(filePath, text) {
-  return createWholeFilePatch(filePath, text, "deleted");
+function createDeletedFileGitPatch(filePath, text, style = "relative") {
+  return createWholeFilePatch(filePath, text, "deleted", style);
 }
-function createEmptyFileGitPatch(filePath, change) {
-  const name = gitPath(filePath);
+function createEmptyFileGitPatch(filePath, change, style = "relative") {
+  const name = gitPath(filePath, style);
   return [
-    `diff --git ${quotedGitName("a/", name)} ${quotedGitName("b/", name)}`,
+    `diff --git ${quotedGitName(style === "absolute" ? "" : "a/", name)} ${quotedGitName(style === "absolute" ? "" : "b/", name)}`,
     `${change === "added" ? "new" : "deleted"} file mode ${REGULAR_FILE_MODE}`,
     ""
   ].join("\n");
 }
-function createWholeFilePatch(filePath, text, change) {
+function createWholeFilePatch(filePath, text, change, style) {
   if (text.length === 0 || isBinary(text)) return null;
-  const name = gitPath(filePath);
+  const name = gitPath(filePath, style);
+  const oldPrefix = style === "absolute" ? "" : "a/";
+  const newPrefix = style === "absolute" ? "" : "b/";
   const lines = text.split("\n");
   const endsWithNewline = lines.at(-1) === "";
   if (endsWithNewline) lines.pop();
   const sign = change === "added" ? "+" : "-";
   const range = `1${lines.length === 1 ? "" : `,${lines.length}`}`;
   const patch = [
-    `diff --git ${quotedGitName("a/", name)} ${quotedGitName("b/", name)}`,
+    `diff --git ${quotedGitName(oldPrefix, name)} ${quotedGitName(newPrefix, name)}`,
     `${change === "added" ? "new" : "deleted"} file mode ${REGULAR_FILE_MODE}`,
-    change === "added" ? "--- /dev/null" : fileHeader("---", "a/", name),
-    change === "added" ? fileHeader("+++", "b/", name) : "+++ /dev/null",
+    change === "added" ? "--- /dev/null" : fileHeader("---", oldPrefix, name),
+    change === "added" ? fileHeader("+++", newPrefix, name) : "+++ /dev/null",
     change === "added" ? `@@ -0,0 +${range} @@` : `@@ -${range} +0,0 @@`,
     ...lines.map((line) => `${sign}${line}`),
     ...endsWithNewline ? [] : [NO_NEWLINE_MARKER],
@@ -33595,7 +33480,8 @@ function isBinary(text) {
 function limited(patch) {
   return Buffer.byteLength(patch, "utf8") <= DIFF_PATCH_MAX_BYTES ? patch : null;
 }
-function gitPath(filePath) {
+function gitPath(filePath, style) {
+  if (style === "absolute") return filePath;
   const slashed = /^[A-Za-z]:\\/.test(filePath) ? filePath.replace(/\\/g, "/") : filePath;
   return slashed.replace(/^\/+/, "");
 }
@@ -33751,13 +33637,13 @@ function createAcpV2Content(change) {
   let patch;
   switch (kind.type) {
     case "add":
-      patch = diff.length === 0 ? createEmptyFileGitPatch(path16, "added") : createAddedFileGitPatch(path16, diff);
+      patch = diff.length === 0 ? createEmptyFileGitPatch(path16, "added", "absolute") : createAddedFileGitPatch(path16, diff, "absolute");
       break;
     case "delete":
-      patch = diff.length === 0 ? createEmptyFileGitPatch(path16, "deleted") : createDeletedFileGitPatch(path16, diff);
+      patch = diff.length === 0 ? createEmptyFileGitPatch(path16, "deleted", "absolute") : createDeletedFileGitPatch(path16, diff, "absolute");
       break;
     case "update":
-      patch = kind.move_path !== null && diff.trim().length === 0 ? createRenameGitPatch(oldPath, path16) : createUpdateGitPatch(oldPath, path16, diff);
+      patch = kind.move_path !== null && diff.trim().length === 0 ? createRenameGitPatch(oldPath, path16, "absolute") : createUpdateGitPatch(oldPath, path16, diff, "absolute");
       break;
   }
   if (patch === null) {
@@ -38960,13 +38846,13 @@ function typedChoiceAnswer(value, question) {
 }
 function userInputResponseValue(content, fieldId) {
   const value = content[fieldId];
-  if (typeof value === "string" && value.trim() === "") {
-    return void 0;
+  if (typeof value === "string") {
+    return value.trim() === "" ? void 0 : value;
   }
-  if (Array.isArray(value) && value.length === 0) {
-    return void 0;
+  if (Array.isArray(value) && value.length > 0 && value.every((item) => typeof item === "string")) {
+    return value;
   }
-  return value;
+  return void 0;
 }
 function buildUserInputSchema(questions, clientCapabilities, answersRequired) {
   const properties = {};
@@ -39044,8 +38930,9 @@ function buildUserInputRequest(params, clientCapabilities) {
     }
   };
 }
-function userInputAnswers(response, questions, clientCapabilities) {
-  if (!CreateElicitationResponse.isAccept(response)) {
+function userInputAnswers(rawResponse, questions, clientCapabilities) {
+  const response = toV2CreateElicitationResponse(rawResponse);
+  if (!CreateElicitationResponse2.isAccept(response)) {
     return {};
   }
   const answers = {};
@@ -39299,8 +39186,12 @@ var CodexElicitationHandler = class {
         };
     }
   }
-  convertElicitationResponse(response, context) {
-    if (CreateElicitationResponse.isAccept(response)) {
+  convertElicitationResponse(rawResponse, context) {
+    if (AcpV2Connection.of(this.connection) === null && rawResponse.action === "accept" && !CreateElicitationResponse.isAccept(rawResponse)) {
+      return { action: "cancel", content: null, _meta: null };
+    }
+    const response = toV2CreateElicitationResponse(rawResponse);
+    if (CreateElicitationResponse2.isAccept(response)) {
       const content = contentRecord(response.content);
       const persist = context.isToolApproval ? content["persist"] : void 0;
       if (context.isToolApproval && !this.isAllowedToolApprovalPersist(persist, context.persistOptions)) {
@@ -39315,13 +39206,13 @@ var CodexElicitationHandler = class {
         _meta: elicitationResponseMeta(response, context, persist)
       };
     }
-    if (CreateElicitationResponse.isDecline(response)) {
+    if (CreateElicitationResponse2.isDecline(response)) {
       return context.isToolApproval ? { action: "cancel", content: null, _meta: elicitationResponseMeta(response, context) } : { action: "decline", content: null, _meta: elicitationResponseMeta(response, context) };
     }
-    if (CreateElicitationResponse.isCancel(response)) {
+    if (CreateElicitationResponse2.isCancel(response)) {
       return { action: "cancel", content: null, _meta: elicitationResponseMeta(response, context) };
     }
-    if (CreateElicitationResponse.isCustom(response)) {
+    if (CreateElicitationResponse2.isCustom(response)) {
       return { action: "cancel", content: null, _meta: null };
     }
     return { action: "cancel", content: null, _meta: null };
@@ -39510,6 +39401,15 @@ function sanitizeMcpServerName(name) {
 function getMcpServerName(server) {
   return typeof server.name === "string" ? server.name : "";
 }
+function normalizeMcpServers(servers) {
+  const names = /* @__PURE__ */ new Set();
+  return servers.map((server) => {
+    const name = sanitizeMcpServerName(getMcpServerName(server));
+    if (names.has(name)) throw RequestError.invalidParams({ name: getMcpServerName(server) }, "MCP server names must be unique");
+    names.add(name);
+    return { ...normalizeMcpServer(server), name };
+  });
+}
 function normalizeMcpServer(server) {
   if (!("type" in server)) {
     return { type: "stdio", name: server.name, command: server.command, args: server.args, env: server.env };
@@ -40575,7 +40475,7 @@ var package_default = {
   publishConfig: {
     access: "public"
   },
-  version: "2.5.1-preview.3",
+  version: "2.5.1-preview.5",
   description: "",
   main: "dist/index.js",
   bin: {
@@ -40640,7 +40540,7 @@ var package_default = {
     vitest: "^5.0.1"
   },
   dependencies: {
-    "@agentclientprotocol/sdk": "~2.1.0",
+    "@agentclientprotocol/sdk": "~2.2.0",
     "@openai/codex": "^0.165.0",
     "cross-spawn": "^7.0.6",
     diff: "^9.0.0",
@@ -40687,9 +40587,11 @@ function createCodexCollaborationMode(mode, currentModelId) {
 
 // src/PathUtils.ts
 import path9 from "node:path";
+function isAbsoluteProtocolPath(value) {
+  return !value.includes("\0") && (path9.posix.isAbsolute(value) || isWindowsAbsolutePath2(value));
+}
 function isAbsolutePathLike(value) {
-  const trimmed = value.trim();
-  return path9.isAbsolute(trimmed) || isWindowsAbsolutePath2(trimmed);
+  return isAbsoluteProtocolPath(value.trim());
 }
 function arePathsEqual(left, right) {
   return normalizePathForComparison(left) === normalizePathForComparison(right);
@@ -40746,7 +40648,7 @@ var CodexSubagentSubscriptions = class {
       existing.current = subscription;
       return;
     }
-    const session = { current: subscription, children: /* @__PURE__ */ new Set() };
+    const session = { current: subscription, children: /* @__PURE__ */ new Set(), childParents: /* @__PURE__ */ new Map() };
     this.sessions.set(subscription.rootSessionId, session);
     this.client.onServerNotification(subscription.rootSessionId, (event) => {
       this.discover(session, event);
@@ -40768,10 +40670,35 @@ var CodexSubagentSubscriptions = class {
   isChildThread(threadId) {
     return [...this.sessions.values()].some((session) => session.children.has(threadId));
   }
+  async readChildThread(threadId) {
+    const session = [...this.sessions.values()].find((session2) => session2.children.has(threadId));
+    const { thread } = await this.client.threadRead({ threadId });
+    if (!thread || thread.id !== threadId) return null;
+    if (session && this.sessions.get(session.current.rootSessionId) === session) this.rememberParent(session, thread);
+    return thread;
+  }
+  /** Use observed ownership, without waiting on unrelated metadata reads during close. */
+  verifiedChildThreadIds(rootSessionId) {
+    const parents = this.sessions.get(rootSessionId)?.childParents ?? /* @__PURE__ */ new Map();
+    const owned = /* @__PURE__ */ new Set([rootSessionId]);
+    let changed;
+    do {
+      changed = false;
+      for (const [threadId, parentId] of parents) {
+        if (!owned.has(threadId) && owned.has(parentId)) {
+          owned.add(threadId);
+          changed = true;
+        }
+      }
+    } while (changed);
+    owned.delete(rootSessionId);
+    return [...owned];
+  }
   async restoreChild(rootSessionId, parentThreadId, thread) {
     const session = this.sessions.get(rootSessionId);
     if (!session || session.children.has(thread.id) || thread.parentThreadId !== parentThreadId || parentThreadId !== rootSessionId && !session.children.has(parentThreadId)) return null;
     if (!this.attachChild(session, thread.id)) return null;
+    this.rememberParent(session, thread);
     if (thread.status.type === "notLoaded") return null;
     try {
       const response = await this.client.threadResume({ threadId: thread.id, excludeTurns: true });
@@ -40784,6 +40711,10 @@ var CodexSubagentSubscriptions = class {
     return null;
   }
   discover(session, event) {
+    if (event.method === "thread/started") {
+      if (session.children.has(event.params.thread.id)) this.rememberParent(session, event.params.thread);
+      return;
+    }
     if (event.method !== "item/started" && event.method !== "item/completed") {
       return;
     }
@@ -40812,8 +40743,13 @@ var CodexSubagentSubscriptions = class {
   }
   detachChild(session, childSessionId) {
     if (this.sessions.get(session.current.rootSessionId) !== session || !session.children.delete(childSessionId)) return;
+    session.childParents.delete(childSessionId);
     if (!this.sessions.has(childSessionId)) this.client.clearThreadHandlers(childSessionId);
   }
+  rememberParent(session, thread) {
+    if (thread.status.type === "notLoaded" || thread.parentThreadId === null) session.childParents.delete(thread.id);
+    else session.childParents.set(thread.id, thread.parentThreadId);
+  }
   registerInteractiveHandlers(session, targetSessionId) {
     this.client.onApprovalRequest(targetSessionId, {
       handleCommandExecution: async (params) => {
@@ -41159,6 +41095,7 @@ var CodexAcpClient = class _CodexAcpClient {
     version: `${package_default.version}`
   };
   async initialize(request) {
+    if (this.isInitialized) return;
     const response = await this.codexClient.initialize({
       capabilities: {
         experimentalApi: true,
@@ -41732,6 +41669,9 @@ var CodexAcpClient = class _CodexAcpClient {
   isSubagentThread(threadId) {
     return this.subagents.isChildThread(threadId);
   }
+  readSubagentThread(threadId) {
+    return this.subagents.readChildThread(threadId);
+  }
   async newSession(request) {
     const instructions = await this.resolveSessionInstructions(request, void 0, true);
     const additionalDirectories = readAdditionalDirectories(request.cwd, request.additionalDirectories, request._meta);
@@ -41832,11 +41772,30 @@ var CodexAcpClient = class _CodexAcpClient {
     }
   }
   async closeSession(sessionId) {
+    const children = this.subagents.verifiedChildThreadIds(sessionId);
+    for (const threadId of [...children, sessionId]) {
+      await this.stopBackgroundTerminals(threadId);
+    }
+    await this.codexClient.threadUnsubscribe({ threadId: sessionId });
+    this.codexClient.clearThreadHandlers(sessionId);
+    this.subagents.clear(sessionId);
+  }
+  async stopBackgroundTerminals(threadId) {
     try {
-      await this.codexClient.threadUnsubscribe({ threadId: sessionId });
-    } finally {
-      this.codexClient.clearThreadHandlers(sessionId);
-      this.subagents.clear(sessionId);
+      const terminals = [];
+      for await (const page of this.codexClient.backgroundTerminalPages(threadId)) terminals.push(...page);
+      for (const terminal of terminals) {
+        const result = await this.codexClient.threadBackgroundTerminalsTerminate({ threadId, processId: terminal.processId });
+        if (!result.terminated) {
+          for await (const page of this.codexClient.backgroundTerminalPages(threadId)) {
+            if (page.some((current) => current.processId === terminal.processId)) {
+              throw new Error(`Codex could not stop background terminal ${terminal.processId}`);
+            }
+          }
+        }
+      }
+    } catch (error62) {
+      if (!isThreadNotFoundError(error62) && !isThreadNotLoadedError(error62)) throw error62;
     }
   }
   /**
@@ -41944,10 +41903,7 @@ var CodexAcpClient = class _CodexAcpClient {
     if (mcpServers.length === 0) {
       return { config: configWithWorkspaceRoots, skippedMcpServers: [] };
     }
-    const requestedServers = mcpServers.map((mcp) => ({
-      name: sanitizeMcpServerName(getMcpServerName(mcp)),
-      server: normalizeMcpServer(mcp)
-    }));
+    const requestedServers = normalizeMcpServers(mcpServers).map((server) => ({ name: server.name, server }));
     let serversToConfigure = requestedServers;
     if (shouldDeduplicateMcpConflicts()) {
       const existingNames = await this.getConfigMcpServerNames(projectPath);
@@ -42378,7 +42334,7 @@ function readAdditionalDirectories(cwd, additionalDirectories, meta3) {
     if (directory.length === 0) {
       throw RequestError.invalidParams(void 0, "additionalDirectories entries must not be empty");
     }
-    if (!path10.isAbsolute(directory)) {
+    if (!isAbsoluteProtocolPath(directory)) {
       throw RequestError.invalidParams(void 0, "additionalDirectories entries must be absolute paths");
     }
     if (!seen.has(directory)) {
@@ -43377,6 +43333,19 @@ var CodexAppServerClient = class {
   async threadBackgroundTerminalsTerminate(params) {
     return await this.sendRequest({ method: "thread/backgroundTerminals/terminate", params });
   }
+  async *backgroundTerminalPages(threadId) {
+    const seen = /* @__PURE__ */ new Set();
+    let cursor = null;
+    do {
+      const response = await this.threadBackgroundTerminalsList({ threadId, cursor });
+      yield response.data;
+      cursor = response.nextCursor;
+      if (cursor !== null) {
+        if (seen.has(cursor)) throw new Error("Codex returned a repeated background terminal cursor");
+        seen.add(cursor);
+      }
+    } while (cursor !== null);
+  }
   async threadGoalSet(params) {
     return await this.sendRequest({ method: "thread/goal/set", params });
   }
@@ -46264,13 +46233,16 @@ function hasPayload(update) {
   return Object.keys(update).some((name) => name !== "sessionUpdate" && name !== "toolCallId");
 }
 
-// src/ToolCallReportingConnection.ts
-var ToolCallReportingConnection = class {
-  constructor(client) {
+// src/AcpClientDelivery.ts
+var AcpClientDelivery = class {
+  constructor(client, sessionIsClosing = () => false) {
     this.client = client;
+    this.sessionIsClosing = sessionIsClosing;
   }
   client;
+  sessionIsClosing;
   reports = new ToolCallReports();
+  sessionRequests = /* @__PURE__ */ new Map();
   /** Returns this connection with the signature of the SDK connection. */
   asClientConnection() {
     return this;
@@ -46286,12 +46258,12 @@ var ToolCallReportingConnection = class {
   }
   async request(method, params, options) {
     if (method !== methods.client.session.requestPermission || !isPermissionRequestParams(params)) {
-      return await this.client.request(method, params, options);
+      return await this.sendRequest(method, params, options);
     }
     this.reports.prepare(params.sessionId, { sessionUpdate: "tool_call_update", ...params.toolCall });
     let response;
     try {
-      response = await this.client.request(method, params, options);
+      response = await this.sendRequest(method, params, options);
     } catch (error62) {
       this.reports.forgetOpen(params.sessionId, params.toolCall.toolCallId);
       throw error62;
@@ -46299,7 +46271,37 @@ var ToolCallReportingConnection = class {
     if (isCancelled(response)) this.reports.forgetOpen(params.sessionId, params.toolCall.toolCallId);
     return response;
   }
+  /** Withdraw pending UI without waiting for the client to answer the cancelled requests. */
+  cancelSessionRequests(sessionId) {
+    for (const controller of this.sessionRequests.get(sessionId) ?? []) {
+      controller.abort(RequestError.requestCancelled(void 0, `Session ${sessionId} is closing`));
+    }
+  }
+  async sendRequest(method, params, options) {
+    const sessionId = interactionSessionId(method, params);
+    if (sessionId === null) return await this.client.request(method, params, options);
+    if (this.sessionIsClosing(sessionId)) {
+      throw RequestError.requestCancelled(void 0, `Session ${sessionId} is closing`);
+    }
+    const controller = new AbortController();
+    const requests = this.sessionRequests.get(sessionId) ?? /* @__PURE__ */ new Set();
+    this.sessionRequests.set(sessionId, requests);
+    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 });
+    } finally {
+      requests.delete(controller);
+      if (requests.size === 0) this.sessionRequests.delete(sessionId);
+    }
+  }
 };
+function interactionSessionId(method, params) {
+  if (method !== methods.client.elicitation.create && method !== methods.client.session.requestPermission) return null;
+  if (params === null || typeof params !== "object") return null;
+  const sessionId = params.sessionId;
+  return typeof sessionId === "string" ? sessionId : null;
+}
 function isCancelled(response) {
   return response?.outcome?.outcome === "cancelled";
 }
@@ -49506,23 +49508,10 @@ var CodexBackgroundTerminalTasks = class {
     const appServer = this.appServer;
     const generation = this.appServerGeneration;
     const terminals = [];
-    const seenCursors = /* @__PURE__ */ new Set();
-    let cursor = null;
-    do {
-      const response = await appServer.threadBackgroundTerminalsList({
-        threadId,
-        cursor
-      });
+    for await (const page of appServer.backgroundTerminalPages(threadId)) {
       if (!this.queryIsCurrent(generation)) return null;
-      terminals.push(...response.data);
-      cursor = response.nextCursor;
-      if (cursor !== null) {
-        if (seenCursors.has(cursor)) {
-          throw new Error("Codex returned a repeated background terminal cursor");
-        }
-        seenCursors.add(cursor);
-      }
-    } while (cursor !== null);
+      terminals.push(...page);
+    }
     return { generation, terminals };
   }
   isActive() {
@@ -49659,7 +49648,7 @@ var CodexAcpServer = class {
   codexAcpClient;
   connection;
   mcpServerSignIn;
-  reportingConnection;
+  clientDelivery;
   /** ACP protocol version of the connection this agent serves, fixed by the protocol router. */
   protocolVersion;
   /** The v2 client handle; `null` on a v1 connection. */
@@ -49756,18 +49745,19 @@ var CodexAcpServer = class {
     this.sessionGenerations = /* @__PURE__ */ new Map();
     this.sessionOpenGenerations = /* @__PURE__ */ new Map();
     this.permissionLifecycleContexts = /* @__PURE__ */ new WeakMap();
+    const sessionIsClosing = (id) => this.sessionIsClosing(this.subagentAssociations.get(id)?.rootSessionId ?? id);
     if (connection instanceof AcpV2Connection) {
       this.protocolVersion = 2;
       this.v2Connection = connection.client;
-      this.reportingConnection = new ToolCallReportingConnection(connection.extensionOnlyV1View());
-      this.connection = this.reportingConnection.asClientConnection();
+      this.clientDelivery = new AcpClientDelivery(connection.extensionOnlyV1View(), sessionIsClosing);
+      this.connection = this.clientDelivery.asClientConnection();
       connection.registerView(this.connection);
       connection.setTurnRunningCheck((sessionId) => this.isSessionBusy(sessionId));
     } else {
       this.protocolVersion = 1;
       this.v2Connection = null;
-      this.reportingConnection = new ToolCallReportingConnection(connection);
-      this.connection = this.reportingConnection.asClientConnection();
+      this.clientDelivery = new AcpClientDelivery(connection, sessionIsClosing);
+      this.connection = this.clientDelivery.asClientConnection();
     }
     this.codexAcpClient = codexAcpClient;
     this.mcpServerSignIn = createMcpServerSignIn(
@@ -49816,7 +49806,7 @@ var CodexAcpServer = class {
     const existing = this.sessions.get(sessionId)?.subagents;
     if (this.usesStandardSubagents() && existing instanceof StandardSubagentEventRouter && !existing.isRetired()) return existing;
     const session = new ACPSessionConnection(this.connection, sessionId);
-    const release = (id) => this.reportingConnection.reports.releaseOpen(id);
+    const release = (id) => this.clientDelivery.reports.releaseOpen(id);
     const models = () => {
       const state = this.sessions.get(sessionId);
       return state ? this.subagentModels(state) : null;
@@ -49840,7 +49830,7 @@ var CodexAcpServer = class {
     return router;
   }
   async readSubagentConfiguration(threadId, parentThreadId) {
-    const { thread } = await this.codexAcpClient.appServerClient.threadRead({ threadId });
+    const thread = await this.codexAcpClient.readSubagentThread(threadId);
     if (!thread || thread.id !== threadId || thread.parentThreadId !== parentThreadId || thread.status.type === "notLoaded") return null;
     return { model: thread.model, effort: thread.reasoningEffort };
   }
@@ -49927,16 +49917,16 @@ var CodexAcpServer = class {
   }
   async initialize(_params) {
     logger.log("Initialize request received");
+    const appServer = this.ensureAppServer();
+    if (appServer) await appServer;
+    await this.runWithProcessCheck(() => this.codexAcpClient.initialize(_params));
     this.clientInfo = _params.clientInfo ?? null;
     this.clientCapabilities = _params.clientCapabilities ?? null;
     this.initializeRequest = _params;
     this.capabilities = ClientCapabilities.from(_params.clientCapabilities);
-    const appServer = this.ensureAppServer();
-    if (appServer) await appServer;
-    this.reportingConnection.reports.compareMeta = this.capabilities.airToolCallContract;
+    this.clientDelivery.reports.compareMeta = this.capabilities.airToolCallContract;
     this.booleanConfigOptionsSupported = clientSupportsBooleanConfigOptions(_params.clientCapabilities);
     this.sessionIndex.configure(_params.clientCapabilities);
-    await this.runWithProcessCheck(() => this.codexAcpClient.initialize(_params));
     this.sessionIndex.observe(this.codexAcpClient);
     this.publishFirstAuthStatusAfterResponse();
     const sessionCapabilities = {
@@ -49985,16 +49975,16 @@ var CodexAcpServer = class {
   async initializeV2(params) {
     logger.log("Initialize request received", { protocolVersion: params.protocolVersion });
     const clientCapabilities = toV1ClientCapabilitiesView(params.capabilities);
+    const appServer = this.ensureAppServer();
+    if (appServer) await appServer;
+    await this.runWithProcessCheck(() => this.codexAcpClient.initialize({ clientInfo: params.info }));
     this.clientInfo = params.info;
     this.clientCapabilities = clientCapabilities;
     this.initializeRequest = { clientInfo: params.info };
     this.capabilities = ClientCapabilities.fromV2(clientCapabilities);
-    const appServer = this.ensureAppServer();
-    if (appServer) await appServer;
-    this.reportingConnection.reports.compareMeta = this.capabilities.airToolCallContract;
+    this.clientDelivery.reports.compareMeta = this.capabilities.airToolCallContract;
     this.booleanConfigOptionsSupported = true;
     this.sessionIndex.configure(clientCapabilities);
-    await this.runWithProcessCheck(() => this.codexAcpClient.initialize({ clientInfo: params.info }));
     this.sessionIndex.observe(this.codexAcpClient);
     this.publishFirstAuthStatusAfterResponse();
     return {
@@ -50459,7 +50449,7 @@ You have been logged out. Please try again.`);
       subagents: this.createSubagentRouter(sessionId),
       asyncTasks: this.createAsyncTasks(sessionId),
       compactions: new CodexSessionCompactions(),
-      toolCallReports: this.reportingConnection.reports,
+      toolCallReports: this.clientDelivery.reports,
       openToolCalls: new CodexSessionToolCalls()
     };
     sessionState.titleGen = new TitleGenerator(
@@ -51004,15 +50994,18 @@ You have been logged out. Please try again.`);
   }
   async closeSession(params) {
     logger.log("Closing session...", { sessionId: params.sessionId });
-    const closeGeneration = this.bumpSessionGeneration(params.sessionId);
+    if (!this.hasLocalSession(params.sessionId)) return {};
+    let closeGeneration = null;
     const sessionState = this.sessions.get(params.sessionId);
     this.beginSessionCloseFence(params.sessionId);
     try {
+      this.clientDelivery.cancelSessionRequests(params.sessionId);
+      for (const child of this.subagentAssociations.forRoot(params.sessionId)) {
+        this.clientDelivery.cancelSessionRequests(child.sessionId);
+      }
       this.cancelQueuedV2Prompts(params.sessionId);
       if (sessionState) {
         await this.interruptSessionTurn(sessionState, "Close", true);
-        if (sessionState.subagents instanceof StandardSubagentEventRouter) await sessionState.subagents.finishOutstanding("disconnected");
-        sessionState.asyncTasks.clear();
         sessionState.promptSuggestions?.invalidate();
       } else {
         logger.log("Close request received for unknown local session", { sessionId: params.sessionId });
@@ -51027,10 +51020,15 @@ You have been logged out. Please try again.`);
       } else {
         logger.log("Session closed without an app-server call: its app-server is gone", { sessionId: params.sessionId });
       }
+      closeGeneration = this.bumpSessionGeneration(params.sessionId);
+      if (sessionState) {
+        if (sessionState.subagents instanceof StandardSubagentEventRouter) await sessionState.subagents.finishOutstanding("disconnected");
+        await sessionState.asyncTasks.finishAll("stopped");
+      }
       await this.reportCodexTurnState(params.sessionId, { state: "idle", stopReason: "cancelled" });
       logger.log("Session closed", { sessionId: params.sessionId });
     } finally {
-      if (this.getSessionGeneration(params.sessionId) === closeGeneration) {
+      if (closeGeneration !== null && this.getSessionGeneration(params.sessionId) === closeGeneration) {
         this.sessions.delete(params.sessionId);
         this.asyncQuestions.get(params.sessionId)?.dispose();
         this.asyncQuestions.delete(params.sessionId);
@@ -51045,6 +51043,7 @@ You have been logged out. Please try again.`);
         this.queuedV2PromptCancellers.delete(params.sessionId);
         this.steeringQueues.delete(params.sessionId);
         if (sessionState) {
+          sessionState.asyncTasks.clear();
           this.availableCommands.cancelPendingSkillsPublish(sessionState);
         }
       }
@@ -51581,6 +51580,10 @@ You have been logged out. Please try again.`);
     };
   }
   async setSessionConfigOptionV2(params) {
+    const option = this.createSessionConfigOptions(this.getSessionState(params.sessionId)).find((option2) => option2.id === params.configId);
+    if (!option || params.type !== (option.type === "boolean" ? "boolean" : "id")) {
+      throw RequestError.invalidParams();
+    }
     const response = await this.setSessionConfigOption(toV1SetSessionConfigOptionRequest(params));
     return { configOptions: toV2ConfigOptions(response.configOptions) };
   }
@@ -52216,7 +52219,7 @@ You have been logged out. Please try again.`);
       subagents: this.createSubagentRouter(sessionId, true),
       asyncTasks: this.createAsyncTasks(sessionId),
       compactions: new CodexSessionCompactions(),
-      toolCallReports: this.reportingConnection.reports,
+      toolCallReports: this.clientDelivery.reports,
       openToolCalls: new CodexSessionToolCalls()
     };
     sessionState.titleGen = new TitleGenerator(
@@ -53927,7 +53930,7 @@ You have been logged out. Please try again.`);
   }
   async failUnfinishedToolCalls(sessionIds) {
     for (const sessionId of sessionIds) {
-      for (const toolCallId of this.reportingConnection.reports.unfinished(sessionId)) {
+      for (const toolCallId of this.clientDelivery.reports.unfinished(sessionId)) {
         await this.connection.notify(methods.client.session.update, {
           sessionId,
           update: { sessionUpdate: "tool_call_update", toolCallId, status: "failed" }
@@ -54308,12 +54311,10 @@ var AcpResponseDelivery = class {
           } finally {
             writer.releaseLock();
           }
-          for (const entry of Array.isArray(message) ? message : [message]) {
-            if ("method" in entry || entry.id === null) continue;
-            const callback = this.callbacks.get(entry.id);
-            this.callbacks.delete(entry.id);
-            callback?.();
-          }
+          if ("method" in message || message.id === null) return;
+          const callback = this.callbacks.get(message.id);
+          this.callbacks.delete(message.id);
+          callback?.();
         },
         close: async () => {
           const writer = stream.writable.getWriter();
@@ -54394,6 +54395,15 @@ function createRouter(createAgent, responses) {
     if (typeof params?.sessionId === "string") codexAcpServer.assertSessionMutationAllowed(params.sessionId);
     return codexAcpServer;
   };
+  const getAgentForPaths = (params) => {
+    if (params.cwd != null && !isAbsoluteProtocolPath(params.cwd)) {
+      throw RequestError.invalidParams(void 0, "cwd must be an absolute path");
+    }
+    if (params.additionalDirectories?.some((directory) => !isAbsoluteProtocolPath(directory))) {
+      throw RequestError.invalidParams(void 0, "additionalDirectories entries must be absolute paths");
+    }
+    return getAgent(params);
+  };
   const setups = /* @__PURE__ */ new Map();
   const setup = (sessionId, requestId, operation, signal) => {
     const agent3 = getAgent({ sessionId });
@@ -54450,8 +54460,8 @@ 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) => getAgent().newSession(ctx.params)).onRequest(methods.agent.session.load, (ctx) => setup(ctx.params.sessionId, ctx.requestId, () => getAgent(ctx.params).loadSession(ctx.params), ctx.signal)).onRequest(methods.agent.session.fork, (ctx) => getAgent(ctx.params).forkSession(ctx.params)).onRequest(methods.agent.session.list, (ctx) => getAgent().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, () => getAgent(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) => getAgent().newSessionV2(ctx.params)).onRequest(methods2.agent.session.list, (ctx) => getAgent().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, () => getAgent(ctx.params).resumeSessionV2(ctx.params), ctx.signal)).onRequest(methods2.agent.session.fork, (ctx) => getAgent(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) => 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));
   return agentProtocolRouter().withV1(v1Agent).withV2(v2Agent);
 }