@karlorz/codexhost-cli-win32-arm64 0.13.3-4 → 0.13.3-6

package/app/plugins/grok/plugin.mjs

@@ -246,7 +246,19 @@ function resolveHarnessExecutable(spec, input, dependencies = {}) {
 
 // ../../harness-discovery/dist/installation.js
 import { execFile } from "node:child_process";
+import { open } from "node:fs/promises";
 import { homedir } from "node:os";
+async function readLauncherScript(command) {
+  const file2 = await open(command, "r");
+  try {
+    const buffer = Buffer.alloc(4096);
+    const { bytesRead } = await file2.read(buffer, 0, buffer.length, 0);
+    const prefix = buffer.toString("utf8", 0, bytesRead);
+    return prefix.startsWith("#!") || /\.(cmd|bat|ps1)$/i.test(command) ? prefix : "";
+  } finally {
+    await file2.close();
+  }
+}
 function runInstallationCommand(command, args, environment, timeout = 3e4) {
   const env = withNodeRuntimeOnPath(environment);
   const invocation = /\.[cm]?js$/i.test(command) ? commandInvocation(process.execPath, [command, ...args], env) : commandInvocation(command, args, env);
@@ -274,6 +286,9 @@ function installationVersion(value) {
     throw new Error("Harness returned an invalid version");
   return value.trim().replace(/^v/, "");
 }
+function versionFromOutput(output) {
+  return installationVersion(output.match(/\b\d+(?:\.\d+){1,3}(?:-[\w.-]+)?(?:\+[\w.-]+)?\b/)?.[0]);
+}
 function createInstallationManager(options) {
   let checking;
   let updating;
@@ -15372,6 +15387,36 @@ var hostInteractionIdSchema = opaqueIdSchema.brand();
 var threadPrewarmDiscardParamsSchema = external_exports.object({ threadId: hostThreadIdSchema });
 var threadPrewarmDiscardResultSchema = external_exports.object({ discarded: external_exports.boolean() });
 
+// ../../shared-contracts/dist/realtime-call.js
+var REALTIME_CALL_FORWARDED_HEADERS = [
+  "openai-alpha",
+  "thread-id",
+  "session-id",
+  "originator",
+  "x-codex-turn-metadata"
+];
+var FORWARDED_HEADERS = new Set(REALTIME_CALL_FORWARDED_HEADERS);
+var REALTIME_CALL_ID_PATTERN = /^rtc_[A-Za-z0-9_-]{1,128}$/u;
+var requestId = external_exports.string().min(1).max(128);
+var realtimeCallParamsSchema = external_exports.discriminatedUnion("operation", [
+  external_exports.object({
+    operation: external_exports.literal("create"),
+    requestId,
+    body: external_exports.string().min(1).max(16 << 20),
+    headers: external_exports.record(external_exports.string(), external_exports.string()).default({})
+  }),
+  external_exports.object({ operation: external_exports.literal("cancel"), requestId }),
+  external_exports.object({
+    operation: external_exports.literal("hangup"),
+    callId: external_exports.string().regex(REALTIME_CALL_ID_PATTERN)
+  })
+]);
+var realtimeCallResponseSchema = external_exports.object({
+  status: external_exports.number().int().min(200).max(599),
+  body: external_exports.string(),
+  headers: external_exports.record(external_exports.string(), external_exports.string())
+});
+
 // ../../shared-contracts/dist/console.js
 var consoleAnnouncementSchema = external_exports.strictObject({
   title: external_exports.string().trim().min(1).max(200),
@@ -15384,6 +15429,7 @@ var consoleOpenResultSchema = external_exports.strictObject({
   url: external_exports.string().max(2048).regex(/^http:\/\/(?:127\.0\.0\.1|localhost):\d{1,5}\/(?:\?.*)?$/u)
 });
 var CONSOLE_HOST_METHODS = Object.freeze([
+  "codexhost/voice/gateway-status",
   "codexhost/console/remote-connections",
   "codexhost/runtime/status",
   "codexhost/remote/ssh-setup",
@@ -16493,6 +16539,52 @@ var remoteConnectionsReplySchema = external_exports.union([
   external_exports.strictObject({ error: external_exports.strictObject({ code: external_exports.number().int(), message: external_exports.string() }) })
 ]);
 
+// ../../shared-contracts/dist/voice-settings.js
+var voiceRoutesSchema = external_exports.strictObject({
+  chatExperience: external_exports.enum(["chatgpt", "codex"]),
+  chatConnection: external_exports.enum(["desktop", "gateway"]),
+  workConnection: external_exports.enum(["desktop", "gateway"])
+});
+var DEFAULT_VOICE_ROUTES = Object.freeze({
+  chatExperience: "chatgpt",
+  chatConnection: "desktop",
+  workConnection: "gateway"
+});
+var voiceSettingsSchema = voiceRoutesSchema.extend({ inject: external_exports.boolean() });
+var voiceSettingsRequestSchema = external_exports.discriminatedUnion("operation", [
+  external_exports.strictObject({
+    operation: external_exports.literal("get"),
+    runtime: external_exports.strictObject({
+      id: external_exports.string().uuid(),
+      revision: external_exports.string().max(64),
+      activeCall: external_exports.boolean()
+    }).optional()
+  }),
+  external_exports.strictObject({ operation: external_exports.literal("migrate"), routes: voiceRoutesSchema }),
+  external_exports.strictObject({
+    operation: external_exports.literal("set"),
+    settings: voiceSettingsSchema,
+    revision: external_exports.string().max(64)
+  }),
+  external_exports.strictObject({ operation: external_exports.literal("restart"), confirm: external_exports.literal(true) })
+]);
+var voiceSettingsStateSchema = external_exports.strictObject({
+  settings: voiceSettingsSchema,
+  initialized: external_exports.boolean(),
+  revision: external_exports.string(),
+  activeInject: external_exports.boolean().nullable(),
+  envOverride: external_exports.enum(["0", "1"]).nullable(),
+  activeEnvOverride: external_exports.enum(["0", "1"]).nullable(),
+  routesActive: external_exports.boolean().nullable(),
+  activeCall: external_exports.boolean().nullable(),
+  gatewayReady: external_exports.boolean().nullable(),
+  restartAvailable: external_exports.boolean(),
+  restart: external_exports.strictObject({
+    phase: external_exports.enum(["idle", "restarting", "succeeded", "failed"]),
+    error: external_exports.string().nullable()
+  })
+});
+
 // ../../shared-contracts/dist/index.js
 var workspaceContractVersionSchema = external_exports.literal(WORKSPACE_CONTRACT_VERSION);
 
@@ -18774,8 +18866,8 @@ var ConnectionContext = class {
   /**
    * Sends a protocol-level request cancellation notification.
    */
-  sendCancelRequest(requestId) {
-    return this.connection.sendCancelRequest(requestId);
+  sendCancelRequest(requestId2) {
+    return this.connection.sendCancelRequest(requestId2);
   }
   /**
    * Registers a handler that can be disposed independently.
@@ -18960,8 +19052,8 @@ var Connection = class {
   /**
    * Sends a protocol-level request cancellation notification.
    */
-  sendCancelRequest(requestId) {
-    return this.sendNotification(CANCEL_REQUEST_METHOD, { requestId });
+  sendCancelRequest(requestId2) {
+    return this.sendNotification(CANCEL_REQUEST_METHOD, { requestId: requestId2 });
   }
   /**
    * Sends a JSON-RPC notification.
@@ -19269,15 +19361,15 @@ var Connection = class {
     if (message.method !== CANCEL_REQUEST_METHOD) {
       return;
     }
-    const requestId = cancelRequestId(message.params);
-    if (requestId === void 0) {
+    const requestId2 = cancelRequestId(message.params);
+    if (requestId2 === void 0) {
       return;
     }
-    const controller = this.incomingRequests.get(requestId);
+    const controller = this.incomingRequests.get(requestId2);
     if (!controller || controller.signal.aborted) {
       return;
     }
-    controller.abort(RequestError.requestCancelled({ requestId }));
+    controller.abort(RequestError.requestCancelled({ requestId: requestId2 }));
   }
   closedReason() {
     return this.abortController.signal.reason ?? new Error("ACP connection closed");
@@ -19743,12 +19835,12 @@ var AcpContext = class {
   }
 };
 var AgentContext = class _AgentContext extends AcpContext {
-  constructor(cx, requestId) {
-    super(cx, requestId);
+  constructor(cx, requestId2) {
+    super(cx, requestId2);
   }
   /** @internal */
-  static create(cx, requestId) {
-    return new _AgentContext(cx, requestId);
+  static create(cx, requestId2) {
+    return new _AgentContext(cx, requestId2);
   }
   request(method, params, options) {
     const spec = clientRequestSpecsByMethod[method];
@@ -19759,12 +19851,12 @@ var AgentContext = class _AgentContext extends AcpContext {
   }
 };
 var ClientContext = class _ClientContext extends AcpContext {
-  constructor(cx, requestId) {
-    super(cx, requestId);
+  constructor(cx, requestId2) {
+    super(cx, requestId2);
   }
   /** @internal */
-  static create(cx, requestId) {
-    return new _ClientContext(cx, requestId);
+  static create(cx, requestId2) {
+    return new _ClientContext(cx, requestId2);
   }
   /** @internal */
   [startActiveSession](params, options) {
@@ -20197,10 +20289,10 @@ var agentRequestSpecsByMethod = specsByMethod(agentRequestSpecs);
 var agentNotificationSpecsByMethod = specsByMethod(agentNotificationSpecs);
 var clientRequestSpecsByMethod = specsByMethod(clientRequestSpecs);
 var clientNotificationSpecsByMethod = specsByMethod(clientNotificationSpecs);
-function agentRequestContext(params, client2, signal, requestId) {
+function agentRequestContext(params, client2, signal, requestId2) {
   return {
     params,
-    requestId,
+    requestId: requestId2,
     signal,
     client: client2
   };
@@ -20212,10 +20304,10 @@ function agentNotificationContext(params, client2, signal) {
     client: client2
   };
 }
-function clientRequestContext(params, agent, signal, requestId) {
+function clientRequestContext(params, agent, signal, requestId2) {
   return {
     params,
-    requestId,
+    requestId: requestId2,
     signal,
     agent
   };
@@ -20340,7 +20432,7 @@ var AgentApp = class {
     return this.notification(spec, handlerOrParams);
   }
   request(spec, handler) {
-    registerAppRequest(this.builder, spec, (params, cx, signal, requestId) => agentRequestContext(params, AgentContext.create(cx, requestId), signal, requestId), handler);
+    registerAppRequest(this.builder, spec, (params, cx, signal, requestId2) => agentRequestContext(params, AgentContext.create(cx, requestId2), signal, requestId2), handler);
     return this;
   }
   notification(spec, handler) {
@@ -20440,7 +20532,7 @@ var ClientApp = class {
     return this.notification(spec, handlerOrParams);
   }
   request(spec, handler) {
-    registerAppRequest(this.builder, spec, (params, cx, signal, requestId) => clientRequestContext(params, ClientContext.create(cx, requestId), signal, requestId), handler);
+    registerAppRequest(this.builder, spec, (params, cx, signal, requestId2) => clientRequestContext(params, ClientContext.create(cx, requestId2), signal, requestId2), handler);
     return this;
   }
   notification(spec, handler) {
@@ -23976,8 +24068,12 @@ var GrokAcpTransport = class {
     const response = await connection.request("session/set_model", {
       sessionId: this.#sessionId,
       modelId,
-      ...reasoningEffort ? { reasoningEffort } : {},
-      ...contextWindowTokens !== void 0 ? { _meta: { contextWindow: contextWindowTokens } } : {}
+      ...reasoningEffort || contextWindowTokens !== void 0 ? {
+        _meta: {
+          ...reasoningEffort ? { reasoningEffort } : {},
+          ...contextWindowTokens !== void 0 ? { contextWindow: contextWindowTokens } : {}
+        }
+      } : {}
     });
     if (!isRecord13(response) || !isRecord13(response._meta) || !isRecord13(response._meta.model)) {
       throw new GrokTransportError("protocolError", "Grok rejected Model configuration");
@@ -26531,6 +26627,24 @@ function createGrokInstallation(environment, command) {
   let installer = "";
   return createInstallationManager({
     async check() {
+      const launcher = await readLauncherScript(resolveGrokExecutable({ environment, ...command ? { command } : {} }));
+      if (launcher.includes("GROKGOD_HOME=") && launcher.includes("GROKGOD_BIN=")) {
+        return {
+          currentVersion: versionFromOutput(await run(["--version"], void 0, {
+            GROK_DISABLE_AUTOUPDATER: "1",
+            GROKGOD_UPDATE_CHECK_DISABLE: "1"
+          })),
+          latestVersion: "Unknown",
+          latestVersionKind: "unknown",
+          updateAvailable: false,
+          canUpdate: false,
+          messageCode: "original-installer",
+          notice: {
+            en: "Managed by grokgod. Use grokgod's updater or installer to preserve the installed patches. The latest patched version is not checked here.",
+            "zh-CN": "此安装由 grokgod 管理。请使用 grokgod 的更新程序或安装程序保留补丁；此处不检查最新补丁版本。"
+          }
+        };
+      }
       const state = JSON.parse(await run(["update", "--check", "--json"]));
       if (state.error || typeof state.updateAvailable !== "boolean")
         throw new Error("Grok update check failed");

package/app/plugins/hermes/plugin.mjs

@@ -15142,6 +15142,36 @@ var hostInteractionIdSchema = opaqueIdSchema.brand();
 var threadPrewarmDiscardParamsSchema = external_exports.object({ threadId: hostThreadIdSchema });
 var threadPrewarmDiscardResultSchema = external_exports.object({ discarded: external_exports.boolean() });
 
+// ../../shared-contracts/dist/realtime-call.js
+var REALTIME_CALL_FORWARDED_HEADERS = [
+  "openai-alpha",
+  "thread-id",
+  "session-id",
+  "originator",
+  "x-codex-turn-metadata"
+];
+var FORWARDED_HEADERS = new Set(REALTIME_CALL_FORWARDED_HEADERS);
+var REALTIME_CALL_ID_PATTERN = /^rtc_[A-Za-z0-9_-]{1,128}$/u;
+var requestId = external_exports.string().min(1).max(128);
+var realtimeCallParamsSchema = external_exports.discriminatedUnion("operation", [
+  external_exports.object({
+    operation: external_exports.literal("create"),
+    requestId,
+    body: external_exports.string().min(1).max(16 << 20),
+    headers: external_exports.record(external_exports.string(), external_exports.string()).default({})
+  }),
+  external_exports.object({ operation: external_exports.literal("cancel"), requestId }),
+  external_exports.object({
+    operation: external_exports.literal("hangup"),
+    callId: external_exports.string().regex(REALTIME_CALL_ID_PATTERN)
+  })
+]);
+var realtimeCallResponseSchema = external_exports.object({
+  status: external_exports.number().int().min(200).max(599),
+  body: external_exports.string(),
+  headers: external_exports.record(external_exports.string(), external_exports.string())
+});
+
 // ../../shared-contracts/dist/console.js
 var consoleAnnouncementSchema = external_exports.strictObject({
   title: external_exports.string().trim().min(1).max(200),
@@ -15154,6 +15184,7 @@ var consoleOpenResultSchema = external_exports.strictObject({
   url: external_exports.string().max(2048).regex(/^http:\/\/(?:127\.0\.0\.1|localhost):\d{1,5}\/(?:\?.*)?$/u)
 });
 var CONSOLE_HOST_METHODS = Object.freeze([
+  "codexhost/voice/gateway-status",
   "codexhost/console/remote-connections",
   "codexhost/runtime/status",
   "codexhost/remote/ssh-setup",
@@ -16263,6 +16294,52 @@ var remoteConnectionsReplySchema = external_exports.union([
   external_exports.strictObject({ error: external_exports.strictObject({ code: external_exports.number().int(), message: external_exports.string() }) })
 ]);
 
+// ../../shared-contracts/dist/voice-settings.js
+var voiceRoutesSchema = external_exports.strictObject({
+  chatExperience: external_exports.enum(["chatgpt", "codex"]),
+  chatConnection: external_exports.enum(["desktop", "gateway"]),
+  workConnection: external_exports.enum(["desktop", "gateway"])
+});
+var DEFAULT_VOICE_ROUTES = Object.freeze({
+  chatExperience: "chatgpt",
+  chatConnection: "desktop",
+  workConnection: "gateway"
+});
+var voiceSettingsSchema = voiceRoutesSchema.extend({ inject: external_exports.boolean() });
+var voiceSettingsRequestSchema = external_exports.discriminatedUnion("operation", [
+  external_exports.strictObject({
+    operation: external_exports.literal("get"),
+    runtime: external_exports.strictObject({
+      id: external_exports.string().uuid(),
+      revision: external_exports.string().max(64),
+      activeCall: external_exports.boolean()
+    }).optional()
+  }),
+  external_exports.strictObject({ operation: external_exports.literal("migrate"), routes: voiceRoutesSchema }),
+  external_exports.strictObject({
+    operation: external_exports.literal("set"),
+    settings: voiceSettingsSchema,
+    revision: external_exports.string().max(64)
+  }),
+  external_exports.strictObject({ operation: external_exports.literal("restart"), confirm: external_exports.literal(true) })
+]);
+var voiceSettingsStateSchema = external_exports.strictObject({
+  settings: voiceSettingsSchema,
+  initialized: external_exports.boolean(),
+  revision: external_exports.string(),
+  activeInject: external_exports.boolean().nullable(),
+  envOverride: external_exports.enum(["0", "1"]).nullable(),
+  activeEnvOverride: external_exports.enum(["0", "1"]).nullable(),
+  routesActive: external_exports.boolean().nullable(),
+  activeCall: external_exports.boolean().nullable(),
+  gatewayReady: external_exports.boolean().nullable(),
+  restartAvailable: external_exports.boolean(),
+  restart: external_exports.strictObject({
+    phase: external_exports.enum(["idle", "restarting", "succeeded", "failed"]),
+    error: external_exports.string().nullable()
+  })
+});
+
 // ../../shared-contracts/dist/index.js
 var workspaceContractVersionSchema = external_exports.literal(WORKSPACE_CONTRACT_VERSION);
 

package/app/plugins/kimi-code/plugin.mjs

@@ -15262,6 +15262,36 @@ var hostInteractionIdSchema = opaqueIdSchema.brand();
 var threadPrewarmDiscardParamsSchema = external_exports.object({ threadId: hostThreadIdSchema });
 var threadPrewarmDiscardResultSchema = external_exports.object({ discarded: external_exports.boolean() });
 
+// ../../shared-contracts/dist/realtime-call.js
+var REALTIME_CALL_FORWARDED_HEADERS = [
+  "openai-alpha",
+  "thread-id",
+  "session-id",
+  "originator",
+  "x-codex-turn-metadata"
+];
+var FORWARDED_HEADERS = new Set(REALTIME_CALL_FORWARDED_HEADERS);
+var REALTIME_CALL_ID_PATTERN = /^rtc_[A-Za-z0-9_-]{1,128}$/u;
+var requestId = external_exports.string().min(1).max(128);
+var realtimeCallParamsSchema = external_exports.discriminatedUnion("operation", [
+  external_exports.object({
+    operation: external_exports.literal("create"),
+    requestId,
+    body: external_exports.string().min(1).max(16 << 20),
+    headers: external_exports.record(external_exports.string(), external_exports.string()).default({})
+  }),
+  external_exports.object({ operation: external_exports.literal("cancel"), requestId }),
+  external_exports.object({
+    operation: external_exports.literal("hangup"),
+    callId: external_exports.string().regex(REALTIME_CALL_ID_PATTERN)
+  })
+]);
+var realtimeCallResponseSchema = external_exports.object({
+  status: external_exports.number().int().min(200).max(599),
+  body: external_exports.string(),
+  headers: external_exports.record(external_exports.string(), external_exports.string())
+});
+
 // ../../shared-contracts/dist/console.js
 var consoleAnnouncementSchema = external_exports.strictObject({
   title: external_exports.string().trim().min(1).max(200),
@@ -15274,6 +15304,7 @@ var consoleOpenResultSchema = external_exports.strictObject({
   url: external_exports.string().max(2048).regex(/^http:\/\/(?:127\.0\.0\.1|localhost):\d{1,5}\/(?:\?.*)?$/u)
 });
 var CONSOLE_HOST_METHODS = Object.freeze([
+  "codexhost/voice/gateway-status",
   "codexhost/console/remote-connections",
   "codexhost/runtime/status",
   "codexhost/remote/ssh-setup",
@@ -16383,6 +16414,52 @@ var remoteConnectionsReplySchema = external_exports.union([
   external_exports.strictObject({ error: external_exports.strictObject({ code: external_exports.number().int(), message: external_exports.string() }) })
 ]);
 
+// ../../shared-contracts/dist/voice-settings.js
+var voiceRoutesSchema = external_exports.strictObject({
+  chatExperience: external_exports.enum(["chatgpt", "codex"]),
+  chatConnection: external_exports.enum(["desktop", "gateway"]),
+  workConnection: external_exports.enum(["desktop", "gateway"])
+});
+var DEFAULT_VOICE_ROUTES = Object.freeze({
+  chatExperience: "chatgpt",
+  chatConnection: "desktop",
+  workConnection: "gateway"
+});
+var voiceSettingsSchema = voiceRoutesSchema.extend({ inject: external_exports.boolean() });
+var voiceSettingsRequestSchema = external_exports.discriminatedUnion("operation", [
+  external_exports.strictObject({
+    operation: external_exports.literal("get"),
+    runtime: external_exports.strictObject({
+      id: external_exports.string().uuid(),
+      revision: external_exports.string().max(64),
+      activeCall: external_exports.boolean()
+    }).optional()
+  }),
+  external_exports.strictObject({ operation: external_exports.literal("migrate"), routes: voiceRoutesSchema }),
+  external_exports.strictObject({
+    operation: external_exports.literal("set"),
+    settings: voiceSettingsSchema,
+    revision: external_exports.string().max(64)
+  }),
+  external_exports.strictObject({ operation: external_exports.literal("restart"), confirm: external_exports.literal(true) })
+]);
+var voiceSettingsStateSchema = external_exports.strictObject({
+  settings: voiceSettingsSchema,
+  initialized: external_exports.boolean(),
+  revision: external_exports.string(),
+  activeInject: external_exports.boolean().nullable(),
+  envOverride: external_exports.enum(["0", "1"]).nullable(),
+  activeEnvOverride: external_exports.enum(["0", "1"]).nullable(),
+  routesActive: external_exports.boolean().nullable(),
+  activeCall: external_exports.boolean().nullable(),
+  gatewayReady: external_exports.boolean().nullable(),
+  restartAvailable: external_exports.boolean(),
+  restart: external_exports.strictObject({
+    phase: external_exports.enum(["idle", "restarting", "succeeded", "failed"]),
+    error: external_exports.string().nullable()
+  })
+});
+
 // ../../shared-contracts/dist/index.js
 var workspaceContractVersionSchema = external_exports.literal(WORKSPACE_CONTRACT_VERSION);
 
@@ -18578,8 +18655,8 @@ var ConnectionContext = class {
   /**
    * Sends a protocol-level request cancellation notification.
    */
-  sendCancelRequest(requestId) {
-    return this.connection.sendCancelRequest(requestId);
+  sendCancelRequest(requestId2) {
+    return this.connection.sendCancelRequest(requestId2);
   }
   /**
    * Registers a handler that can be disposed independently.
@@ -18764,8 +18841,8 @@ var Connection = class {
   /**
    * Sends a protocol-level request cancellation notification.
    */
-  sendCancelRequest(requestId) {
-    return this.sendNotification(CANCEL_REQUEST_METHOD, { requestId });
+  sendCancelRequest(requestId2) {
+    return this.sendNotification(CANCEL_REQUEST_METHOD, { requestId: requestId2 });
   }
   /**
    * Sends a JSON-RPC notification.
@@ -19073,15 +19150,15 @@ var Connection = class {
     if (message.method !== CANCEL_REQUEST_METHOD) {
       return;
     }
-    const requestId = cancelRequestId(message.params);
-    if (requestId === void 0) {
+    const requestId2 = cancelRequestId(message.params);
+    if (requestId2 === void 0) {
       return;
     }
-    const controller = this.incomingRequests.get(requestId);
+    const controller = this.incomingRequests.get(requestId2);
     if (!controller || controller.signal.aborted) {
       return;
     }
-    controller.abort(RequestError.requestCancelled({ requestId }));
+    controller.abort(RequestError.requestCancelled({ requestId: requestId2 }));
   }
   closedReason() {
     return this.abortController.signal.reason ?? new Error("ACP connection closed");
@@ -19547,12 +19624,12 @@ var AcpContext = class {
   }
 };
 var AgentContext = class _AgentContext extends AcpContext {
-  constructor(cx, requestId) {
-    super(cx, requestId);
+  constructor(cx, requestId2) {
+    super(cx, requestId2);
   }
   /** @internal */
-  static create(cx, requestId) {
-    return new _AgentContext(cx, requestId);
+  static create(cx, requestId2) {
+    return new _AgentContext(cx, requestId2);
   }
   request(method, params, options) {
     const spec = clientRequestSpecsByMethod[method];
@@ -19563,12 +19640,12 @@ var AgentContext = class _AgentContext extends AcpContext {
   }
 };
 var ClientContext = class _ClientContext extends AcpContext {
-  constructor(cx, requestId) {
-    super(cx, requestId);
+  constructor(cx, requestId2) {
+    super(cx, requestId2);
   }
   /** @internal */
-  static create(cx, requestId) {
-    return new _ClientContext(cx, requestId);
+  static create(cx, requestId2) {
+    return new _ClientContext(cx, requestId2);
   }
   /** @internal */
   [startActiveSession](params, options) {
@@ -20001,10 +20078,10 @@ var agentRequestSpecsByMethod = specsByMethod(agentRequestSpecs);
 var agentNotificationSpecsByMethod = specsByMethod(agentNotificationSpecs);
 var clientRequestSpecsByMethod = specsByMethod(clientRequestSpecs);
 var clientNotificationSpecsByMethod = specsByMethod(clientNotificationSpecs);
-function agentRequestContext(params, client2, signal, requestId) {
+function agentRequestContext(params, client2, signal, requestId2) {
   return {
     params,
-    requestId,
+    requestId: requestId2,
     signal,
     client: client2
   };
@@ -20016,10 +20093,10 @@ function agentNotificationContext(params, client2, signal) {
     client: client2
   };
 }
-function clientRequestContext(params, agent, signal, requestId) {
+function clientRequestContext(params, agent, signal, requestId2) {
   return {
     params,
-    requestId,
+    requestId: requestId2,
     signal,
     agent
   };
@@ -20144,7 +20221,7 @@ var AgentApp = class {
     return this.notification(spec, handlerOrParams);
   }
   request(spec, handler) {
-    registerAppRequest(this.builder, spec, (params, cx, signal, requestId) => agentRequestContext(params, AgentContext.create(cx, requestId), signal, requestId), handler);
+    registerAppRequest(this.builder, spec, (params, cx, signal, requestId2) => agentRequestContext(params, AgentContext.create(cx, requestId2), signal, requestId2), handler);
     return this;
   }
   notification(spec, handler) {
@@ -20244,7 +20321,7 @@ var ClientApp = class {
     return this.notification(spec, handlerOrParams);
   }
   request(spec, handler) {
-    registerAppRequest(this.builder, spec, (params, cx, signal, requestId) => clientRequestContext(params, ClientContext.create(cx, requestId), signal, requestId), handler);
+    registerAppRequest(this.builder, spec, (params, cx, signal, requestId2) => clientRequestContext(params, ClientContext.create(cx, requestId2), signal, requestId2), handler);
     return this;
   }
   notification(spec, handler) {