@modelzen/feishu-codex-bridge 0.6.0 → 0.6.2

package/dist/cli.js

@@ -829,9 +829,9 @@ var init_cards = __esm({
 // src/card/managed.ts
 function stampRenderToken(card2) {
   const token = (++renderToken).toString(36);
-  const visit = (node) => {
+  const visit2 = (node) => {
     if (Array.isArray(node)) {
-      node.forEach(visit);
+      node.forEach(visit2);
       return;
     }
     if (!node || typeof node !== "object") return;
@@ -845,9 +845,9 @@ function stampRenderToken(card2) {
         }
       }
     }
-    for (const k2 of Object.keys(obj)) visit(obj[k2]);
+    for (const k2 of Object.keys(obj)) visit2(obj[k2]);
   };
-  visit(card2);
+  visit2(card2);
 }
 function isCardIdNotReady(err) {
   const data = err?.response?.data;
@@ -5953,6 +5953,7 @@ function buildDoctorCard(i) {
         `- Codex\uFF1A${i.codexOk ? `\u2705 \u53EF\u7528${i.codexVer ? `\uFF08${i.codexVer}\uFF09` : ""}` : "\u274C \u4E0D\u53EF\u7528\uFF08\u68C0\u67E5 CODEX_BIN / PATH\uFF09"}`
       ),
       md(`- \u98DE\u4E66\u957F\u8FDE\u63A5\uFF1A${connLabel(i.conn)}`),
+      md(`- \u673A\u5668\u4EBA open_id\uFF1A${i.botOpenId ? `\`${i.botOpenId}\`` : "\u26A0\uFE0F \u672A\u80FD\u83B7\u53D6\uFF08\u51ED\u636E\u5931\u6548\u6216\u7F51\u7EDC\u4E0D\u901A\uFF09"}`),
       ...scopeDiagnosis(i),
       ...eventSubscriptionDiagnosis(i),
       note(`bridge v${i.bridgeVer}\u3000\xB7\u3000Node ${i.node}\u3000\xB7\u3000${i.platform}`),
@@ -9741,6 +9742,80 @@ async function handleDmConsole(channel, cfg, msg) {
   });
 }
 
+// src/bot/card-content.ts
+init_logger();
+function isDegradedCardContent(content) {
+  const t = content.trim();
+  if (t === "" || t === "[interactive card]") return true;
+  return /请升级至最新版本客户端|请使用新版本.*查看|client to view|upgrade .*client/i.test(t);
+}
+function parseRawCardWrapper(bodyContent) {
+  try {
+    const parsed = JSON.parse(bodyContent);
+    if (typeof parsed.json_card === "string") return JSON.parse(parsed.json_card);
+    return parsed;
+  } catch {
+    return void 0;
+  }
+}
+function extractRawCardText(jsonCard) {
+  const out = [];
+  visit(jsonCard, out);
+  const seen = /* @__PURE__ */ new Set();
+  const lines = [];
+  for (const piece of out) {
+    const key = piece.trim();
+    if (!key || seen.has(key)) continue;
+    seen.add(key);
+    lines.push(key);
+  }
+  return lines.join("\n");
+}
+function visit(node, out) {
+  if (node == null) return;
+  if (Array.isArray(node)) {
+    for (const child of node) visit(child, out);
+    return;
+  }
+  if (typeof node !== "object") return;
+  const obj = node;
+  if (obj.header) visit(obj.header, out);
+  if (obj.body) visit(obj.body, out);
+  const prop = obj.property;
+  if (!prop) return;
+  if (typeof prop.content === "string" && prop.content.trim()) {
+    const url = prop.url?.url;
+    out.push(url ? `[${prop.content.trim()}](${url})` : prop.content);
+  }
+  const i18n = prop.i18nElements;
+  if (i18n && typeof i18n === "object") {
+    visit(i18n.zh_cn ?? i18n.zh_hk ?? i18n.zh_tw ?? i18n.en_us ?? Object.values(i18n)[0], out);
+  }
+  visit(prop.title, out);
+  visit(prop.text, out);
+  visit(prop.elements, out);
+  visit(prop.columns, out);
+  visit(prop.actions, out);
+}
+async function fetchInteractiveCardText(channel, messageId) {
+  let body;
+  try {
+    const res = await channel.rawClient.im.v1.message.get({
+      path: { message_id: messageId },
+      params: { card_msg_content_type: "raw_card_content" }
+    });
+    body = res.data?.items?.[0]?.body?.content;
+  } catch (err) {
+    log.warn("intake", "card-content-fetch-failed", { messageId, err: String(err) });
+    return void 0;
+  }
+  if (!body) return void 0;
+  const card2 = parseRawCardWrapper(body);
+  if (card2 == null) return void 0;
+  const text = extractRawCardText(card2);
+  return text.trim() ? text : void 0;
+}
+
 // src/bot/media.ts
 init_paths();
 init_logger();
@@ -10061,7 +10136,7 @@ function extractMessageText(msgType, content, mentions) {
     case "sticker":
       return "[\u8868\u60C5]";
     case "interactive":
-      return "[\u5361\u7247\u6D88\u606F]";
+      return extractCardText(parsed) || "[\u5361\u7247\u6D88\u606F]";
     case "share_chat":
       return "[\u5206\u4EAB\u7FA4\u540D\u7247]";
     case "share_user":
@@ -10123,6 +10198,55 @@ function nodeToText(node) {
       return typeof n.text === "string" ? n.text : "";
   }
 }
+var CARD_UPGRADE_HINT = "\u8BF7\u5347\u7EA7\u81F3\u6700\u65B0\u7248\u672C\u5BA2\u6237\u7AEF";
+function extractCardText(parsed) {
+  if (!parsed || typeof parsed !== "object") return "";
+  const obj = parsed;
+  const parts = [];
+  const title = textValue(obj.title);
+  if (title.trim()) parts.push(title.trim());
+  if (Array.isArray(obj.elements)) {
+    for (const line of obj.elements) {
+      const nodes = Array.isArray(line) ? line : [line];
+      const lineText = nodes.map(cardNodeToText).join("").trim();
+      if (lineText && !lineText.includes(CARD_UPGRADE_HINT)) parts.push(lineText);
+    }
+  }
+  return parts.join("\n").trim();
+}
+function textValue(t) {
+  if (typeof t === "string") return t;
+  if (t && typeof t === "object") {
+    const c = t.content;
+    if (typeof c === "string") return c;
+  }
+  return "";
+}
+function cardNodeToText(node) {
+  if (typeof node === "string") return node;
+  if (!node || typeof node !== "object") return "";
+  const n = node;
+  switch (n.tag) {
+    case "text":
+      return textValue(n.text);
+    case "a":
+      return textValue(n.text) || (typeof n.href === "string" ? n.href : "");
+    case "at": {
+      const name = typeof n.user_name === "string" ? n.user_name : "";
+      return name ? `@${name}` : "@\u67D0\u4EBA";
+    }
+    case "note":
+      return Array.isArray(n.elements) ? n.elements.map(cardNodeToText).join("") : "";
+    case "button": {
+      const label = textValue(n.text);
+      return label ? `[\u6309\u94AE\uFF1A${label}]` : "";
+    }
+    case "img":
+      return "";
+    default:
+      return textValue(n.text);
+  }
+}
 function replaceMentions(text, mentions) {
   if (!text || !mentions?.length) return text;
   let out = text;
@@ -10768,6 +10892,13 @@ function createOrchestrator(channel, cfg, fallbackCwd, cliBridge) {
       }
       return;
     }
+    if (msg.rawContentType === "interactive" && isDegradedCardContent(msg.content)) {
+      const full = await fetchInteractiveCardText(channel, msg.messageId);
+      if (full) {
+        log.info("intake", "card-content-enriched", { msgId: msg.messageId, len: full.length });
+        msg.content = full;
+      }
+    }
     const text = msg.content.trim();
     const cmd = parseCommand(text);
     const goalObjective = parseGoalTrigger(text);
@@ -11590,6 +11721,9 @@ function createOrchestrator(channel, cfg, fallbackCwd, cliBridge) {
       codexOk: codexProbe.ok,
       codexVer: codexProbe.version,
       conn: channel.getConnectionStatus?.()?.state ?? "unknown",
+      // 复用上面 validateAppCredentials 的返回（bot/v3/info），不额外发请求；
+      // scopeCheck 没换成 token → undefined，卡片降级显示「未能获取」。
+      botOpenId: scopeCheck?.botOpenId,
       bridgeVer: bridgeVersion(),
       node: process.version,
       platform: `${process.platform}-${process.arch}`,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@modelzen/feishu-codex-bridge",
-  "version": "0.6.0",
+  "version": "0.6.2",
   "description": "Bridge Feishu/Lark messenger with local Codex via app-server (project=group, thread=session)",
   "type": "module",
   "bin": {