@clawos-dev/clawd 0.2.436 → 0.2.438

package/dist/cli.cjs

@@ -6944,13 +6944,14 @@ var init_github = __esm({
 });
 
 // ../protocol/src/lark-bot-schemas.ts
-var LarkBotPersonaArgs, LarkBotUnbindArgs, LarkBotStatusArgs, LarkBotProvisionArgs, LarkBotProvisionCancelArgs, LARK_BOT_PROVISION_ERROR_REASONS, LarkBotProvisionErrorReasonSchema, LarkBotBindManualArgs, LarkBotGroupSchema, LarkBotStatusResultSchema, LarkBotStateFrameSchema;
+var LarkBotPersonaArgs, LarkBotUnbindArgs, LarkBotUpgradeArgs, LarkBotStatusArgs, LarkBotProvisionArgs, LarkBotProvisionCancelArgs, LARK_BOT_PROVISION_ERROR_REASONS, LarkBotProvisionErrorReasonSchema, LarkBotBindManualArgs, LarkBotGroupSchema, LarkBotStatusResultSchema, LarkBotStateFrameSchema;
 var init_lark_bot_schemas = __esm({
   "../protocol/src/lark-bot-schemas.ts"() {
     "use strict";
     init_zod();
     LarkBotPersonaArgs = external_exports.object({ personaId: external_exports.string().min(1) });
     LarkBotUnbindArgs = LarkBotPersonaArgs;
+    LarkBotUpgradeArgs = external_exports.object({ personaId: external_exports.string().min(1) });
     LarkBotStatusArgs = LarkBotPersonaArgs;
     LarkBotProvisionArgs = LarkBotPersonaArgs;
     LarkBotProvisionCancelArgs = LarkBotPersonaArgs;
@@ -6984,7 +6985,21 @@ var init_lark_bot_schemas = __esm({
       qrUrl: external_exports.string().optional(),
       /** provision 失败后的 unbound 帧携带；正常 unbound 无此字段 */
       errorReason: LarkBotProvisionErrorReasonSchema.optional(),
-      groups: external_exports.array(LarkBotGroupSchema)
+      groups: external_exports.array(LarkBotGroupSchema),
+      /**
+       * bound 态：该 bot 实际授予的 scope 缺了 LARK_PROVISION_ADDONS 里声明的项
+       * （spec 2026-09-01）——addons 是扫码时一次性写进飞书应用配置的，后来新增的
+       * scope / 事件对存量 bot 不生效，不提示的话用户只会觉得「功能没生效」。
+       * 判定真源是飞书回读的 granted scopes，不落库任何版本号。
+       */
+      needsUpgrade: external_exports.boolean().optional(),
+      /**
+       * bound 态叠加：正在扫码更新授权（spec 2026-09-01）。
+       * **不复用 provisioning 态**——升级期间 bot 仍在正常服务（长连接不断、群照常响应），
+       * 降级成 provisioning 会丢掉 botName / groups，UI 上像是断了。
+       * 有值即渲染二维码弹层；升级结束（成功或取消）该字段消失。
+       */
+      upgradeQrUrl: external_exports.string().optional()
     });
     LarkBotStateFrameSchema = LarkBotStatusResultSchema.extend({
       personaId: external_exports.string().min(1)
@@ -8712,6 +8727,10 @@ var init_methods = __esm({
         summary: "\u89E3\u7ED1 persona \u7684\u98DE\u4E66 bot\uFF08\u5220\u4E91\u7AEF\u7ED1\u5B9A + \u65AD\u957F\u8FDE\u63A5\uFF0C\u98DE\u4E66\u4FA7 app \u4FDD\u7559\uFF09\uFF1Bowner-only",
         args: LarkBotUnbindArgs
       },
+      "larkBot:upgrade": {
+        summary: "\u626B\u7801\u66F4\u65B0\u5DF2\u7ED1\u5B9A bot \u7684\u6388\u6743\uFF08\u8865\u540E\u6765\u65B0\u589E\u7684 scope / \u4E8B\u4EF6\uFF09\uFF1B\u5168\u7A0B\u4FDD\u6301 bound\uFF0Cbot \u4E0D\u65AD\u8FDE\uFF1Bowner-only",
+        args: LarkBotUpgradeArgs
+      },
       "larkBot:status": {
         summary: "\u67E5 persona \u7684\u98DE\u4E66 bot \u72B6\u6001\uFF08unbound/bound/broken + \u670D\u52A1\u4E2D\u7FA4\u6E05\u5355\uFF09\uFF1Bowner-only",
         args: LarkBotStatusArgs
@@ -9157,8 +9176,8 @@ var init_visitor_schemas = __esm({
 function formatLarkSpeakerReminder(speaker) {
   return `<system-reminder>\u6B64\u6D88\u606F\u6765\u81EA\u98DE\u4E66\u7FA4\u6210\u5458 ${speaker}</system-reminder>`;
 }
-function formatSenderAttribution(sender) {
-  if (sender.principal === "owner") return "";
+function formatSenderAttribution(sender, declaredParty) {
+  if (sender.principal === "owner" && declaredParty === "owner") return "";
   if (!sender.displayName) return "";
   return `<system-reminder>\u6B64\u6D88\u606F\u6765\u81EA ${sender.principal}\uFF1A${sender.displayName}</system-reminder>`;
 }
@@ -44934,7 +44953,7 @@ function renderIdentityLines(fields) {
 function buildConnectionPrompt(args) {
   const parts = ["# \u8FDE\u63A5\u4E0A\u4E0B\u6587"];
   if (args.mode === "owner") {
-    parts.push("\u5F53\u524D\u8FDE\u63A5\u65B9\uFF08\u5C31\u662F owner \u672C\u4EBA\uFF09\uFF1A");
+    parts.push("\u5F00\u8FD9\u4E2A session \u7684\u8FDE\u63A5\u65B9\uFF08\u5C31\u662F owner \u672C\u4EBA\uFF09\uFF1A");
     parts.push(
       renderIdentityLines({
         label: args.ownerLabel,
@@ -44943,7 +44962,7 @@ function buildConnectionPrompt(args) {
       })
     );
   } else {
-    parts.push("\u5F53\u524D\u8FDE\u63A5\u65B9\uFF08\u4E0D\u662F owner \u672C\u4EBA\uFF09\uFF1A");
+    parts.push("\u5F00\u8FD9\u4E2A session \u7684\u8FDE\u63A5\u65B9\uFF08\u4E0D\u662F owner \u672C\u4EBA\uFF09\uFF1A");
     parts.push(
       renderIdentityLines({
         label: args.guestLabel,
@@ -44962,6 +44981,10 @@ function buildConnectionPrompt(args) {
       })
     );
   }
+  parts.push("");
+  parts.push(
+    `\u4E0A\u9762\u5199\u7684\u662F\u5F00\u8FD9\u4E2A session \u7684\u4EBA\uFF0C\u4E4B\u540E\u7684\u6D88\u606F\u4E0D\u4E00\u5B9A\u90FD\u6765\u81EA\u4ED6 \u2014\u2014 \u4E2D\u9014\u53EF\u80FD\u6362\u4EBA\u8BF4\u8BDD\uFF0C\u6BD4\u5982 ${args.mode === "owner" ? "guest \u4ECE\u522B\u7684\u8BBE\u5907\u8FDE\u8FDB\u6765" : "owner \u672C\u4EBA\u8FDB\u6765"}\u63A5\u4E00\u53E5\u3002\u6D88\u606F\u5C3E\u90E8\u5E26 <system-reminder>\u6B64\u6D88\u606F\u6765\u81EA owner\uFF0Fguest\uFF1A\u67D0\u67D0</system-reminder> \u65F6\uFF0C\u4EE5\u5C3E\u6CE8\u91CC\u7684\u4EBA\u4E3A\u51C6\uFF1B\u6CA1\u6709\u5C3E\u6CE8\u5C31\u662F\u4E0A\u9762\u8FD9\u4F4D\u3002`
+  );
   if (args.workDir) {
     parts.push("");
     let line = `\u4F60\u7684\u6587\u4EF6\u5DE5\u4F5C\u76EE\u5F55\u662F ${args.workDir}\uFF0C\u8FD9\u4E2A\u76EE\u5F55\u5BF9\u4F60\u53EF\u8BFB\u53EF\u5199\uFF0C\u6587\u4EF6\u7684\u8BFB\u53D6/\u521B\u5EFA/\u4FEE\u6539\u90FD\u5728\u8FD9\u91CC\u8FDB\u884C\u3002`;
@@ -44975,7 +44998,7 @@ function buildConnectionPrompt(args) {
   if (args.mode === "guest" && args.guestDeviceId) {
     parts.push("");
     parts.push(
-      `\u5BF9\u65B9\u8BF4\u7684\u300C\u6211\u7684\u684C\u9762 / \u6211\u672C\u5730\u7684\u2026\u300D\u662F\u4ED6\u90A3\u53F0\u8BBE\u5907\u3001\u4E0D\u662F\u672C\u673A\uFF1B\u8981\u5728\u90A3\u8FB9\u770B\u6587\u4EF6\u6216\u8DD1\u547D\u4EE4\uFF0C\u7528 peer-ops \u7684 exec\uFF0CpeerDeviceId \u586B ${args.guestDeviceId}\u3002`
+      `${args.guestLabel}\u8BF4\u7684\u300C\u6211\u7684\u684C\u9762 / \u6211\u672C\u5730\u7684\u2026\u300D\u662F\u4ED6\u90A3\u53F0\u8BBE\u5907\u3001\u4E0D\u662F\u672C\u673A\uFF1B\u8981\u5728\u90A3\u8FB9\u770B\u6587\u4EF6\u6216\u8DD1\u547D\u4EE4\uFF0C\u7528 peer-ops \u7684 exec\uFF0CpeerDeviceId \u586B ${args.guestDeviceId}\u3002`
     );
   }
   parts.push("");
@@ -54026,6 +54049,7 @@ function buildShiftInternalHandlers(deps) {
 init_protocol();
 var PROVISION_ERROR_SET = new Set(LARK_BOT_PROVISION_ERROR_REASONS);
 var PROVISION_POLL_INTERVAL_MS = 2e3;
+var UPGRADE_POLL_MAX_FAILURES = 5;
 var PROVISION_MAX_CONSECUTIVE_FAILURES = 5;
 var PROVISION_POLL_MAX_MS = 60 * 60 * 1e3;
 function normalizeProvisionReason(reason) {
@@ -54039,6 +54063,7 @@ function buildLarkBotHandlers(deps) {
   const sleep2 = deps.sleep ?? ((ms) => new Promise((r) => setTimeout(r, ms)));
   const pollIntervalMs = deps.pollIntervalMs ?? PROVISION_POLL_INTERVAL_MS;
   const inFlight = /* @__PURE__ */ new Map();
+  const upgradeInFlight = /* @__PURE__ */ new Map();
   const groupsOf = (personaId2) => {
     const removed = new Set(deps.store.read(personaId2)?.removedChatIds ?? []);
     return deps.listLarkSessions(personaId2).filter((g2) => !removed.has(g2.chatId));
@@ -54137,8 +54162,121 @@ function buildLarkBotHandlers(deps) {
     void runProvisionPolling(personaId2, provisionId);
     return { response: { type: "larkBot:provision:ok" } };
   };
+  const runUpgradePolling = async (personaId2) => {
+    const backToBound = (needsUpgrade) => {
+      upgradeInFlight.delete(personaId2);
+      const fresh = deps.store.read(personaId2);
+      if (!fresh) {
+        emit(personaId2, { state: "unbound", groups: [] });
+        return;
+      }
+      emit(personaId2, {
+        state: "bound",
+        appId: fresh.appId,
+        botName: fresh.botName,
+        ...needsUpgrade ? { needsUpgrade: true } : {},
+        groups: groupsOf(personaId2)
+      });
+    };
+    const startedAt = now();
+    let failures = 0;
+    for (; ; ) {
+      await sleep2(pollIntervalMs);
+      const entry = upgradeInFlight.get(personaId2);
+      if (!entry || entry.cancelled) return;
+      if (now() - startedAt >= PROVISION_POLL_MAX_MS) {
+        deps.logger?.warn(`larkBot upgrade poll deadline exceeded: ${personaId2}`);
+        backToBound(true);
+        return;
+      }
+      let stillNeeds;
+      try {
+        const binding = (await deps.cloud.listBindings()).find((b2) => b2.personaId === personaId2);
+        if (!binding) {
+          backToBound(false);
+          return;
+        }
+        stillNeeds = binding.needsUpgrade !== false;
+        failures = 0;
+        if (!upgradeInFlight.get(personaId2) || upgradeInFlight.get(personaId2)?.cancelled) return;
+      } catch (err) {
+        failures += 1;
+        deps.logger?.warn(`larkBot upgrade poll failed (${failures}): ${err.message}`);
+        if (failures >= UPGRADE_POLL_MAX_FAILURES) {
+          backToBound(true);
+          return;
+        }
+        await sleep2(pollIntervalMs * 2 ** failures);
+        continue;
+      }
+      if (!stillNeeds) {
+        backToBound(false);
+        return;
+      }
+    }
+  };
+  const upgrade = async (frame) => {
+    const { personaId: personaId2 } = parseArgs2(LarkBotUpgradeArgs, frame, "larkBot:upgrade");
+    const meta = deps.store.read(personaId2);
+    if (!meta) throw new Error(`larkBot not bound: ${personaId2}`);
+    if (inFlight.has(personaId2) || upgradeInFlight.has(personaId2)) {
+      throw new Error(`larkBot provision already in flight: ${personaId2}`);
+    }
+    upgradeInFlight.set(personaId2, { provisionId: "", qrUrl: "", cancelled: false });
+    let provisionId;
+    let qrUrl;
+    try {
+      ;
+      ({ provisionId, qrUrl } = await deps.cloud.provisionUpgrade({ personaId: personaId2 }));
+    } catch (err) {
+      upgradeInFlight.delete(personaId2);
+      throw err;
+    }
+    const placeholder = upgradeInFlight.get(personaId2);
+    if (!placeholder || placeholder.cancelled) {
+      upgradeInFlight.delete(personaId2);
+      void deps.cloud.provisionCancel(provisionId).catch(
+        (err) => deps.logger?.warn(`larkBot upgrade cancel-during-begin: ${err.message}`)
+      );
+      return { response: { type: "larkBot:upgrade:ok" } };
+    }
+    upgradeInFlight.set(personaId2, { provisionId, qrUrl, cancelled: false });
+    emit(personaId2, {
+      state: "bound",
+      appId: meta.appId,
+      botName: meta.botName,
+      needsUpgrade: true,
+      upgradeQrUrl: qrUrl,
+      groups: groupsOf(personaId2)
+    });
+    void runUpgradePolling(personaId2);
+    return { response: { type: "larkBot:upgrade:ok" } };
+  };
   const provisionCancel = async (frame) => {
     const { personaId: personaId2 } = parseArgs2(LarkBotProvisionCancelArgs, frame, "larkBot:provisionCancel");
+    const upgrading = upgradeInFlight.get(personaId2);
+    if (upgrading) {
+      upgrading.cancelled = true;
+      upgradeInFlight.delete(personaId2);
+      if (upgrading.provisionId) {
+        await deps.cloud.provisionCancel(upgrading.provisionId).catch(
+          (err) => deps.logger?.warn(`larkBot upgrade cancel cloud failed: ${err.message}`)
+        );
+      }
+      const meta = deps.store.read(personaId2);
+      emit(
+        personaId2,
+        meta ? {
+          state: "bound",
+          appId: meta.appId,
+          botName: meta.botName,
+          // 取消了就是没升成，提示条留着
+          needsUpgrade: true,
+          groups: groupsOf(personaId2)
+        } : { state: "unbound", groups: [] }
+      );
+      return { response: { type: "larkBot:provisionCancel:ok" } };
+    }
     const entry = inFlight.get(personaId2);
     if (!entry) throw new Error(`larkBot provision not in flight: ${personaId2}`);
     entry.cancelled = true;
@@ -54178,6 +54316,7 @@ function buildLarkBotHandlers(deps) {
     const ownerId = deps.getOwnerId();
     if (!ownerId) throw new Error("larkBot bind requires feishu login (owner identity)");
     const name = botName ?? deps.getPersonaName(personaId2) ?? personaId2;
+    upgradeInFlight.delete(personaId2);
     await deps.cloud.bind({ personaId: personaId2, appId, appSecret, botName: name, tunnelUrl, ownerId });
     deps.store.write(personaId2, { appId, botName: name, boundAt: now() });
     emit(personaId2, { state: "bound", appId, botName: name, groups: groupsOf(personaId2) });
@@ -54185,6 +54324,7 @@ function buildLarkBotHandlers(deps) {
   };
   const unbind = async (frame) => {
     const { personaId: personaId2 } = parseArgs2(LarkBotUnbindArgs, frame, "larkBot:unbind");
+    upgradeInFlight.delete(personaId2);
     const meta = deps.store.read(personaId2);
     if (!meta) throw new Error(`larkBot not bound: ${personaId2}`);
     try {
@@ -54210,6 +54350,8 @@ function buildLarkBotHandlers(deps) {
         }
       };
     }
+    const upgrading = upgradeInFlight.get(personaId2);
+    const upgradingQr = upgrading && !upgrading.cancelled ? upgrading.qrUrl : void 0;
     const meta = deps.store.read(personaId2);
     let cloudReachable = false;
     let cloudBinding;
@@ -54231,7 +54373,10 @@ function buildLarkBotHandlers(deps) {
           state: broken2 ? "broken" : "bound",
           appId: cloudBinding.appId,
           botName: cloudBinding.botName,
+          ...upgradingQr ? { needsUpgrade: true, upgradeQrUrl: upgradingQr } : {},
           ...broken2 ? { brokenReason: cloudBinding.brokenReason ?? "unknown" } : {},
+          // 云端判定（它持有飞书回读的 granted scopes），daemon 只透传（spec 2026-09-01）
+          ...cloudBinding.needsUpgrade ? { needsUpgrade: true } : {},
           groups: groupsOf(personaId2)
         };
         return { response: { type: "larkBot:status:ok", ...result2 } };
@@ -54258,7 +54403,10 @@ function buildLarkBotHandlers(deps) {
       state: broken ? "broken" : "bound",
       appId: cloudBinding?.appId ?? meta.appId,
       botName: cloudBinding?.botName ?? meta.botName,
+      ...upgradingQr ? { needsUpgrade: true, upgradeQrUrl: upgradingQr } : {},
       ...broken ? { brokenReason: cloudBinding?.brokenReason ?? "unknown" } : {},
+      // 云端不可达时 cloudBinding 为空 → 不提示升级（宁可不提示也不误报）
+      ...cloudBinding?.needsUpgrade ? { needsUpgrade: true } : {},
       groups: groupsOf(personaId2)
     };
     return { response: { type: "larkBot:status:ok", ...result } };
@@ -54268,7 +54416,8 @@ function buildLarkBotHandlers(deps) {
     "larkBot:provisionCancel": provisionCancel,
     "larkBot:bindManual": bindManual,
     "larkBot:unbind": unbind,
-    "larkBot:status": status
+    "larkBot:status": status,
+    "larkBot:upgrade": upgrade
   };
 }
 async function refreshTunnelUrlOnStartup(deps) {
@@ -54388,6 +54537,10 @@ function createLarkBotCloudClient(opts) {
       const json = await request("POST", "/api/lark-bot/provision", { ...args });
       return { provisionId: String(json.provisionId), qrUrl: String(json.qrUrl) };
     },
+    async provisionUpgrade(args) {
+      const json = await request("POST", "/api/lark-bot/upgrade", { ...args });
+      return { provisionId: String(json.provisionId), qrUrl: String(json.qrUrl) };
+    },
     async provisionStatus(provisionId) {
       const json = await request("GET", `/api/lark-bot/provision/${encodeURIComponent(provisionId)}`);
       if (json.state === "success") {
@@ -61017,7 +61170,9 @@ function buildSessionHandlers(deps) {
         deps.getOwnerIdentity().feishuUnionId
       )
     );
-    const attribution = formatSenderAttribution(sender);
+    const creatorPrincipalId = manager.findOwnedSession(args.sessionId)?.creatorPrincipalId;
+    const declaredParty = creatorPrincipalId && creatorPrincipalId !== ownerPrincipalId ? "guest" : "owner";
+    const attribution = formatSenderAttribution(sender, declaredParty);
     const outbound = attribution ? { ...args, text: `${args.text}
 
 ${attribution}` } : args;
@@ -62515,6 +62670,7 @@ var METHOD_GRANT_MAP = {
   "larkBot:bindManual": ADMIN_ANY,
   "larkBot:unbind": ADMIN_ANY,
   "larkBot:status": ADMIN_ANY,
+  "larkBot:upgrade": ADMIN_ANY,
   // ---- onboarding:* / tools:probe / session:externalScan（首启 wizard，owner-only）----
   "onboarding:complete": ADMIN_ANY,
   "onboarding:iosInterest": ADMIN_ANY,
@@ -62651,7 +62807,7 @@ function computeMethodAccess(args) {
 }
 
 // src/version.ts
-var version = "0.2.436".length > 0 ? "0.2.436" : "dev";
+var version = "0.2.438".length > 0 ? "0.2.438" : "dev";
 
 // src/cli-probe/probe.ts
 var fs65 = __toESM(require("fs"), 1);

package/dist/dispatch/mcp-server.cjs

@@ -22118,6 +22118,7 @@ var GithubPrRequestReviewersArgs = external_exports.object({
 // ../protocol/src/lark-bot-schemas.ts
 var LarkBotPersonaArgs = external_exports.object({ personaId: external_exports.string().min(1) });
 var LarkBotUnbindArgs = LarkBotPersonaArgs;
+var LarkBotUpgradeArgs = external_exports.object({ personaId: external_exports.string().min(1) });
 var LarkBotStatusArgs = LarkBotPersonaArgs;
 var LarkBotProvisionArgs = LarkBotPersonaArgs;
 var LarkBotProvisionCancelArgs = LarkBotPersonaArgs;
@@ -22151,7 +22152,21 @@ var LarkBotStatusResultSchema = external_exports.object({
   qrUrl: external_exports.string().optional(),
   /** provision 失败后的 unbound 帧携带；正常 unbound 无此字段 */
   errorReason: LarkBotProvisionErrorReasonSchema.optional(),
-  groups: external_exports.array(LarkBotGroupSchema)
+  groups: external_exports.array(LarkBotGroupSchema),
+  /**
+   * bound 态：该 bot 实际授予的 scope 缺了 LARK_PROVISION_ADDONS 里声明的项
+   * （spec 2026-09-01）——addons 是扫码时一次性写进飞书应用配置的，后来新增的
+   * scope / 事件对存量 bot 不生效，不提示的话用户只会觉得「功能没生效」。
+   * 判定真源是飞书回读的 granted scopes，不落库任何版本号。
+   */
+  needsUpgrade: external_exports.boolean().optional(),
+  /**
+   * bound 态叠加：正在扫码更新授权（spec 2026-09-01）。
+   * **不复用 provisioning 态**——升级期间 bot 仍在正常服务（长连接不断、群照常响应），
+   * 降级成 provisioning 会丢掉 botName / groups，UI 上像是断了。
+   * 有值即渲染二维码弹层；升级结束（成功或取消）该字段消失。
+   */
+  upgradeQrUrl: external_exports.string().optional()
 });
 var LarkBotStateFrameSchema = LarkBotStatusResultSchema.extend({
   personaId: external_exports.string().min(1)
@@ -23772,6 +23787,10 @@ var METHOD_DOCS = {
     summary: "\u89E3\u7ED1 persona \u7684\u98DE\u4E66 bot\uFF08\u5220\u4E91\u7AEF\u7ED1\u5B9A + \u65AD\u957F\u8FDE\u63A5\uFF0C\u98DE\u4E66\u4FA7 app \u4FDD\u7559\uFF09\uFF1Bowner-only",
     args: LarkBotUnbindArgs
   },
+  "larkBot:upgrade": {
+    summary: "\u626B\u7801\u66F4\u65B0\u5DF2\u7ED1\u5B9A bot \u7684\u6388\u6743\uFF08\u8865\u540E\u6765\u65B0\u589E\u7684 scope / \u4E8B\u4EF6\uFF09\uFF1B\u5168\u7A0B\u4FDD\u6301 bound\uFF0Cbot \u4E0D\u65AD\u8FDE\uFF1Bowner-only",
+    args: LarkBotUpgradeArgs
+  },
   "larkBot:status": {
     summary: "\u67E5 persona \u7684\u98DE\u4E66 bot \u72B6\u6001\uFF08unbound/bound/broken + \u670D\u52A1\u4E2D\u7FA4\u6E05\u5355\uFF09\uFF1Bowner-only",
     args: LarkBotStatusArgs