@modelzen/feishu-codex-bridge 0.3.5 → 0.3.7-test.0

package/dist/cli.js

@@ -1111,7 +1111,7 @@ async function registerNewBot(desiredName) {
   await addBot({ name, appId: app.id, tenant: app.tenant, botName: v.botName, createdAt: Date.now() });
   console.log(`\u2713 \u5DF2\u521B\u5EFA\u673A\u5668\u4EBA\u300C${name}\u300D  bot: ${v.botName ?? "-"}  appId: ${app.id}`);
   log.info("onboard", "bot-created", { name, appId: app.id, bot: v.botName ?? null });
-  showScopeGrant(cfg, v.missingScopes);
+  noticeMissingScopes(cfg, v.missingScopes);
   const secret = await resolveAppSecret(cfg);
   return { cfg, secret, missingScopes: v.missingScopes };
 }
@@ -1125,28 +1125,12 @@ async function validateAndReport(cfg) {
   }
   console.log(`\u2713 \u51ED\u636E\u6821\u9A8C\u901A\u8FC7  bot: ${v.botName ?? "-"}  appId: ${cfg.accounts.app.id}`);
   log.info("onboard", "credentials-ok", { appId: cfg.accounts.app.id, bot: v.botName ?? null });
-  showScopeGrant(cfg, v.missingScopes);
+  noticeMissingScopes(cfg, v.missingScopes);
   return { secret, missingScopes: v.missingScopes };
 }
 async function confirmReadyForDaemon(result) {
   if (!process.stdin.isTTY) return true;
   const { app } = result.cfg.accounts;
-  let missing = result.missingScopes;
-  while (missing && missing.length > 0) {
-    const url = buildScopeGrantUrl(app.id, app.tenant);
-    console.log(`
-\u23F3 \u8FD8\u5DEE ${missing.length} \u9879\u6743\u9650\u672A\u5F00\u901A\uFF0C\u540E\u53F0\u670D\u52A1\u6682\u4E0D\u5B89\u88C5\u3002`);
-    console.log(`   \u5F00\u901A\u9875\uFF1A${url}`);
-    await promptEnter("   \u5728\u6D4F\u89C8\u5668\u52FE\u9009\u5168\u90E8\u6743\u9650\u5E76\u786E\u8BA4\u540E\uFF0C\u6309 Enter \u91CD\u65B0\u68C0\u6D4B\uFF08Ctrl+C \u53D6\u6D88\uFF09\u2026 ");
-    const v = await validateAppCredentials(app.id, result.secret, app.tenant);
-    if (!v.ok) {
-      console.error(`\u2717 \u51ED\u636E\u6821\u9A8C\u5931\u8D25\uFF1A${v.reason}`);
-      return false;
-    }
-    missing = v.missingScopes;
-    if (missing && missing.length > 0) console.log(`   \u4ECD\u7F3A\uFF1A${missing.join("  ")}`);
-  }
-  console.log("\u2713 \u6743\u9650\u5DF2\u5F00\u901A\u3002");
   const eventUrl = buildEventConfigUrl(app.id, app.tenant);
   const opened = openUrl(eventUrl);
   console.log("\n\u6700\u540E\u8FD9\u51E0\u6B65\u98DE\u4E66\u6CA1\u6709 API/\u6DF1\u94FE\u53EF\u4EE3\u529E\uFF08\u8FDE\u67E5\u8BE2\u8BA2\u9605\u72B6\u6001\u7684\u63A5\u53E3\u90FD\u6CA1\u6709\uFF09\uFF0C\u9700\u4F60\u624B\u52A8\u70B9\uFF1A\n");
@@ -1178,27 +1162,26 @@ async function promptEnter(message) {
     rl.close();
   }
 }
