@clawos-dev/clawd 0.2.286 → 0.2.287

package/dist/cli.cjs

@@ -6585,15 +6585,14 @@ var init_shift_internal = __esm({
 });
 
 // ../protocol/src/lark-bot-schemas.ts
-var LarkBotProvisionArgs, LarkBotProvisionCancelArgs, LarkBotUnbindArgs, LarkBotStatusArgs, LarkBotBindManualArgs, LarkBotGroupSchema, LarkBotStatusResultSchema, LarkBotStateFrameSchema;
+var LarkBotPersonaArgs, LarkBotUnbindArgs, LarkBotStatusArgs, LarkBotBindManualArgs, LarkBotGroupSchema, LarkBotStatusResultSchema, LarkBotStateFrameSchema;
 var init_lark_bot_schemas = __esm({
   "../protocol/src/lark-bot-schemas.ts"() {
     "use strict";
     init_zod();
-    LarkBotProvisionArgs = external_exports.object({ personaId: external_exports.string().min(1) });
-    LarkBotProvisionCancelArgs = LarkBotProvisionArgs;
-    LarkBotUnbindArgs = LarkBotProvisionArgs;
-    LarkBotStatusArgs = LarkBotProvisionArgs;
+    LarkBotPersonaArgs = external_exports.object({ personaId: external_exports.string().min(1) });
+    LarkBotUnbindArgs = LarkBotPersonaArgs;
+    LarkBotStatusArgs = LarkBotPersonaArgs;
     LarkBotBindManualArgs = external_exports.object({
       personaId: external_exports.string().min(1),
       appId: external_exports.string().min(1),
@@ -6607,14 +6606,9 @@ var init_lark_bot_schemas = __esm({
       lastActiveAt: external_exports.number().int().optional()
     });
     LarkBotStatusResultSchema = external_exports.object({
-      state: external_exports.enum(["unbound", "provisioning", "bound", "broken"]),
+      state: external_exports.enum(["unbound", "bound", "broken"]),
       appId: external_exports.string().optional(),
       botName: external_exports.string().optional(),
-      /** state='provisioning' 时的当前步骤与待用户打开的授权 URL */
-      provisioning: external_exports.object({
-        step: external_exports.enum(["register", "authorize"]),
-        verificationUrl: external_exports.string().optional()
-      }).optional(),
       brokenReason: external_exports.string().optional(),
       groups: external_exports.array(LarkBotGroupSchema)
     });
@@ -8028,16 +8022,8 @@ var init_methods = __esm({
         summary: "\u67E5 shift \u7684\u6267\u884C\u5386\u53F2\uFF08\u4EC5\u521B\u5EFA\u8005\uFF09",
         args: ShiftInternalHistoryArgs
       },
-      "larkBot:provision": {
-        summary: "\u53D1\u8D77 persona \u7684\u98DE\u4E66 bot \u4E00\u952E\u88C5\u914D\uFF08\u5EFA app + \u6388 scope\uFF09\uFF0C\u8FDB\u5EA6\u4E0E\u6388\u6743 URL \u8D70 larkBot:state \u5E27\uFF1Bowner-only",
-        args: LarkBotProvisionArgs
-      },
-      "larkBot:provisionCancel": {
-        summary: "\u53D6\u6D88\u8FDB\u884C\u4E2D\u7684\u98DE\u4E66 bot \u88C5\u914D\u6D41\u7A0B\uFF1Bowner-only",
-        args: LarkBotProvisionCancelArgs
-      },
       "larkBot:bindManual": {
-        summary: "\u624B\u586B app_id/app_secret \u76F4\u63A5\u7ED1\u5B9A\u98DE\u4E66 bot\uFF08\u88C5\u914D\u9003\u751F\u8231\uFF09\uFF1Bowner-only",
+        summary: "\u624B\u586B app_id/app_secret \u7ED1\u5B9A\u73B0\u6709\u98DE\u4E66 bot\uFF08\u552F\u4E00\u7ED1\u5B9A\u5165\u53E3\uFF09\uFF1Bowner-only",
         args: LarkBotBindManualArgs
       },
       "larkBot:unbind": {
@@ -8045,7 +8031,7 @@ var init_methods = __esm({
         args: LarkBotUnbindArgs
       },
       "larkBot:status": {
-        summary: "\u67E5 persona \u7684\u98DE\u4E66 bot \u72B6\u6001\uFF08unbound/provisioning/bound/broken + \u670D\u52A1\u4E2D\u7FA4\u6E05\u5355\uFF09\uFF1Bowner-only",
+        summary: "\u67E5 persona \u7684\u98DE\u4E66 bot \u72B6\u6001\uFF08unbound/bound/broken + \u670D\u52A1\u4E2D\u7FA4\u6E05\u5355\uFF09\uFF1Bowner-only",
         args: LarkBotStatusArgs
       },
       "skills:list": {
@@ -51722,163 +51708,6 @@ function buildShiftInternalHandlers(deps) {
   };
 }
 
-// src/lark-bot-connector/provisioner.ts
-var LARK_BOT_V1_SCOPES = [
-  "offline_access",
-  "im:chat:readonly",
-  "im:resource",
-  "contact:user.base:readonly"
-];
-var REGISTRATION_URL = "https://accounts.feishu.cn/oauth/v1/app/registration";
-var DEVICE_AUTHORIZE_URL = "https://accounts.feishu.cn/oauth/v1/device/authorize";
-var DEVICE_TOKEN_URL = "https://open.feishu.cn/open-apis/authen/v2/oauth/token";
-var DEFAULT_POLL_INTERVAL_MS = 6e3;
-var DEFAULT_TIMEOUT_MS2 = 10 * 60 * 1e3;
-var SLOW_DOWN_STEP_MS = 5e3;
-var FlowCtx = class {
-  fetchImpl;
-  sleep;
-  now;
-  timeoutMs;
-  intervalMs;
-  cancelled = false;
-  constructor(opts) {
-    const f = opts.fetchImpl ?? globalThis.fetch;
-    if (!f) throw new Error("fetch is not available (Node >= 18 required)");
-    this.fetchImpl = f;
-    this.sleep = opts.sleepImpl ?? ((ms) => new Promise((r) => setTimeout(r, ms)));
-    this.now = opts.nowImpl ?? Date.now;
-    this.timeoutMs = opts.timeoutMs ?? DEFAULT_TIMEOUT_MS2;
-    this.intervalMs = opts.pollIntervalMs ?? DEFAULT_POLL_INTERVAL_MS;
-  }
-  /**
-   * RFC 8628 轮询循环：pollOnce 返回 null 表示 pending 继续；'slow_down' 加间隔；
-   * 非 null 结果即完成。超时 / cancel reject。
-   */
-  async poll(pollOnce) {
-    const start = this.now();
-    for (; ; ) {
-      if (this.cancelled) throw new Error("flow cancelled");
-      if (this.now() - start >= this.timeoutMs) throw new Error("flow timeout");
-      const r = await pollOnce();
-      if (r === "slow_down") {
-        this.intervalMs += SLOW_DOWN_STEP_MS;
-      } else if (r !== "pending") {
-        return r;
-      }
-      await this.sleep(this.intervalMs);
-    }
-  }
-};
-var POST_TIMEOUT_MS = 15e3;
-async function postJson(ctx, url, body) {
-  const ac = new AbortController();
-  const timer = setTimeout(() => ac.abort(), POST_TIMEOUT_MS);
-  let res;
-  try {
-    res = await ctx.fetchImpl(url, {
-      method: "POST",
-      headers: { "content-type": "application/json" },
-      body: JSON.stringify(body),
-      signal: ac.signal
-    });
-  } finally {
-    clearTimeout(timer);
-  }
-  let parsed = {};
-  try {
-    parsed = await res.json();
-  } catch {
-    parsed = {};
-  }
-  return { status: res.status, json: parsed };
-}
-var TERMINAL_OAUTH_ERRORS = /* @__PURE__ */ new Set(["access_denied", "expired_token", "invalid_grant"]);
-function pollSignal(status, json, what) {
-  if (status >= 200 && status < 300) return "done";
-  const err = String(json.error ?? "");
-  if (TERMINAL_OAUTH_ERRORS.has(err)) {
-    throw new Error(`${what} rejected: ${err}`);
-  }
-  if (err === "authorization_pending" || status === 400) {
-    if (err === "slow_down") return "slow_down";
-    if (err === "authorization_pending") return "pending";
-    return "pending";
-  }
-  if (status === 429) return "slow_down";
-  throw new Error(`${what} failed: HTTP ${status} ${JSON.stringify(json).slice(0, 200)}`);
-}
-async function startAppRegistration(opts = {}) {
-  const ctx = new FlowCtx(opts);
-  const init = await postJson(ctx, REGISTRATION_URL, { action: "start", brand: "feishu" });
-  const verificationUrl = String(init.json.verification_url ?? init.json.verification_uri ?? "");
-  const flowId = String(init.json.flow_id ?? "");
-  if (init.status < 200 || init.status >= 300 || !verificationUrl || !flowId) {
-    throw new Error(
-      `app registration start failed: HTTP ${init.status} ${JSON.stringify(init.json).slice(0, 200)}`
-    );
-  }
-  return {
-    verificationUrl,
-    cancel: () => {
-      ctx.cancelled = true;
-    },
-    complete: () => ctx.poll(async () => {
-      const r = await postJson(ctx, REGISTRATION_URL, {
-        action: "poll",
-        brand: "feishu",
-        flow_id: flowId
-      });
-      const sig = pollSignal(r.status, r.json, "app registration");
-      if (sig !== "done") return sig;
-      const appId = String(r.json.client_id ?? "");
-      const appSecret = String(r.json.client_secret ?? "");
-      if (!appId || !appSecret) {
-        throw new Error("app registration succeeded but missing client_id or client_secret");
-      }
-      return { appId, appSecret };
-    })
-  };
-}
-async function startScopeAuthorization(args) {
-  const ctx = new FlowCtx(args);
-  const init = await postJson(ctx, DEVICE_AUTHORIZE_URL, {
-    client_id: args.appId,
-    scope: args.scopes.join(" ")
-  });
-  const verificationUrl = String(init.json.verification_url ?? init.json.verification_uri ?? "");
-  const deviceCode = String(init.json.device_code ?? "");
-  if (init.status < 200 || init.status >= 300 || !verificationUrl || !deviceCode) {
-    throw new Error(
-      `scope authorization start failed: HTTP ${init.status} ${JSON.stringify(init.json).slice(0, 200)}`
-    );
-  }
-  return {
-    verificationUrl,
-    cancel: () => {
-      ctx.cancelled = true;
-    },
-    complete: () => ctx.poll(async () => {
-      const r = await postJson(ctx, DEVICE_TOKEN_URL, {
-        grant_type: "urn:ietf:params:oauth:grant-type:device_code",
-        client_id: args.appId,
-        device_code: deviceCode
-      });
-      const sig = pollSignal(r.status, r.json, "scope authorization");
-      if (sig !== "done") return sig;
-      const grantedSet = new Set(
-        String(r.json.scope ?? "").split(/\s+/).filter(Boolean)
-      );
-      const granted = args.scopes.filter((s) => grantedSet.has(s));
-      const denied = args.scopes.filter((s) => !grantedSet.has(s));
-      if (granted.length === 0) {
-        throw new Error(`scope authorization: no scopes granted (requested: ${args.scopes.join(" ")})`);
-      }
-      return { granted: [...granted], denied: [...denied] };
-    })
-  };
-}
-
 // src/handlers/lark-bot.ts
 init_protocol();
 function statusFrame(personaId2, status) {
@@ -51886,7 +51715,6 @@ function statusFrame(personaId2, status) {
 }
 function buildLarkBotHandlers(deps) {
   const now = deps.now ?? Date.now;
-  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));
@@ -51894,82 +51722,6 @@ function buildLarkBotHandlers(deps) {
   const emit = (personaId2, status2) => {
     deps.broadcast(statusFrame(personaId2, status2));
   };
-  const runProvision = async (personaId2, flight) => {
-    const finish = () => {
-      if (inFlight.get(personaId2) === flight) inFlight.delete(personaId2);
-    };
-    const tunnelUrl = deps.getTunnelUrl();
-    const ownerId = deps.getOwnerId();
-    if (!tunnelUrl || !ownerId) {
-      finish();
-      emit(personaId2, { state: "unbound", brokenReason: "tunnel or owner identity unavailable", groups: [] });
-      return;
-    }
-    try {
-      const reg = await deps.provisioner.startAppRegistration();
-      if (flight.cancelled) return finish();
-      flight.cancelFn = reg.cancel;
-      emit(personaId2, {
-        state: "provisioning",
-        provisioning: { step: "register", verificationUrl: reg.verificationUrl },
-        groups: []
-      });
-      const { appId, appSecret } = await reg.complete();
-      if (flight.cancelled) return finish();
-      const auth = await deps.provisioner.startScopeAuthorization({
-        appId,
-        scopes: LARK_BOT_V1_SCOPES
-      });
-      if (flight.cancelled) return finish();
-      flight.cancelFn = auth.cancel;
-      emit(personaId2, {
-        state: "provisioning",
-        provisioning: { step: "authorize", verificationUrl: auth.verificationUrl },
-        groups: []
-      });
-      const { denied } = await auth.complete();
-      if (flight.cancelled) return finish();
-      if (denied.length > 0) {
-        deps.logger?.warn(`larkBot provision ${personaId2}: scopes denied (accepted): ${denied.join(" ")}`);
-      }
-      const botName = deps.getPersonaName(personaId2) ?? personaId2;
-      await deps.cloud.bind({ personaId: personaId2, appId, appSecret, botName, tunnelUrl, ownerId });
-      deps.store.write(personaId2, { appId, botName, boundAt: now() });
-      finish();
-      emit(personaId2, { state: "bound", appId, botName, groups: groupsOf(personaId2) });
-    } catch (err) {
-      finish();
-      if (flight.cancelled) return;
-      emit(personaId2, {
-        state: "unbound",
-        brokenReason: err.message,
-        groups: []
-      });
-    }
-  };
-  const provision = async (frame) => {
-    const { personaId: personaId2 } = parseArgs2(LarkBotProvisionArgs, frame, "larkBot:provision");
-    if (deps.store.read(personaId2)) throw new Error(`larkBot already bound: ${personaId2}`);
-    if (inFlight.has(personaId2)) throw new Error(`larkBot provision already in progress: ${personaId2}`);
-    if (!deps.getTunnelUrl()) throw new Error("larkBot provision requires tunnel to be up");
-    if (!deps.getOwnerId()) throw new Error("larkBot provision requires feishu login (owner identity)");
-    const flight = { cancelled: false, cancelFn: () => {
-    } };
-    inFlight.set(personaId2, flight);
-    void runProvision(personaId2, flight);
-    return { response: { type: "larkBot:provision:ok" } };
-  };
-  const provisionCancel = async (frame) => {
-    const { personaId: personaId2 } = parseArgs2(LarkBotProvisionCancelArgs, frame, "larkBot:provisionCancel");
-    const flight = inFlight.get(personaId2);
-    if (flight) {
-      flight.cancelled = true;
-      inFlight.delete(personaId2);
-      flight.cancelFn();
-    }
-    emit(personaId2, { state: "unbound", groups: [] });
-    return { response: { type: "larkBot:provisionCancel:ok" } };
-  };
   const bindManual = async (frame) => {
     const { personaId: personaId2, appId, appSecret, botName } = parseArgs2(
       LarkBotBindManualArgs,
@@ -52025,8 +51777,6 @@ 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
@@ -57082,11 +56832,11 @@ var DeviceBindingClientError = class extends Error {
   code;
   cause;
 };
-var DEFAULT_TIMEOUT_MS3 = 8e3;
+var DEFAULT_TIMEOUT_MS2 = 8e3;
 async function upsertDeviceBinding(opts) {
   const doFetch = opts.fetchImpl ?? fetch;
   const ac = new AbortController();
-  const timer = setTimeout(() => ac.abort(), opts.timeoutMs ?? DEFAULT_TIMEOUT_MS3);
+  const timer = setTimeout(() => ac.abort(), opts.timeoutMs ?? DEFAULT_TIMEOUT_MS2);
   const body = { unionId: opts.unionId };
   if (opts.avatarUrl != null) body.avatarUrl = opts.avatarUrl;
   let res;
@@ -58827,9 +58577,7 @@ var METHOD_GRANT_MAP = {
   "shift-internal:cancel": ADMIN_ANY,
   "shift-internal:update": ADMIN_ANY,
   "shift-internal:history": ADMIN_ANY,
-  // ---- larkBot:* (LarkBotConnector 装配/状态，owner-only) ----
-  "larkBot:provision": ADMIN_ANY,
-  "larkBot:provisionCancel": ADMIN_ANY,
+  // ---- larkBot:* (LarkBotConnector 绑定/状态，owner-only) ----
   "larkBot:bindManual": ADMIN_ANY,
   "larkBot:unbind": ADMIN_ANY,
   "larkBot:status": ADMIN_ANY,
@@ -58964,7 +58712,7 @@ function computeMethodAccess(args) {
 }
 
 // src/version.ts
-var version = "0.2.286".length > 0 ? "0.2.286" : "dev";
+var version = "0.2.287".length > 0 ? "0.2.287" : "dev";
 
 // src/cli-probe/probe.ts
 var fs55 = __toESM(require("fs"), 1);
@@ -61221,11 +60969,11 @@ init_protocol();
 // src/peer-ops/run-command.ts
 var import_node_child_process14 = require("child_process");
 var import_node_os21 = __toESM(require("os"), 1);
-var DEFAULT_TIMEOUT_MS4 = 3e4;
+var DEFAULT_TIMEOUT_MS3 = 3e4;
 var MAX_TIMEOUT_MS = 3e5;
 var MAX_OUTPUT_BYTES = 1048576;
 function runCommand(command, opts = {}) {
-  const timeoutMs = Math.min(opts.timeoutMs ?? DEFAULT_TIMEOUT_MS4, MAX_TIMEOUT_MS);
+  const timeoutMs = Math.min(opts.timeoutMs ?? DEFAULT_TIMEOUT_MS3, MAX_TIMEOUT_MS);
   return new Promise((resolve6) => {
     const child = (0, import_node_child_process14.spawn)("bash", ["-c", command], { cwd: import_node_os21.default.homedir() });
     const out = [];
@@ -62988,7 +62736,6 @@ async function startDaemon(config) {
     logger: { warn: (msg) => logger.warn(msg) }
   });
   const larkBotDeps = {
-    provisioner: { startAppRegistration, startScopeAuthorization },
     cloud: larkBotCloud,
     store: larkBotStore,
     broadcast: (frame) => wsServer?.broadcastToOwners(frame),

package/dist/dispatch/mcp-server.cjs

@@ -21791,10 +21791,9 @@ var ShiftInternalHistoryArgs = external_exports.object({
 });
 
 // ../protocol/src/lark-bot-schemas.ts
-var LarkBotProvisionArgs = external_exports.object({ personaId: external_exports.string().min(1) });
-var LarkBotProvisionCancelArgs = LarkBotProvisionArgs;
-var LarkBotUnbindArgs = LarkBotProvisionArgs;
-var LarkBotStatusArgs = LarkBotProvisionArgs;
+var LarkBotPersonaArgs = external_exports.object({ personaId: external_exports.string().min(1) });
+var LarkBotUnbindArgs = LarkBotPersonaArgs;
+var LarkBotStatusArgs = LarkBotPersonaArgs;
 var LarkBotBindManualArgs = external_exports.object({
   personaId: external_exports.string().min(1),
   appId: external_exports.string().min(1),
@@ -21808,14 +21807,9 @@ var LarkBotGroupSchema = external_exports.object({
   lastActiveAt: external_exports.number().int().optional()
 });
 var LarkBotStatusResultSchema = external_exports.object({
-  state: external_exports.enum(["unbound", "provisioning", "bound", "broken"]),
+  state: external_exports.enum(["unbound", "bound", "broken"]),
   appId: external_exports.string().optional(),
   botName: external_exports.string().optional(),
-  /** state='provisioning' 时的当前步骤与待用户打开的授权 URL */
-  provisioning: external_exports.object({
-    step: external_exports.enum(["register", "authorize"]),
-    verificationUrl: external_exports.string().optional()
-  }).optional(),
   brokenReason: external_exports.string().optional(),
   groups: external_exports.array(LarkBotGroupSchema)
 });
@@ -23134,16 +23128,8 @@ var METHOD_DOCS = {
     summary: "\u67E5 shift \u7684\u6267\u884C\u5386\u53F2\uFF08\u4EC5\u521B\u5EFA\u8005\uFF09",
     args: ShiftInternalHistoryArgs
   },
-  "larkBot:provision": {
-    summary: "\u53D1\u8D77 persona \u7684\u98DE\u4E66 bot \u4E00\u952E\u88C5\u914D\uFF08\u5EFA app + \u6388 scope\uFF09\uFF0C\u8FDB\u5EA6\u4E0E\u6388\u6743 URL \u8D70 larkBot:state \u5E27\uFF1Bowner-only",
-    args: LarkBotProvisionArgs
-  },
-  "larkBot:provisionCancel": {
-    summary: "\u53D6\u6D88\u8FDB\u884C\u4E2D\u7684\u98DE\u4E66 bot \u88C5\u914D\u6D41\u7A0B\uFF1Bowner-only",
-    args: LarkBotProvisionCancelArgs
-  },
   "larkBot:bindManual": {
-    summary: "\u624B\u586B app_id/app_secret \u76F4\u63A5\u7ED1\u5B9A\u98DE\u4E66 bot\uFF08\u88C5\u914D\u9003\u751F\u8231\uFF09\uFF1Bowner-only",
+    summary: "\u624B\u586B app_id/app_secret \u7ED1\u5B9A\u73B0\u6709\u98DE\u4E66 bot\uFF08\u552F\u4E00\u7ED1\u5B9A\u5165\u53E3\uFF09\uFF1Bowner-only",
     args: LarkBotBindManualArgs
   },
   "larkBot:unbind": {
@@ -23151,7 +23137,7 @@ var METHOD_DOCS = {
     args: LarkBotUnbindArgs
   },
   "larkBot:status": {
-    summary: "\u67E5 persona \u7684\u98DE\u4E66 bot \u72B6\u6001\uFF08unbound/provisioning/bound/broken + \u670D\u52A1\u4E2D\u7FA4\u6E05\u5355\uFF09\uFF1Bowner-only",
+    summary: "\u67E5 persona \u7684\u98DE\u4E66 bot \u72B6\u6001\uFF08unbound/bound/broken + \u670D\u52A1\u4E2D\u7FA4\u6E05\u5355\uFF09\uFF1Bowner-only",
     args: LarkBotStatusArgs
   },
   "skills:list": {