@clawos-dev/clawd 0.2.251 → 0.2.253

package/dist/cli.cjs

@@ -148,12 +148,6 @@ var init_methods = __esm({
       "attachment.groupAdd",
       "attachment.groupRemove",
       "attachment.groupList",
-      // ---- capability:* (capability platform 鉴权底座) ----
-      // 飞书统一身份 Phase 2 (2026-06-01, spec 决策 #12): personal token / 邀请码全链路删除——
-      // device:connect 已完整替代（中心 server 签发自包含 connect token）。capability:list / capability:delete
-      // 保留：调试 + whoami 反查 + 撤销级联 + 清旧 per-peer cap。personal-cap:get 已下线。
-      "capability:list",
-      "capability:delete",
       // ---- inbox:* (capability platform Phase 3 跨用户通知 + Phase 4 DM) ----
       // owner 接 guest 的 cross-principal 消息事件 + DM 双向私聊.
       // inbox:list / markRead: admin-only (Phase 3); inbox:postMessage: DM 自带能力,
@@ -5643,11 +5637,7 @@ var init_persona_mode = __esm({
 });
 
 // ../protocol/src/capability.ts
-function stripSecretHash(cap) {
-  const { secretHash: _hash, ...wire } = cap;
-  return wire;
-}
-var ResourceSchema, ActionSchema, GrantSchema, CapabilitySchema, CapabilityWireSchema, CapabilityErrorCodeSchema, WhoamiResponseSchema, PERSONAL_CAP_GRANTS;
+var ResourceSchema, ActionSchema, GrantSchema, CapabilitySchema, CapabilityWireSchema, WhoamiResponseSchema, PERSONAL_CAP_GRANTS;
 var init_capability = __esm({
   "../protocol/src/capability.ts"() {
     "use strict";
@@ -5688,12 +5678,6 @@ var init_capability = __esm({
       peerDisplayName: external_exports.string().optional()
     }).strict();
     CapabilityWireSchema = CapabilitySchema.omit({ secretHash: true });
-    CapabilityErrorCodeSchema = external_exports.enum([
-      "TOKEN_INVALID",
-      "TOKEN_REVOKED",
-      "TOKEN_EXPIRED",
-      "TOKEN_EXHAUSTED"
-    ]);
     WhoamiResponseSchema = external_exports.object({
       type: external_exports.literal("whoami:ok"),
       owner: external_exports.object({
@@ -6099,9 +6083,6 @@ var init_feishu_auth = __esm({
     "use strict";
     init_zod();
     FEISHU_GATED_METHODS = [
-      // capability（调试 / 撤销，仍属远程身份体系）
-      "capability:list",
-      "capability:delete",
       // 联系人列表（device:connect 落同一 store；list 读 / remove 删）
       "contact:list",
       "contact:remove",
@@ -7527,7 +7508,7 @@ var require_atomic_sleep = __commonJS({
 var require_sonic_boom = __commonJS({
   "../node_modules/.pnpm/sonic-boom@4.2.1/node_modules/sonic-boom/index.js"(exports2, module2) {
     "use strict";
-    var fs66 = require("fs");
+    var fs65 = require("fs");
     var EventEmitter3 = require("events");
     var inherits = require("util").inherits;
     var path74 = require("path");
@@ -7584,20 +7565,20 @@ var require_sonic_boom = __commonJS({
       const mode = sonic.mode;
       if (sonic.sync) {
         try {
-          if (sonic.mkdir) fs66.mkdirSync(path74.dirname(file), { recursive: true });
-          const fd = fs66.openSync(file, flags, mode);
+          if (sonic.mkdir) fs65.mkdirSync(path74.dirname(file), { recursive: true });
+          const fd = fs65.openSync(file, flags, mode);
           fileOpened(null, fd);
         } catch (err) {
           fileOpened(err);
           throw err;
         }
       } else if (sonic.mkdir) {
-        fs66.mkdir(path74.dirname(file), { recursive: true }, (err) => {
+        fs65.mkdir(path74.dirname(file), { recursive: true }, (err) => {
           if (err) return fileOpened(err);
-          fs66.open(file, flags, mode, fileOpened);
+          fs65.open(file, flags, mode, fileOpened);
         });
       } else {
-        fs66.open(file, flags, mode, fileOpened);
+        fs65.open(file, flags, mode, fileOpened);
       }
     }
     function SonicBoom(opts) {
@@ -7638,8 +7619,8 @@ var require_sonic_boom = __commonJS({
         this.flush = flushBuffer;
         this.flushSync = flushBufferSync;
         this._actualWrite = actualWriteBuffer;
-        fsWriteSync = () => fs66.writeSync(this.fd, this._writingBuf);
-        fsWrite = () => fs66.write(this.fd, this._writingBuf, this.release);
+        fsWriteSync = () => fs65.writeSync(this.fd, this._writingBuf);
+        fsWrite = () => fs65.write(this.fd, this._writingBuf, this.release);
       } else if (contentMode === void 0 || contentMode === kContentModeUtf8) {
         this._writingBuf = "";
         this.write = write;
@@ -7648,15 +7629,15 @@ var require_sonic_boom = __commonJS({
         this._actualWrite = actualWrite;
         fsWriteSync = () => {
           if (Buffer.isBuffer(this._writingBuf)) {
-            return fs66.writeSync(this.fd, this._writingBuf);
+            return fs65.writeSync(this.fd, this._writingBuf);
           }
-          return fs66.writeSync(this.fd, this._writingBuf, "utf8");
+          return fs65.writeSync(this.fd, this._writingBuf, "utf8");
         };
         fsWrite = () => {
           if (Buffer.isBuffer(this._writingBuf)) {
-            return fs66.write(this.fd, this._writingBuf, this.release);
+            return fs65.write(this.fd, this._writingBuf, this.release);
           }
-          return fs66.write(this.fd, this._writingBuf, "utf8", this.release);
+          return fs65.write(this.fd, this._writingBuf, "utf8", this.release);
         };
       } else {
         throw new Error(`SonicBoom supports "${kContentModeUtf8}" and "${kContentModeBuffer}", but passed ${contentMode}`);
@@ -7713,7 +7694,7 @@ var require_sonic_boom = __commonJS({
           }
         }
         if (this._fsync) {
-          fs66.fsyncSync(this.fd);
+          fs65.fsyncSync(this.fd);
         }
         const len = this._len;
         if (this._reopening) {
@@ -7827,7 +7808,7 @@ var require_sonic_boom = __commonJS({
       const onDrain = () => {
         if (!this._fsync) {
           try {
-            fs66.fsync(this.fd, (err) => {
+            fs65.fsync(this.fd, (err) => {
               this._flushPending = false;
               cb(err);
             });
@@ -7929,7 +7910,7 @@ var require_sonic_boom = __commonJS({
       const fd = this.fd;
       this.once("ready", () => {
         if (fd !== this.fd) {
-          fs66.close(fd, (err) => {
+          fs65.close(fd, (err) => {
             if (err) {
               return this.emit("error", err);
             }
@@ -7978,7 +7959,7 @@ var require_sonic_boom = __commonJS({
           buf = this._bufs[0];
         }
         try {
-          const n = Buffer.isBuffer(buf) ? fs66.writeSync(this.fd, buf) : fs66.writeSync(this.fd, buf, "utf8");
+          const n = Buffer.isBuffer(buf) ? fs65.writeSync(this.fd, buf) : fs65.writeSync(this.fd, buf, "utf8");
           const releasedBufObj = releaseWritingBuf(buf, this._len, n);
           buf = releasedBufObj.writingBuf;
           this._len = releasedBufObj.len;
@@ -7994,7 +7975,7 @@ var require_sonic_boom = __commonJS({
         }
       }
       try {
-        fs66.fsyncSync(this.fd);
+        fs65.fsyncSync(this.fd);
       } catch {
       }
     }
@@ -8015,7 +7996,7 @@ var require_sonic_boom = __commonJS({
           buf = mergeBuf(this._bufs[0], this._lens[0]);
         }
         try {
-          const n = fs66.writeSync(this.fd, buf);
+          const n = fs65.writeSync(this.fd, buf);
           buf = buf.subarray(n);
           this._len = Math.max(this._len - n, 0);
           if (buf.length <= 0) {
@@ -8043,13 +8024,13 @@ var require_sonic_boom = __commonJS({
       this._writingBuf = this._writingBuf.length ? this._writingBuf : this._bufs.shift() || "";
       if (this.sync) {
         try {
-          const written = Buffer.isBuffer(this._writingBuf) ? fs66.writeSync(this.fd, this._writingBuf) : fs66.writeSync(this.fd, this._writingBuf, "utf8");
+          const written = Buffer.isBuffer(this._writingBuf) ? fs65.writeSync(this.fd, this._writingBuf) : fs65.writeSync(this.fd, this._writingBuf, "utf8");
           release(null, written);
         } catch (err) {
           release(err);
         }
       } else {
-        fs66.write(this.fd, this._writingBuf, release);
+        fs65.write(this.fd, this._writingBuf, release);
       }
     }
     function actualWriteBuffer() {
@@ -8058,7 +8039,7 @@ var require_sonic_boom = __commonJS({
       this._writingBuf = this._writingBuf.length ? this._writingBuf : mergeBuf(this._bufs.shift(), this._lens.shift());
       if (this.sync) {
         try {
-          const written = fs66.writeSync(this.fd, this._writingBuf);
+          const written = fs65.writeSync(this.fd, this._writingBuf);
           release(null, written);
         } catch (err) {
           release(err);
@@ -8067,7 +8048,7 @@ var require_sonic_boom = __commonJS({
         if (kCopyBuffer) {
           this._writingBuf = Buffer.from(this._writingBuf);
         }
-        fs66.write(this.fd, this._writingBuf, release);
+        fs65.write(this.fd, this._writingBuf, release);
       }
     }
     function actualClose(sonic) {
@@ -8083,12 +8064,12 @@ var require_sonic_boom = __commonJS({
       sonic._lens = [];
       assert(typeof sonic.fd === "number", `sonic.fd must be a number, got ${typeof sonic.fd}`);
       try {
-        fs66.fsync(sonic.fd, closeWrapped);
+        fs65.fsync(sonic.fd, closeWrapped);
       } catch {
       }
       function closeWrapped() {
         if (sonic.fd !== 1 && sonic.fd !== 2) {
-          fs66.close(sonic.fd, done);
+          fs65.close(sonic.fd, done);
         } else {
           done();
         }
@@ -26932,8 +26913,8 @@ var require_CronFileParser = __commonJS({
        * @throws If file cannot be read
        */
       static parseFileSync(filePath) {
-        const { readFileSync: readFileSync7 } = require("fs");
-        const data = readFileSync7(filePath, "utf8");
+        const { readFileSync: readFileSync6 } = require("fs");
+        const data = readFileSync6(filePath, "utf8");
         return _CronFileParser.#parseContent(data);
       }
       /**
@@ -29234,7 +29215,7 @@ var require_websocket = __commonJS({
     var http3 = require("http");
     var net3 = require("net");
     var tls = require("tls");
-    var { randomBytes, createHash: createHash3 } = require("crypto");
+    var { randomBytes, createHash: createHash2 } = require("crypto");
     var { Duplex, Readable: Readable3 } = require("stream");
     var { URL: URL2 } = require("url");
     var PerMessageDeflate2 = require_permessage_deflate();
@@ -29894,7 +29875,7 @@ var require_websocket = __commonJS({
           abortHandshake(websocket, socket, "Invalid Upgrade header");
           return;
         }
-        const digest = createHash3("sha1").update(key + GUID).digest("base64");
+        const digest = createHash2("sha1").update(key + GUID).digest("base64");
         if (res.headers["sec-websocket-accept"] !== digest) {
           abortHandshake(websocket, socket, "Invalid Sec-WebSocket-Accept header");
           return;
@@ -30261,7 +30242,7 @@ var require_websocket_server = __commonJS({
     var EventEmitter3 = require("events");
     var http3 = require("http");
     var { Duplex } = require("stream");
-    var { createHash: createHash3 } = require("crypto");
+    var { createHash: createHash2 } = require("crypto");
     var extension2 = require_extension();
     var PerMessageDeflate2 = require_permessage_deflate();
     var subprotocol2 = require_subprotocol();
@@ -30562,7 +30543,7 @@ var require_websocket_server = __commonJS({
           );
         }
         if (this._state > RUNNING) return abortHandshake(socket, 503);
-        const digest = createHash3("sha1").update(key + GUID).digest("base64");
+        const digest = createHash2("sha1").update(key + GUID).digest("base64");
         const headers = [
           "HTTP/1.1 101 Switching Protocols",
           "Upgrade: websocket",
@@ -42057,6 +42038,8 @@ function buildSpawnContext(state, deps) {
   env.CLAWD_SESSION_ID = file.sessionId;
   const daemonUrl = deps.getDaemonUrl?.() ?? null;
   if (daemonUrl) env.CLAWD_DAEMON_URL = daemonUrl;
+  const clawosApi = deps.getClawosApi?.();
+  if (clawosApi) env.CLAWOS_API = clawosApi;
   const dispatchId = deps.lookupDispatchByBSessionId?.(file.sessionId);
   if (dispatchId) env.CLAWD_DISPATCH_ID = dispatchId;
   const personaId = file.ownerPersonaId;
@@ -42906,6 +42889,9 @@ var SessionRunner = class {
       // 单栏 refactor (spec 2026-06-02 §5.1): cc 子进程 env 注入 CLAWD_DAEMON_URL，让 assistant
       // curl daemon HTTP RPC adapter (/api/rpc/<method>) 触发管理操作。null = HTTP adapter 未启。
       getDaemonUrl: this.hooks.getDaemonUrl,
+      // clawd 管家 (spec 2026-07-22-clawd-butler-persona §3.1): cc 子进程 env 注入 CLAWOS_API，
+      // 让 clawd 管家 skill fetch `${CLAWOS_API}/docs/**` 线上文档。
+      getClawosApi: this.hooks.getClawosApi,
       // daemon 级 MCP server 列表闭包透传；见 reducer.buildSpawnContext 派生
       // SpawnContext.mcpConfigs + 按 DISPATCH_MCP_ID 判断 dispatch 教学注入
       getMcpConfigs: this.hooks.getMcpConfigs,
@@ -43708,6 +43694,9 @@ var SessionManager = class {
       // 单栏 refactor (spec 2026-06-02 §5.1): 透传 daemon HTTP RPC base URL 闭包,
       // reducer 把它注入 cc 子进程 env CLAWD_DAEMON_URL.
       getDaemonUrl: this.deps.getDaemonUrl,
+      // clawd 管家 (spec 2026-07-22-clawd-butler-persona §3.1): 透传 clawos 云 api base URL
+      // 闭包, reducer 把它注入 cc 子进程 env CLAWOS_API, skill fetch 线上 md 文档用。
+      getClawosApi: this.deps.getClawosApi,
       // daemon 级 MCP server 列表闭包透传给 reducer，cc spawn 逐项加 --mcp-config flag；
       // B session 的 CLAWD_DISPATCH_ID env 由下方 lookupDispatchByBSessionId 反查闭包负责。
       getMcpConfigs: () => this.deps.mcpConfigs ?? [],
@@ -45880,17 +45869,9 @@ var PersonaManager = class {
   }
   /**
    * 删除 persona。
-   * PersonaStore.remove(personaId) 已级联删除整个 <personaRoot>/<personaId>/ 目录,
-   * Phase 2 capability platform 新布局下含 .clawd/sessions/owner/ +
-   * .clawd/sessions/guests/<capId>/, rmSync recursive force 一锅清.
-   *
-   * ⚠️ TODO (Phase 3+ design gap, reviewer P1 flagged):
-   * ~/.clawd/capabilities.json 里若有 cap.grants 含本 personaId, grant 会变成
-   * 悬空引用 (guest 仍能持 token 接入, 但调依赖该 persona 的 RPC 会 fail).
-   * 选项: (A) 这里扫所有 cap 过滤掉该 personaId 的 grant; (B) revoke 所有 grant
-   * 含该 personaId 的 cap. 当前因 cleanupGuestSessionsForCapability 用 rmSync
-   * force=true 吞 ENOENT 不会 crash, 但 UI CapabilityManagerDrawer 会展示
-   * "无效的 persona" grant. Phase 3 加 cross-reference 矩阵后正式实现.
+   * PersonaStore.remove(personaId) 级联删整个 <personaRoot>/<personaId>/ 目录
+   * （含 .clawd/sessions/owner/ 和 .clawd/sessions/guests/<capId>/），rmSync
+   * recursive force 一锅清。
    */
   delete(personaId) {
     this.deps.store.remove(personaId);
@@ -45940,7 +45921,7 @@ var DEFAULT_PERSONAS = [
   },
   {
     personaId: "persona-clawd-helper",
-    label: "clawd\u4F7F\u7528\u52A9\u624B",
+    label: "clawd \u7BA1\u5BB6",
     model: "opus",
     iconKey: "assist",
     public: false,
@@ -50678,9 +50659,9 @@ var LocalWsServer = class {
       this.safeSend(c.ws, frame);
     }
   }
-  // Task 1.9 capability platform：仅广播给 owner 连接（跳过 guest ws）。
-  // 用于 capability:tokenIssued / capability:tokenDeleted 等 owner-only push frame——
-  // guest 没必要也无法消费这类管理帧。noAuth localhost ws 没有 ctx, 视作 owner.
+  // 仅广播给 owner 连接（跳过 guest ws）。用于 contact:added / contact:removed /
+  // contact:pinned / friend:reverseTokenOffered / appBuilder:project-updated 等
+  // owner-only push frame——guest 无需消费。noAuth localhost ws 无 ctx，视作 owner。
   broadcastToOwners(frame) {
     const gate = this.opts.authGate;
     for (const c of this.clients.values()) {
@@ -50754,10 +50735,8 @@ var LocalWsServer = class {
       }
     }
   }
-  // Task 1.10 撤销级联：关闭某 guest principal 的所有活跃 ws 连接。close code 4401
-  // 让客户端识别 'capability revoked' 而非普通断连。
-  // capability:delete 级联用 cap.id 调本方法——noAuth 旧 per-peer cap guest 的
-  // principal.id ≡ cap.id，级联语义不变（Phase 3 决策 #14 正名）。
+  // 关闭某 guest principal 的所有活跃 ws 连接。close code 4401 让客户端识别
+  // 'TOKEN_REVOKED' 而非普通断连；调用方按需触发（如 contact:remove 后要断对方现有连接）。
   closeConnectionsByGuestId(guestPrincipalId, code = 4401, reason = "TOKEN_REVOKED") {
     const set = this.guestIdToClients.get(guestPrincipalId);
     if (!set) return;
@@ -51231,191 +51210,38 @@ async function authenticate(token, deps) {
   };
 }
 
-// src/permission/capability-store.ts
-var fs33 = __toESM(require("fs"), 1);
+// src/legacy-cleanup.ts
+var fs33 = __toESM(require("fs/promises"), 1);
 var path34 = __toESM(require("path"), 1);
-var CAPABILITIES_FILE_NAME = "capabilities.json";
-var FILE_VERSION = 1;
-var CapabilityStore = class {
-  constructor(dataDir) {
-    this.dataDir = dataDir;
-    fs33.mkdirSync(dataDir, { recursive: true });
-    this.cache = this.readFromDisk();
-  }
-  dataDir;
-  cache;
-  list() {
-    return [...this.cache];
-  }
-  upsert(cap) {
-    const idx = this.cache.findIndex((c) => c.id === cap.id);
-    if (idx >= 0) {
-      this.cache[idx] = cap;
-    } else {
-      this.cache.push(cap);
-    }
-    this.flush();
-  }
-  remove(id) {
-    const next = this.cache.filter((c) => c.id !== id);
-    if (next.length === this.cache.length) return;
-    this.cache = next;
-    this.flush();
-  }
-  filePath() {
-    return path34.join(this.dataDir, CAPABILITIES_FILE_NAME);
-  }
-  readFromDisk() {
-    const file = this.filePath();
-    let raw;
-    try {
-      raw = fs33.readFileSync(file, "utf8");
-    } catch (err) {
-      if (err?.code === "ENOENT") return [];
-      return [];
-    }
-    if (!raw.trim()) return [];
-    let parsed;
-    try {
-      parsed = JSON.parse(raw);
-    } catch {
-      return [];
-    }
-    if (!parsed || typeof parsed !== "object") return [];
-    const arr = parsed.capabilities;
-    if (!Array.isArray(arr)) return [];
-    const out = [];
-    for (const item of arr) {
-      const r = CapabilitySchema.safeParse(item);
-      if (r.success) out.push(r.data);
-    }
-    return out;
-  }
-  flush() {
-    const content = { version: FILE_VERSION, capabilities: this.cache };
-    this.atomicWrite(this.filePath(), JSON.stringify(content, null, 2));
-  }
-  atomicWrite(file, content) {
-    const tmp = `${file}.tmp-${process.pid}-${Date.now()}-${Math.random().toString(36).slice(2)}`;
-    fs33.writeFileSync(tmp, content, { mode: 384 });
-    fs33.renameSync(tmp, file);
-    try {
-      fs33.chmodSync(file, 384);
-    } catch {
-    }
-  }
-};
-
-// src/permission/capability-registry.ts
-var crypto5 = __toESM(require("crypto"), 1);
-var CapabilityRegistry = class {
-  constructor(store, now = () => Date.now()) {
-    this.store = store;
-    this.now = now;
-    for (const cap of store.list()) {
-      this.bySecretHash.set(cap.secretHash, cap);
-    }
-  }
-  store;
-  now;
-  // sha256(token) → Capability
-  bySecretHash = /* @__PURE__ */ new Map();
-  list() {
-    return this.store.list();
-  }
-  verifyToken(token) {
-    if (!token) return { ok: false, code: "TOKEN_INVALID" };
-    const hash = sha256Hex(token);
-    const cap = this.bySecretHash.get(hash);
-    if (!cap) return { ok: false, code: "TOKEN_INVALID" };
-    if (cap.expiresAt && this.now() >= cap.expiresAt) {
-      return { ok: false, code: "TOKEN_EXPIRED" };
-    }
-    if (cap.maxUses && cap.usedCount >= cap.maxUses) {
-      return { ok: false, code: "TOKEN_EXHAUSTED" };
-    }
-    const updated = { ...cap, usedCount: cap.usedCount + 1 };
-    this.bySecretHash.set(hash, updated);
-    this.store.upsert(updated);
-    return { ok: true, capability: updated };
-  }
-  upsertCapability(cap) {
-    this.bySecretHash.set(cap.secretHash, cap);
-    this.store.upsert(cap);
-  }
-  /**
-   * Hard delete：从 store 物理移除 + 从 Map 清掉 secretHash 索引。
-   * 后续 verifyToken 该 token 走 'TOKEN_INVALID' 分支（secretHash 已不在 Map）。
-   * idempotent：不存在 → null。
-   */
-  delete(id) {
-    const current = this.store.list().find((c) => c.id === id);
-    if (!current) return null;
-    this.bySecretHash.delete(current.secretHash);
-    this.store.remove(id);
-    return current;
-  }
-  findById(id) {
-    return this.store.list().find((c) => c.id === id) ?? null;
-  }
-};
-function sha256Hex(s) {
-  return crypto5.createHash("sha256").update(s).digest("hex");
-}
-
-// src/permission/capability-manager.ts
-var CapabilityManager = class {
-  constructor(registry2, hooks = {}) {
-    this.registry = registry2;
-    this.hooks = hooks;
-  }
-  registry;
-  hooks;
-  list() {
-    return this.registry.list();
-  }
-  // 调试 / 旧 per-peer cap 反查用（Phase 3 决策 #14 后无生产调用方，保留属三件套范围）。
-  // 返回 Capability 持久化形态；调用方需 stripSecretHash 后再上 wire。
-  findById(id) {
-    return this.registry.findById(id);
-  }
-  /**
-   * Hard delete：从 registry / store 物理移除 capability。
-   * idempotent：不存在 → null（handler 翻译成 VALIDATION_ERROR）
-   * onDeleted hook 在 daemon/index.ts wire 负责 close 连接 + cleanup 文件 + 广播
-   */
-  delete(id) {
-    const removed = this.registry.delete(id);
-    if (!removed) return null;
-    this.hooks.onDeleted?.(removed);
-    return { capability: removed };
-  }
-};
-
-// src/permission/cleanup.ts
-var fs34 = __toESM(require("fs"), 1);
-function cleanupGuestSessionsForCapability(cap, factory) {
+var LEGACY_FILES = [
+  "personal-capability.json",
+  "received-capabilities.json",
+  "capabilities.json"
+];
+async function cleanupLegacyCapabilityFiles(dataDir, logger) {
   const removed = [];
-  for (const g2 of cap.grants) {
-    if (g2.resource.type !== "persona") continue;
-    const dir = factory.vmGuestRoot(g2.resource.id, cap.id);
+  for (const name of LEGACY_FILES) {
+    const p2 = path34.join(dataDir, name);
     try {
-      fs34.rmSync(dir, { recursive: true, force: true });
-      removed.push(dir);
-    } catch {
+      await fs33.unlink(p2);
+      removed.push(name);
+      logger.debug("legacy capability file removed", { file: name });
+    } catch (err) {
+      if (err?.code === "ENOENT") continue;
+      throw err;
     }
   }
   return { removed };
 }
 
 // src/inbox/inbox-store.ts
-var fs35 = __toESM(require("fs"), 1);
+var fs34 = __toESM(require("fs"), 1);
 var path35 = __toESM(require("path"), 1);
 var INBOX_SUBDIR = "inbox";
 var InboxStore = class {
   constructor(dataDir) {
     this.dataDir = dataDir;
-    fs35.mkdirSync(this.dirPath(), { recursive: true });
+    fs34.mkdirSync(this.dirPath(), { recursive: true });
   }
   dataDir;
   /**
@@ -51427,7 +51253,7 @@ var InboxStore = class {
     const file = this.filePath(peerDeviceId);
     let raw;
     try {
-      raw = fs35.readFileSync(file, "utf8");
+      raw = fs34.readFileSync(file, "utf8");
     } catch (err) {
       if (err?.code === "ENOENT") return [];
       return [];
@@ -51443,7 +51269,7 @@ var InboxStore = class {
     const dir = this.dirPath();
     let entries;
     try {
-      entries = fs35.readdirSync(dir);
+      entries = fs34.readdirSync(dir);
     } catch (err) {
       if (err?.code === "ENOENT") return [];
       return [];
@@ -51459,9 +51285,9 @@ var InboxStore = class {
     if (existing.some((m2) => m2.id === message.id)) return;
     const file = this.filePath(message.peerDeviceId);
     const line = JSON.stringify(message) + "\n";
-    fs35.appendFileSync(file, line, { mode: 384 });
+    fs34.appendFileSync(file, line, { mode: 384 });
     try {
-      fs35.chmodSync(file, 384);
+      fs34.chmodSync(file, 384);
     } catch {
     }
   }
@@ -51491,7 +51317,7 @@ var InboxStore = class {
   removeByPeerDeviceId(peerDeviceId) {
     const file = this.filePath(peerDeviceId);
     try {
-      fs35.unlinkSync(file);
+      fs34.unlinkSync(file);
     } catch (err) {
       if (err?.code === "ENOENT") return;
     }
@@ -51500,10 +51326,10 @@ var InboxStore = class {
     const file = this.filePath(peerDeviceId);
     const tmp = `${file}.tmp-${process.pid}-${Date.now()}-${Math.random().toString(36).slice(2)}`;
     const content = messages.map((m2) => JSON.stringify(m2)).join("\n") + (messages.length > 0 ? "\n" : "");
-    fs35.writeFileSync(tmp, content, { mode: 384 });
-    fs35.renameSync(tmp, file);
+    fs34.writeFileSync(tmp, content, { mode: 384 });
+    fs34.renameSync(tmp, file);
     try {
-      fs35.chmodSync(file, 384);
+      fs34.chmodSync(file, 384);
     } catch {
     }
   }
@@ -51599,7 +51425,7 @@ var InboxManager = class {
 };
 
 // src/state/contact-store.ts
-var fs36 = __toESM(require("fs"), 1);
+var fs35 = __toESM(require("fs"), 1);
 var path36 = __toESM(require("path"), 1);
 var FILE_NAME = "contacts.json";
 var ContactStore = class {
@@ -51613,7 +51439,7 @@ var ContactStore = class {
     const file = path36.join(this.dataDir, FILE_NAME);
     let raw;
     try {
-      raw = fs36.readFileSync(file, "utf8");
+      raw = fs35.readFileSync(file, "utf8");
     } catch (err) {
       if (err?.code !== "ENOENT") this.renameBak(file);
       return;
@@ -51689,20 +51515,20 @@ var ContactStore = class {
       null,
       2
     );
-    fs36.mkdirSync(this.dataDir, { recursive: true });
-    fs36.writeFileSync(tmp, content, { mode: 384 });
-    fs36.renameSync(tmp, file);
+    fs35.mkdirSync(this.dataDir, { recursive: true });
+    fs35.writeFileSync(tmp, content, { mode: 384 });
+    fs35.renameSync(tmp, file);
   }
   renameBak(file) {
     try {
-      fs36.renameSync(file, `${file}.bak`);
+      fs35.renameSync(file, `${file}.bak`);
     } catch {
     }
   }
 };
 
 // src/contact/connect-remote.ts
-var crypto6 = __toESM(require("crypto"), 1);
+var crypto5 = __toESM(require("crypto"), 1);
 var HANDSHAKE_TIMEOUT_MS = 5e3;
 var RPC_TIMEOUT_MS = 5e3;
 async function connectRemote(args) {
@@ -51766,7 +51592,7 @@ async function connectRemote(args) {
     ws.once("close", onClose);
   });
   function call(method, payload) {
-    const requestId = crypto6.randomUUID();
+    const requestId = crypto5.randomUUID();
     return new Promise((resolve6, reject) => {
       const onMessage = (raw) => {
         let f;
@@ -51848,7 +51674,7 @@ async function autoReverseContact(args) {
 }
 
 // src/migrations/2026-05-20-flatten-sessions.ts
-var fs37 = __toESM(require("fs"), 1);
+var fs36 = __toESM(require("fs"), 1);
 var path37 = __toESM(require("path"), 1);
 var MIGRATION_FLAG_NAME = ".migration.v1.done";
 function migrateFlattenSessions(opts) {
@@ -51868,7 +51694,7 @@ function migrateFlattenSessions(opts) {
       if (!entry.endsWith(".json")) continue;
       const src = path37.join(defaultDir, entry);
       const dst = path37.join(sessionsDir, entry);
-      fs37.renameSync(src, dst);
+      fs36.renameSync(src, dst);
       movedBare += 1;
     }
     rmdirIfEmpty(defaultDir);
@@ -51880,10 +51706,10 @@ function migrateFlattenSessions(opts) {
     const ownerSrc = path37.join(personaDir, "owner");
     if (existsSync3(ownerSrc) && isDir(ownerSrc)) {
       const ownerDst = path37.join(dataDir, "personas", pid, ".clawd", "sessions", "owner");
-      fs37.mkdirSync(ownerDst, { recursive: true });
+      fs36.mkdirSync(ownerDst, { recursive: true });
       for (const file of readdirSafe(ownerSrc)) {
         if (!file.endsWith(".json")) continue;
-        fs37.renameSync(path37.join(ownerSrc, file), path37.join(ownerDst, file));
+        fs36.renameSync(path37.join(ownerSrc, file), path37.join(ownerDst, file));
         movedVmOwner += 1;
       }
       rmdirIfEmpty(ownerSrc);
@@ -51891,18 +51717,18 @@ function migrateFlattenSessions(opts) {
     const listenerSrc = path37.join(personaDir, "listener");
     if (existsSync3(listenerSrc) && isDir(listenerSrc)) {
       const archiveDst = path37.join(dataDir, ".legacy", `listener-${pid}`);
-      fs37.mkdirSync(archiveDst, { recursive: true });
+      fs36.mkdirSync(archiveDst, { recursive: true });
       for (const file of readdirSafe(listenerSrc)) {
         if (!file.endsWith(".json")) continue;
-        fs37.renameSync(path37.join(listenerSrc, file), path37.join(archiveDst, file));
+        fs36.renameSync(path37.join(listenerSrc, file), path37.join(archiveDst, file));
         archivedListener += 1;
       }
       rmdirIfEmpty(listenerSrc);
     }
     rmdirIfEmpty(personaDir);
   }
-  fs37.mkdirSync(sessionsDir, { recursive: true });
-  fs37.writeFileSync(flagPath, JSON.stringify({ migratedAt: now() }, null, 2));
+  fs36.mkdirSync(sessionsDir, { recursive: true });
+  fs36.writeFileSync(flagPath, JSON.stringify({ migratedAt: now() }, null, 2));
   return {
     skipped: false,
     flagWritten: true,
@@ -51913,7 +51739,7 @@ function migrateFlattenSessions(opts) {
 }
 function existsSync3(p2) {
   try {
-    fs37.statSync(p2);
+    fs36.statSync(p2);
     return true;
   } catch {
     return false;
@@ -51921,21 +51747,21 @@ function existsSync3(p2) {
 }
 function isDir(p2) {
   try {
-    return fs37.statSync(p2).isDirectory();
+    return fs36.statSync(p2).isDirectory();
   } catch {
     return false;
   }
 }
 function readdirSafe(p2) {
   try {
-    return fs37.readdirSync(p2);
+    return fs36.readdirSync(p2);
   } catch {
     return [];
   }
 }
 function rmdirIfEmpty(p2) {
   try {
-    fs37.rmdirSync(p2);
+    fs36.rmdirSync(p2);
   } catch {
   }
 }
@@ -54282,7 +54108,7 @@ async function upsertDeviceBinding(opts) {
 }
 
 // src/feishu-auth/verify-token.ts
-var crypto14 = __toESM(require("crypto"), 1);
+var crypto13 = __toESM(require("crypto"), 1);
 var CONNECT_TOKEN_PREFIX = "clawdtk1";
 function verifyConnectToken(args) {
   const now = args.nowSeconds ?? Math.floor(Date.now() / 1e3);
@@ -54294,7 +54120,7 @@ function verifyConnectToken(args) {
   const data = `${prefix}.${payloadB64}`;
   let signatureValid = false;
   try {
-    signatureValid = crypto14.verify(
+    signatureValid = crypto13.verify(
       null,
       Buffer.from(data, "utf8"),
       args.publicKeyPem,
@@ -54331,7 +54157,7 @@ function verifyConnectToken(args) {
 }
 
 // src/feishu-auth/server-key.ts
-var fs51 = __toESM(require("fs"), 1);
+var fs50 = __toESM(require("fs"), 1);
 var path53 = __toESM(require("path"), 1);
 var FILE_NAME2 = "server-signing-key.json";
 var ServerKeyStore = class {
@@ -54345,7 +54171,7 @@ var ServerKeyStore = class {
   /** 读缓存的公钥；无缓存 / 损坏 → null（调用方决定是否触发拉取） */
   read() {
     try {
-      const raw = fs51.readFileSync(this.filePath(), "utf8");
+      const raw = fs50.readFileSync(this.filePath(), "utf8");
       const parsed = JSON.parse(raw);
       if (typeof parsed.publicKeyPem === "string" && parsed.publicKeyPem.includes("PUBLIC KEY")) {
         return parsed.publicKeyPem;
@@ -54360,12 +54186,12 @@ var ServerKeyStore = class {
       publicKeyPem,
       fetchedAt: (/* @__PURE__ */ new Date()).toISOString()
     };
-    fs51.mkdirSync(this.dataDir, { recursive: true });
-    fs51.writeFileSync(this.filePath(), JSON.stringify(content, null, 2), { mode: 384 });
+    fs50.mkdirSync(this.dataDir, { recursive: true });
+    fs50.writeFileSync(this.filePath(), JSON.stringify(content, null, 2), { mode: 384 });
   }
   clear() {
     try {
-      fs51.unlinkSync(this.filePath());
+      fs50.unlinkSync(this.filePath());
     } catch {
     }
   }
@@ -55272,45 +55098,6 @@ function buildCapabilitiesHandlers(deps) {
   };
 }
 
-// src/handlers/capability.ts
-init_zod();
-init_protocol();
-var DeleteArgsSchema = external_exports.object({
-  capabilityId: external_exports.string().min(1)
-}).strict();
-function buildCapabilityHandlers(deps) {
-  const { manager } = deps;
-  const list = async () => {
-    return {
-      response: {
-        type: "capability:list",
-        capabilities: manager.list().map(stripSecretHash)
-      }
-    };
-  };
-  const del = async (frame) => {
-    const { type: _type, requestId: _requestId, ...rest } = frame;
-    const args = DeleteArgsSchema.parse(rest);
-    const result = manager.delete(args.capabilityId);
-    if (!result) {
-      throw new ClawdError(
-        ERROR_CODES.VALIDATION_ERROR,
-        `capability not found: ${args.capabilityId}`
-      );
-    }
-    return {
-      response: {
-        type: "capability:deleted",
-        capabilityId: args.capabilityId
-      }
-    };
-  };
-  return {
-    "capability:list": list,
-    "capability:delete": del
-  };
-}
-
 // src/handlers/inbox.ts
 init_protocol();
 function resolvePeerDeviceId(ctx, argsPeerDeviceId) {
@@ -58178,9 +57965,6 @@ function buildMethodHandlers(deps) {
       personaManager: deps.personaManager,
       personaRegistry: deps.personaRegistry
     }),
-    ...buildCapabilityHandlers({
-      manager: deps.capabilityManager
-    }),
     ...buildInboxHandlers({
       manager: deps.inboxManager,
       sendDmDeps: {
@@ -58216,8 +58000,7 @@ function buildMethodHandlers(deps) {
       ownerPrincipalId: deps.ownerPrincipalId,
       ownerId: deps.ownerId,
       ownerProvider: deps.ownerProvider,
-      personaStore: deps.personaStore,
-      capabilityManager: deps.capabilityManager
+      personaStore: deps.personaStore
     }),
     ...buildFeishuAuthHandlers(deps.feishuAuth),
     ...buildDeviceHandlers(deps.feishuDevice),
@@ -58531,12 +58314,6 @@ var METHOD_GRANT_MAP = {
   // handler 内部按 ctx.principal.kind 决定返回 "合成 owner self capability" 还是
   // "查 capabilityManager 拿 caller 的 guest capability"。
   "whoami": { kind: "public" },
-  // ---- capability platform（admin-only） ----
-  // 飞书统一身份 Phase 2 (2026-06-01, spec 决策 #12): personal-cap:get / capability:issue /
-  // bindPeer 已下线（personal token / 邀请码全链路删除）。capability:list / delete 保留供调试 +
-  // 撤销级联 + 清旧 per-peer cap。
-  "capability:list": ADMIN_ANY,
-  "capability:delete": ADMIN_ANY,
   // ---- inbox: 双投 P2P IM ----
   // 三条都 'public' — 能连上 = 已通过本地验票. handler 内额外校验 guest 的
   // args.peerDeviceId 与 ctx.principal.id(=deviceId) 一致, 防 guest 越权操作别的 DM 桶.
@@ -59196,32 +58973,13 @@ async function startDaemon(config) {
       }
     } : {}
   });
-  const capabilityStore = new CapabilityStore(config.dataDir);
-  const capabilityRegistry = new CapabilityRegistry(capabilityStore);
-  const capabilityManager = new CapabilityManager(capabilityRegistry, {
-    onDeleted: (cap) => {
-      const deletedAt = Date.now();
-      wsServer?.broadcastToOwners({
-        type: "capability:tokenDeleted",
-        capabilityId: cap.id,
-        deletedAt
-      });
-      wsServer?.closeConnectionsByGuestId(cap.id);
-      const cleanup = cleanupGuestSessionsForCapability(cap, sessionStoreFactory);
-      if (cleanup.removed.length > 0) {
-        logger.info("capability delete cascade: guest sessions removed", {
-          capabilityId: cap.id,
-          removedDirs: cleanup.removed
-        });
-      }
-    }
-  });
+  await cleanupLegacyCapabilityFiles(config.dataDir, logger);
   migrateDropPersonsDir(config.dataDir);
   let wsServer = null;
   const authGate = authMode === "first-message" ? new AuthGate({
     shouldEnforce: buildShouldEnforce({ tunnel: config.tunnel }),
     // Task 1.7：authenticate 注入路径替代 expectedToken 单 token 比对。
-    // owner 路径 constantTimeEqual 防侧信道；guest 路径走 capabilityRegistry.
+    // owner 路径 constantTimeEqual 防侧信道；guest 路径走 verifyConnectToken (Ed25519).
     expectedToken: resolvedAuthToken,
     authenticate: async (t, selfUrl) => {
       const result = await authenticate(t, buildConnectAuthDeps());
@@ -59477,6 +59235,11 @@ async function startDaemon(config) {
     // 127.0.0.1（不是 config.host）—— cc 跑在本机，loopback 最稳；外部访问限制 + http-router
     // 的 isLoopback 兜底已确保安全。
     getDaemonUrl: () => `http://127.0.0.1:${config.port}`,
+    // clawd 管家 (spec 2026-07-22-clawd-butler-persona §3.1)：cc 子进程 env CLAWOS_API 闭包来源。
+    // clawd 管家 skill 用它 fetch 云端 md 文档（`${CLAWOS_API}/docs/**`）。非 tunnel 模式
+    // config.clawosApi 为 null → fallback 到 DEFAULT_CLAWOS_API（api.clawos.chat），保证注入
+    // 的 env 一定非空；skill 拿到但云端不可达时走 §3.4 明说降级。
+    getClawosApi: () => config.clawosApi ?? DEFAULT_CLAWOS_API,
     // Persona dispatch (Task 8): manager.createDispatchedSession 用 personaDispatchManager
     // registerBSession；reducer 通过闭包反查 dispatchId 注 CLAWD_DISPATCH_ID env。
     personaDispatchManager,
@@ -59745,8 +59508,6 @@ async function startDaemon(config) {
     personaRoot: import_node_path61.default.join(config.dataDir, "personas"),
     // v2 多人 persona 隔离：handler 派生 guest user-dir 放行
     usersRoot,
-    // capability:list / delete handler 依赖
-    capabilityManager,
     // v2 Phase 6: whoami handler 装在 owner principal.displayName + persona 解析
     ownerDisplayName,
     // 决策 #16: whoami owner.id = 本机 deviceId（路由主键）+ ownerId/provider 归属人
@@ -59756,8 +59517,6 @@ async function startDaemon(config) {
     ownerId,
     ownerProvider,
     personaStore,
-    // capability handler 也用 (capability:issue 走 registry / capability:list)
-    capabilityRegistry,
     // capability platform v3 inbox: handler 接 manager (post/list/markRead),
     // cascade 接 store (list 统计 deletedInboxEvents).
     inboxManager,
@@ -60092,18 +59851,11 @@ async function startDaemon(config) {
     ),
     protocolVersion: PROTOCOL_VERSION,
     authGate: authGate ?? void 0,
-    // noAuth 模式下仍验 capability token: 修 capability platform 漏洞 — 远端 client
-    // 用 cap token 连 noAuth daemon 时若无此 hook 会 fallback owner ctx, whoami 错返
-    // capability.id = ownerPrincipalId, 导致 myCapabilityId 写错 → inbox channel 写错.
-    // 命中 cap → attach guest ctx; 空 token / 未命中 → 保持 noAuth 行为 (handler fallback owner).
+    // T-35: capability path retired；本 hook 只剩 persona web 分享 visitor token 分支：
+    // noAuth localhost daemon 上访客 token 若命中 → attach guest ctx，否则 fallback owner
+    // （非 persona-web 场景静默 return null；tunnel 模式走 AuthGate 不经此路）。参数名
+    // tryVerifyCapabilityToken 不再准确，跨 local-ws-server 改名属 followup 清理。
     tryVerifyCapabilityToken: (token) => {
-      const v2 = capabilityRegistry.verifyToken(token);
-      if (v2.ok) {
-        return {
-          principal: { id: v2.capability.id, kind: "guest", displayName: v2.capability.displayName },
-          grants: v2.capability.grants
-        };
-      }
       const vis = verifyVisitorToken(authFile.visitorTokenSecret, token, Math.floor(Date.now() / 1e3));
       if (vis.ok) return visitorGuestContext(vis.payload);
       return null;