-function showScopeGrant(cfg, missingScopes) {
-  if (missingScopes && missingScopes.length > 0) {
-    const url = buildScopeGrantUrl(cfg.accounts.app.id, cfg.accounts.app.tenant);
-    const rule = "\u2500".repeat(64);
-    const opened = openUrl(url);
-    console.log(`
-${rule}`);
-    console.log(`\u26A0\uFE0F  \u8FD8\u5DEE ${missingScopes.length} \u9879\u6743\u9650\u672A\u5F00\u901A \u2014\u2014 \u4E0D\u5F00\u901A\u5219\u6536\u4E0D\u5230\u6D88\u606F\u3001\u53D1\u4E0D\u51FA\u5361\u7247`);
-    console.log("   \u98DE\u4E66\u6CA1\u6709\u300C\u626B\u7801\u5373\u6388\u6743\u300D\u7684\u63A5\u53E3\uFF0C\u53EA\u80FD\u5728\u6D4F\u89C8\u5668\u5F00\u901A\uFF08\u5373\u65F6\u751F\u6548\uFF0C\u65E0\u9700\u91CD\u542F\uFF09\uFF1A");
-    console.log(
-      opened ? "\n   \u{1F310} \u5DF2\u81EA\u52A8\u6253\u5F00\u6D4F\u89C8\u5668\u6388\u6743\u9875\u3002\u82E5\u6CA1\u5F39\u51FA\uFF0C\u624B\u52A8\u590D\u5236\u4E0B\u9762\u94FE\u63A5\u6253\u5F00\uFF1A" : "\n   \u{1F310} \u5728\u6D4F\u89C8\u5668\u6253\u5F00\u4E0B\u9762\u94FE\u63A5\uFF0C\u52FE\u9009\u5168\u90E8\u6743\u9650 \u2192 \u786E\u8BA4\uFF1A"
-    );
-    console.log(`
-   \u{1F449} ${url}
-`);
-    console.log(`   \uFF08\u672C\u6B21\u7F3A\u5931\uFF1A${missingScopes.join("  ")}\uFF09`);
-    console.log(`${rule}
-`);
-  } else if (missingScopes === void 0) {
+function noticeMissingScopes(cfg, missingScopes) {
+  if (missingScopes === void 0) {
     log.info("onboard", "scope-check-skipped", { reason: "scope list unavailable" });
+    return;
   }
+  if (missingScopes.length === 0) return;
+  const url = buildScopeGrantUrl(cfg.accounts.app.id, cfg.accounts.app.tenant);
+  const opened = openUrl(url);
+  const rule = "-".repeat(64);
+  console.log(`
+${rule}`);
+  console.log(`\u26A0\uFE0F  \u7F3A ${missingScopes.length} \u9879\u6743\u9650\uFF08\u4E0D\u5F71\u54CD\u542F\u52A8\uFF0C\u4F46\u8FD9\u4E9B\u529F\u80FD\u5F00\u901A\u524D\u7528\u4E0D\u4E86\uFF09\uFF1A`);
+  for (const s of missingScopes) console.log(`   \xB7 ${labelScope(s)}`);
+  console.log(
+    opened ? "\u{1F310} \u5DF2\u81EA\u52A8\u6253\u5F00\u6D4F\u89C8\u5668\u6388\u6743\u9875\uFF08\u5373\u65F6\u751F\u6548\u3001\u65E0\u9700\u91CD\u542F\uFF09\uFF1A" : "   \u53BB\u8FD9\u91CC\u7533\u8BF7\uFF08\u52FE\u9009 \u2192 \u786E\u8BA4\uFF0C\u5373\u65F6\u751F\u6548\u3001\u65E0\u9700\u91CD\u542F\uFF09\uFF1A"
+  );
+  console.log(`   \u{1F449} ${url}`);
+  console.log("   \u4E0D\u60F3\u73B0\u5728\u5F04\u4E5F\u884C\uFF1A\u4E4B\u540E\u79C1\u804A\u673A\u5668\u4EBA \u2192\u300C\u{1FA7A} \u8BCA\u65AD\u300D\u53EF\u968F\u65F6\u518D\u7533\u8BF7\u3002");
+  console.log(`${rule}
+`);
 }
 
 // src/bot/bridge.ts
@@ -5606,6 +5589,199 @@ ${lines}
 ]`;
 }
 
+// src/bot/context-weave.ts
+var QUOTE_MAX = 800;
+var LINE_MAX = 280;
+var THREAD_WEAVE_MAX = 20;
+var THREAD_PAGE_SIZE = 50;
+async function fetchQuotedMessage(channel, messageId) {
+  try {
+    const res = await channel.rawClient.im.v1.message.get({ path: { message_id: messageId } });
+    const items = res.data?.items ?? [];
+    const item = items[0];
+    if (!item || item.deleted) return void 0;
+    const cm = toContextMessage(item);
+    return cm.text.trim() ? cm : void 0;
+  } catch (err) {
+    log.warn("intake", "quote-fetch-failed", { messageId, err: String(err) });
+    return void 0;
+  }
+}
+async function fetchThreadContext(channel, threadId, opts = {}) {
+  const limit = opts.limit ?? THREAD_WEAVE_MAX;
+  const since = opts.sinceTime ?? 0;
+  try {
+    const res = await channel.rawClient.im.v1.message.list({
+      params: {
+        container_id_type: "thread",
+        container_id: threadId,
+        sort_type: "ByCreateTimeDesc",
+        page_size: THREAD_PAGE_SIZE
+      }
+    });
+    const items = res.data?.items ?? [];
+    const picked = items.filter((it) => !it.deleted).map(toContextMessage).filter(
+      (m) => m.fromUser && // drop the bot's own replies, other apps, system notices
+      m.messageId !== opts.excludeMessageId && // drop the triggering @ message
+      (since === 0 || m.createTime > since) && // delta only for existing sessions
+      m.text.trim().length > 0
+    );
+    picked.sort((a, b) => a.createTime - b.createTime);
+    const out = picked.slice(-limit);
+    if (picked.length > out.length) {
+      log.info("intake", "thread-context-truncated", { threadId, kept: out.length, total: picked.length });
+    }
+    return out;
+  } catch (err) {
+    log.warn("intake", "thread-context-failed", { threadId, err: String(err) });
+    return [];
+  }
+}
+function toContextMessage(item) {
+  const id = item.sender?.id ?? "";
+  const name = item.sender?.sender_name || (id ? `\u7528\u6237${id.slice(-4)}` : "\u67D0\u4EBA");
+  return {
+    messageId: item.message_id ?? "",
+    senderName: name,
+    text: extractMessageText(item.msg_type, item.body?.content, item.mentions),
+    fromUser: item.sender?.sender_type === "user",
+    createTime: Number(item.create_time) || 0
+  };
+}
+function extractMessageText(msgType, content, mentions) {
+  if (!content) return placeholderFor(msgType);
+  let parsed;
+  try {
+    parsed = JSON.parse(content);
+  } catch {
+    return placeholderFor(msgType);
+  }
+  switch (msgType) {
+    case "text":
+      return replaceMentions(parsed?.text ?? "", mentions);
+    case "post":
+      return replaceMentions(extractPostText(parsed), mentions);
+    case "image":
+      return "[\u56FE\u7247]";
+    case "audio":
+      return "[\u8BED\u97F3]";
+    case "media":
+      return "[\u89C6\u9891]";
+    case "file": {
+      const name = parsed?.file_name;
+      return name ? `[\u6587\u4EF6\uFF1A${name}]` : "[\u6587\u4EF6]";
+    }
+    case "sticker":
+      return "[\u8868\u60C5]";
+    case "interactive":
+      return "[\u5361\u7247\u6D88\u606F]";
+    case "share_chat":
+      return "[\u5206\u4EAB\u7FA4\u540D\u7247]";
+    case "share_user":
+      return "[\u5206\u4EAB\u4E2A\u4EBA\u540D\u7247]";
+    case "merge_forward":
+    case "forward":
+      return "[\u5408\u5E76\u8F6C\u53D1\u6D88\u606F]";
+    default:
+      return placeholderFor(msgType);
+  }
+}
+function placeholderFor(msgType) {
+  return msgType ? `[${msgType} \u6D88\u606F]` : "[\u6D88\u606F]";
+}
+function extractPostText(parsed) {
+  if (!parsed || typeof parsed !== "object") return "";
+  const obj = parsed;
+  let title = obj.title;
+  let blocks = obj.content;
+  if (!Array.isArray(blocks)) {
+    for (const v of Object.values(obj)) {
+      if (v && typeof v === "object" && Array.isArray(v.content)) {
+        title = v.title;
+        blocks = v.content;
+        break;
+      }
+    }
+  }
+  const parts = [];
+  if (typeof title === "string" && title.trim()) parts.push(title.trim());
+  if (Array.isArray(blocks)) {
+    for (const line of blocks) {
+      if (!Array.isArray(line)) continue;
+      const lineText = line.map(nodeToText).join("");
+      if (lineText) parts.push(lineText);
+    }
+  }
+  return parts.join("\n");
+}
+function nodeToText(node) {
+  if (!node || typeof node !== "object") return "";
+  const n = node;
+  switch (n.tag) {
+    case "text":
+      return typeof n.text === "string" ? n.text : "";
+    case "a":
+      return typeof n.text === "string" ? 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 "img":
+      return "[\u56FE\u7247]";
+    case "media":
+      return "[\u89C6\u9891]";
+    case "emotion":
+      return "[\u8868\u60C5]";
+    default:
+      return typeof n.text === "string" ? n.text : "";
+  }
+}
+function replaceMentions(text, mentions) {
+  if (!text || !mentions?.length) return text;
+  let out = text;
+  for (const m of mentions) {
+    if (!m.key) continue;
+    out = out.split(m.key).join(m.name ? `@${m.name}` : "@\u67D0\u4EBA");
+  }
+  return out;
+}
+function sanitizeContext(s, maxLen, oneLine2) {
+  if (!s) return "";
+  let out = s.replace(/[\x00-\x08\x0b\x0c\x0e-\x1f\x7f]/g, "").replace(/\r\n?/g, "\n");
+  out = oneLine2 ? out.replace(/\s+/g, " ") : out.replace(/[ \t]+\n/g, "\n").replace(/\n{3,}/g, "\n\n");
+  out = out.trim();
+  return out.length > maxLen ? `${out.slice(0, maxLen)}\u2026` : out;
+}
+function weaveQuote(text, quoted) {
+  if (!quoted) return text;
+  const who = sanitizeContext(quoted.senderName, 40, true) || "\u67D0\u4EBA";
+  const body = sanitizeContext(quoted.text, QUOTE_MAX, true);
+  if (!body) return text;
+  const block = `[\u7528\u6237\u5F15\u7528\u4E86\u4E00\u6761\u6D88\u606F\uFF08\u6765\u81EA ${who}\uFF09\uFF1A
+${body}
+]`;
+  const base = text.trim();
+  return base ? `${block}
+
+${base}` : block;
+}
+function weaveThreadHistory(text, msgs) {
+  if (msgs.length === 0) return text;
+  const lines = msgs.map((m) => {
+    const who = sanitizeContext(m.senderName, 40, true) || "\u67D0\u4EBA";
+    const body = sanitizeContext(m.text, LINE_MAX, true);
+    return body ? `${who}\uFF1A${body}` : "";
+  }).filter((l) => l.length > 0);
+  if (lines.length === 0) return text;
+  const block = `[\u8BDD\u9898\u4E2D\u5728\u6B64\u4E4B\u524D\u5DF2\u6709\u7684\u6D88\u606F\uFF08\u6309\u65F6\u95F4\u5148\u540E\u6392\u5217\uFF0C\u4F9B\u4F60\u7406\u89E3\u4E0A\u4E0B\u6587\uFF09\uFF1A
+${lines.join("\n")}
+]`;
+  const base = text.trim();
+  return base ? `${block}
+
+${base}` : block;
+}
+
 // src/bot/comments.ts
 var SUPPORTED_FILE_TYPES = /* @__PURE__ */ new Set(["doc", "docx", "sheet", "file"]);
 var REPLY_MAX_CHARS = 2e3;
@@ -6091,20 +6267,26 @@ function createOrchestrator(channel, cfg, fallbackCwd) {
     const perm = turnPerm(project, senderId);
     return { sessionKey: perm.roleSuffix ? `${baseKey}#${perm.roleSuffix}` : baseKey, ...perm };
   }
