codexuse-cli 2.5.5 → 2.5.8

package/dist/index.js

@@ -5386,21 +5386,6 @@ function isThreadNotFoundError(error) {
   const lower = message.toLowerCase();
   return lower.includes("thread not found") || lower.includes("rollout");
 }
-function isMethodPayloadUnsupportedError(error) {
-  if (!error || typeof error !== "object") {
-    return false;
-  }
-  const code = error.code;
-  if (typeof code !== "number" || code !== -32600) {
-    return false;
-  }
-  const message = error.message;
-  if (typeof message !== "string") {
-    return false;
-  }
-  const normalized = message.toLowerCase();
-  return normalized.includes("invalid request") || normalized.includes("missing field") || normalized.includes("unknown field");
-}
 function asString4(value) {
   return typeof value === "string" ? value : value != null ? String(value) : "";
 }
@@ -5442,58 +5427,6 @@ function normalizeSendUserMessageItem(value) {
   }
   return value;
 }
-function buildSendUserMessageItemsFromLegacyParams(params) {
-  const items = [];
-  const text = asString4(params.text);
-  if (text.trim()) {
-    items.push({
-      type: "text",
-      data: { text }
-    });
-  }
-  if (Array.isArray(params.images)) {
-    for (const candidate of params.images) {
-      const image = asString4(candidate).trim();
-      if (!image) {
-        continue;
-      }
-      if (isInlineImageValue(image)) {
-        items.push({
-          type: "image",
-          data: { image_url: image }
-        });
-        continue;
-      }
-      items.push({
-        type: "localImage",
-        data: { path: image }
-      });
-    }
-  }
-  if (items.length === 0) {
-    return null;
-  }
-  return items;
-}
-function normalizeSendUserMessageParams(params) {
-  const normalized = { ...params };
-  const conversationId = asString4(
-    params.conversationId ?? params.conversation_id ?? params.threadId ?? params.thread_id ?? ""
-  ).trim();
-  if (conversationId && !asString4(params.conversationId).trim()) {
-    normalized.conversationId = conversationId;
-  }
-  const items = Array.isArray(params.items) ? params.items.map((item) => normalizeSendUserMessageItem(item)).filter((item) => item !== null) : null;
-  if (items && items.length > 0) {
-    normalized.items = items;
-    return normalized;
-  }
-  const legacyItems = buildSendUserMessageItemsFromLegacyParams(params);
-  if (legacyItems) {
-    normalized.items = legacyItems;
-  }
-  return normalized;
-}
 function normalizeTurnInputParams(params) {
   const normalized = { ...params };
   const threadId = asString4(
@@ -5517,6 +5450,26 @@ function normalizeTurnInputParams(params) {
     normalized.input = providedInput;
     return normalized;
   }
+  const providedItems = Array.isArray(params.items) ? params.items.map((item) => normalizeSendUserMessageItem(item)).filter((item) => item !== null) : [];
+  if (providedItems.length > 0) {
+    const input2 = providedItems.flatMap((item) => {
+      const type = asString4(item.type).trim();
+      const data = isRecord6(item.data) ? item.data : item;
+      if (type === "text") {
+        const text2 = asString4(data.text).trim();
+        return text2 ? [{ type: "text", text: text2 }] : [];
+      }
+      if (type === "localImage") {
+        const path17 = asString4(data.path).trim();
+        return path17 ? [{ type: "localImage", path: path17 }] : [];
+      }
+      return [];
+    });
+    if (input2.length > 0) {
+      normalized.input = input2;
+      return normalized;
+    }
+  }
   const input = [];
   const text = asString4(params.text);
   if (text.trim()) {
@@ -5595,37 +5548,9 @@ function normalizeThreadLiveWorkspaceId(value) {
   const workspaceId = asString4(value).trim();
   return workspaceId || DEFAULT_THREAD_LIVE_WORKSPACE_ID;
 }
-function resolveThreadLiveWorkspacePayloadId(workspaceId) {
-  return workspaceId === DEFAULT_THREAD_LIVE_WORKSPACE_ID ? null : workspaceId;
-}
 function threadLiveKey(workspaceId, threadId) {
   return `${workspaceId}:${threadId}`;
 }
-function buildThreadRealtimePayloads(threadId, workspaceId) {
-  const payloads = [];
-  const seen = /* @__PURE__ */ new Set();
-  const pushPayload = (payload) => {
-    const signature = JSON.stringify(payload);
-    if (seen.has(signature)) {
-      return;
-    }
-    seen.add(signature);
-    payloads.push(payload);
-  };
-  pushPayload({ threadId });
-  pushPayload({ conversationId: threadId });
-  pushPayload({ threadId, conversationId: threadId });
-  if (!workspaceId) {
-    return payloads;
-  }
-  pushPayload({ threadId, workspaceId });
-  pushPayload({ conversationId: threadId, workspaceId });
-  pushPayload({ threadId, conversationId: threadId, workspaceId });
-  pushPayload({ threadId, workspace_id: workspaceId });
-  pushPayload({ conversationId: threadId, workspace_id: workspaceId });
-  pushPayload({ threadId, conversationId: threadId, workspace_id: workspaceId });
-  return payloads;
-}
 function escapeInvalidJsonStringChars(input) {
   let output = "";
   let inString = false;
@@ -5732,6 +5657,7 @@ var CodexAppServer = class extends import_node_events.EventEmitter {
     this.parseLineBuffer = null;
     this.threadLiveSubscriptionIdByKey = /* @__PURE__ */ new Map();
     this.threadLiveModeByKey = /* @__PURE__ */ new Map();
+    this.addConversationListenerSupported = null;
     this.setMaxListeners(50);
   }
   async start() {
@@ -5763,6 +5689,7 @@ var CodexAppServer = class extends import_node_events.EventEmitter {
     this.parseLineBuffer = null;
     this.threadLiveSubscriptionIdByKey.clear();
     this.threadLiveModeByKey.clear();
+    this.addConversationListenerSupported = null;
     this.clearPendingRequests(new Error("codex app-server stopped"));
   }
   isRunning() {
@@ -5824,6 +5751,9 @@ var CodexAppServer = class extends import_node_events.EventEmitter {
     return this.request("resumeConversation", merged);
   }
   async addConversationListenerWithResumeFallback(threadId, workspaceId = null) {
+    if (this.addConversationListenerSupported === false) {
+      return {};
+    }
     const listenerParams = {
       conversationId: threadId
     };
@@ -5834,87 +5764,50 @@ var CodexAppServer = class extends import_node_events.EventEmitter {
     }
     try {
       const response = await this.request("addConversationListener", listenerParams);
+      this.addConversationListenerSupported = true;
       return isRecord6(response) ? response : null;
     } catch (error) {
+      if (isMethodUnavailableError(error, "addConversationListener")) {
+        this.addConversationListenerSupported = false;
+        return {};
+      }
       if (!isThreadNotFoundError(error)) {
         throw error;
       }
       await this.threadResume(
         resolvedWorkspaceId ? { threadId, workspaceId: resolvedWorkspaceId, workspace_id: resolvedWorkspaceId } : { threadId }
       );
-      const response = await this.request("addConversationListener", listenerParams);
-      return isRecord6(response) ? response : null;
-    }
-  }
-  async removeConversationListenerBySubscriptionId(subscriptionId) {
-    if (!subscriptionId) {
-      return;
-    }
-    await this.request("removeConversationListener", { subscriptionId });
-  }
-  trackThreadLiveSubscriptionId(key, subscriptionId) {
-    if (!subscriptionId) {
-      return;
-    }
-    const previousSubscriptionId = this.threadLiveSubscriptionIdByKey.get(key) ?? null;
-    this.threadLiveSubscriptionIdByKey.set(key, subscriptionId);
-    if (previousSubscriptionId && previousSubscriptionId !== subscriptionId) {
-      void this.removeConversationListenerBySubscriptionId(
-        previousSubscriptionId
-      ).catch(() => {
-      });
-    }
-  }
-  async startThreadRealtime(threadId, workspaceId = null) {
-    const payloads = buildThreadRealtimePayloads(threadId, workspaceId);
-    let resumed = false;
-    for (let index = 0; index < payloads.length; index += 1) {
-      const payload = payloads[index];
       try {
-        const response = await this.request("thread/realtime/start", payload);
-        return isRecord6(response) ? response : {};
-      } catch (error) {
-        if (isMethodUnavailableError(error, "thread/realtime/start")) {
-          return null;
+        const response = await this.request("addConversationListener", listenerParams);
+        this.addConversationListenerSupported = true;
+        return isRecord6(response) ? response : null;
+      } catch (resumeError) {
+        if (isMethodUnavailableError(resumeError, "addConversationListener")) {
+          this.addConversationListenerSupported = false;
+          return {};
         }
-        if (isMethodPayloadUnsupportedError(error)) {
-          continue;
-        }
-        if (!isThreadNotFoundError(error)) {
-          throw error;
-        }
-        if (resumed) {
-          continue;
-        }
-        resumed = true;
-        await this.threadResume({ threadId });
-        index = -1;
+        throw resumeError;
       }
     }
-    return null;
   }
-  async stopThreadRealtime(threadId, workspaceId = null) {
-    const payloads = buildThreadRealtimePayloads(threadId, workspaceId);
-    for (const payload of payloads) {
-      try {
-        await this.request("thread/realtime/stop", payload);
-        return true;
-      } catch (error) {
-        if (isMethodUnavailableError(error, "thread/realtime/stop")) {
-          return false;
-        }
-        if (isMethodPayloadUnsupportedError(error)) {
-          continue;
-        }
-        if (isThreadNotFoundError(error)) {
-          return true;
-        }
-        throw error;
+  async removeConversationListenerBySubscriptionId(subscriptionId) {
+    if (!subscriptionId || this.addConversationListenerSupported === false) {
+      return;
+    }
+    try {
+      await this.request("removeConversationListener", { subscriptionId });
+    } catch (error) {
+      if (isMethodUnavailableError(error, "removeConversationListener")) {
+        this.addConversationListenerSupported = false;
+        return;
       }
+      throw error;
     }
-    return false;
   }
   async addConversationListener(params) {
+    if (this.addConversationListenerSupported === false) {
+      return {};
+    }
     const conversationId = asString4(
       params.conversationId ?? params.threadId ?? params.thread_id ?? ""
     ).trim();
@@ -5922,7 +5815,17 @@ var CodexAppServer = class extends import_node_events.EventEmitter {
       params.workspaceId ?? params.workspace_id ?? ""
     ).trim();
     if (!conversationId) {
-      return this.request("addConversationListener", params);
+      try {
+        const response = await this.request("addConversationListener", params);
+        this.addConversationListenerSupported = true;
+        return response;
+      } catch (error) {
+        if (isMethodUnavailableError(error, "addConversationListener")) {
+          this.addConversationListenerSupported = false;
+          return {};
+        }
+        throw error;
+      }
     }
     return this.addConversationListenerWithResumeFallback(
       conversationId,
@@ -5930,13 +5833,23 @@ var CodexAppServer = class extends import_node_events.EventEmitter {
     );
   }
   async removeConversationListener(params) {
-    return this.request("removeConversationListener", params);
+    if (this.addConversationListenerSupported === false) {
+      return {};
+    }
+    try {
+      return await this.request("removeConversationListener", params);
+    } catch (error) {
+      if (isMethodUnavailableError(error, "removeConversationListener")) {
+        this.addConversationListenerSupported = false;
+        return {};
+      }
+      throw error;
+    }
   }
   async threadLiveSubscribe(params) {
     const workspaceId = normalizeThreadLiveWorkspaceId(
       params.workspaceId ?? params.workspace_id
     );
-    const workspaceIdForPayload = resolveThreadLiveWorkspacePayloadId(workspaceId);
     const threadId = asString4(
       params.threadId ?? params.thread_id ?? params.conversationId
     ).trim();
@@ -5944,38 +5857,14 @@ var CodexAppServer = class extends import_node_events.EventEmitter {
       return {};
     }
     const key = threadLiveKey(workspaceId, threadId);
-    const realtimeResponse = await this.startThreadRealtime(
-      threadId,
-      workspaceIdForPayload
-    );
-    if (realtimeResponse) {
-      const previousSubscriptionId = this.threadLiveSubscriptionIdByKey.get(key) ?? null;
-      this.threadLiveSubscriptionIdByKey.delete(key);
-      this.threadLiveModeByKey.set(key, "realtime");
-      if (previousSubscriptionId) {
-        void this.removeConversationListenerBySubscriptionId(
-          previousSubscriptionId
-        ).catch(() => {
-        });
-      }
-      return realtimeResponse;
-    }
-    const response = await this.addConversationListenerWithResumeFallback(
-      threadId,
-      workspaceIdForPayload
-    );
     this.threadLiveModeByKey.set(key, "listener");
-    this.trackThreadLiveSubscriptionId(
-      key,
-      asString4(response?.subscriptionId ?? "").trim() || null
-    );
-    return response ?? {};
+    this.threadLiveSubscriptionIdByKey.delete(key);
+    return {};
   }
   async threadLiveUnsubscribe(params) {
     const workspaceId = normalizeThreadLiveWorkspaceId(
       params.workspaceId ?? params.workspace_id
     );
-    const workspaceIdForPayload = resolveThreadLiveWorkspacePayloadId(workspaceId);
     const threadId = asString4(
       params.threadId ?? params.thread_id ?? params.conversationId
     ).trim();
@@ -5983,42 +5872,16 @@ var CodexAppServer = class extends import_node_events.EventEmitter {
       return {};
     }
     const key = threadLiveKey(workspaceId, threadId);
-    const mode = this.threadLiveModeByKey.get(key) ?? null;
     this.threadLiveModeByKey.delete(key);
     const subscriptionId = this.threadLiveSubscriptionIdByKey.get(key) ?? null;
     this.threadLiveSubscriptionIdByKey.delete(key);
-    if (mode === "realtime") {
-      const stoppedRealtime = await this.stopThreadRealtime(
-        threadId,
-        workspaceIdForPayload
-      );
-      if (stoppedRealtime) {
-        return {};
-      }
-    }
     if (subscriptionId) {
       await this.removeConversationListenerBySubscriptionId(subscriptionId);
-      return {};
-    }
-    if (mode !== "listener") {
-      const stoppedRealtime = await this.stopThreadRealtime(
-        threadId,
-        workspaceIdForPayload
-      );
-      if (stoppedRealtime) {
-        return {};
-      }
     }
-    return this.removeConversationListener(
-      workspaceIdForPayload ? {
-        conversationId: threadId,
-        workspaceId: workspaceIdForPayload,
-        workspace_id: workspaceIdForPayload
-      } : { conversationId: threadId }
-    );
+    return {};
   }
   async sendUserMessage(params) {
-    return this.request("sendUserMessage", normalizeSendUserMessageParams(params));
+    return this.request("turn/start", normalizeTurnInputParams(params));
   }
   async threadStart(params) {
     return this.request("thread/start", params);
@@ -6157,6 +6020,7 @@ var CodexAppServer = class extends import_node_events.EventEmitter {
     this.initializeResponse = null;
     this.initializePromise = null;
     this.parseLineBuffer = null;
+    this.addConversationListenerSupported = null;
     child.on("exit", (code, signal) => {
       logWarn("[app-server] exited", { code, signal });
       this.child = null;
@@ -6164,6 +6028,7 @@ var CodexAppServer = class extends import_node_events.EventEmitter {
       this.initializePromise = null;
       this.threadLiveSubscriptionIdByKey.clear();
       this.threadLiveModeByKey.clear();
+      this.addConversationListenerSupported = null;
       this.clearPendingRequests(new Error("codex app-server exited"));
       this.emit("codex:process-exited", {});
     });
@@ -6171,6 +6036,7 @@ var CodexAppServer = class extends import_node_events.EventEmitter {
       logError("[app-server] process error", error);
       this.threadLiveSubscriptionIdByKey.clear();
       this.threadLiveModeByKey.clear();
+      this.addConversationListenerSupported = null;
       this.emit("codex:process-exited", {});
     });
     if (child.stderr) {
@@ -9113,7 +8979,7 @@ async function handleDaemonCommand(args, version) {
 }
 
 // src/index.ts
-var VERSION = true ? "2.5.5" : "0.0.0";
+var VERSION = true ? "2.5.8" : "0.0.0";
 var cliStorageReadyPromise = null;
 async function ensureCliStorageReady() {
   if (cliStorageReadyPromise) {