@karlorz/codexhost-cli-win32-x64 0.13.3-3 → 0.13.3-5

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),
@@ -18578,8 +18608,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 +18794,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 +19103,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 +19577,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 +19593,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 +20031,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 +20046,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 +20174,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 +20274,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) {

package/app/plugins/kiro-cli/plugin.mjs

@@ -15121,6 +15121,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),
@@ -18559,8 +18589,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.
@@ -18745,8 +18775,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.
@@ -19054,15 +19084,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");
@@ -19528,12 +19558,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];
@@ -19544,12 +19574,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) {
@@ -19982,10 +20012,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
   };
@@ -19997,10 +20027,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
   };
@@ -20125,7 +20155,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) {
@@ -20225,7 +20255,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) {

package/app/plugins/omp/plugin.mjs

@@ -15321,6 +15321,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),
@@ -17630,8 +17660,8 @@ function ompUsageRecord(message3, extra = {}) {
   const usage = isRecord5(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);
@@ -17642,7 +17672,7 @@ function ompUsageRecord(message3, extra = {}) {
     return {
       kind: "request",
       request: parseHostUsageRequest({
-        requestId,
+        requestId: requestId2,
         ...extra.historical ? { historical: true } : {},
         // Omp's provider is a configurable name, not a standard provider ID.
         ...typeof message3.model === "string" && message3.model.length > 0 ? { model: message3.model } : {},
@@ -19492,11 +19522,11 @@ var OmpRpcSession = 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 OmpRpcFaultError("protocolError", "Omp RPC returned an invalid Interaction request");
     }
     let request;
@@ -19512,7 +19542,7 @@ var OmpRpcSession = class {
         optionDetails = value.optionDetails.map(({ description }) => description === void 0 ? {} : { description });
       }
       request = {
-        requestId,
+        requestId: requestId2,
         method,
         title,
         options: [...value.options],
@@ -19524,7 +19554,7 @@ var OmpRpcSession = class {
         throw new OmpRpcFaultError("protocolError", "Omp RPC confirm request has no message");
       }
       request = {
-        requestId,
+        requestId: requestId2,
         method,
         title,
         message: value.message,
@@ -19535,7 +19565,7 @@ var OmpRpcSession = class {
         throw new OmpRpcFaultError("protocolError", "Omp RPC input placeholder is invalid");
       }
       request = {
-        requestId,
+        requestId: requestId2,
         method,
         title,
         ...typeof value.placeholder === "string" ? { placeholder: value.placeholder } : {},
@@ -19546,7 +19576,7 @@ var OmpRpcSession = class {
         throw new OmpRpcFaultError("protocolError", "Omp RPC editor prefill is invalid");
       }
       request = {
-        requestId,
+        requestId: requestId2,
         method: "editor",
         title,
         ...typeof value.prefill === "string" ? { prefill: value.prefill } : {},
@@ -19556,16 +19586,16 @@ var OmpRpcSession = 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 OmpRpcFaultError("protocolError", `Omp 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) {
@@ -19917,11 +19947,11 @@ var OmpRpcSession = 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, reason });
+      active.onEvent({ type: "interaction.closed", requestId: requestId2, reason });
     }
   }
   #rejectActiveTurn(error51) {

package/app/plugins/opencode/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),

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),
@@ -18001,8 +18031,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 +18043,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 +19765,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 +20643,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 +20656,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 +20667,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 +20678,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 +20689,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 +20699,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 +20962,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
       });
     }