-  async function ingestFiles(msg, text) {
-    if (!messageHasFiles(msg)) return text;
-    const files = await collectInboundFiles(channel, msg);
-    const woven = weaveFileManifest(text, files);
-    if (!woven.trim()) {
-      return "\u7528\u6237\u53D1\u6765\u4E00\u4E2A\u9644\u4EF6\uFF0C\u4F46\u6865\u6CA1\u80FD\u4E0B\u8F7D\u5B83\uFF08\u53EF\u80FD\u8D85\u8FC7 50MB \u4E0A\u9650\u6216\u88AB\u98DE\u4E66\u62D2\u7EDD\uFF09\u3002\u8BF7\u544A\u8BC9\u7528\u6237\u9644\u4EF6\u6CA1\u8BFB\u5230\uFF0C\u53EF\u4EE5\u91CD\u53D1\uFF0C\u6216\u6539\u4E3A\u7C98\u8D34\u6587\u672C / \u53D1\u56FE\u7247\u3002";
+  async function ingestContext(msg, text) {
+    let body = text;
+    if (messageHasFiles(msg)) {
+      const files = await collectInboundFiles(channel, msg);
+      body = weaveFileManifest(text, files);
+      if (!body.trim()) {
+        body = "\u7528\u6237\u53D1\u6765\u4E00\u4E2A\u9644\u4EF6\uFF0C\u4F46\u6865\u6CA1\u80FD\u4E0B\u8F7D\u5B83\uFF08\u53EF\u80FD\u8D85\u8FC7 50MB \u4E0A\u9650\u6216\u88AB\u98DE\u4E66\u62D2\u7EDD\uFF09\u3002\u8BF7\u544A\u8BC9\u7528\u6237\u9644\u4EF6\u6CA1\u8BFB\u5230\uFF0C\u53EF\u4EE5\u91CD\u53D1\uFF0C\u6216\u6539\u4E3A\u7C98\u8D34\u6587\u672C / \u53D1\u56FE\u7247\u3002";
+      }
+    }
+    if (msg.replyToMessageId) {
+      const quoted = await fetchQuotedMessage(channel, msg.replyToMessageId);
+      body = weaveQuote(body, quoted);
     }
-    return woven;
+    return body;
   }
   async function handleTurn(msg, text, sessionKey, flat, project, perm) {
     const existing = active.get(sessionKey);
     if (existing) {
       const images = messageHasImages(msg) ? await collectInboundImages(channel, msg) : void 0;
-      const woven = await ingestFiles(msg, text);
+      const woven = await ingestContext(msg, text);
       const cur = active.get(sessionKey);
       if (!cur) {
         startReservedRun(msg, woven, sessionKey, flat, project, perm, images, true, text);
@@ -6141,8 +6323,15 @@ function createOrchestrator(channel, cfg, fallbackCwd) {
       const reaction = runReaction(msg.messageId, !sema.hasFree());
       try {
         const images = preloadedImages ?? (messageHasImages(msg) ? await collectInboundImages(channel, msg) : void 0);
-        const firstText = preIngested ? text : await ingestFiles(msg, text);
-        let thread = await resolveThread(sessionKey, msg.chatId, { mode: perm.mode, network: perm.network });
+        let firstText = preIngested ? text : await ingestContext(msg, text);
+        const { thread: resolved, recreated } = await resolveThread(sessionKey, msg.chatId, {
+          mode: perm.mode,
+          network: perm.network
+        });
+        let thread = resolved;
+        const neverSeen = !thread;
+        const codexEmpty = neverSeen || recreated;
+        const prior = neverSeen ? void 0 : await getSession(sessionKey);
         if (!thread) {
           const cwd = project?.cwd ?? fallbackCwd;
           thread = await backend.startThread({ cwd, mode: perm.mode, network: perm.network });
@@ -6156,10 +6345,19 @@ function createOrchestrator(channel, cfg, fallbackCwd) {
             // `summaryText` (handleTurn's original) so the session label isn't
             // manifest boilerplate + a temp path.
             summary: stripFileTokens(summaryText2 ?? text).slice(0, 80),
+            lastSeenAt: msg.createTime,
             createdAt: Date.now(),
             updatedAt: Date.now()
           });
         }
+        if (msg.threadId && (codexEmpty || prior?.lastSeenAt !== void 0)) {
+          const history = await fetchThreadContext(channel, msg.threadId, {
+            sinceTime: codexEmpty ? 0 : prior?.lastSeenAt ?? 0,
+            excludeMessageId: msg.messageId
+          });
+          firstText = weaveThreadHistory(firstText, history);
+        }
+        if (!neverSeen) void patchSession(sessionKey, { lastSeenAt: msg.createTime }).catch(() => void 0);
         reserved.thread = thread;
         await launchRun(
           {
@@ -6185,9 +6383,9 @@ function createOrchestrator(channel, cfg, fallbackCwd) {
   }
   async function resolveThread(threadId, chatId, perm) {
     const live = sessions.get(threadId);
-    if (live) return live;
+    if (live) return { thread: live, recreated: false };
     const rec = await getSession(threadId);
-    if (!rec) return void 0;
+    if (!rec) return { thread: void 0, recreated: false };
     try {
       const resumed = await backend.resumeThread({
         cwd: rec.cwd,
@@ -6198,7 +6396,7 @@ function createOrchestrator(channel, cfg, fallbackCwd) {
         network: perm?.network
       });
       sessions.set(threadId, resumed);
-      return resumed;
+      return { thread: resumed, recreated: false };
     } catch (err) {
       log.fail("agent", err, { phase: "resume-on-turn", threadId });
       const project = await getProjectByChatId(chatId);
@@ -6211,7 +6409,8 @@ function createOrchestrator(channel, cfg, fallbackCwd) {
         network: perm?.network ?? project?.network
       });
       sessions.set(threadId, fresh);
-      return fresh;
+      await patchSession(threadId, { codexThreadId: fresh.codexThreadId }).catch(() => void 0);
+      return { thread: fresh, recreated: true };
     }
   }
   async function evictLiveSessionsForChat(chatId) {
@@ -6243,7 +6442,7 @@ function createOrchestrator(channel, cfg, fallbackCwd) {
         return;
       }
       const images = messageHasImages(msg) ? await collectInboundImages(channel, msg) : void 0;
-      const firstText = await ingestFiles(msg, text) || "\u4F60\u597D\uFF0C\u6211\u4EEC\u5F00\u59CB\u5427\u3002";
+      const firstText = await ingestContext(msg, text) || "\u4F60\u597D\uFF0C\u6211\u4EEC\u5F00\u59CB\u5427\u3002";
       log.info("card", "start", { project: project?.name ?? "(unregistered)", model, effort, images: images?.length ?? 0 });
       await launchRun(
         {

package/package.json

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