@modelzen/feishu-codex-bridge 0.1.5 → 0.1.7

package/dist/cli.js

@@ -2764,6 +2764,27 @@ function connLabel(state) {
       return state;
   }
 }
+function scopeStatusText(i) {
+  if (i.missingScopes === void 0) return "\u672A\u80FD\u81EA\u52A8\u68C0\u67E5\uFF08\u51ED\u8BC1\u5931\u6548\u6216\u7F51\u7EDC\u95EE\u9898\uFF09";
+  if (i.missingScopes.length === 0) return "\u5FC5\u9700\u6743\u9650\u9F50\u5168";
+  return `\u7F3A\u5931 ${i.missingScopes.length} \u9879\uFF1A${i.missingScopes.join(" ")}`;
+}
+function scopeDiagnosis(i) {
+  if (i.missingScopes === void 0) {
+    return [
+      md("- \u98DE\u4E66\u6743\u9650\uFF1A\u26A0\uFE0F \u65E0\u6CD5\u81EA\u52A8\u68C0\u67E5\uFF08\u51ED\u8BC1\u5931\u6548\u6216\u7F51\u7EDC\u4E0D\u901A\uFF09"),
+      actions([linkButton("\u{1F511} \u53BB\u6743\u9650\u9875\u6838\u5BF9", i.scopeGrantUrl)])
+    ];
+  }
+  if (i.missingScopes.length === 0) {
+    return [md("- \u98DE\u4E66\u6743\u9650\uFF1A\u2705 \u5FC5\u9700\u6743\u9650\u5DF2\u5168\u90E8\u5F00\u901A")];
+  }
+  return [
+    md(`- \u98DE\u4E66\u6743\u9650\uFF1A\u274C \u7F3A ${i.missingScopes.length} \u9879 \u2014\u2014 \u5F00\u901A\u524D\u76F8\u5173\u529F\u80FD\uFF08\u6536\u53D1\u6D88\u606F / \u5361\u7247 / \u5EFA\u7FA4\u7B49\uFF09\u4E0D\u53EF\u7528`),
+    note(`\u5F85\u5F00\u901A\uFF1A${i.missingScopes.join("\u3000")}`),
+    actions([linkButton("\u{1F511} \u4E00\u952E\u53BB\u5F00\u901A\u8FD9\u4E9B\u6743\u9650", i.scopeGrantUrl)])
+  ];
+}
 function codexDiagnosePrompt(i) {
   return [
     "\u6211\u5728\u7528 feishu-codex-bridge\uFF08\u98DE\u4E66 \u2194 \u672C\u5730 Codex \u6865\u63A5\uFF09\u9047\u5230\u95EE\u9898\uFF0C\u8BF7\u5E2E\u6211\u5B9A\u4F4D\u539F\u56E0\u5E76\u7ED9\u51FA\u4FEE\u590D\u6B65\u9AA4\u3002",
@@ -2778,6 +2799,7 @@ function codexDiagnosePrompt(i) {
     "\u3010\u8FD0\u884C\u5FEB\u7167\u3011",
     `- codex \u53EF\u7528\uFF1A${i.codexOk ? "\u662F" : "\u5426"}`,
     `- \u98DE\u4E66\u957F\u8FDE\u63A5\uFF1A${i.conn}`,
+    `- \u98DE\u4E66\u6743\u9650\uFF1A${scopeStatusText(i)}`,
     "",
     "\u3010\u8BF7\u4F60\u505A\u7684\u4E8B\u3011",
     "1. \u8BFB\u53D6\u5E76\u5206\u6790\u65E5\u5FD7\uFF0C\u627E\u51FA\u6700\u8FD1\u7684\u62A5\u9519\u6216\u5F02\u5E38\u5806\u6808\uFF1A",
@@ -2794,6 +2816,7 @@ function codexDiagnosePrompt(i) {
 }
 function buildDoctorCard(i) {
   const prompt = codexDiagnosePrompt(i);
+  const hasProblem = !i.codexOk || i.missingScopes !== void 0 && i.missingScopes.length > 0;
   return card(
     [
       md("**\u521D\u6B65\u8BCA\u65AD**"),
@@ -2801,6 +2824,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)}`),
+      ...scopeDiagnosis(i),
       note(`bridge v${i.bridgeVer}\u3000\xB7\u3000Node ${i.node}\u3000\xB7\u3000${i.platform}`),
       hr(),
       md("**\u65E5\u5FD7\u8DEF\u5F84**"),
@@ -2815,7 +2839,7 @@ function buildDoctorCard(i) {
         linkButton("\u{1F41E} \u63D0 Issue", `${REPO}/issues`)
       ])
     ],
-    { header: { title: "\u{1FA7A} \u8BCA\u65AD", template: i.codexOk ? "blue" : "orange" } }
+    { header: { title: "\u{1FA7A} \u8BCA\u65AD", template: hasProblem ? "orange" : "blue" } }
   );
 }
 function buildNewProjectFormCard(opts = {}) {
@@ -3504,6 +3528,156 @@ async function handleDmConsole(channel, cfg, msg) {
   });
 }
 
+// src/bot/media.ts
+import { mkdir as mkdir8, readdir as readdir2, rm as rm3, stat as stat2 } from "fs/promises";
+import { join as join10 } from "path";
+var MAX_IMAGES = 9;
+var MEDIA_TTL_MS = 60 * 6e4;
+var EXT_BY_CONTENT_TYPE = {
+  "image/png": "png",
+  "image/jpeg": "jpg",
+  "image/jpg": "jpg",
+  "image/gif": "gif",
+  "image/webp": "webp",
+  "image/bmp": "bmp",
+  "image/heic": "heic",
+  "image/heif": "heif",
+  "image/tiff": "tiff"
+};
+function messageHasImages(msg) {
+  if ((msg.resources ?? []).some((r) => r.type === "image")) return true;
+  return msg.rawContentType === "merge_forward";
+}
+async function collectInboundImages(channel, msg) {
+  let refs;
+  try {
+    refs = await gatherRefs(channel, msg);
+  } catch (err) {
+    log.warn("intake", "image-gather-failed", { err: String(err) });
+    return [];
+  }
+  if (refs.length === 0) return [];
+  await pruneOldMedia();
+  try {
+    await mkdir8(paths.mediaDir, { recursive: true });
+  } catch {
+  }
+  const out = [];
+  let index = 0;
+  for (const ref of refs.slice(0, MAX_IMAGES)) {
+    const path = await downloadOne(channel, ref, index++);
+    if (path) out.push(path);
+  }
+  log.info("intake", "images", { found: refs.length, downloaded: out.length });
+  return out;
+}
+async function gatherRefs(channel, msg) {
+  const refs = [];
+  const seen = /* @__PURE__ */ new Set();
+  const add = (messageId, fileKey) => {
+    if (!fileKey || seen.has(fileKey)) return;
+    seen.add(fileKey);
+    refs.push({ messageId, fileKey });
+  };
+  for (const r of msg.resources ?? []) {
+    if (r.type === "image") add(msg.messageId, r.fileKey);
+  }
+  if (msg.rawContentType === "merge_forward") {
+    const items = await fetchSubMessages(channel, msg.messageId);
+    for (const sub of items) {
+      if (!sub.message_id || sub.message_id === msg.messageId) continue;
+      for (const key of imageKeysFromContent(sub.msg_type, sub.body?.content)) {
+        add(sub.message_id, key);
+      }
+    }
+  }
+  return refs;
+}
+async function fetchSubMessages(channel, messageId) {
+  try {
+    const res = await channel.rawClient.im.v1.message.get({ path: { message_id: messageId } });
+    return res.data?.items ?? [];
+  } catch (err) {
+    log.warn("intake", "submessages-failed", { messageId, err: String(err) });
+    return [];
+  }
+}
+function imageKeysFromContent(msgType, content) {
+  if (!content) return [];
+  let parsed;
+  try {
+    parsed = JSON.parse(content);
+  } catch {
+    return [];
+  }
+  if (msgType === "image") {
+    const key = parsed?.image_key;
+    return key ? [key] : [];
+  }
+  const keys = [];
+  walkForImageKeys(parsed, keys);
+  return keys;
+}
+function walkForImageKeys(node, out) {
+  if (!node || typeof node !== "object") return;
+  if (Array.isArray(node)) {
+    for (const child of node) walkForImageKeys(child, out);
+    return;
+  }
+  const obj = node;
+  if (obj.tag === "img" && typeof obj.image_key === "string") out.push(obj.image_key);
+  for (const k of Object.keys(obj)) walkForImageKeys(obj[k], out);
+}
+async function downloadOne(channel, ref, index) {
+  try {
+    const res = await channel.rawClient.im.v1.messageResource.get({
+      path: { message_id: ref.messageId, file_key: ref.fileKey },
+      params: { type: "image" }
+    });
+    const ext = extFromHeaders(res.headers);
+    const file = join10(paths.mediaDir, `${safeName(ref.fileKey)}-${index}.${ext}`);
+    await res.writeFile(file);
+    return file;
+  } catch (err) {
+    log.warn("intake", "image-download-failed", { fileKey: ref.fileKey.slice(0, 24), err: String(err) });
+    return void 0;
+  }
+}
+function extFromHeaders(headers) {
+  const ct = readHeader(headers, "content-type");
+  if (ct) {
+    const base = ct.split(";")[0]?.trim().toLowerCase();
+    if (base && EXT_BY_CONTENT_TYPE[base]) return EXT_BY_CONTENT_TYPE[base];
+  }
+  return "png";
+}
+function readHeader(headers, name) {
+  if (!headers || typeof headers !== "object") return void 0;
+  const h = headers;
+  const raw = typeof h.get === "function" ? h.get(name) : h[name] ?? h[name.toLowerCase()];
+  return typeof raw === "string" ? raw : Array.isArray(raw) ? String(raw[0]) : void 0;
+}
+function safeName(fileKey) {
+  return fileKey.replace(/[^a-zA-Z0-9_-]/g, "").slice(-40) || "img";
+}
+async function pruneOldMedia() {
+  let entries;
+  try {
+    entries = await readdir2(paths.mediaDir);
+  } catch {
+    return;
+  }
+  const cutoff = Date.now() - MEDIA_TTL_MS;
+  for (const name of entries) {
+    const file = join10(paths.mediaDir, name);
+    try {
+      const st = await stat2(file);
+      if (st.mtimeMs < cutoff) await rm3(file, { force: true });
+    } catch {
+    }
+  }
+}
+
 // src/bot/comments.ts
 var SUPPORTED_FILE_TYPES = /* @__PURE__ */ new Set(["doc", "docx", "sheet", "file"]);
 var REPLY_MAX_CHARS = 2e3;
@@ -3898,19 +4072,34 @@ function createOrchestrator(channel, cfg, fallbackCwd) {
   async function handleTurn(msg, text, sessionKey, flat, project) {
     const existing = active.get(sessionKey);
     if (existing) {
-      if (getPendingPolicy(cfg) === "steer" && existing.run && existing.thread) {
-        const tid = existing.run.turnId();
+      const images = messageHasImages(msg) ? await collectInboundImages(channel, msg) : void 0;
+      const cur = active.get(sessionKey);
+      if (!cur) {
+        startReservedRun(msg, text, sessionKey, flat, project, images);
+        return;
+      }
+      if (getPendingPolicy(cfg) === "steer" && cur.run && cur.thread) {
+        const tid = cur.run.turnId();
         if (tid) {
           try {
-            await existing.thread.steer({ text }, tid);
-            log.info("intake", "steer", { tid });
+            await cur.thread.steer({ text, images }, tid);
+            log.info("intake", "steer", { tid, images: images?.length ?? 0 });
             return;
           } catch (err) {
             log.warn("intake", "steer-failed", { err: String(err) });
           }
         }
       }
-      existing.queue.push(text);
+      cur.queue.push({ text, images });
+      log.info("intake", "queued", { depth: cur.queue.length });
+      return;
+    }
+    startReservedRun(msg, text, sessionKey, flat, project);
+  }
+  function startReservedRun(msg, text, sessionKey, flat, project, preloadedImages) {
+    const existing = active.get(sessionKey);
+    if (existing) {
+      existing.queue.push({ text, images: preloadedImages });
       log.info("intake", "queued", { depth: existing.queue.length });
       return;
     }
@@ -3919,6 +4108,7 @@ function createOrchestrator(channel, cfg, fallbackCwd) {
     void withTrace({ chatId: msg.chatId, msgId: msg.messageId }, async () => {
       const reaction = runReaction(msg.messageId, !sema.hasFree());
       try {
+        const images = preloadedImages ?? (messageHasImages(msg) ? await collectInboundImages(channel, msg) : void 0);
         let thread = await resolveThread(sessionKey, msg.chatId);
         if (!thread) {
           const cwd = project?.cwd ?? fallbackCwd;
@@ -3943,6 +4133,7 @@ function createOrchestrator(channel, cfg, fallbackCwd) {
             flat,
             thread,
             firstText: text,
+            images,
             knownThreadId: sessionKey,
             requesterOpenId: msg.senderId
           },
@@ -3995,7 +4186,8 @@ function createOrchestrator(channel, cfg, fallbackCwd) {
         return;
       }
       const firstText = text || "\u4F60\u597D\uFF0C\u6211\u4EEC\u5F00\u59CB\u5427\u3002";
-      log.info("card", "start", { project: project?.name ?? "(unregistered)", model, effort });
+      const images = messageHasImages(msg) ? await collectInboundImages(channel, msg) : void 0;
+      log.info("card", "start", { project: project?.name ?? "(unregistered)", model, effort, images: images?.length ?? 0 });
       await launchRun(
         {
           chatId: msg.chatId,
@@ -4003,6 +4195,7 @@ function createOrchestrator(channel, cfg, fallbackCwd) {
           replyInThread: true,
           thread,
           firstText,
+          images,
           model,
           effort,
           cwd,
@@ -4202,6 +4395,10 @@ function createOrchestrator(channel, cfg, fallbackCwd) {
   }).on(DM.doctor, async ({ evt }) => {
     if (!dmAdmin(evt.operator?.openId)) return;
     const codexBin = resolveCodexBin();
+    const app = cfg.accounts.app;
+    const secret = await getSecret(secretKeyForApp(app.id)).catch(() => void 0);
+    const scopeCheck = secret ? await validateAppCredentials(app.id, secret, app.tenant).catch(() => void 0) : void 0;
+    const missingScopes = scopeCheck?.missingScopes;
     const info = {
       codexOk: await backend.isAvailable().catch(() => false),
       codexVer: codexBin ? codexVersion(codexBin) : null,
@@ -4211,7 +4408,14 @@ function createOrchestrator(channel, cfg, fallbackCwd) {
       platform: `${process.platform}-${process.arch}`,
       logStdout: serviceStdoutPath(),
       logStderr: serviceStderrPath(),
-      configFile: paths.configFile
+      configFile: paths.configFile,
+      missingScopes,
+      // 缺失时预选缺失项（精准开通）；查不到/全开通时预选全部必需 scope 供核对。
+      scopeGrantUrl: buildScopeGrantUrl(
+        app.id,
+        app.tenant,
+        missingScopes && missingScopes.length ? missingScopes : void 0
+      )
     };
     await sendManagedCard(channel, evt.chatId, buildDoctorCard(info), evt.messageId).catch(
       (err) => log.fail("console", err, { cmd: "doctor" })
@@ -4397,14 +4601,14 @@ ${tail}` }, { replyTo: evt.messageId }).catch(() => void 0);
     };
     let curCardKey;
     try {
-      let turnText = opts.firstText;
+      let turnInput = { text: opts.firstText, images: opts.images };
       let replyTo = opts.replyTo;
       let replyInThread = opts.flat ? false : opts.replyInThread ?? Boolean(opts.knownThreadId);
       for (; ; ) {
         const rec = topicThreadId ? await getSession(topicThreadId) : void 0;
         const turnModel = rec?.model ?? opts.model;
         const turnEffort = rec?.effort ?? opts.effort;
-        const run = opts.thread.runStreamed({ text: turnText }, { model: turnModel, effort: turnEffort });
+        const run = opts.thread.runStreamed(turnInput, { model: turnModel, effort: turnEffort });
         state.run = run;
         const render = new RunRender();
         render.showTools = getShowToolCalls(cfg);
@@ -4491,7 +4695,7 @@ ${tail}` }, { replyTo: evt.messageId }).catch(() => void 0);
         log.info("card", "final", { terminal: render.terminal() });
         if (killed) break;
         if (state.queue.length === 0) break;
-        turnText = state.queue.shift();
+        turnInput = state.queue.shift();
       }
     } catch (err) {
       log.fail("intake", err);
@@ -4855,7 +5059,7 @@ async function runUpdate(opts = {}) {
 }
 
 // src/cli/commands/bot.ts
-import { rm as rm3 } from "fs/promises";
+import { rm as rm4 } from "fs/promises";
 async function runBotInit(name) {
   if (!ensureCodex()) {
     process.exitCode = 1;
@@ -4909,7 +5113,7 @@ async function runBotRm(name) {
   }
   const after = await removeBot(bot2.appId);
   await removeSecret(secretKeyForApp(bot2.appId));
-  await rm3(botDir(bot2.appId), { recursive: true, force: true });
+  await rm4(botDir(bot2.appId), { recursive: true, force: true });
   console.log(`\u2713 \u5DF2\u79FB\u9664\u673A\u5668\u4EBA\u300C${bot2.name}\u300D(${bot2.appId})\uFF1A\u6CE8\u518C\u8868 + \u5BC6\u94A5 + \u72B6\u6001\u76EE\u5F55(projects/sessions)\u3002`);
   if (after.bots.length === 0) {
     console.log("  \u5DF2\u65E0\u4EFB\u4F55\u673A\u5668\u4EBA\uFF0C`bot init` \u91CD\u65B0\u521B\u5EFA\u3002");

package/package.json

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