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

package/app/plugins/pi/plugin.mjs

@@ -15318,6 +15318,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),
@@ -15330,6 +15360,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",
@@ -16439,6 +16470,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);
 
@@ -18001,8 +18078,8 @@ function piUsageRecord(message3, extra = {}) {
   const usage = isRecord4(message3.usage) ? message3.usage : null;
   const input = nonNegativeSafeInteger(usage?.input);
   const output = nonNegativeSafeInteger(usage?.output);
-  const requestId = typeof message3.responseId === "string" && message3.responseId.length > 0 ? message3.responseId : typeof message3.timestamp === "number" && Number.isSafeInteger(message3.timestamp) ? `t${message3.timestamp}` : null;
-  if (!usage || input === null || output === null || requestId === null) {
+  const requestId2 = typeof message3.responseId === "string" && message3.responseId.length > 0 ? message3.responseId : typeof message3.timestamp === "number" && Number.isSafeInteger(message3.timestamp) ? `t${message3.timestamp}` : null;
+  if (!usage || input === null || output === null || requestId2 === null) {
     return { kind: "missing" };
   }
   const cacheRead = nonNegativeSafeInteger(usage.cacheRead);
@@ -18013,7 +18090,7 @@ function piUsageRecord(message3, extra = {}) {
     return {
       kind: "request",
       request: parseHostUsageRequest({
-        requestId,
+        requestId: requestId2,
         ...extra.historical ? { historical: true } : {},
         // Pi's provider is a user-configurable name, not a standard provider ID.
         ...typeof message3.model === "string" && message3.model.length > 0 ? { model: message3.model } : {},
@@ -19735,26 +19812,26 @@ var PiSubagentRpc = class {
     if (!Array.isArray(data?.commands) || !data.commands.some((command) => command?.name === "subagents-inspect-rpc" && command.source === "extension")) {
       throw new Error("Installed Pi has no pi-subagents Host inspection command");
     }
-    const requestId = randomUUID4();
+    const requestId2 = randomUUID4();
     const reply = new Promise((resolve, reject) => {
       const timer = setTimeout(() => {
-        this.#pending.delete(requestId);
+        this.#pending.delete(requestId2);
         reject(new Error("Pi subagent inspection timed out"));
       }, this.timeoutMs);
-      this.#pending.set(requestId, { resolve, reject, timer });
+      this.#pending.set(requestId2, { resolve, reject, timer });
     });
     try {
-      const message3 = `/subagents-inspect-rpc ${requestId} ${address.runId}${address.childId ? ` ${address.childId}` : ""} --lines 200`;
+      const message3 = `/subagents-inspect-rpc ${requestId2} ${address.runId}${address.childId ? ` ${address.childId}` : ""} --lines 200`;
       const [, result] = await Promise.all([this.send("prompt", { message: message3 }), reply]);
       if (!result.error && (result.asyncId !== address.runId && result.asyncId !== address.childId || result.childId !== address.childId)) {
         throw new Error("Pi subagent inspection identity does not match the request");
       }
       return result;
     } finally {
-      const pending = this.#pending.get(requestId);
+      const pending = this.#pending.get(requestId2);
       if (pending) {
         clearTimeout(pending.timer);
-        this.#pending.delete(requestId);
+        this.#pending.delete(requestId2);
       }
     }
   }
@@ -20613,11 +20690,11 @@ var PiRpcSession = class {
   #startInteraction(active, value) {
     if (!this.#isBlockingInteraction(value))
       return;
-    const requestId = value.id;
+    const requestId2 = value.id;
     const method = value.method;
     const title = value.title;
     const timeoutMs = value.timeout;
-    if (typeof requestId !== "string" || requestId.length === 0 || typeof method !== "string" || typeof title !== "string" || title.length === 0 || timeoutMs !== void 0 && (typeof timeoutMs !== "number" || !Number.isFinite(timeoutMs) || timeoutMs < 0) || active.interactions.has(requestId)) {
+    if (typeof requestId2 !== "string" || requestId2.length === 0 || typeof method !== "string" || typeof title !== "string" || title.length === 0 || timeoutMs !== void 0 && (typeof timeoutMs !== "number" || !Number.isFinite(timeoutMs) || timeoutMs < 0) || active.interactions.has(requestId2)) {
       throw new PiRpcFaultError("protocolError", "Pi RPC returned an invalid Interaction request");
     }
     let request;
@@ -20626,7 +20703,7 @@ var PiRpcSession = class {
         throw new PiRpcFaultError("protocolError", "Pi RPC select request has invalid options");
       }
       request = {
-        requestId,
+        requestId: requestId2,
         method,
         title,
         options: [...value.options],
@@ -20637,7 +20714,7 @@ var PiRpcSession = class {
         throw new PiRpcFaultError("protocolError", "Pi RPC confirm request has no message");
       }
       request = {
-        requestId,
+        requestId: requestId2,
         method,
         title,
         message: value.message,
@@ -20648,7 +20725,7 @@ var PiRpcSession = class {
         throw new PiRpcFaultError("protocolError", "Pi RPC input placeholder is invalid");
       }
       request = {
-        requestId,
+        requestId: requestId2,
         method,
         title,
         ...typeof value.placeholder === "string" ? { placeholder: value.placeholder } : {},
@@ -20659,7 +20736,7 @@ var PiRpcSession = class {
         throw new PiRpcFaultError("protocolError", "Pi RPC editor prefill is invalid");
       }
       request = {
-        requestId,
+        requestId: requestId2,
         method: "editor",
         title,
         ...typeof value.prefill === "string" ? { prefill: value.prefill } : {},
@@ -20669,16 +20746,16 @@ var PiRpcSession = class {
     const pending = { request, timeout: null };
     if (request.timeoutMs !== void 0) {
       pending.timeout = setTimeout(() => {
-        if (this.#activeTurn !== active || !active.interactions.has(requestId))
+        if (this.#activeTurn !== active || !active.interactions.has(requestId2))
           return;
-        void this.#resolveInteraction({ requestId, cancelled: true }, "expired").catch((error51) => {
+        void this.#resolveInteraction({ requestId: requestId2, cancelled: true }, "expired").catch((error51) => {
           if (this.#closed || this.#failed)
             return;
           this.#fail(new PiRpcFaultError("protocolError", `Pi RPC Interaction timeout handling failed: ${message2(error51)}`));
         });
       }, request.timeoutMs);
     }
-    active.interactions.set(requestId, pending);
+    active.interactions.set(requestId2, pending);
     active.onEvent({ type: "interaction.requested", request });
   }
   #handleResponse(value) {
@@ -20932,13 +21009,13 @@ var PiRpcSession = class {
     this.#options.onFault?.(finalFault);
   }
   #closeInteractions(active, reason) {
-    for (const [requestId, pending] of active.interactions) {
-      active.interactions.delete(requestId);
+    for (const [requestId2, pending] of active.interactions) {
+      active.interactions.delete(requestId2);
       if (pending.timeout)
         clearTimeout(pending.timeout);
       active.onEvent({
         type: "interaction.closed",
-        requestId,
+        requestId: requestId2,
         reason
       });
     }

package/app/plugins/qoder/plugin.mjs

@@ -27767,6 +27767,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),
@@ -27779,6 +27809,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",
@@ -28888,6 +28919,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);
 
@@ -37211,10 +37288,10 @@ var Protocol = class {
             while (queuedMessage = await this._taskMessageQueue.dequeue(taskId, extra.sessionId)) {
               if (queuedMessage.type === "response" || queuedMessage.type === "error") {
                 const message = queuedMessage.message;
-                const requestId = message.id;
-                const resolver = this._requestResolvers.get(requestId);
+                const requestId2 = message.id;
+                const resolver = this._requestResolvers.get(requestId2);
                 if (resolver) {
-                  this._requestResolvers.delete(requestId);
+                  this._requestResolvers.delete(requestId2);
                   if (queuedMessage.type === "response") {
                     resolver(message);
                   } else {
@@ -37224,7 +37301,7 @@ var Protocol = class {
                   }
                 } else {
                   const messageType = queuedMessage.type === "response" ? "Response" : "Error";
-                  this._onerror(new Error(`${messageType} handler missing for request ${requestId}`));
+                  this._onerror(new Error(`${messageType} handler missing for request ${requestId2}`));
                 }
                 continue;
               }
@@ -37993,13 +38070,13 @@ var Protocol = class {
       const messages = await this._taskMessageQueue.dequeueAll(taskId, sessionId);
       for (const message of messages) {
         if (message.type === "request" && isJSONRPCRequest(message.message)) {
-          const requestId = message.message.id;
-          const resolver = this._requestResolvers.get(requestId);
+          const requestId2 = message.message.id;
+          const resolver = this._requestResolvers.get(requestId2);
           if (resolver) {
             resolver(new McpError(ErrorCode.InternalError, "Task cancelled or completed"));
-            this._requestResolvers.delete(requestId);
+            this._requestResolvers.delete(requestId2);
           } else {
-            this._onerror(new Error(`Resolver missing for request ${requestId} during task ${taskId} cleanup`));
+            this._onerror(new Error(`Resolver missing for request ${requestId2} during task ${taskId} cleanup`));
           }
         }
       }

package/app/plugins/qoder-cn/plugin.mjs

@@ -27364,6 +27364,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),
@@ -27376,6 +27406,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",
@@ -28485,6 +28516,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);
 
@@ -37213,10 +37290,10 @@ var Protocol = class {
             while (queuedMessage = await this._taskMessageQueue.dequeue(taskId, extra.sessionId)) {
               if (queuedMessage.type === "response" || queuedMessage.type === "error") {
                 const message = queuedMessage.message;
-                const requestId = message.id;
-                const resolver = this._requestResolvers.get(requestId);
+                const requestId2 = message.id;
+                const resolver = this._requestResolvers.get(requestId2);
                 if (resolver) {
-                  this._requestResolvers.delete(requestId);
+                  this._requestResolvers.delete(requestId2);
                   if (queuedMessage.type === "response") {
                     resolver(message);
                   } else {
@@ -37226,7 +37303,7 @@ var Protocol = class {
                   }
                 } else {
                   const messageType = queuedMessage.type === "response" ? "Response" : "Error";
-                  this._onerror(new Error(`${messageType} handler missing for request ${requestId}`));
+                  this._onerror(new Error(`${messageType} handler missing for request ${requestId2}`));
                 }
                 continue;
               }
@@ -37995,13 +38072,13 @@ var Protocol = class {
       const messages = await this._taskMessageQueue.dequeueAll(taskId, sessionId);
       for (const message of messages) {
         if (message.type === "request" && isJSONRPCRequest(message.message)) {
-          const requestId = message.message.id;
-          const resolver = this._requestResolvers.get(requestId);
+          const requestId2 = message.message.id;
+          const resolver = this._requestResolvers.get(requestId2);
           if (resolver) {
             resolver(new McpError(ErrorCode.InternalError, "Task cancelled or completed"));
-            this._requestResolvers.delete(requestId);
+            this._requestResolvers.delete(requestId2);
           } else {
-            this._onerror(new Error(`Resolver missing for request ${requestId} during task ${taskId} cleanup`));
+            this._onerror(new Error(`Resolver missing for request ${requestId2} during task ${taskId} cleanup`));
           }
         }
       }