openzca 0.1.24 → 0.1.26

package/README.md

@@ -76,7 +76,7 @@ You can also open the saved file manually (for example: `open qr.png` on macOS).
 | `openzca msg delete <msgId> <cliMsgId> <uidFrom> <threadId>` | Delete a message |
 | `openzca msg undo <msgId> <cliMsgId> <threadId>` | Recall a sent message |
 | `openzca msg upload <arg1> [arg2]` | Upload and send file(s) |
-| `openzca msg recent <threadId>` | List recent messages (`-n`, `--json`) |
+| `openzca msg recent <threadId>` | List recent messages (`-n`, `--json`, newest-first); group mode uses direct group-history API |
 
 Media commands accept local files, `file://` paths, and repeatable `--url` options. Add `--group` for group threads.
 Local paths using `~` are expanded automatically (for positional file args, `--url`, and `OPENZCA_LISTEN_MEDIA_DIR`).
@@ -272,6 +272,9 @@ Listener resilience override:
 - `OPENZCA_LISTEN_DOWNLOAD_QUOTE_MEDIA`: download quoted attachment URLs (if present) into inbound media cache.
   - Default: enabled.
   - Set to `0` to keep only quote metadata/URLs without downloading.
+- `OPENZCA_RECENT_USER_MAX_PAGES`: max websocket history pages to scan for `msg recent` in user/DM mode.
+  - Default: `6`.
+  - Increase if a DM thread is old and not found in the first page.
 - `OPENZCA_LISTEN_ENFORCE_SINGLE_OWNER`: enforce one `listen` owner process per profile.
   - Default: enabled.
   - Set to `0` to allow multiple listeners on the same profile (not recommended).
@@ -303,6 +306,12 @@ Upload/listener coordination overrides:
 - `OPENZCA_UPLOAD_ENFORCE_SINGLE_OWNER`: when an active listener owner exists but IPC is unavailable, fail fast instead of starting a second listener.
   - Default: enabled.
   - Set to `0` to allow fallback listener startup (may disconnect active listener due duplicate websocket ownership).
+- `OPENZCA_UPLOAD_AUTO_THREAD_TYPE`: auto-detect `msg upload` thread type (group/user) when `--group` is not provided.
+  - Default: disabled (`0`) for safer routing.
+  - Set to `1` to enable cache/probe-based detection.
+- `OPENZCA_UPLOAD_GROUP_PROBE`: allow `msg upload` to probe `getGroupInfo` when auto thread-type detection is enabled.
+  - Default: enabled.
+  - Set to `0` to skip probe and rely only on cache matches.
 
 ### account — Multi-account profiles
 

package/dist/cli.js

@@ -1177,7 +1177,7 @@ async function resolveUploadThreadType(api, profile, threadId, groupFlag, comman
   if (groupFlag) {
     return { type: ThreadType.Group, reason: "explicit_group_flag" };
   }
-  const autoDetectEnabled = parseBooleanFromEnv("OPENZCA_UPLOAD_AUTO_THREAD_TYPE", true);
+  const autoDetectEnabled = parseBooleanFromEnv("OPENZCA_UPLOAD_AUTO_THREAD_TYPE", false);
   if (!autoDetectEnabled) {
     return { type: ThreadType.User, reason: "auto_detect_disabled" };
   }
@@ -1555,10 +1555,66 @@ async function withUploadListener(api, command, task) {
     api.listener.off("closed", sinkClosed);
   }
 }
