@clawos-dev/clawd 0.2.299 → 0.2.301

package/dist/cli.cjs

@@ -6585,7 +6585,7 @@ var init_shift_internal = __esm({
 });
 
 // ../protocol/src/lark-bot-schemas.ts
-var LarkBotPersonaArgs, LarkBotUnbindArgs, LarkBotStatusArgs, LarkBotBindManualArgs, LarkBotGroupSchema, LarkBotStatusResultSchema, LarkBotStateFrameSchema;
+var LarkBotPersonaArgs, LarkBotUnbindArgs, 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";
@@ -6593,6 +6593,17 @@ var init_lark_bot_schemas = __esm({
     LarkBotPersonaArgs = external_exports.object({ personaId: external_exports.string().min(1) });
     LarkBotUnbindArgs = LarkBotPersonaArgs;
     LarkBotStatusArgs = LarkBotPersonaArgs;
+    LarkBotProvisionArgs = LarkBotPersonaArgs;
+    LarkBotProvisionCancelArgs = LarkBotPersonaArgs;
+    LARK_BOT_PROVISION_ERROR_REASONS = [
+      "expired",
+      "cancelled",
+      "access_denied",
+      "lark_protocol_error",
+      "cloud_unreachable",
+      "internal_error"
+    ];
+    LarkBotProvisionErrorReasonSchema = external_exports.enum(LARK_BOT_PROVISION_ERROR_REASONS);
     LarkBotBindManualArgs = external_exports.object({
       personaId: external_exports.string().min(1),
       appId: external_exports.string().min(1),
@@ -6606,10 +6617,14 @@ var init_lark_bot_schemas = __esm({
       lastActiveAt: external_exports.number().int().optional()
     });
     LarkBotStatusResultSchema = external_exports.object({
-      state: external_exports.enum(["unbound", "bound", "broken"]),
+      state: external_exports.enum(["unbound", "provisioning", "bound", "broken"]),
       appId: external_exports.string().optional(),
       botName: external_exports.string().optional(),
       brokenReason: external_exports.string().optional(),
+      /** provisioning 态：二维码内容 URL（UI 本地渲染成 QR 图；spec P5 无 expiresAt/倒计时） */
+      qrUrl: external_exports.string().optional(),
+      /** provision 失败后的 unbound 帧携带；正常 unbound 无此字段 */
+      errorReason: LarkBotProvisionErrorReasonSchema.optional(),
       groups: external_exports.array(LarkBotGroupSchema)
     });
     LarkBotStateFrameSchema = LarkBotStatusResultSchema.extend({
@@ -8034,8 +8049,16 @@ var init_methods = __esm({
         summary: "\u67E5 shift \u7684\u6267\u884C\u5386\u53F2\uFF08\u4EC5\u521B\u5EFA\u8005\uFF09",
         args: ShiftInternalHistoryArgs
       },
+      "larkBot:provision": {
+        summary: "\u626B\u7801\u88C5\u914D\uFF1A\u4E91\u7AEF registerApp \u521B\u5EFA PersonalAgent \u5E76\u81EA\u52A8\u7ED1\u5B9A\uFF1B\u7ACB\u5373\u8FD4\u56DE\uFF0C\u8FDB\u5EA6\u8D70 larkBot:state \u5E27\uFF1Bowner-only",
+        args: LarkBotProvisionArgs
+      },
+      "larkBot:provisionCancel": {
+        summary: "\u53D6\u6D88\u8FDB\u884C\u4E2D\u7684\u626B\u7801\u88C5\u914D\uFF1Bowner-only",
+        args: LarkBotProvisionCancelArgs
+      },
       "larkBot:bindManual": {
-        summary: "\u624B\u586B app_id/app_secret \u7ED1\u5B9A\u73B0\u6709\u98DE\u4E66 bot\uFF08\u552F\u4E00\u7ED1\u5B9A\u5165\u53E3\uFF09\uFF1Bowner-only",
+        summary: "\u9003\u751F\u8231\uFF1A\u624B\u586B app_id/app_secret \u7ED1\u5B9A\u73B0\u6709\u98DE\u4E66 bot\uFF1Bowner-only",
         args: LarkBotBindManualArgs
       },
       "larkBot:unbind": {
@@ -51829,11 +51852,20 @@ function buildShiftInternalHandlers(deps) {
 
 // src/handlers/lark-bot.ts
 init_protocol();
+var PROVISION_ERROR_SET = new Set(LARK_BOT_PROVISION_ERROR_REASONS);
+var PROVISION_POLL_INTERVAL_MS = 2e3;
+var PROVISION_MAX_CONSECUTIVE_FAILURES = 5;
+function normalizeProvisionReason(reason) {
+  return PROVISION_ERROR_SET.has(reason) ? reason : "lark_protocol_error";
+}
 function statusFrame(personaId2, status) {
   return { type: "larkBot:state", personaId: personaId2, ...status };
 }
 function buildLarkBotHandlers(deps) {
   const now = deps.now ?? Date.now;
+  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 groupsOf = (personaId2) => {
     const removed = new Set(deps.store.read(personaId2)?.removedChatIds ?? []);
     return deps.listLarkSessions(personaId2).filter((g2) => !removed.has(g2.chatId));
@@ -51841,12 +51873,120 @@ function buildLarkBotHandlers(deps) {
   const emit = (personaId2, status2) => {
     deps.broadcast(statusFrame(personaId2, status2));
   };
+  const runProvisionPolling = async (personaId2, provisionId) => {
+    let failures = 0;
+    for (; ; ) {
+      await sleep2(pollIntervalMs);
+      const entry = inFlight.get(personaId2);
+      if (!entry || entry.cancelled) return;
+      let status2;
+      try {
+        status2 = await deps.cloud.provisionStatus(provisionId);
+        failures = 0;
+      } catch (err) {
+        failures += 1;
+        if (failures >= PROVISION_MAX_CONSECUTIVE_FAILURES) {
+          inFlight.delete(personaId2);
+          deps.logger?.warn(`larkBot provision poll unreachable: ${err.message}`);
+          emit(personaId2, { state: "unbound", errorReason: "cloud_unreachable", groups: [] });
+          return;
+        }
+        await sleep2(pollIntervalMs * 2 ** failures);
+        continue;
+      }
+      const current = inFlight.get(personaId2);
+      if (!current || current.cancelled) {
+        if (status2.state === "success") {
+          void deps.cloud.unbind(status2.appId).catch(
+            (err) => deps.logger?.warn(
+              `larkBot provision late-success cleanup unbind failed: ${err.message}`
+            )
+          );
+        }
+        return;
+      }
+      if (status2.state === "pending") continue;
+      inFlight.delete(personaId2);
+      if (status2.state === "success") {
+        deps.store.write(personaId2, {
+          appId: status2.appId,
+          botName: status2.botName,
+          boundAt: now()
+        });
+        emit(personaId2, {
+          state: "bound",
+          appId: status2.appId,
+          botName: status2.botName,
+          groups: groupsOf(personaId2)
+        });
+      } else {
+        emit(personaId2, {
+          state: "unbound",
+          errorReason: normalizeProvisionReason(status2.reason),
+          groups: []
+        });
+      }
+      return;
+    }
+  };
+  const provision = async (frame) => {
+    const { personaId: personaId2 } = parseArgs2(LarkBotProvisionArgs, frame, "larkBot:provision");
+    const tunnelUrl = deps.getTunnelUrl();
+    if (!tunnelUrl) throw new Error("larkBot provision requires tunnel to be up");
+    const ownerId = deps.getOwnerId();
+    if (!ownerId) throw new Error("larkBot provision requires feishu login (owner identity)");
+    if (deps.store.read(personaId2)) throw new Error(`larkBot already bound: ${personaId2}`);
+    if (inFlight.has(personaId2)) throw new Error(`larkBot provision already in flight: ${personaId2}`);
+    const botName = deps.getPersonaName(personaId2) ?? personaId2;
+    inFlight.set(personaId2, { provisionId: "", qrUrl: "", cancelled: false });
+    let provisionId;
+    let qrUrl;
+    try {
+      ;
+      ({ provisionId, qrUrl } = await deps.cloud.provisionBegin({
+        personaId: personaId2,
+        botName,
+        tunnelUrl,
+        ownerId
+      }));
+    } catch (err) {
+      inFlight.delete(personaId2);
+      throw err;
+    }
+    const placeholder = inFlight.get(personaId2);
+    if (!placeholder || placeholder.cancelled) {
+      inFlight.delete(personaId2);
+      void deps.cloud.provisionCancel(provisionId).catch(
+        (err) => deps.logger?.warn(`larkBot provision cancel-during-begin: ${err.message}`)
+      );
+      return { response: { type: "larkBot:provision:ok" } };
+    }
+    inFlight.set(personaId2, { provisionId, qrUrl, cancelled: false });
+    emit(personaId2, { state: "provisioning", qrUrl, groups: [] });
+    void runProvisionPolling(personaId2, provisionId);
+    return { response: { type: "larkBot:provision:ok" } };
+  };
+  const provisionCancel = async (frame) => {
+    const { personaId: personaId2 } = parseArgs2(LarkBotProvisionCancelArgs, frame, "larkBot:provisionCancel");
+    const entry = inFlight.get(personaId2);
+    if (!entry) throw new Error(`larkBot provision not in flight: ${personaId2}`);
+    entry.cancelled = true;
+    if (entry.provisionId) {
+      await deps.cloud.provisionCancel(entry.provisionId).catch(
+        (err) => deps.logger?.warn(`larkBot provisionCancel cloud failed: ${err.message}`)
+      );
+      inFlight.delete(personaId2);
+    }
+    emit(personaId2, { state: "unbound", groups: [] });
+    return { response: { type: "larkBot:provisionCancel:ok" } };
+  };
   const bindManual = async (frame) => {
     const { personaId: personaId2, appId, appSecret, botName } = parseArgs2(
       LarkBotBindManualArgs,
       frame,
       "larkBot:bindManual"
     );
+    if (inFlight.has(personaId2)) throw new Error(`larkBot provision already in flight: ${personaId2}`);
     const tunnelUrl = deps.getTunnelUrl();
     if (!tunnelUrl) throw new Error("larkBot bind requires tunnel to be up");
     const ownerId = deps.getOwnerId();
@@ -51873,6 +52013,17 @@ function buildLarkBotHandlers(deps) {
   };
   const status = async (frame) => {
     const { personaId: personaId2 } = parseArgs2(LarkBotStatusArgs, frame, "larkBot:status");
+    const flight = inFlight.get(personaId2);
+    if (flight && !flight.cancelled && flight.qrUrl) {
+      return {
+        response: {
+          type: "larkBot:status:ok",
+          state: "provisioning",
+          qrUrl: flight.qrUrl,
+          groups: []
+        }
+      };
+    }
     const meta = deps.store.read(personaId2);
     if (!meta) {
       return {
@@ -51896,6 +52047,8 @@ function buildLarkBotHandlers(deps) {
     return { response: { type: "larkBot:status:ok", ...result } };
   };
   return {
+    "larkBot:provision": provision,
+    "larkBot:provisionCancel": provisionCancel,
     "larkBot:bindManual": bindManual,
     "larkBot:unbind": unbind,
     "larkBot:status": status
@@ -52014,6 +52167,23 @@ function createLarkBotCloudClient(opts) {
     async updateTunnelUrl(tunnelUrl) {
       await request("PATCH", "/api/lark-bot/tunnel", { tunnelUrl });
     },
+    async provisionBegin(args) {
+      const json = await request("POST", "/api/lark-bot/provision", { ...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") {
+        return { state: "success", appId: String(json.appId), botName: String(json.botName) };
+      }
+      if (json.state === "error") {
+        return { state: "error", reason: String(json.reason ?? "internal_error") };
+      }
+      return { state: "pending" };
+    },
+    async provisionCancel(provisionId) {
+      await request("DELETE", `/api/lark-bot/provision/${encodeURIComponent(provisionId)}`);
+    },
     async reply(args) {
       await request("POST", "/api/lark-bot/reply", { ...args });
     },
@@ -52065,6 +52235,7 @@ init_protocol();
 var ERROR_REPLY_TEXT = "\u5904\u7406\u51FA\u9519\u4E86\uFF0C\u8BF7\u91CD\u8BD5";
 var DEFAULT_TURN_TIMEOUT_MS = 10 * 60 * 1e3;
 var DEBOUNCE_MS = 1e3;
+var CONTENT_HOLD_MS = 6e4;
 var MAX_IMAGE_BYTES = 8 * 1024 * 1024;
 var EXT_BY_MIME = {
   "image/png": "png",
@@ -52094,6 +52265,14 @@ function createLarkChatRouter(deps) {
   const replyDelays = deps.replyRetryDelaysMs ?? [2e3, 8e3, 3e4];
   const sleep2 = deps.sleepImpl ?? ((ms) => new Promise((r) => setTimeout(r, ms)));
   const debounceMs = deps.debounceMs ?? DEBOUNCE_MS;
+  const contentHoldMs = deps.contentHoldMs ?? CONTENT_HOLD_MS;
+  const timerMsFor = (envs) => {
+    if (envs.some((e) => e.text?.trim())) return debounceMs;
+    const hasContent = envs.some(
+      (e) => (e.imageKeys?.length ?? 0) > 0 || (e.files?.length ?? 0) > 0
+    );
+    return hasContent ? contentHoldMs : debounceMs;
+  };
   const queues = /* @__PURE__ */ new Map();
   const activity = /* @__PURE__ */ new Map();
   const pending = /* @__PURE__ */ new Map();
@@ -52270,12 +52449,12 @@ ${formatLarkSpeakerReminder(speaker)}`;
       if (batch) {
         batch.envelopes.push(env);
         clearTimeout(batch.timer);
-        batch.timer = setTimeout(() => flushPending(env.chatId), debounceMs);
+        batch.timer = setTimeout(() => flushPending(env.chatId), timerMsFor(batch.envelopes));
       } else {
         pending.set(env.chatId, {
           envelopes: [env],
           senderOpenId: sender,
-          timer: setTimeout(() => flushPending(env.chatId), debounceMs)
+          timer: setTimeout(() => flushPending(env.chatId), timerMsFor([env]))
         });
       }
     },
@@ -58902,6 +59081,8 @@ var METHOD_GRANT_MAP = {
   "shift-internal:update": ADMIN_ANY,
   "shift-internal:history": ADMIN_ANY,
   // ---- larkBot:* (LarkBotConnector 绑定/状态，owner-only) ----
+  "larkBot:provision": ADMIN_ANY,
+  "larkBot:provisionCancel": ADMIN_ANY,
   "larkBot:bindManual": ADMIN_ANY,
   "larkBot:unbind": ADMIN_ANY,
   "larkBot:status": ADMIN_ANY,
@@ -59036,7 +59217,7 @@ function computeMethodAccess(args) {
 }
 
 // src/version.ts
-var version = "0.2.299".length > 0 ? "0.2.299" : "dev";
+var version = "0.2.301".length > 0 ? "0.2.301" : "dev";
 
 // src/cli-probe/probe.ts
 var fs56 = __toESM(require("fs"), 1);

package/dist/dispatch/mcp-server.cjs

@@ -21794,6 +21794,17 @@ var ShiftInternalHistoryArgs = external_exports.object({
 var LarkBotPersonaArgs = external_exports.object({ personaId: external_exports.string().min(1) });
 var LarkBotUnbindArgs = LarkBotPersonaArgs;
 var LarkBotStatusArgs = LarkBotPersonaArgs;
+var LarkBotProvisionArgs = LarkBotPersonaArgs;
+var LarkBotProvisionCancelArgs = LarkBotPersonaArgs;
+var LARK_BOT_PROVISION_ERROR_REASONS = [
+  "expired",
+  "cancelled",
+  "access_denied",
+  "lark_protocol_error",
+  "cloud_unreachable",
+  "internal_error"
+];
+var LarkBotProvisionErrorReasonSchema = external_exports.enum(LARK_BOT_PROVISION_ERROR_REASONS);
 var LarkBotBindManualArgs = external_exports.object({
   personaId: external_exports.string().min(1),
   appId: external_exports.string().min(1),
@@ -21807,10 +21818,14 @@ var LarkBotGroupSchema = external_exports.object({
   lastActiveAt: external_exports.number().int().optional()
 });
 var LarkBotStatusResultSchema = external_exports.object({
-  state: external_exports.enum(["unbound", "bound", "broken"]),
+  state: external_exports.enum(["unbound", "provisioning", "bound", "broken"]),
   appId: external_exports.string().optional(),
   botName: external_exports.string().optional(),
   brokenReason: external_exports.string().optional(),
+  /** provisioning 态：二维码内容 URL（UI 本地渲染成 QR 图；spec P5 无 expiresAt/倒计时） */
+  qrUrl: external_exports.string().optional(),
+  /** provision 失败后的 unbound 帧携带；正常 unbound 无此字段 */
+  errorReason: LarkBotProvisionErrorReasonSchema.optional(),
   groups: external_exports.array(LarkBotGroupSchema)
 });
 var LarkBotStateFrameSchema = LarkBotStatusResultSchema.extend({
@@ -23140,8 +23155,16 @@ var METHOD_DOCS = {
     summary: "\u67E5 shift \u7684\u6267\u884C\u5386\u53F2\uFF08\u4EC5\u521B\u5EFA\u8005\uFF09",
     args: ShiftInternalHistoryArgs
   },
+  "larkBot:provision": {
+    summary: "\u626B\u7801\u88C5\u914D\uFF1A\u4E91\u7AEF registerApp \u521B\u5EFA PersonalAgent \u5E76\u81EA\u52A8\u7ED1\u5B9A\uFF1B\u7ACB\u5373\u8FD4\u56DE\uFF0C\u8FDB\u5EA6\u8D70 larkBot:state \u5E27\uFF1Bowner-only",
+    args: LarkBotProvisionArgs
+  },
+  "larkBot:provisionCancel": {
+    summary: "\u53D6\u6D88\u8FDB\u884C\u4E2D\u7684\u626B\u7801\u88C5\u914D\uFF1Bowner-only",
+    args: LarkBotProvisionCancelArgs
+  },
   "larkBot:bindManual": {
-    summary: "\u624B\u586B app_id/app_secret \u7ED1\u5B9A\u73B0\u6709\u98DE\u4E66 bot\uFF08\u552F\u4E00\u7ED1\u5B9A\u5165\u53E3\uFF09\uFF1Bowner-only",
+    summary: "\u9003\u751F\u8231\uFF1A\u624B\u586B app_id/app_secret \u7ED1\u5B9A\u73B0\u6709\u98DE\u4E66 bot\uFF1Bowner-only",
     args: LarkBotBindManualArgs
   },
   "larkBot:unbind": {