@modelzen/feishu-codex-bridge 0.1.4 → 0.1.6

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 = {}) {
@@ -3041,9 +3065,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);
@@ -4202,6 +4226,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 +4239,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" })

package/package.json

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