-async function fetchRecentMessagesViaListener(api, threadId, threadType, count) {
+function parseRecentMessageTs(value) {
+  if (typeof value === "number" && Number.isFinite(value)) {
+    return Math.trunc(value);
+  }
+  if (typeof value === "string") {
+    const trimmed = value.trim();
+    if (!trimmed) return 0;
+    const parsed = Number(trimmed);
+    if (Number.isFinite(parsed)) {
+      return Math.trunc(parsed);
+    }
+  }
+  return 0;
+}
+function sortRecentMessagesNewestFirst(messages) {
+  return [...messages].sort((left, right) => {
+    const rightTs = parseRecentMessageTs(right.data?.ts);
+    const leftTs = parseRecentMessageTs(left.data?.ts);
+    if (rightTs !== leftTs) return rightTs - leftTs;
+    const rightMsgId = String(right.data?.msgId ?? "");
+    const leftMsgId = String(left.data?.msgId ?? "");
+    if (rightMsgId !== leftMsgId) return rightMsgId.localeCompare(leftMsgId);
+    const rightCliMsgId = String(right.data?.cliMsgId ?? "");
+    const leftCliMsgId = String(left.data?.cliMsgId ?? "");
+    return rightCliMsgId.localeCompare(leftCliMsgId);
+  });
+}
+async function fetchRecentGroupMessagesViaApi(api, threadId, count) {
+  const historyApi = api.getGroupChatHistory;
+  if (typeof historyApi !== "function") {
+    throw new Error(
+      "Current zca-js build does not expose getGroupChatHistory(). Upgrade zca-js/openzca."
+    );
+  }
+  const response = await historyApi(threadId, count);
+  const messages = Array.isArray(response?.groupMsgs) ? response.groupMsgs : [];
+  return sortRecentMessagesNewestFirst(messages).slice(0, count);
+}
+async function fetchRecentUserMessagesViaListener(api, threadId, count) {
   return new Promise((resolve, reject) => {
     let settled = false;
     const collected = [];
+    const seenMessageKeys = /* @__PURE__ */ new Set();
+    const requestedLastIds = /* @__PURE__ */ new Set();
+    const maxPages = parsePositiveIntFromEnv("OPENZCA_RECENT_USER_MAX_PAGES", 6);
+    let pagesRequested = 0;
+    const toKey = (message) => {
+      const msgId = String(message.data?.msgId ?? "");
+      const cliMsgId = String(message.data?.cliMsgId ?? "");
+      return `${msgId}:${cliMsgId}`;
+    };
+    const requestPage = (lastMsgId) => {
+      if (lastMsgId) {
+        if (requestedLastIds.has(lastMsgId)) return false;
+        requestedLastIds.add(lastMsgId);
+      }
+      pagesRequested += 1;
+      api.listener.requestOldMessages(ThreadType.User, lastMsgId);
+      return true;
+    };
     const cleanup = () => {
       clearTimeout(timeoutId);
       api.listener.off("connected", onConnected);
@@ -1578,24 +1634,61 @@ async function fetchRecentMessagesViaListener(api, threadId, threadType, count)
         reject(error);
         return;
       }
-      resolve(collected.slice(0, count));
+      resolve(sortRecentMessagesNewestFirst(collected).slice(0, count));
     };
     const onConnected = () => {
       try {
-        api.listener.requestOldMessages(threadType, null);
+        requestPage(null);
       } catch (error) {
         finish(error);
       }
     };
     const onOldMessages = (messages, type) => {
-      if (type !== threadType) return;
+      if (type !== ThreadType.User) return;
       const typedMessages = messages;
       for (const message of typedMessages) {
         if (message.threadId === threadId) {
+          const key = toKey(message);
+          if (seenMessageKeys.has(key)) continue;
+          seenMessageKeys.add(key);
           collected.push(message);
         }
       }
-      finish();
+      if (collected.length >= count) {
+        finish();
+        return;
+      }
+      if (typedMessages.length === 0) {
+        finish();
+        return;
+      }
+      if (pagesRequested >= maxPages) {
+        finish();
+        return;
+      }
+      let oldest = null;
+      for (const message of typedMessages) {
+        if (!oldest) {
+          oldest = message;
+          continue;
+        }
+        if (parseRecentMessageTs(message.data?.ts) < parseRecentMessageTs(oldest.data?.ts)) {
+          oldest = message;
+        }
+      }
+      const nextLastId = String(oldest?.data?.msgId ?? "").trim();
+      if (!nextLastId) {
+        finish();
+        return;
+      }
+      try {
+        const requested = requestPage(nextLastId);
+        if (!requested) {
+          finish();
+        }
+      } catch (error) {
+        finish(error);
+      }
     };
     const onError = (error) => {
       finish(error);
@@ -2952,17 +3045,16 @@ msg.command("upload <arg1> [arg2]").option("-u, --url <url>", "File URL (repeata
     }
   )
 );
-msg.command("recent <threadId>").option("-g, --group", "List recent messages for group thread").option("-n, --count <count>", "Number of messages (default: 20)", "20").option("-j, --json", "JSON output").description("List recent messages via websocket history").action(
+msg.command("recent <threadId>").option("-g, --group", "List recent messages for group thread").option("-n, --count <count>", "Number of messages (default: 20)", "20").option("-j, --json", "JSON output").description("List recent messages (group uses direct history API)").action(
   wrapAction(
     async (threadId, opts, command) => {
       const { api } = await requireApi(command);
       const parsedCount = Number(opts.count);
       const count = Number.isFinite(parsedCount) ? Math.min(Math.max(Math.trunc(parsedCount), 1), 200) : 20;
       const threadType = opts.group ? ThreadType.Group : ThreadType.User;
-      const messages = await fetchRecentMessagesViaListener(
+      const messages = opts.group ? await fetchRecentGroupMessagesViaApi(api, threadId, count) : await fetchRecentUserMessagesViaListener(
         api,
         threadId,
-        threadType,
         count
       );
       const rows = messages.map((message) => ({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "openzca",
-  "version": "0.1.24",
+  "version": "0.1.26",
   "description": "Open-source zca-compatible CLI to integrate Zalo with OpenClaw",
   "type": "module",
   "bin": {