@modelzen/feishu-codex-bridge 0.1.3 → 0.1.5

package/dist/cli.js

@@ -1,9 +1,19 @@
 // src/cli/index.ts
-import { readFileSync as readFileSync3 } from "fs";
-import { dirname as dirname9, resolve as resolve4 } from "path";
-import { fileURLToPath as fileURLToPath3 } from "url";
 import { Command } from "commander";
 
+// src/core/version.ts
+import { readFileSync } from "fs";
+import { dirname, resolve } from "path";
+import { fileURLToPath } from "url";
+function bridgeVersion() {
+  try {
+    const pkgPath = resolve(dirname(fileURLToPath(import.meta.url)), "..", "package.json");
+    return JSON.parse(readFileSync(pkgPath, "utf8")).version ?? "0.0.0";
+  } catch {
+    return "0.0.0";
+  }
+}
+
 // src/cli/commands/doctor.ts
 import { execFileSync as execFileSync2 } from "child_process";
 import { existsSync as existsSync3 } from "fs";
@@ -65,11 +75,11 @@ var paths = {
 // src/config/bots.ts
 import { existsSync } from "fs";
 import { chmod as chmod2, mkdir as mkdir2, readFile as readFile2, rename as rename2, writeFile as writeFile2 } from "fs/promises";
-import { dirname as dirname2, join as join2 } from "path";
+import { dirname as dirname3, join as join2 } from "path";
 
 // src/config/store.ts
 import { chmod, mkdir, readFile, rename, writeFile } from "fs/promises";
-import { dirname } from "path";
+import { dirname as dirname2 } from "path";
 
 // src/config/schema.ts
 function isComplete(cfg) {
@@ -158,7 +168,7 @@ async function ensureSecretsGetterWrapper() {
 # Auto-generated by feishu-codex-bridge. Do not edit.
 exec ${sq(node)} ${sq(bridgeEntry)} secrets get "$@"
 `;
-  await mkdir(dirname(wrapperPath), { recursive: true });
+  await mkdir(dirname2(wrapperPath), { recursive: true });
   const tmp = `${wrapperPath}.tmp-${process.pid}`;
   await writeFile(tmp, content, "utf8");
   await chmod(tmp, 448);
@@ -166,7 +176,7 @@ exec ${sq(node)} ${sq(bridgeEntry)} secrets get "$@"
   return wrapperPath;
 }
 async function saveConfig(cfg, path = paths.configFile) {
-  await mkdir(dirname(path), { recursive: true });
+  await mkdir(dirname2(path), { recursive: true });
   const tmp = `${path}.tmp-${process.pid}`;
   await writeFile(tmp, `${JSON.stringify(cfg, null, 2)}
 `, "utf8");
@@ -187,7 +197,7 @@ async function loadBots() {
   }
 }
 async function saveBots(reg) {
-  await mkdir2(dirname2(paths.botsFile), { recursive: true });
+  await mkdir2(dirname3(paths.botsFile), { recursive: true });
   const tmp = `${paths.botsFile}.tmp-${process.pid}`;
   await writeFile2(tmp, `${JSON.stringify(reg, null, 2)}
 `, "utf8");
@@ -358,7 +368,7 @@ import { createInterface } from "readline/promises";
 import { createCipheriv, createDecipheriv, pbkdf2Sync, randomBytes } from "crypto";
 import { chmod as chmod3, mkdir as mkdir3, readFile as readFile3, rename as rename3, writeFile as writeFile3 } from "fs/promises";
 import { hostname, userInfo } from "os";
-import { dirname as dirname3 } from "path";
+import { dirname as dirname4 } from "path";
 var KEY_LEN = 32;
 var IV_LEN = 12;
 var TAG_LEN = 16;
@@ -377,7 +387,7 @@ async function readStore() {
   }
 }
 async function writeStore(store) {
-  await mkdir3(dirname3(paths.secretsFile), { recursive: true });
+  await mkdir3(dirname4(paths.secretsFile), { recursive: true });
   const tmp = `${paths.secretsFile}.tmp-${process.pid}`;
   await writeFile3(tmp, `${JSON.stringify(store, null, 2)}
 `, "utf8");
@@ -392,7 +402,7 @@ async function loadOrCreateSalt() {
     if (err.code !== "ENOENT") throw err;
   }
   const salt = randomBytes(KEY_LEN);
-  await mkdir3(dirname3(paths.keystoreSaltFile), { recursive: true });
+  await mkdir3(dirname4(paths.keystoreSaltFile), { recursive: true });
   const tmp = `${paths.keystoreSaltFile}.tmp-${process.pid}`;
   await writeFile3(tmp, salt);
   await chmod3(tmp, 384);
@@ -2618,6 +2628,7 @@ var RunCardStream = class {
 function openChatUrl(chatId) {
   return `https://applink.feishu.cn/client/chat/open?openChatId=${encodeURIComponent(chatId)}`;
 }
+var REPO = "https://github.com/modelzen/feishu-codex-bridge";
 var DM = {
   menu: "dm.menu",
   newProject: "dm.newProject",
@@ -2739,6 +2750,74 @@ function buildUpdateCard(state) {
       );
   }
 }
+function connLabel(state) {
+  switch (state) {
+    case "connected":
+      return "\u2705 \u5DF2\u8FDE\u63A5";
+    case "connecting":
+      return "\u23F3 \u8FDE\u63A5\u4E2D";
+    case "reconnecting":
+      return "\u21BB \u91CD\u8FDE\u4E2D";
+    case "disconnected":
+      return "\u274C \u5DF2\u65AD\u5F00";
+    default:
+      return state;
+  }
+}
+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",
+    "",
+    "\u3010\u73AF\u5883\u3011",
+    `- bridge \u7248\u672C\uFF1Av${i.bridgeVer}`,
+    `- codex \u7248\u672C\uFF1A${i.codexVer ?? "\u672A\u627E\u5230\uFF08PATH / CODEX_BIN \u91CC\u90FD\u6CA1\u6709 codex\uFF09"}`,
+    `- Node\uFF1A${i.node}`,
+    `- \u5E73\u53F0\uFF1A${i.platform}`,
+    `- \u9879\u76EE\u4ED3\u5E93\uFF1A${REPO}`,
+    "",
+    "\u3010\u8FD0\u884C\u5FEB\u7167\u3011",
+    `- codex \u53EF\u7528\uFF1A${i.codexOk ? "\u662F" : "\u5426"}`,
+    `- \u98DE\u4E66\u957F\u8FDE\u63A5\uFF1A${i.conn}`,
+    "",
+    "\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",
+    `   - \u540E\u53F0\u5B88\u62A4\u8F93\u51FA\u65E5\u5FD7\uFF1A${i.logStdout}`,
+    `   - \u540E\u53F0\u5B88\u62A4\u9519\u8BEF\u65E5\u5FD7\uFF1A${i.logStderr}`,
+    "   \uFF08\u82E5\u662F\u524D\u53F0 feishu-codex-bridge run \u6A21\u5F0F\uFF0C\u65E5\u5FD7\u5728\u542F\u52A8\u5B83\u7684\u7EC8\u7AEF\u7A97\u53E3\uFF0C\u8BF7\u628A\u7EC8\u7AEF\u91CC\u7684\u62A5\u9519\u4E00\u8D77\u53D1\u6211\uFF09",
+    `2. \u5224\u65AD\u95EE\u9898\u5C5E\u4E8E\u54EA\u7C7B\uFF1Acodex \u542F\u52A8 / \u767B\u5F55\u3001\u98DE\u4E66\u9274\u6743\u6216\u6743\u9650\u4E0D\u8DB3\u3001\u957F\u8FDE\u63A5\u65AD\u5F00\u3001\u8FD8\u662F\u914D\u7F6E\u7F3A\u5931\uFF08\u914D\u7F6E\u6587\u4EF6\uFF1A${i.configFile}\uFF09\u3002`,
+    `3. \u5FC5\u8981\u65F6\u5BF9\u7167\u4ED3\u5E93 README \u4E0E issues \u7ED9\u65B9\u6848\uFF1A${REPO}/issues`,
+    "4. \u7ED9\u51FA\u53EF\u76F4\u63A5\u6267\u884C\u7684\u4FEE\u590D\u6B65\u9AA4\u3002",
+    "",
+    "\u3010\u6211\u9047\u5230\u7684\u73B0\u8C61\u3011",
+    "\uFF08\u5728\u8FD9\u91CC\u8865\u5145\uFF1A\u6BD4\u5982 @\u673A\u5668\u4EBA\u4E0D\u56DE\u590D / \u5361\u7247\u6309\u94AE\u70B9\u4E86\u6CA1\u53CD\u5E94 / \u542F\u52A8\u5C31\u62A5\u9519\u2026\u2026\uFF09"
+  ].join("\n");
+}
+function buildDoctorCard(i) {
+  const prompt = codexDiagnosePrompt(i);
+  return card(
+    [
+      md("**\u521D\u6B65\u8BCA\u65AD**"),
+      md(
+        `- 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)}`),
+      note(`bridge v${i.bridgeVer}\u3000\xB7\u3000Node ${i.node}\u3000\xB7\u3000${i.platform}`),
+      hr(),
+      md("**\u65E5\u5FD7\u8DEF\u5F84**"),
+      note(`\u540E\u53F0\u5B88\u62A4\u8F93\u51FA\uFF1A\`${i.logStdout}\``),
+      note(`\u540E\u53F0\u5B88\u62A4\u9519\u8BEF\uFF1A\`${i.logStderr}\``),
+      note("\u524D\u53F0 `run` \u6A21\u5F0F\uFF1A\u65E5\u5FD7\u5728\u542F\u52A8\u5B83\u7684\u7EC8\u7AEF\u7A97\u53E3\u91CC"),
+      hr(),
+      md("**\u8BA9 Codex \u5E2E\u4F60\u6DF1\u5EA6\u8BCA\u65AD** \u2014 \u590D\u5236\u4E0B\u9762\u6574\u6BB5\uFF0C\u5230\u4EFB\u610F\u9879\u76EE\u7FA4\u91CC **@\u6211** \u7C98\u8D34\u53D1\u9001\uFF1A"),
+      md("```\n" + prompt + "\n```"),
+      actions([
+        linkButton("\u{1F4E6} \u9879\u76EE\u4ED3\u5E93", REPO),
+        linkButton("\u{1F41E} \u63D0 Issue", `${REPO}/issues`)
+      ])
+    ],
+    { header: { title: "\u{1FA7A} \u8BCA\u65AD", template: i.codexOk ? "blue" : "orange" } }
+  );
+}
 function buildNewProjectFormCard(opts = {}) {
   const elements = [];
   if (opts.error) elements.push(md(`\u274C **\u521B\u5EFA\u5931\u8D25**\uFF1A${opts.error}`));
@@ -2873,9 +2952,9 @@ function buildGroupSettingsCard(project) {
 
 // src/service/update.ts
 import { execFile, spawn as spawn5 } from "child_process";
-import { existsSync as existsSync5, readFileSync } from "fs";
-import { dirname as dirname5, join as join8, resolve as resolve2 } from "path";
-import { fileURLToPath as fileURLToPath2 } from "url";
+import { existsSync as existsSync5, readFileSync as readFileSync2 } from "fs";
+import { dirname as dirname6, join as join8, resolve as resolve3 } from "path";
+import { fileURLToPath as fileURLToPath3 } from "url";
 import { promisify } from "util";
 
 // src/service/launchd.ts
@@ -2883,8 +2962,8 @@ import { spawn as spawn4, spawnSync } from "child_process";
 import { existsSync as existsSync4 } from "fs";
 import { appendFile, mkdir as mkdir4, rm as rm2, writeFile as writeFile4 } from "fs/promises";
 import { homedir as homedir3, userInfo as userInfo2 } from "os";
-import { dirname as dirname4, join as join7, resolve } from "path";
-import { fileURLToPath } from "url";
+import { dirname as dirname5, join as join7, resolve as resolve2 } from "path";
+import { fileURLToPath as fileURLToPath2 } from "url";
 var LAUNCHD_LABEL = "ai.feishu-codex-bridge.bot";
 function launchAgentPlistPath() {
   return join7(homedir3(), "Library", "LaunchAgents", `${LAUNCHD_LABEL}.plist`);
@@ -2896,8 +2975,8 @@ function serviceStderrPath() {
   return join7(paths.appDir, "service.err.log");
 }
 function resolveCliBinPath() {
-  const distDir = dirname4(fileURLToPath(import.meta.url));
-  return resolve(distDir, "..", "bin", "feishu-codex-bridge.mjs");
+  const distDir = dirname5(fileURLToPath2(import.meta.url));
+  return resolve2(distDir, "..", "bin", "feishu-codex-bridge.mjs");
 }
 function escapeXml(value) {
   return value.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/"/g, "&quot;");
@@ -2937,7 +3016,7 @@ function buildPlist() {
 }
 async function installLaunchd() {
   const plistPath = launchAgentPlistPath();
-  await mkdir4(dirname4(plistPath), { recursive: true });
+  await mkdir4(dirname5(plistPath), { recursive: true });
   await ensureLogFiles();
   await writeFile4(plistPath, buildPlist(), "utf8");
   if (isLoaded()) {
@@ -2962,9 +3041,9 @@ async function restartLaunchd() {
     throw new Error(`launchd service \u672A\u5B89\u88C5\uFF1A${launchAgentPlistPath()}`);
   }
   if (isLoaded()) {
-    const bootout = runLaunchctl(["bootout", serviceTarget()]);
-    if (!bootout.ok) throw launchctlError("launchctl bootout", bootout);
-    await waitUntilUnloaded();
+    const kick = runLaunchctl(["kickstart", "-k", serviceTarget()]);
+    if (!kick.ok) throw launchctlError("launchctl kickstart", kick);
+    return statusLaunchd();
   }
   const bootstrap = runLaunchctl(["bootstrap", userTarget(), launchAgentPlistPath()]);
   if (!bootstrap.ok) throw launchctlError("launchctl bootstrap", bootstrap);
@@ -3063,11 +3142,11 @@ function getServiceAdapter() {
 var execFileP = promisify(execFile);
 var NPM = process.platform === "win32" ? "npm.cmd" : "npm";
 function pkgRoot() {
-  return resolve2(dirname5(fileURLToPath2(import.meta.url)), "..");
+  return resolve3(dirname6(fileURLToPath3(import.meta.url)), "..");
 }
 function pkgJson() {
   try {
-    return JSON.parse(readFileSync(join8(pkgRoot(), "package.json"), "utf8"));
+    return JSON.parse(readFileSync2(join8(pkgRoot(), "package.json"), "utf8"));
   } catch {
     return {};
   }
@@ -3130,7 +3209,7 @@ async function restartDaemon() {
 
 // src/project/registry.ts
 import { mkdir as mkdir5, readFile as readFile5, rename as rename4, writeFile as writeFile5 } from "fs/promises";
-import { dirname as dirname6 } from "path";
+import { dirname as dirname7 } from "path";
 var FILE_VERSION2 = 1;
 async function read() {
   try {
@@ -3143,7 +3222,7 @@ async function read() {
   }
 }
 async function write(projects) {
-  await mkdir5(dirname6(paths.projectsFile), { recursive: true });
+  await mkdir5(dirname7(paths.projectsFile), { recursive: true });
   const tmp = `${paths.projectsFile}.tmp-${process.pid}`;
   const body = { version: FILE_VERSION2, projects };
   await writeFile5(tmp, `${JSON.stringify(body, null, 2)}
@@ -3189,7 +3268,7 @@ async function removeProject(name) {
 // src/project/lifecycle.ts
 import { mkdir as mkdir6 } from "fs/promises";
 import { existsSync as existsSync6 } from "fs";
-import { isAbsolute, join as join9, resolve as resolve3 } from "path";
+import { isAbsolute, join as join9, resolve as resolve4 } from "path";
 
 // src/project/git-info.ts
 import { execFile as execFile2 } from "child_process";
@@ -3327,7 +3406,7 @@ async function createProject(channel, input2) {
   let cwd;
   let blank;
   if (input2.existingPath) {
-    cwd = isAbsolute(input2.existingPath) ? input2.existingPath : resolve3(input2.existingPath);
+    cwd = isAbsolute(input2.existingPath) ? input2.existingPath : resolve4(input2.existingPath);
     if (!existsSync6(cwd)) throw new Error(`\u6587\u4EF6\u5939\u4E0D\u5B58\u5728\uFF1A${cwd}`);
     blank = false;
   } else {
@@ -3366,7 +3445,7 @@ async function transferOwnership(channel, chatId, toOpenId) {
 
 // src/bot/session-store.ts
 import { mkdir as mkdir7, readFile as readFile6, rename as rename5, writeFile as writeFile6 } from "fs/promises";
-import { dirname as dirname7 } from "path";
+import { dirname as dirname8 } from "path";
 var FILE_VERSION3 = 1;
 async function read2() {
   try {
@@ -3379,7 +3458,7 @@ async function read2() {
   }
 }
 async function write2(sessions) {
-  await mkdir7(dirname7(paths.sessionsFile), { recursive: true });
+  await mkdir7(dirname8(paths.sessionsFile), { recursive: true });
   const tmp = `${paths.sessionsFile}.tmp-${process.pid}`;
   const body = { version: FILE_VERSION3, sessions };
   await writeFile6(tmp, `${JSON.stringify(body, null, 2)}
@@ -4122,11 +4201,21 @@ function createOrchestrator(channel, cfg, fallbackCwd) {
     if (dmAdmin(evt.operator?.openId)) await patch(evt, buildSettingsCard(cfg));
   }).on(DM.doctor, async ({ evt }) => {
     if (!dmAdmin(evt.operator?.openId)) return;
-    const ok = await backend.isAvailable().catch(() => false);
-    const conn = channel.getConnectionStatus?.()?.state ?? "unknown";
-    await channel.send(evt.chatId, { markdown: `\u{1FA7A} **\u8BCA\u65AD**
-- codex: ${ok ? "\u2705 \u53EF\u7528" : "\u274C \u4E0D\u53EF\u7528\uFF08\u68C0\u67E5 CODEX_BIN/PATH\uFF09"}
-- \u957F\u8FDE\u63A5: ${conn}` }, { replyTo: evt.messageId }).catch(() => void 0);
+    const codexBin = resolveCodexBin();
+    const info = {
+      codexOk: await backend.isAvailable().catch(() => false),
+      codexVer: codexBin ? codexVersion(codexBin) : null,
+      conn: channel.getConnectionStatus?.()?.state ?? "unknown",
+      bridgeVer: bridgeVersion(),
+      node: process.version,
+      platform: `${process.platform}-${process.arch}`,
+      logStdout: serviceStdoutPath(),
+      logStderr: serviceStderrPath(),
+      configFile: paths.configFile
+    };
+    await sendManagedCard(channel, evt.chatId, buildDoctorCard(info), evt.messageId).catch(
+      (err) => log.fail("console", err, { cmd: "doctor" })
+    );
   }).on(DM.reconnect, async ({ evt }) => {
     if (!dmAdmin(evt.operator?.openId)) return;
     const conn = channel.getConnectionStatus?.()?.state ?? "unknown";
@@ -4585,8 +4674,8 @@ async function startBridge(opts) {
 }
 
 // src/core/single-instance.ts
-import { mkdirSync as mkdirSync2, readFileSync as readFileSync2, unlinkSync, writeFileSync } from "fs";
-import { dirname as dirname8 } from "path";
+import { mkdirSync as mkdirSync2, readFileSync as readFileSync3, unlinkSync, writeFileSync } from "fs";
+import { dirname as dirname9 } from "path";
 var BridgeAlreadyRunningError = class extends Error {
   constructor(pid) {
     super(
@@ -4608,20 +4697,20 @@ function isAlive(pid) {
 function acquireSingleInstanceLock(appId) {
   const file = paths.processesFile;
   try {
-    const rec = JSON.parse(readFileSync2(file, "utf8"));
+    const rec = JSON.parse(readFileSync3(file, "utf8"));
     if (rec.pid && rec.pid !== process.pid && rec.appId === appId && isAlive(rec.pid)) {
       throw new BridgeAlreadyRunningError(rec.pid);
     }
   } catch (err) {
     if (err instanceof BridgeAlreadyRunningError) throw err;
   }
-  mkdirSync2(dirname8(file), { recursive: true });
+  mkdirSync2(dirname9(file), { recursive: true });
   const record = { pid: process.pid, appId, startedAt: Date.now() };
   writeFileSync(file, `${JSON.stringify(record)}
 `, "utf8");
   const release = () => {
     try {
-      const rec = JSON.parse(readFileSync2(file, "utf8"));
+      const rec = JSON.parse(readFileSync3(file, "utf8"));
       if (rec.pid === process.pid) unlinkSync(file);
     } catch {
     }
@@ -4892,15 +4981,7 @@ function readStdin() {
 
 // src/cli/index.ts
 var program = new Command();
-function readVersion() {
-  try {
-    const pkgPath = resolve4(dirname9(fileURLToPath3(import.meta.url)), "..", "package.json");
-    return JSON.parse(readFileSync3(pkgPath, "utf8")).version ?? "0.0.0";
-  } catch {
-    return "0.0.0";
-  }
-}
-program.name("feishu-codex-bridge").description("\u628A\u98DE\u4E66/Lark \u6865\u63A5\u5230\u672C\u673A Codex\uFF08\u9879\u76EE=\u7FA4, \u8BDD\u9898=\u4F1A\u8BDD\uFF09").version(readVersion());
+program.name("feishu-codex-bridge").description("\u628A\u98DE\u4E66/Lark \u6865\u63A5\u5230\u672C\u673A Codex\uFF08\u9879\u76EE=\u7FA4, \u8BDD\u9898=\u4F1A\u8BDD\uFF09").version(bridgeVersion());
 program.command("run").description("\u524D\u53F0\u542F\u52A8 bot\uFF08\u6CA1\u914D\u7F6E\u5219\u5148\u626B\u7801 init\uFF1BCtrl+C \u4F18\u96C5\u9000\u51FA\uFF09").action(async () => {
   await runRun();
 });

package/package.json

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