@clawos-dev/clawd 0.2.164-beta.340.60574f3 → 0.2.165-beta.341.c72ef11

package/dist/cli.cjs

@@ -105,6 +105,12 @@ var init_methods = __esm({
       "persona:get",
       "persona:update",
       "persona:delete",
+      // ---- personaDispatch:* (跨设备 dispatch) ----
+      // personaDispatch:run 有两个入口：本地 cc 经 /api/rpc（EXPOSED_RPC_METHODS，127.0.0.1 无 token）；
+      // 跨设备时 A 的 peer daemon 经 /rpc（Bearer connect token）。后者要求它是 WS METHOD_NAME +
+      // METHOD_GRANT_MAP capability-scoped（handler 自检 persona.public + assertGrant(send)）。
+      // personaDispatch:complete 仅 B 本地 cc 调（/api/rpc），不跨设备，故不列入 WS method。
+      "personaDispatch:run",
       // ---- session:pty 双向透传（仅 CLAWD_CC_MODE=tui 才生效，对应 session:pty push 帧的上行） ----
       // session:pty:input — UI 把用户键盘字节（base64 UTF-8）发给 daemon，daemon 直写 pty stdin。
       //   高频帧（每次按键 1 帧），不入 reducer / 不广播。response 是 fire-and-forget 风格 ack。
@@ -4704,9 +4710,6 @@ var init_schemas = __esm({
       // 不受 parent clear / re-spawn 影响）；sidebar 据此挂 fork 图标。非 fork session 该字段缺省。
       // 旧字段 forkedFromToolSessionId 已弃用，daemon 启动时一次性迁移老数据
       forkedFromSessionId: external_exports.string().min(1).optional(),
-      // 快速问答临时会话标记（spec 2026-06-23-fork-quick-ask）：true = 关闭抽屉即删、
-      // 不进 sidebar 树、daemon 启动清扫孤儿。普通会话缺省。
-      ephemeral: external_exports.boolean().optional(),
       // owner-mode persona session 身份标识；UI 用它在 SessionList 过滤 + jump，
       // daemon 用它做 idempotent dedupe + spawn 时派生 ctx.personaMode='owner'
       ownerPersonaId: external_exports.string().min(1).optional(),
@@ -4995,8 +4998,6 @@ var init_schemas = __esm({
       iconKey: external_exports.string().optional(),
       // session:fork 派生 session 时由 UI 传入源 sessionId，daemon 写到 SessionFile.forkedFromSessionId
       forkedFromSessionId: external_exports.string().min(1).optional(),
-      // 快速问答：创建时打 ephemeral 标记，daemon 写到 SessionFile.ephemeral
-      ephemeral: external_exports.boolean().optional(),
       // owner-mode persona session：传此字段时 daemon 自行派生 cwd 和启动参数，
       // 且按 ownerPersonaId 做 idempotent dedupe（每 persona 永远只有一个 owner session）
       ownerPersonaId: external_exports.string().min(1).optional()
@@ -5982,7 +5983,10 @@ var init_dispatch = __esm({
     ]);
     DispatchRunArgsSchema = external_exports.object({
       targetPersona: external_exports.string().min(1),
-      prompt: external_exports.string()
+      prompt: external_exports.string(),
+      // 跨设备 dispatch：非空 = A 角色，转发到该 contact deviceId 的 peer daemon；
+      // 省略 = 本地 dispatch / B 角色本地执行。A 转发给 B 时 body 不带此字段。
+      targetDeviceId: external_exports.string().min(1).optional()
     });
     DispatchCompleteArgsSchema = external_exports.object({
       dispatchId: external_exports.string().min(1),
@@ -32142,6 +32146,14 @@ tool \u4F1A\u963B\u585E\u6302\u8D77\u7B49\u5BF9\u65B9\u4EBA\u683C\u5E72\u5B8C\uF
 - \u4E00\u53E5\u8BDD\u91CC\u591A\u4E2A \`@persona/<id>\` \u65F6\u9009\u7B2C\u4E00\u4E2A\uFF08tool \u4E00\u6B21\u53EA\u5904\u7406\u4E00\u4E2A target\uFF09
 - \u59D4\u6D3E\u5931\u8D25\uFF08tool_result.is_error=true\uFF09\u65F6\u5982\u5B9E\u544A\u8BC9\u7528\u6237\u539F\u56E0\uFF0C**\u4E0D\u8981\u91CD\u8BD5**
 
+### \u8DE8\u8BBE\u5907\u59D4\u6D3E\uFF08remote persona\uFF09
+
+\u5F53 @ token \u5F62\u5982 \`@persona/<id>@<\u5BF9\u65B9>\`\uFF08\`<\u5BF9\u65B9>\` \u662F\u8054\u7CFB\u4EBA\u540D\uFF09\u65F6\uFF0C\u662F\u628A\u4EFB\u52A1\u59D4\u6D3E\u7ED9\u90A3\u53F0\u8BBE\u5907\u4E0A\u7684 persona\u3002\u9664 targetPersona / prompt \u5916\u518D\u5E26\u4E00\u4E2A\u53C2\u6570\uFF1A
+
+- \`targetDeviceId = <\u5BF9\u65B9\u5BF9\u5E94\u7684 contact deviceId>\`
+
+\u4F60\u4E0D\u77E5\u9053\u786E\u5207 deviceId \u65F6\u6309\u8054\u7CFB\u4EBA\u540D\u539F\u6837\u586B \`targetDeviceId\`\uFF0Cdaemon \u4F1A\u89E3\u6790\uFF1B\u89E3\u6790\u4E0D\u5230 / \u5BF9\u65B9\u672A\u6388\u6743\u4F1A\u8FD4\u56DE\u660E\u786E\u9519\u8BEF\uFF0C\u7167\u5E38\u628A\u9519\u8BEF\u8F6C\u8FF0\u7ED9\u7528\u6237\u5373\u53EF\u3002\u5176\u4F59\u884C\u4E3A\uFF08\u963B\u585E\u7B49\u7ED3\u679C\u3001\u5931\u8D25\u4E0D\u91CD\u8BD5\uFF09\u4E0E\u672C\u5730\u59D4\u6D3E\u4E00\u81F4\u3002
+
 ## \u88AB dispatch \u63A5\u5230\u4EFB\u52A1
 
 \u5982\u679C\u4F60\u7684 session \u7B2C\u4E00\u6761 user message \u662F\u4EE5 \`[Dispatched from owner \u2014 another persona session\u59D4\u6D3E\u7ED9\u4F60\u6267\u884C\u4EFB\u52A1]\` \u8D77\u5934\u7684 plain text \u4EFB\u52A1\u5305\uFF0C\u4F60\u662F\u88AB\u53E6\u4E00\u4E2A persona \u59D4\u6D3E\u6765\u5E72\u6D3B\u7684\uFF08\u4EFB\u52A1\u5305\u4E0D\u7528 \`<system-reminder>\` \u5305\u662F\u4E3A\u4E86 reducer dedup \u5DE5\u4F5C\u6B63\u5E38\uFF0C\u89C1 manager.ts buildDispatchTaskPack \u6CE8\u91CA\uFF09\uFF1A
@@ -33956,7 +33968,6 @@ var SessionManager = class {
       forkedFromSessionId: args.forkedFromSessionId,
       ownerPersonaId: args.ownerPersonaId,
       appBuilderProject: args.appBuilderProject,
-      ephemeral: args.ephemeral,
       creatorPrincipalId,
       creatorDisplayName,
       createdAt: iso,
@@ -34125,19 +34136,6 @@ var SessionManager = class {
     this.writeOwned(updated);
     return { response: updated, broadcast: [] };
   }
-  /**
-   * 启动清扫：删除所有磁盘残留的 ephemeral（快速问答临时）session。
-   * 客户端崩溃 / 没关抽屉会留下永久不可见的孤儿（ephemeral 被 sidebar 过滤，用户自己也删不掉）。
-   * 启动时调用——此刻无客户端连接，纯文件删除，不广播。
-   */
-  sweepEphemeralOnStartup() {
-    for (const file of this.listAllOwned()) {
-      if (file.ephemeral) {
-        this.deleteOwned(file.sessionId);
-        this.deps.logger?.info?.(`swept ephemeral session ${file.sessionId}`);
-      }
-    }
-  }
   delete(args) {
     const existing = this.findOwnedSession(args.sessionId);
     if (!existing) throw new ClawdError(ERROR_CODES.SESSION_NOT_FOUND, args.sessionId);
@@ -34666,7 +34664,12 @@ var SessionManager = class {
       throw new Error("createDispatchedSession: personaDispatchManager missing in ManagerDeps");
     }
     const sessionId = newSessionId();
-    const scope = {
+    const scope = args.guestPrincipalId ? {
+      kind: "persona",
+      personaId: args.targetPersona,
+      mode: "guest",
+      capId: args.guestPrincipalId
+    } : {
       kind: "persona",
       personaId: args.targetPersona,
       mode: "owner"
@@ -34679,6 +34682,13 @@ var SessionManager = class {
       tool: "claude",
       ownerPersonaId: args.targetPersona,
       dispatchedFromSessionId: args.sourceSessionId,
+      // 跨设备显示关键（spec §8）：creatorPrincipalId = A 的 deviceId，让 A 的
+      // useRemoteSessionsByOwner（按 creatorPrincipalId === A.deviceId 过滤）能 list 到此 B session。
+      // creatorDisplayName = A 的 displayName，供 guest meta callerDisplayName（reducer 要求）。
+      ...args.guestPrincipalId ? {
+        creatorPrincipalId: args.guestPrincipalId,
+        ...args.guestDisplayName ? { creatorDisplayName: args.guestDisplayName } : {}
+      } : {},
       createdAt: now,
       updatedAt: now
     };
@@ -37908,12 +37918,104 @@ function resolveClawdTicketsApiKey() {
 
 // src/handlers/persona-dispatch.ts
 init_protocol();
+
+// src/permission/capability.ts
+function matchResource(grant, target) {
+  if (grant.type === "*") return true;
+  if (grant.type !== target.type) return false;
+  if (grant.id === "*") return true;
+  return grant.id === target.id;
+}
+function assertGrant(grants, resource, action) {
+  for (const g2 of grants) {
+    if (!matchResource(g2.resource, resource)) continue;
+    if (g2.actions.includes(action)) return true;
+    if (g2.actions.includes("admin")) return true;
+  }
+  return false;
+}
+
+// src/permission/session-access.ts
+function canAccessSession(ctx, sessionId, action, deps) {
+  if (ctx.principal.kind === "owner") return true;
+  const file = deps.readSession(sessionId);
+  if (!file) return true;
+  return canAccessPersona(ctx.grants, file.ownerPersonaId, action);
+}
+function canAccessPersona(grants, personaId, action) {
+  if (!personaId) return false;
+  const resource = { type: "persona", id: personaId };
+  return assertGrant(grants, resource, action);
+}
+
+// src/handlers/persona-dispatch.ts
 function buildPersonaDispatchHandlers(deps) {
   const { personaDispatchManager: mgr, spawnB, logger } = deps;
-  const run = async (frame) => {
+  const run = async (frame, _client, ctx) => {
     const { type: _t, requestId: _r, ...rest } = frame;
     const sourceSessionId = typeof rest.sessionId === "string" ? rest.sessionId : void 0;
     const args = DispatchRunArgsSchema.parse(rest);
+    if (args.targetDeviceId) {
+      if (ctx?.principal.kind === "guest") {
+        throw new ClawdError(
+          ERROR_CODES.UNAUTHORIZED,
+          "cross-device forward cannot be initiated by a guest"
+        );
+      }
+      if (!deps.forwardToPeer) {
+        throw new Error("cross-device dispatch not wired (forwardToPeer missing)");
+      }
+      logger?.info("dispatch.run.forward", {
+        targetDeviceId: args.targetDeviceId,
+        targetPersona: args.targetPersona
+      });
+      const outcome2 = await deps.forwardToPeer({
+        targetDeviceId: args.targetDeviceId,
+        targetPersona: args.targetPersona,
+        prompt: args.prompt
+      });
+      return {
+        response: { type: "personaDispatch:run:ok", outcome: outcome2 }
+      };
+    }
+    if (ctx?.principal.kind === "guest") {
+      const isPublic = deps.getPersonaPublic?.(args.targetPersona) ?? false;
+      if (!isPublic || !canAccessPersona(ctx.grants, args.targetPersona, "send")) {
+        throw new ClawdError(
+          ERROR_CODES.UNAUTHORIZED,
+          `persona not dispatchable: ${args.targetPersona}`
+        );
+      }
+      const { dispatchId: dispatchId2 } = mgr.start({
+        sourceSessionId: ctx.principal.id,
+        targetPersona: args.targetPersona
+      });
+      logger?.info("dispatch.run.received.guest", {
+        dispatchId: dispatchId2,
+        sourcePrincipal: ctx.principal.id,
+        targetPersona: args.targetPersona,
+        promptLen: args.prompt.length
+      });
+      void spawnB({
+        dispatchId: dispatchId2,
+        sourceSessionId: ctx.principal.id,
+        targetPersona: args.targetPersona,
+        prompt: args.prompt,
+        guestPrincipalId: ctx.principal.id,
+        guestDisplayName: ctx.principal.displayName
+      }).then(() => logger?.info("dispatch.spawnB.ok", { dispatchId: dispatchId2 })).catch((err) => {
+        const reason = err instanceof Error ? err.message : String(err);
+        logger?.warn("dispatch.spawnB.failed", { dispatchId: dispatchId2, reason });
+        mgr.complete(dispatchId2, {
+          kind: "failure",
+          reason: `failed to spawn B: ${reason}`
+        });
+      });
+      const outcome2 = await mgr.wait(dispatchId2);
+      return {
+        response: { type: "personaDispatch:run:ok", outcome: outcome2 }
+      };
+    }
     if (!sourceSessionId) {
       throw new Error(
         "personaDispatch:run requires sessionId (caller must pass x-clawd-session-id header)"
@@ -37972,6 +38074,46 @@ function buildPersonaDispatchHandlers(deps) {
   };
 }
 
+// src/dispatch/peer-forward.ts
+function wsUrlToHttp(url) {
+  if (url.startsWith("wss://")) return "https://" + url.slice("wss://".length);
+  if (url.startsWith("ws://")) return "http://" + url.slice("ws://".length);
+  return url;
+}
+async function forwardDispatchToPeer(args) {
+  const f = args.fetchImpl ?? fetch;
+  const base = wsUrlToHttp(args.contact.remoteUrl).replace(/\/+$/, "");
+  const url = `${base}/rpc/personaDispatch:run`;
+  let res;
+  try {
+    res = await f(url, {
+      method: "POST",
+      headers: {
+        "content-type": "application/json",
+        authorization: `Bearer ${args.contact.connectToken}`
+      },
+      // 注意：不带 targetDeviceId —— B 端据此判定为本地执行（B 角色）。
+      body: JSON.stringify({ targetPersona: args.targetPersona, prompt: args.prompt })
+    });
+  } catch (err) {
+    const msg = err instanceof Error ? err.message : String(err);
+    return { kind: "failure", reason: `forward to peer failed: ${msg}` };
+  }
+  let json;
+  try {
+    json = await res.json();
+  } catch {
+    return {
+      kind: "failure",
+      reason: `peer returned non-JSON response (HTTP ${res.status})`
+    };
+  }
+  if (json.ok === false) {
+    return { kind: "failure", reason: `peer rejected: ${json.error}: ${json.message}` };
+  }
+  return json.result.outcome;
+}
+
 // src/tools/codex-history.ts
 var import_node_child_process5 = require("child_process");
 var DEFAULT_TIMEOUT_MS = 8e3;
@@ -42472,35 +42614,6 @@ function forkSession(input) {
   return { forkedToolSessionId, forkedFilePath };
 }
 
-// src/permission/capability.ts
-function matchResource(grant, target) {
-  if (grant.type === "*") return true;
-  if (grant.type !== target.type) return false;
-  if (grant.id === "*") return true;
-  return grant.id === target.id;
-}
-function assertGrant(grants, resource, action) {
-  for (const g2 of grants) {
-    if (!matchResource(g2.resource, resource)) continue;
-    if (g2.actions.includes(action)) return true;
-    if (g2.actions.includes("admin")) return true;
-  }
-  return false;
-}
-
-// src/permission/session-access.ts
-function canAccessSession(ctx, sessionId, action, deps) {
-  if (ctx.principal.kind === "owner") return true;
-  const file = deps.readSession(sessionId);
-  if (!file) return true;
-  return canAccessPersona(ctx.grants, file.ownerPersonaId, action);
-}
-function canAccessPersona(grants, personaId, action) {
-  if (!personaId) return false;
-  const resource = { type: "persona", id: personaId };
-  return assertGrant(grants, resource, action);
-}
-
 // src/handlers/session.ts
 init_protocol();
 function buildSessionHandlers(deps) {
@@ -46138,6 +46251,10 @@ var METHOD_GRANT_MAP = {
   "persona:get": CAPABILITY_SCOPED,
   "persona:update": ADMIN_ANY,
   "persona:delete": ADMIN_ANY,
+  // 跨设备 dispatch：A 的 peer daemon 凭 connect token 经 /rpc 调进来；dispatcher 放行，
+  // run handler 内做 persona.public + assertGrant(send) 双重校验（guest grants 是 wildcard，
+  // 单 assertGrant 不够）。本地 cc 仍走 /api/rpc（EXPOSED_RPC_METHODS），不经此表。
+  "personaDispatch:run": CAPABILITY_SCOPED,
   // 2026-05-26 修 clawd people TUI 渲染 mix 串扰回归（参考 f1133ff0 原 owner 路径
   // snapshot/buffer/flush 修复）：之前三件套 ADMIN_ANY 把 guest 拦在 dispatcher 401，
   // 导致 XtermPanel 重挂载拉 snapshot 在 guest 路径不生效，老的字节流断裂串扰回来。
@@ -47212,29 +47329,52 @@ async function startDaemon(config) {
         sourceSessionId: args.sourceSessionId
       });
       const sourceFile = manager.findOwnedSession(args.sourceSessionId);
-      if (!sourceFile) {
+      if (!sourceFile && !args.guestPrincipalId) {
         throw new Error(`personaDispatch:run source session not found: ${args.sourceSessionId}`);
       }
-      const sourceJsonlPath = sourceFile.toolSessionId ? import_node_path48.default.join(
-        import_node_os20.default.homedir(),
-        ".claude",
-        "projects",
-        cwdToHashDir(sourceFile.cwd),
-        `${sourceFile.toolSessionId}.jsonl`
-      ) : "(no transcript yet \u2014 operate from the task description alone)";
+      let sourceJsonlPath = "(no transcript yet \u2014 operate from the task description alone)";
+      if (sourceFile && sourceFile.toolSessionId) {
+        sourceJsonlPath = import_node_path48.default.join(
+          import_node_os20.default.homedir(),
+          ".claude",
+          "projects",
+          cwdToHashDir(sourceFile.cwd),
+          `${sourceFile.toolSessionId}.jsonl`
+        );
+      }
       logger.info("dispatch.spawnB.source-resolved", {
         dispatchId: args.dispatchId,
         sourceJsonlPath,
-        hasToolSessionId: Boolean(sourceFile.toolSessionId)
+        hasToolSessionId: Boolean(sourceFile?.toolSessionId)
       });
       manager.createDispatchedSession({
         dispatchId: args.dispatchId,
         sourceSessionId: args.sourceSessionId,
         targetPersona: args.targetPersona,
         prompt: args.prompt,
-        sourceJsonlPath
+        sourceJsonlPath,
+        // B 角色（跨设备）：非空 → guest scope + creatorPrincipalId/creatorDisplayName = A。
+        guestPrincipalId: args.guestPrincipalId,
+        guestDisplayName: args.guestDisplayName
       });
-    }
+    },
+    // A 角色：从 ContactStore 取 peer 可达 URL + connect token，转发到对端 daemon /rpc。
+    forwardToPeer: async ({ targetDeviceId, targetPersona, prompt }) => {
+      const contact = contactStore.get(targetDeviceId);
+      if (!contact || !contact.remoteUrl || !contact.connectToken) {
+        return {
+          kind: "failure",
+          reason: `unknown or unreachable contact: ${targetDeviceId}`
+        };
+      }
+      return forwardDispatchToPeer({
+        contact: { remoteUrl: contact.remoteUrl, connectToken: contact.connectToken },
+        targetPersona,
+        prompt
+      });
+    },
+    // B 角色：判断 targetPersona 是否 public（跨设备授权边界，private 拒）。
+    getPersonaPublic: (personaId) => personaRegistry.get(personaId)?.public ?? false
   });
   handlers = { ...handlers, ...dispatchHandlers };
   const authResolver = new AuthContextResolver({
@@ -47424,7 +47564,6 @@ async function startDaemon(config) {
       }
     }
   });
-  manager.sweepEphemeralOnStartup();
   await wss.start();
   const url = `ws://${config.host}:${config.port}`;
   let stateSnapshot = {

package/dist/dispatch/mcp-server.cjs

@@ -39576,7 +39576,9 @@ async function handlePersonaDispatchToolCall(input, ctx) {
       },
       body: JSON.stringify({
         targetPersona: input.targetPersona,
-        prompt: input.prompt
+        prompt: input.prompt,
+        // 跨设备：非空时透传，daemon run handler 据此走 A 角色转发分支。
+        ...input.targetDeviceId ? { targetDeviceId: input.targetDeviceId } : {}
       })
     });
   } catch (err) {
@@ -39708,6 +39710,9 @@ async function main() {
         targetPersona: external_exports.string().describe("persona id (e.g. persona-bug-fixer)"),
         prompt: external_exports.string().describe(
           "the task to perform, with the @persona/<id> token stripped out"
+        ),
+        targetDeviceId: external_exports.string().optional().describe(
+          "contact deviceId of the remote device when delegating cross-device (omit for a local persona)"
         )
       }
     },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@clawos-dev/clawd",
-  "version": "0.2.164-beta.340.60574f3",
+  "version": "0.2.165-beta.341.c72ef11",
   "description": "Standalone clawd daemon — Claude Code (and future Codex) session server over WebSocket",
   "type": "module",
   "license": "MIT",