@modelzen/feishu-codex-bridge 0.4.0 → 0.4.2

package/dist/cli.js

@@ -2950,7 +2950,14 @@ function card(elements, opts = {}) {
     obj.header = {
       template: opts.header.template ?? "blue",
       title: { tag: "plain_text", content: opts.header.title },
-      ...opts.header.subtitle ? { subtitle: { tag: "plain_text", content: opts.header.subtitle } } : {}
+      ...opts.header.subtitle ? { subtitle: { tag: "plain_text", content: opts.header.subtitle } } : {},
+      ...opts.header.textTags?.length ? {
+        text_tag_list: opts.header.textTags.map((t) => ({
+          tag: "text_tag",
+          text: { tag: "plain_text", content: t.text },
+          color: t.color
+        }))
+      } : {}
     };
   }
   return obj;
@@ -3025,6 +3032,27 @@ function actions(items, elementId) {
     columns: items.map((it) => ({ tag: "column", width: "auto", elements: [it] }))
   };
 }
+function actionsFixed(items, width, elementId) {
+  return {
+    tag: "column_set",
+    ...elementId ? { element_id: elementId } : {},
+    flex_mode: "flow",
+    horizontal_spacing: "8px",
+    columns: items.map((it) => ({ tag: "column", width: "auto", elements: [{ ...it, width, size: "large" }] }))
+  };
+}
+function splitRow(left, right, elementId) {
+  return {
+    tag: "column_set",
+    ...elementId ? { element_id: elementId } : {},
+    flex_mode: "none",
+    horizontal_spacing: "medium",
+    columns: [
+      { tag: "column", width: "auto", vertical_align: "center", elements: [left] },
+      { tag: "column", width: "weighted", weight: 1, vertical_align: "center", elements: [right] }
+    ]
+  };
+}
 function button(label, value, type = "default") {
   return {
     tag: "button",
@@ -3033,11 +3061,12 @@ function button(label, value, type = "default") {
     behaviors: [{ type: "callback", value }]
   };
 }
-function linkButton(label, url, type = "default") {
+function linkButton(label, url, type = "default", size) {
   return {
     tag: "button",
     text: { tag: "plain_text", content: label },
     type,
+    ...size ? { size } : {},
     behaviors: [{ type: "open_url", default_url: url }]
   };
 }
@@ -3295,6 +3324,8 @@ function openChatUrl(chatId) {
   return `https://applink.feishu.cn/client/chat/open?openChatId=${encodeURIComponent(chatId)}`;
 }
 var REPO = "https://github.com/modelzen/feishu-codex-bridge";
+var MENU_BTN_W_TOP = "152px";
+var MENU_BTN_W_BOT = "112px";
 var DM = {
   menu: "dm.menu",
   newProject: "dm.newProject",
@@ -3351,24 +3382,47 @@ var GS = {
 function kindLabel(kind) {
   return kind === "single" ? "\u{1F4AC} \u5355\u4F1A\u8BDD\u7FA4" : "\u{1F465} \u591A\u8BDD\u9898\u7FA4";
 }
-function buildDmMenuCard() {
+function buildDmMenuCard(opts = {}) {
+  const { webConsoleUrl: webConsoleUrl2, version } = opts;
   return card(
     [
       md("\u79C1\u804A\u7528\u4E8E**\u5EFA\u9879\u76EE\u548C\u7BA1\u7406**\uFF1B\u5177\u4F53\u4EFB\u52A1\u8BF7\u5230\u9879\u76EE\u7FA4\u91CC @\u6211\u3002"),
       hr(),
-      actions([
+      // 两行按钮固定宽度、左对齐；两行宽度配平后总长相等、右边缘对齐（见 MENU_BTN_W_*）。
+      actionsFixed([
         button("\u2795 \u65B0\u5EFA\u9879\u76EE", { a: DM.newProject }, "primary"),
         button("\u{1F4C1} \u9879\u76EE\u5217\u8868", { a: DM.projects }),
         button("\u2699\uFE0F \u8BBE\u7F6E", { a: DM.settings })
-      ]),
-      actions([
+      ], MENU_BTN_W_TOP),
+      actionsFixed([
         button("\u{1F4CA} \u7528\u91CF", { a: DM.usage }),
         button("\u{1FA7A} \u8BCA\u65AD", { a: DM.doctor }),
         button("\u{1F504} \u91CD\u8FDE", { a: DM.reconnect }),
-        button("\u2B06\uFE0F \u7248\u672C\u66F4\u65B0", { a: DM.update })
-      ])
+        button("\u2B06\uFE0F \u66F4\u65B0", { a: DM.update })
+      ], MENU_BTN_W_BOT),
+      // 🌐 网页控制台：刻意低调——小号按钮靠左 + 右侧灰字说明；仅在 daemon 本机控制台
+      // 在跑（webConsoleUrl 有值）时出现。按钮直接开 127.0.0.1 控制台——只有运行 bridge
+      // 的这台机器打得开；其它电脑/手机点了会打不开（本机回环地址，飞书也分不出点击设备
+      // 是不是本机），右侧文字已说明，按用户决定不另做处理。
+      ...webConsoleUrl2 ? [
+        hr(),
+        splitRow(
+          linkButton("\u{1F310} \u7F51\u9875\u63A7\u5236\u53F0", webConsoleUrl2, "default", "small"),
+          note("\u4EC5\u5728**\u8FD0\u884C bridge \u7684\u8FD9\u53F0\u7535\u8111**\u4E0A\u80FD\u6253\u5F00\uFF08\u672C\u673A\u5730\u5740\uFF09\u3002")
+        )
+      ] : []
     ],
-    { header: { title: "\u{1F916} Codex Bridge \u7BA1\u7406\u53F0", template: "blue" } }
+    {
+      header: {
+        title: "\u{1F916} Codex Bridge \u7BA1\u7406\u53F0",
+        template: "blue",
+        textTags: version ? [{ text: `v${version}`, color: "green" }] : void 0
+      },
+      // 这张卡可能内嵌带 token 的本机控制台直达链接（pc_url），且按钮全是管理员专属的
+      // dm.* 回调——转发出去既无意义、又会把 token 链接一并带走。loopback 已使转发副本
+      // 在他人设备上不可用，这里再加一道：禁止转发。
+      forward: false
+    }
   );
 }
 var backToMenu = () => actions([button("\u2B05\uFE0F \u83DC\u5355", { a: DM.menu })]);
@@ -6751,6 +6805,71 @@ function buildUsageShareCard(data, opts = {}) {
   });
 }
 
+// src/web/discovery.ts
+import { randomUUID as randomUUID3 } from "crypto";
+import { mkdirSync as mkdirSync2, readFileSync as readFileSync5, unlinkSync, writeFileSync as writeFileSync2 } from "fs";
+import { dirname as dirname10 } from "path";
+function publishWebConsole(rec, file = paths.webConsoleFile) {
+  mkdirSync2(dirname10(file), { recursive: true });
+  try {
+    unlinkSync(file);
+  } catch {
+  }
+  writeFileSync2(file, `${JSON.stringify(rec, null, 2)}
+`, { mode: 384 });
+}
+function readWebConsole(file = paths.webConsoleFile) {
+  try {
+    const rec = JSON.parse(readFileSync5(file, "utf8"));
+    if (typeof rec.port !== "number" || typeof rec.token !== "string" || rec.token === "" || typeof rec.pid !== "number") {
+      return void 0;
+    }
+    if (!isAlive(rec.pid)) return void 0;
+    return rec;
+  } catch {
+    return void 0;
+  }
+}
+function webConsoleUrl(file = paths.webConsoleFile) {
+  const rec = readWebConsole(file);
+  if (!rec) return void 0;
+  return `http://127.0.0.1:${rec.port}/?token=${encodeURIComponent(rec.token)}`;
+}
+function clearWebConsole(file = paths.webConsoleFile) {
+  try {
+    const rec = JSON.parse(readFileSync5(file, "utf8"));
+    if (rec.pid === process.pid) unlinkSync(file);
+  } catch {
+  }
+}
+function stableWebConsoleToken(file = paths.webTokenFile) {
+  try {
+    const t = readFileSync5(file, "utf8").trim();
+    if (t) return t;
+  } catch {
+  }
+  const token = randomUUID3();
+  try {
+    mkdirSync2(dirname10(file), { recursive: true });
+    try {
+      unlinkSync(file);
+    } catch {
+    }
+    writeFileSync2(file, `${token}
+`, { mode: 384 });
+  } catch {
+  }
+  return token;
+}
+function isAlive(pid) {
+  try {
+    process.kill(pid, 0);
+    return true;
+  } catch (err) {
+    return err.code === "EPERM";
+  }
+}
+
 // src/project/lifecycle.ts
 import { mkdir as mkdir10 } from "fs/promises";
 import { existsSync as existsSync9 } from "fs";
@@ -7019,8 +7138,8 @@ async function leaveChat(channel, chatId) {
 
 // src/bot/session-store.ts
 import { mkdir as mkdir11, readFile as readFile10, rename as rename5, writeFile as writeFile9 } from "fs/promises";
-import { randomUUID as randomUUID3 } from "crypto";
-import { dirname as dirname10 } from "path";
+import { randomUUID as randomUUID4 } from "crypto";
+import { dirname as dirname11 } from "path";
 var FILE_VERSION3 = 2;
 var LEGACY_V1_SESSION_FIELD = "codexThreadId";
 function migrate(raw) {
@@ -7056,8 +7175,8 @@ function withLock2(fn) {
   return run;
 }
 async function write2(sessions) {
-  await mkdir11(dirname10(paths.sessionsFile), { recursive: true });
-  const tmp = `${paths.sessionsFile}.tmp-${process.pid}-${randomUUID3()}`;
+  await mkdir11(dirname11(paths.sessionsFile), { recursive: true });
+  const tmp = `${paths.sessionsFile}.tmp-${process.pid}-${randomUUID4()}`;
   const body = { version: FILE_VERSION3, sessions };
   await writeFile9(tmp, `${JSON.stringify(body, null, 2)}
 `, "utf8");
@@ -7101,7 +7220,7 @@ async function handleDmConsole(channel, cfg, msg) {
       await channel.send(msg.chatId, { markdown: "\u26D4 \u4EC5\u7BA1\u7406\u5458\u53EF\u5728\u79C1\u804A\u91CC\u7BA1\u7406\u9879\u76EE\u3002" }, { replyTo: msg.messageId }).catch(() => void 0);
       return;
     }
-    await sendManagedCard(channel, msg.chatId, buildDmMenuCard(), msg.messageId).catch(
+    await sendManagedCard(channel, msg.chatId, buildDmMenuCard({ webConsoleUrl: webConsoleUrl(), version: bridgeVersion() }), msg.messageId).catch(
       (err) => log.fail("console", err, { cmd: "menu-send" })
     );
   });
@@ -7502,6 +7621,12 @@ function sanitizeContext(s, maxLen, oneLine2) {
   out = out.trim();
   return out.length > maxLen ? `${out.slice(0, maxLen)}\u2026` : out;
 }
+function prependBlock(block, text) {
+  const base = text.trim();
+  return base ? `${block}
+
+${base}` : block;
+}
 function weaveQuote(text, quoted) {
   if (!quoted) return text;
   const who = sanitizeContext(quoted.senderName, 40, true) || "\u67D0\u4EBA";
@@ -7510,10 +7635,7 @@ function weaveQuote(text, quoted) {
   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;
+  return prependBlock(block, text);
 }
 function weaveThreadHistory(text, msgs) {
   if (msgs.length === 0) return text;
@@ -7526,10 +7648,15 @@ function weaveThreadHistory(text, msgs) {
   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;
+  return prependBlock(block, text);
+}
+var SENDER_NAME_MAX = 40;
+function weaveSender(text, sender) {
+  const id = (sender.senderId ?? "").trim();
+  if (!id) return text;
+  const who = sanitizeContext(sender.senderName ?? "", SENDER_NAME_MAX, true) || "\u67D0\u7528\u6237";
+  const block = `[\u672C\u6761\u6D88\u606F\u7684\u53D1\u4FE1\u4EBA\uFF1A${who}\uFF08open_id\uFF1A${id}\uFF09]`;
+  return prependBlock(block, text);
 }
 
 // src/bot/comments.ts
@@ -8271,6 +8398,7 @@ function createOrchestrator(channel, cfg, fallbackCwd) {
       const quoted = await fetchQuotedMessage(channel, msg.replyToMessageId);
       body = weaveQuote(body, quoted);
     }
+    body = weaveSender(body, msg);
     return body;
   }
   async function handleTurn(msg, text, sessionKey, flat, project, perm) {
@@ -8854,7 +8982,7 @@ function createOrchestrator(channel, cfg, fallbackCwd) {
     patch(evt, buildSettingsCard(cfg));
   }
   const freshMenu = (evt) => {
-    patch(evt, buildDmMenuCard());
+    patch(evt, buildDmMenuCard({ webConsoleUrl: webConsoleUrl(), version: bridgeVersion() }));
   };
   const runUsage = (evt, force) => {
     if (!dmAdmin(evt.operator?.openId)) return;
@@ -9204,7 +9332,7 @@ ${tail}` }, { replyTo: evt.messageId }).catch(() => void 0);
     const name = typeof value.n === "string" ? value.n : "";
     patch(evt, async () => {
       const p = await getProjectByName(name);
-      if (!p) return buildDmMenuCard();
+      if (!p) return buildDmMenuCard({ webConsoleUrl: webConsoleUrl(), version: bridgeVersion() });
       return buildAllowlistCard(p, await namesWithOperator(evt, p.allowedUsers ?? []));
     });
   }).on(DM.addAllowedForm, ({ evt, value }) => {
@@ -9236,7 +9364,7 @@ ${tail}` }, { replyTo: evt.messageId }).catch(() => void 0);
     patch(evt, async () => {
       await updateProject(name, (p) => ({ allowedUsers: (p.allowedUsers ?? []).filter((x) => x !== id) }));
       const fresh = await getProjectByName(name);
-      if (!fresh) return buildDmMenuCard();
+      if (!fresh) return buildDmMenuCard({ webConsoleUrl: webConsoleUrl(), version: bridgeVersion() });
       return buildAllowlistCard(fresh, await namesWithOperator(evt, fresh.allowedUsers ?? []));
     });
   }).on(DM.projectSettings, ({ evt, value }) => {
@@ -9244,14 +9372,14 @@ ${tail}` }, { replyTo: evt.messageId }).catch(() => void 0);
     const name = typeof value.n === "string" ? value.n : "";
     patch(evt, async () => {
       const p = await getProjectByName(name);
-      return p ? buildProjectSettingsCard(p, backendDisplayName(p.backend)) : buildDmMenuCard();
+      return p ? buildProjectSettingsCard(p, backendDisplayName(p.backend)) : buildDmMenuCard({ webConsoleUrl: webConsoleUrl(), version: bridgeVersion() });
     });
   }).on(DM.projectTopics, ({ evt, value }) => {
     if (!dmAdmin(evt.operator?.openId)) return;
     const name = typeof value.n === "string" ? value.n : "";
     patch(evt, async () => {
       const p = await getProjectByName(name);
-      if (!p) return buildDmMenuCard();
+      if (!p) return buildDmMenuCard({ webConsoleUrl: webConsoleUrl(), version: bridgeVersion() });
       const sessions2 = (await listSessions()).filter((s) => s.chatId === p.chatId);
       return buildProjectTopicsCard(p, sessions2);
     });
@@ -9261,7 +9389,7 @@ ${tail}` }, { replyTo: evt.messageId }).catch(() => void 0);
     const on = value.v === "on";
     patch(evt, async () => {
       const r = await performSetNoMention({ projectName: name, on });
-      if (!r.ok) return buildDmMenuCard();
+      if (!r.ok) return buildDmMenuCard({ webConsoleUrl: webConsoleUrl(), version: bridgeVersion() });
       return buildProjectSettingsCard(r.project, backendDisplayName(r.project.backend));
     });
   }).on(DM.setAutoCompactDm, ({ evt, value }) => {
@@ -9270,7 +9398,7 @@ ${tail}` }, { replyTo: evt.messageId }).catch(() => void 0);
     const on = value.v === "on";
     patch(evt, async () => {
       const r = await performSetAutoCompact({ projectName: name, on, evictLiveSessionsForChat });
-      if (!r.ok) return buildDmMenuCard();
+      if (!r.ok) return buildDmMenuCard({ webConsoleUrl: webConsoleUrl(), version: bridgeVersion() });
       log.info("console", "project-autocompact", { project: name, on });
       return buildProjectSettingsCard(r.project, backendDisplayName(r.project.backend));
     });
@@ -9279,7 +9407,7 @@ ${tail}` }, { replyTo: evt.messageId }).catch(() => void 0);
     const name = typeof value.n === "string" ? value.n : "";
     patch(evt, async () => {
       const p = await getProjectByName(name);
-      return p ? buildPermissionCard(p) : buildDmMenuCard();
+      return p ? buildPermissionCard(p) : buildDmMenuCard({ webConsoleUrl: webConsoleUrl(), version: bridgeVersion() });
     });
   }).on(DM.permissionSubmit, ({ evt, value, formValue }) => {
     if (!dmAdmin(evt.operator?.openId)) return;
@@ -10080,7 +10208,7 @@ ${tail}` }, { replyTo: evt.messageId }).catch(() => void 0);
       }).catch(() => void 0);
       return;
     }
-    await sendManagedCard(channel, op, buildDmMenuCard(), void 0, false, "open_id").catch(
+    await sendManagedCard(channel, op, buildDmMenuCard({ webConsoleUrl: webConsoleUrl(), version: bridgeVersion() }), void 0, false, "open_id").catch(
       (err) => log.fail("console", err, { cmd: "menu-card" })
     );
   };
@@ -10346,7 +10474,7 @@ function withOwnerAdmin(base, ownerOpenId) {
 
 // src/admin/host.ts
 import { readdir as readdir4, stat as stat4 } from "fs/promises";
-import { dirname as dirname11, join as join18, resolve as resolve7 } from "path";
+import { dirname as dirname12, join as join18, resolve as resolve7 } from "path";
 import { fileURLToPath as fileURLToPath5 } from "url";
 import { arch, platform as platform2, release } from "os";
 function toDaemonStatus(opts) {
@@ -10398,7 +10526,7 @@ async function collectHostDoctor(logsDir2 = join18(paths.appDir, "logs")) {
   };
 }
 function resolveCliBinPath3() {
-  const distDir = dirname11(fileURLToPath5(import.meta.url));
+  const distDir = dirname12(fileURLToPath5(import.meta.url));
   return resolve7(distDir, "..", "bin", "feishu-codex-bridge.mjs");
 }
 function buildDaemonControlCommand(action, binPath = resolveCliBinPath3(), nodePath = process.execPath) {
@@ -10448,7 +10576,7 @@ function createAdminService(deps = {}) {
     try {
       const raw = await readFile11(botPaths(botId).processesFile, "utf8");
       const rec = JSON.parse(raw);
-      if (typeof rec.pid === "number" && isAlive(rec.pid)) {
+      if (typeof rec.pid === "number" && isAlive2(rec.pid)) {
         return { running: true, pid: rec.pid, startedAt: rec.startedAt };
       }
     } catch {
@@ -10844,7 +10972,7 @@ async function probeAllBackends() {
 function createReadonlyAdminService(deps = {}) {
   return createAdminService({ startDaemon: deps.startDaemon, applyUpdate: deps.applyUpdate, readonlyPreview: true });
 }
-function isAlive(pid) {
+function isAlive2(pid) {
   try {
     process.kill(pid, 0);
     return true;
@@ -10853,66 +10981,6 @@ function isAlive(pid) {
   }
 }
 
-// src/web/discovery.ts
-import { randomUUID as randomUUID4 } from "crypto";
-import { mkdirSync as mkdirSync2, readFileSync as readFileSync5, unlinkSync, writeFileSync as writeFileSync2 } from "fs";
-import { dirname as dirname12 } from "path";
-function publishWebConsole(rec, file = paths.webConsoleFile) {
-  mkdirSync2(dirname12(file), { recursive: true });
-  try {
-    unlinkSync(file);
-  } catch {
-  }
-  writeFileSync2(file, `${JSON.stringify(rec, null, 2)}
-`, { mode: 384 });
-}
-function readWebConsole(file = paths.webConsoleFile) {
-  try {
-    const rec = JSON.parse(readFileSync5(file, "utf8"));
-    if (typeof rec.port !== "number" || typeof rec.token !== "string" || rec.token === "" || typeof rec.pid !== "number") {
-      return void 0;
-    }
-    if (!isAlive2(rec.pid)) return void 0;
-    return rec;
-  } catch {
-    return void 0;
-  }
-}
-function clearWebConsole(file = paths.webConsoleFile) {
-  try {
-    const rec = JSON.parse(readFileSync5(file, "utf8"));
-    if (rec.pid === process.pid) unlinkSync(file);
-  } catch {
-  }
-}
-function stableWebConsoleToken(file = paths.webTokenFile) {
-  try {
-    const t = readFileSync5(file, "utf8").trim();
-    if (t) return t;
-  } catch {
-  }
-  const token = randomUUID4();
-  try {
-    mkdirSync2(dirname12(file), { recursive: true });
-    try {
-      unlinkSync(file);
-    } catch {
-    }
-    writeFileSync2(file, `${token}
-`, { mode: 384 });
-  } catch {
-  }
-  return token;
-}
-function isAlive2(pid) {
-  try {
-    process.kill(pid, 0);
-    return true;
-  } catch (err) {
-    return err.code === "EPERM";
-  }
-}
-
 // src/cli/commands/daemon-control.ts
 function spawnDaemonControl(action) {
   const { command, args } = buildDaemonControlCommand(action);

package/package.json

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