@clawos-dev/clawd 0.2.605 → 0.2.607

package/dist/app-builder-plugin/mcp-server.cjs

@@ -22843,6 +22843,8 @@ var LarkBotStatusResultSchema = external_exports.object({
   brokenReason: external_exports.string().optional(),
   /** provisioning 态：二维码内容 URL（UI 本地渲染成 QR 图；spec P5 无 expiresAt/倒计时） */
   qrUrl: external_exports.string().optional(),
+  /** 云扫码会话可从中心恢复，供另一设备取消。 */
+  provisionId: external_exports.string().optional(),
   /** provision 失败后的 unbound 帧携带；正常 unbound 无此字段 */
   errorReason: LarkBotProvisionErrorReasonSchema.optional(),
   groups: external_exports.array(LarkBotGroupSchema),
@@ -23031,7 +23033,7 @@ var PersonaFileSchema = external_exports.object({
    * 上云的就是本机同名 persona，不加后缀发布者自己永远看不到「云上」组。gateway 不认识带后缀的名字，
    * 跟它说话（路径段、登记表）一律用 `cloud.personaId`。
    */
-  cloud: external_exports.object({ gatewayUrl: external_exports.string().min(1), personaId: external_exports.string().min(1) }).strict().optional()
+  cloud: external_exports.object({ gatewayUrl: external_exports.string().min(1), personaId: external_exports.string().min(1), publishedByMe: external_exports.boolean().optional() }).strict().optional()
 }).strict();
 var PersonaSkillSummarySchema = external_exports.object({
   // 目录名作为 skill name（对齐 CC：frontmatter `name:` 仅作 displayName 用）
@@ -24543,6 +24545,12 @@ var METHOD_DOCS = {
     summary: "\u67E5 persona \u7684\u98DE\u4E66 bot \u72B6\u6001\uFF08unbound/bound/broken + \u670D\u52A1\u4E2D\u7FA4\u6E05\u5355\uFF09\uFF1Bowner-only",
     args: LarkBotStatusArgs
   },
+  "cloud:larkBot:provision": { summary: "\u4E3A\u672C\u4EBA\u53D1\u5E03\u7684\u4E91 Persona \u626B\u7801\u521B\u5EFA\u98DE\u4E66 Bot\uFF1Bowner-only", args: LarkBotProvisionArgs },
+  "cloud:larkBot:provisionCancel": { summary: "\u53D6\u6D88\u4E91 Persona \u7684\u626B\u7801\u88C5\u914D\uFF1Bowner-only", args: LarkBotProvisionCancelArgs },
+  "cloud:larkBot:bindManual": { summary: "\u4E3A\u672C\u4EBA\u53D1\u5E03\u7684\u4E91 Persona \u624B\u52A8\u7ED1\u5B9A\u98DE\u4E66 Bot\uFF1Bowner-only", args: LarkBotBindManualArgs },
+  "cloud:larkBot:unbind": { summary: "\u89E3\u7ED1\u4E91 Persona \u7684\u98DE\u4E66 Bot\uFF1Bowner-only", args: LarkBotUnbindArgs },
+  "cloud:larkBot:upgrade": { summary: "\u66F4\u65B0\u4E91 Persona \u98DE\u4E66 Bot \u6388\u6743\uFF1Bowner-only", args: LarkBotUpgradeArgs },
+  "cloud:larkBot:status": { summary: "\u67E5\u770B\u4E91 Persona \u98DE\u4E66 Bot \u72B6\u6001\uFF1Bowner-only", args: LarkBotStatusArgs },
   "onboarding:complete": {
     summary: "\u6807\u8BB0\u9996\u542F onboarding \u5B8C\u6210\uFF1A\u5F80 <dataDir>/profile.json \u5199 onboardingCompletedAt\uFF08\u6BEB\u79D2\u65F6\u95F4\u6233\uFF0C\u4FDD\u7559\u5176\u5B83\u5B57\u6BB5\uFF0C\u91CD\u590D\u8C03\u7528\u5E42\u7B49\uFF09\uFF1Binfo ready \u5E27\u643A\u5E26\u8BE5\u5B57\u6BB5\u4F9B UI \u5224\u5B9A\u662F\u5426\u8FDB wizard",
     args: OnboardingCompleteArgs

package/dist/cli.cjs

@@ -7630,6 +7630,8 @@ var init_lark_bot_schemas = __esm({
       brokenReason: external_exports.string().optional(),
       /** provisioning 态：二维码内容 URL（UI 本地渲染成 QR 图；spec P5 无 expiresAt/倒计时） */
       qrUrl: external_exports.string().optional(),
+      /** 云扫码会话可从中心恢复，供另一设备取消。 */
+      provisionId: external_exports.string().optional(),
       /** provision 失败后的 unbound 帧携带；正常 unbound 无此字段 */
       errorReason: LarkBotProvisionErrorReasonSchema.optional(),
       groups: external_exports.array(LarkBotGroupSchema),
@@ -7848,7 +7850,7 @@ var init_persona_schemas = __esm({
        * 上云的就是本机同名 persona，不加后缀发布者自己永远看不到「云上」组。gateway 不认识带后缀的名字，
        * 跟它说话（路径段、登记表）一律用 `cloud.personaId`。
        */
-      cloud: external_exports.object({ gatewayUrl: external_exports.string().min(1), personaId: external_exports.string().min(1) }).strict().optional()
+      cloud: external_exports.object({ gatewayUrl: external_exports.string().min(1), personaId: external_exports.string().min(1), publishedByMe: external_exports.boolean().optional() }).strict().optional()
     }).strict();
     PersonaSkillSummarySchema = external_exports.object({
       // 目录名作为 skill name（对齐 CC：frontmatter `name:` 仅作 displayName 用）
@@ -9458,6 +9460,12 @@ var init_methods = __esm({
         summary: "\u67E5 persona \u7684\u98DE\u4E66 bot \u72B6\u6001\uFF08unbound/bound/broken + \u670D\u52A1\u4E2D\u7FA4\u6E05\u5355\uFF09\uFF1Bowner-only",
         args: LarkBotStatusArgs
       },
+      "cloud:larkBot:provision": { summary: "\u4E3A\u672C\u4EBA\u53D1\u5E03\u7684\u4E91 Persona \u626B\u7801\u521B\u5EFA\u98DE\u4E66 Bot\uFF1Bowner-only", args: LarkBotProvisionArgs },
+      "cloud:larkBot:provisionCancel": { summary: "\u53D6\u6D88\u4E91 Persona \u7684\u626B\u7801\u88C5\u914D\uFF1Bowner-only", args: LarkBotProvisionCancelArgs },
+      "cloud:larkBot:bindManual": { summary: "\u4E3A\u672C\u4EBA\u53D1\u5E03\u7684\u4E91 Persona \u624B\u52A8\u7ED1\u5B9A\u98DE\u4E66 Bot\uFF1Bowner-only", args: LarkBotBindManualArgs },
+      "cloud:larkBot:unbind": { summary: "\u89E3\u7ED1\u4E91 Persona \u7684\u98DE\u4E66 Bot\uFF1Bowner-only", args: LarkBotUnbindArgs },
+      "cloud:larkBot:upgrade": { summary: "\u66F4\u65B0\u4E91 Persona \u98DE\u4E66 Bot \u6388\u6743\uFF1Bowner-only", args: LarkBotUpgradeArgs },
+      "cloud:larkBot:status": { summary: "\u67E5\u770B\u4E91 Persona \u98DE\u4E66 Bot \u72B6\u6001\uFF1Bowner-only", args: LarkBotStatusArgs },
       "onboarding:complete": {
         summary: "\u6807\u8BB0\u9996\u542F onboarding \u5B8C\u6210\uFF1A\u5F80 <dataDir>/profile.json \u5199 onboardingCompletedAt\uFF08\u6BEB\u79D2\u65F6\u95F4\u6233\uFF0C\u4FDD\u7559\u5176\u5B83\u5B57\u6BB5\uFF0C\u91CD\u590D\u8C03\u7528\u5E42\u7B49\uFF09\uFF1Binfo ready \u5E27\u643A\u5E26\u8BE5\u5B57\u6BB5\u4F9B UI \u5224\u5B9A\u662F\u5426\u8FDB wizard",
         args: OnboardingCompleteArgs
@@ -63234,42 +63242,124 @@ async function refreshTunnelUrlOnStartup(deps) {
   }
 }
 
-// src/lark-bot-connector/binding-store.ts
-var import_node_fs37 = __toESM(require("fs"), 1);
-var import_node_path42 = __toESM(require("path"), 1);
-function createLarkBotBindingStore(personaRoot) {
-  const filePath = (personaId2) => import_node_path42.default.join(personaRoot, safeFileName(personaId2), ".clawd", "lark-bot.json");
-  const read = (personaId2) => {
-    const file = filePath(personaId2);
-    if (!import_node_fs37.default.existsSync(file)) return null;
-    try {
-      const raw = JSON.parse(import_node_fs37.default.readFileSync(file, "utf8"));
-      if (typeof raw?.appId !== "string" || raw.appId.length === 0) return null;
-      return raw;
-    } catch {
-      return null;
+// src/handlers/cloud-lark-bot.ts
+init_protocol();
+function buildCloudLarkBotHandlers(deps) {
+  const flights = /* @__PURE__ */ new Map();
+  const sleep2 = deps.sleep ?? ((ms) => new Promise((resolve9) => setTimeout(resolve9, ms)));
+  function requireCloudPersona(personaId2, ctx) {
+    if (!ctx || ctx.principal.kind !== "owner") throw new ClawdError(ERROR_CODES.UNAUTHORIZED, "owner only");
+    const persona = deps.getPersona(personaId2);
+    if (!persona?.cloud || !persona.cloud.publishedByMe) {
+      throw new ClawdError(ERROR_CODES.UNAUTHORIZED, "\u53EA\u6709\u4E91 Persona \u7684\u53D1\u5E03\u8005\u80FD\u7BA1\u7406\u98DE\u4E66 Bot");
+    }
+    return persona.cloud.personaId;
+  }
+  const emit = (personaId2, status2) => deps.broadcast({ type: "larkBot:state", personaId: personaId2, ...status2 });
+  async function state(personaId2, gatewayId) {
+    const base = await deps.cloud.status(gatewayId);
+    const flight = flights.get(personaId2);
+    if (!flight || flight.cancelled) return base;
+    return flight.upgrade ? { ...base, upgradeQrUrl: flight.qrUrl, needsUpgrade: true } : { state: "provisioning", qrUrl: flight.qrUrl, groups: [] };
+  }
+  async function poll(personaId2, gatewayId, flight) {
+    const deadline = Date.now() + 60 * 60 * 1e3;
+    let failures = 0;
+    while (flights.get(personaId2) === flight && !flight.cancelled && Date.now() < deadline) {
+      await sleep2(2e3);
+      if (flights.get(personaId2) !== flight || flight.cancelled) return;
+      try {
+        if (flight.upgrade) {
+          const next = await deps.cloud.status(gatewayId);
+          if (next.needsUpgrade !== false) continue;
+        } else {
+          const next = await deps.cloud.provisionStatus(gatewayId, flight.provisionId);
+          if (next.state === "pending") continue;
+          if (next.state === "error") {
+            flights.delete(personaId2);
+            emit(personaId2, { state: "unbound", groups: [], errorReason: "internal_error" });
+            return;
+          }
+        }
+        flights.delete(personaId2);
+        emit(personaId2, await deps.cloud.status(gatewayId));
+        return;
+      } catch (err) {
+        if (++failures < 5) continue;
+        deps.logger?.warn(`cloud bot provision polling failed: ${err.message}`);
+        break;
+      }
     }
+    if (flights.get(personaId2) === flight) {
+      flights.delete(personaId2);
+      emit(personaId2, await deps.cloud.status(gatewayId).catch(() => ({ state: "unbound", groups: [] })));
+    }
+  }
+  const status = async (frame, _client, ctx) => {
+    const { personaId: personaId2 } = parseArgs2(LarkBotStatusArgs, frame, "cloud:larkBot:status");
+    const gatewayId = requireCloudPersona(personaId2, ctx);
+    return { response: { type: "cloud:larkBot:status:ok", ...await state(personaId2, gatewayId) } };
   };
-  const write = (personaId2, meta) => {
-    const file = filePath(personaId2);
-    import_node_fs37.default.mkdirSync(import_node_path42.default.dirname(file), { recursive: true });
-    const tmp = `${file}.tmp-${process.pid}-${Date.now()}-${Math.random().toString(36).slice(2)}`;
-    import_node_fs37.default.writeFileSync(tmp, JSON.stringify(meta, null, 2), { mode: 384 });
-    import_node_fs37.default.renameSync(tmp, file);
+  const provision = async (frame, _client, ctx) => {
+    const { personaId: personaId2 } = parseArgs2(LarkBotProvisionArgs, frame, "cloud:larkBot:provision");
+    const gatewayId = requireCloudPersona(personaId2, ctx);
+    if (flights.has(personaId2)) throw new Error("\u626B\u7801\u5DF2\u5728\u8FDB\u884C");
+    const { provisionId, qrUrl } = await deps.cloud.provision(gatewayId);
+    const flight = { provisionId, qrUrl, cancelled: false, upgrade: false };
+    flights.set(personaId2, flight);
+    emit(personaId2, { state: "provisioning", qrUrl, groups: [] });
+    void poll(personaId2, gatewayId, flight);
+    return { response: { type: "cloud:larkBot:provision:ok" } };
   };
-  return {
-    read,
-    write,
-    remove(personaId2) {
-      import_node_fs37.default.rmSync(filePath(personaId2), { force: true });
-    },
-    addRemovedChat(personaId2, chatId) {
-      const meta = read(personaId2);
-      if (!meta) return;
-      const set = new Set(meta.removedChatIds ?? []);
-      set.add(chatId);
-      write(personaId2, { ...meta, removedChatIds: [...set] });
+  const cancel = async (frame, _client, ctx) => {
+    const { personaId: personaId2 } = parseArgs2(LarkBotProvisionCancelArgs, frame, "cloud:larkBot:provisionCancel");
+    const gatewayId = requireCloudPersona(personaId2, ctx);
+    const flight = flights.get(personaId2);
+    if (flight) {
+      flight.cancelled = true;
+      flights.delete(personaId2);
+      await deps.cloud.cancel(gatewayId, flight.provisionId);
+    } else {
+      const remote = await deps.cloud.status(gatewayId);
+      if (remote.state === "provisioning" && remote.provisionId) {
+        await deps.cloud.cancel(gatewayId, remote.provisionId);
+      }
     }
+    emit(personaId2, await deps.cloud.status(gatewayId));
+    return { response: { type: "cloud:larkBot:provisionCancel:ok" } };
+  };
+  const bindManual = async (frame, _client, ctx) => {
+    const { personaId: personaId2, appId, appSecret, botName } = parseArgs2(LarkBotBindManualArgs, frame, "cloud:larkBot:bindManual");
+    const gatewayId = requireCloudPersona(personaId2, ctx);
+    await deps.cloud.bindManual(gatewayId, appId, appSecret, botName ?? gatewayId);
+    emit(personaId2, await deps.cloud.status(gatewayId));
+    return { response: { type: "cloud:larkBot:bindManual:ok" } };
+  };
+  const unbind = async (frame, _client, ctx) => {
+    const { personaId: personaId2 } = parseArgs2(LarkBotUnbindArgs, frame, "cloud:larkBot:unbind");
+    const gatewayId = requireCloudPersona(personaId2, ctx);
+    await deps.cloud.unbind(gatewayId);
+    emit(personaId2, { state: "unbound", groups: [] });
+    return { response: { type: "cloud:larkBot:unbind:ok" } };
+  };
+  const upgrade = async (frame, _client, ctx) => {
+    const { personaId: personaId2 } = parseArgs2(LarkBotUpgradeArgs, frame, "cloud:larkBot:upgrade");
+    const gatewayId = requireCloudPersona(personaId2, ctx);
+    if (flights.has(personaId2)) throw new Error("\u626B\u7801\u5DF2\u5728\u8FDB\u884C");
+    const { provisionId, qrUrl } = await deps.cloud.upgrade(gatewayId);
+    const flight = { provisionId, qrUrl, cancelled: false, upgrade: true };
+    flights.set(personaId2, flight);
+    emit(personaId2, await state(personaId2, gatewayId));
+    void poll(personaId2, gatewayId, flight);
+    return { response: { type: "cloud:larkBot:upgrade:ok" } };
+  };
+  return {
+    "cloud:larkBot:status": status,
+    "cloud:larkBot:provision": provision,
+    "cloud:larkBot:provisionCancel": cancel,
+    "cloud:larkBot:bindManual": bindManual,
+    "cloud:larkBot:unbind": unbind,
+    "cloud:larkBot:upgrade": upgrade
   };
 }
 
@@ -63412,6 +63502,77 @@ function createLarkBotCloudClient(opts) {
   };
 }
 
+// src/lark-bot-connector/cloud-persona-client.ts
+function createCloudPersonaBotClient(opts) {
+  const f2 = opts.fetchImpl ?? fetch;
+  const base = opts.api.replace(/\/+$/, "");
+  const route = (personaId2) => `/api/lark-bot/cloud/${encodeURIComponent(personaId2)}`;
+  async function request(method, path106, body) {
+    const pass = opts.getLoginPass();
+    if (!pass) throw new LarkBotCloudError("\u98DE\u4E66\u767B\u5F55\u540E\u624D\u80FD\u7BA1\u7406\u4E91 Persona \u7684 Bot", 401);
+    const response = await f2(base + path106, {
+      method,
+      headers: { authorization: `Bearer ${pass}`, "content-type": "application/json" },
+      ...body ? { body: JSON.stringify(body) } : {},
+      signal: AbortSignal.timeout(15e3)
+    });
+    const json = await response.json().catch(() => ({}));
+    if (!response.ok) {
+      const detail = typeof json.message === "string" ? json.message : `HTTP ${response.status}`;
+      throw new LarkBotCloudError(`cloud bot ${method} ${path106}: ${detail}`, response.status);
+    }
+    return json;
+  }
+  return {
+    status: async (personaId2) => await request("GET", `${route(personaId2)}/status`),
+    provision: async (personaId2) => await request("POST", `${route(personaId2)}/provision`),
+    provisionStatus: async (personaId2, provisionId) => await request("GET", `${route(personaId2)}/provision/${encodeURIComponent(provisionId)}`),
+    cancel: async (personaId2, provisionId) => await request("DELETE", `${route(personaId2)}/provision/${encodeURIComponent(provisionId)}`),
+    upgrade: async (personaId2) => await request("POST", `${route(personaId2)}/upgrade`),
+    bindManual: async (personaId2, appId, appSecret, botName) => await request("PUT", `${route(personaId2)}/bind`, { personaId: personaId2, appId, appSecret, botName }),
+    unbind: async (personaId2) => await request("DELETE", `${route(personaId2)}/bind`)
+  };
+}
+
+// src/lark-bot-connector/binding-store.ts
+var import_node_fs37 = __toESM(require("fs"), 1);
+var import_node_path42 = __toESM(require("path"), 1);
+function createLarkBotBindingStore(personaRoot) {
+  const filePath = (personaId2) => import_node_path42.default.join(personaRoot, safeFileName(personaId2), ".clawd", "lark-bot.json");
+  const read = (personaId2) => {
+    const file = filePath(personaId2);
+    if (!import_node_fs37.default.existsSync(file)) return null;
+    try {
+      const raw = JSON.parse(import_node_fs37.default.readFileSync(file, "utf8"));
+      if (typeof raw?.appId !== "string" || raw.appId.length === 0) return null;
+      return raw;
+    } catch {
+      return null;
+    }
+  };
+  const write = (personaId2, meta) => {
+    const file = filePath(personaId2);
+    import_node_fs37.default.mkdirSync(import_node_path42.default.dirname(file), { recursive: true });
+    const tmp = `${file}.tmp-${process.pid}-${Date.now()}-${Math.random().toString(36).slice(2)}`;
+    import_node_fs37.default.writeFileSync(tmp, JSON.stringify(meta, null, 2), { mode: 384 });
+    import_node_fs37.default.renameSync(tmp, file);
+  };
+  return {
+    read,
+    write,
+    remove(personaId2) {
+      import_node_fs37.default.rmSync(filePath(personaId2), { force: true });
+    },
+    addRemovedChat(personaId2, chatId) {
+      const meta = read(personaId2);
+      if (!meta) return;
+      const set = new Set(meta.removedChatIds ?? []);
+      set.add(chatId);
+      write(personaId2, { ...meta, removedChatIds: [...set] });
+    }
+  };
+}
+
 // src/lark-bot-connector/chat-router.ts
 var import_node_fs38 = __toESM(require("fs"), 1);
 var import_node_path43 = __toESM(require("path"), 1);
@@ -64367,7 +64528,7 @@ var CloudApiKeyRequiredError = class extends Error {
   }
 };
 var CLOUD_PERSONA_ID_SUFFIX = "-cloud";
-function cloudPersonaToFile(p3) {
+function cloudPersonaToFile(p3, publishedByMe = false) {
   const at3 = p3.registeredAt ?? 0;
   return {
     personaId: p3.personaId + CLOUD_PERSONA_ID_SUFFIX,
@@ -64378,7 +64539,7 @@ function cloudPersonaToFile(p3) {
     public: false,
     createdAt: at3,
     updatedAt: at3,
-    cloud: { gatewayUrl: p3.gatewayUrl, personaId: p3.personaId }
+    cloud: { gatewayUrl: p3.gatewayUrl, personaId: p3.personaId, ...publishedByMe ? { publishedByMe: true } : {} }
   };
 }
 var CloudGatewayClient = class {
@@ -73122,6 +73283,12 @@ var METHOD_GRANT_MAP = {
   "larkBot:unbind": ADMIN_ANY,
   "larkBot:status": ADMIN_ANY,
   "larkBot:upgrade": ADMIN_ANY,
+  "cloud:larkBot:provision": ADMIN_ANY,
+  "cloud:larkBot:provisionCancel": ADMIN_ANY,
+  "cloud:larkBot:bindManual": ADMIN_ANY,
+  "cloud:larkBot:unbind": ADMIN_ANY,
+  "cloud:larkBot:status": ADMIN_ANY,
+  "cloud:larkBot:upgrade": ADMIN_ANY,
   // ---- onboarding:* / tools:probe / session:externalScan（首启 wizard，owner-only）----
   "onboarding:complete": ADMIN_ANY,
   "onboarding:iosInterest": ADMIN_ANY,
@@ -73264,7 +73431,7 @@ function computeMethodAccess(args) {
 }
 
 // src/version.ts
-var version = "0.2.605".length > 0 ? "0.2.605" : "dev";
+var version = "0.2.607".length > 0 ? "0.2.607" : "dev";
 
 // src/cli-probe/probe.ts
 var fs83 = __toESM(require("fs"), 1);
@@ -76426,7 +76593,17 @@ async function startDaemon(config) {
   const refreshCloudPersonas = async () => {
     try {
       const list = await cloudGateway.listPersonas();
-      const shadowed = personaRegistry.setCloudSnapshot(list.map(cloudPersonaToFile));
+      const loginPass = ownerIdentityStore.read()?.loginPass;
+      const publishedIds = /* @__PURE__ */ new Set();
+      if (loginPass) {
+        try {
+          const visible = await centralVisiblePersonas({ api: config.clawosApi ?? DEFAULT_CLAWOS_API, loginPass });
+          for (const id of visible.personaIds) publishedIds.add(id);
+        } catch (err) {
+          logger.warn("cloud bot publisher lookup failed; binding controls hidden", { reason: err.message });
+        }
+      }
+      const shadowed = personaRegistry.setCloudSnapshot(list.map((p3) => cloudPersonaToFile(p3, publishedIds.has(p3.personaId))));
       if (shadowed.length > 0) {
         logger.warn("cloud personas shadowed by local personas with the same id", { personaIds: shadowed });
       }
@@ -77056,6 +77233,15 @@ async function startDaemon(config) {
     logger: { warn: (msg) => logger.warn(msg) }
   };
   Object.assign(handlers, buildLarkBotHandlers(larkBotDeps));
+  Object.assign(handlers, buildCloudLarkBotHandlers({
+    getPersona: (personaId2) => personaRegistry.get(personaId2),
+    cloud: createCloudPersonaBotClient({
+      api: config.clawosApi ?? DEFAULT_CLAWOS_API,
+      getLoginPass: () => ownerIdentityStore.read()?.loginPass ?? null
+    }),
+    broadcast: (frame) => wsServer?.broadcastToOwners(frame),
+    logger: { warn: (message) => logger.warn(message) }
+  }));
   Object.assign(
     handlers,
     buildOnboardingHandlers({