@clawos-dev/clawd 0.2.179-beta.359.7bf1eca → 0.2.180-beta.360.ee0a26c

package/dist/cli.cjs

@@ -41339,11 +41339,34 @@ function buildConnectionPrompt(args) {
   }
   if (args.workDir) {
     result += `
-\u4F60\u7684\u6587\u4EF6\u5DE5\u4F5C\u76EE\u5F55\u662F ${args.workDir}\uFF0C\u6240\u6709\u6587\u4EF6\u8BFB\u5199\u90FD\u653E\u5728\u8FD9\u4E2A\u76EE\u5F55\u4E0B\u3002persona \u76EE\u5F55\u5BF9\u4F60\u53EA\u8BFB\uFF0C\u4E0D\u8981\u5F80\u91CC\u5199\u3002`;
+\u4F60\u7684\u6587\u4EF6\u5DE5\u4F5C\u76EE\u5F55\u662F ${args.workDir}\uFF0C\u8FD9\u4E2A\u76EE\u5F55\u5BF9\u4F60\u53EF\u8BFB\u53EF\u5199\uFF0C\u6587\u4EF6\u7684\u8BFB\u53D6/\u521B\u5EFA/\u4FEE\u6539\u90FD\u5728\u8FD9\u91CC\u8FDB\u884C\u3002persona \u76EE\u5F55\u5BF9\u4F60\u53EA\u8BFB\uFF0C\u4E0D\u8981\u5F80\u91CC\u5199\u3002`;
   }
   return result;
 }
 
+// src/persona/sharing-prompt.ts
+var ATTACHMENT_SHARING_HINT = `## \u628A\u4EA7\u51FA\u6587\u4EF6\u5206\u4EAB\u7ED9\u5BF9\u65B9\uFF08attachment\uFF09
+
+\u5F53\u4F60\u4EA7\u51FA\u4E86\u6587\u4EF6\u3001\u9700\u8981\u8BA9\u5BF9\u65B9\u62FF\u5230\u65F6\uFF08\u5C24\u5176 Bash \u89E3\u538B/\u751F\u6210\u7684\u6587\u4EF6\uFF0C\u6216\u8DE8\u8BBE\u5907\u88AB\u59D4\u6D3E\u65F6\u5BF9\u65B9\u5728\u53E6\u4E00\u53F0\u673A\u5668\u3001\u770B\u4E0D\u5230\u4F60\u7684\u672C\u5730\u8DEF\u5F84\uFF09\uFF0C\u7528 daemon \u7684 HTTP RPC \u628A\u6587\u4EF6\u8F6C\u6210\u4E00\u4E2A\u5E26\u7B7E\u540D\u7684\u4E0B\u8F7D URL\uFF1A
+
+1. \u5165\u7FA4\uFF08\u767B\u8BB0\u5230\u672C session \u7684\u5171\u4EAB\u6E05\u5355\uFF09\uFF1A
+   \`\`\`bash
+   curl -sS -X POST "$CLAWD_DAEMON_URL/api/rpc/attachment.groupAdd" \\
+     -H "X-Clawd-Session-Id: $CLAWD_SESSION_ID" -H 'Content-Type: application/json' \\
+     -d '{"relPath":"<\u6587\u4EF6\u7684\u7EDD\u5BF9\u8DEF\u5F84>"}'
+   \`\`\`
+2. \u7B7E\u540D\u62FF URL\uFF1A
+   \`\`\`bash
+   curl -sS -X POST "$CLAWD_DAEMON_URL/api/rpc/attachment.signUrl" \\
+     -H "X-Clawd-Session-Id: $CLAWD_SESSION_ID" -H 'Content-Type: application/json' \\
+     -d '{"relPath":"<\u540C\u4E00\u4E2A\u7EDD\u5BF9\u8DEF\u5F84>"}'
+   \`\`\`
+   \u8FD4\u56DE\u7684 \`url\` \u5C31\u662F\u5BF9\u65B9\u53EF\u76F4\u63A5\u6253\u5F00/\u4E0B\u8F7D\u7684\u94FE\u63A5\u3002
+
+- \`relPath\` \u5FC5\u987B\u4F20**\u7EDD\u5BF9\u8DEF\u5F84**\uFF08\u4F60\u4EA7\u51FA\u6587\u4EF6\u7684\u771F\u5B9E\u8DEF\u5F84\uFF09\uFF0C\u4E0D\u8981\u4F20\u76F8\u5BF9\u8DEF\u5F84\u3002
+- \u53EA\u80FD\u5206\u4EAB\u4F60\u81EA\u5DF1\u5DE5\u4F5C\u76EE\u5F55\u5185\u7684\u6587\u4EF6\uFF0C\u8D8A\u754C\u4F1A\u88AB\u62D2\u3002
+- \u88AB dispatch \u63A5\u5230\u4EFB\u52A1\u3001\u8981\u56DE\u4F20\u4EA7\u7269\u65F6\uFF1A\u628A\u7B7E\u540D URL \u5199\u8FDB \`personaDispatchComplete\` \u7684 \`text\` \u91CC\uFF08\`filePaths\` \u53EA\u662F\u4F60\u672C\u673A\u7684\u7EDD\u5BF9\u8DEF\u5F84\uFF0C\u8DE8\u8BBE\u5907\u5BF9\u65B9\u6253\u4E0D\u5F00\uFF0CURL \u624D\u80FD\u6253\u5F00\uFF09\u3002`;
+
 // src/dispatch/system-prompt.ts
 var DISPATCH_SYSTEM_PROMPT_HINT = `## \u59D4\u6D3E\u7ED9\u53E6\u4E00\u4E2A persona\uFF08dispatch\uFF09
 
@@ -41509,6 +41532,9 @@ function buildSpawnContext(state, deps) {
   if (dispatchMcpConfigPath2) {
     ctx.extraSystemPrompt = (ctx.extraSystemPrompt ? ctx.extraSystemPrompt + "\n\n" : "") + DISPATCH_SYSTEM_PROMPT_HINT;
   }
+  if (daemonUrl) {
+    ctx.extraSystemPrompt = (ctx.extraSystemPrompt ? ctx.extraSystemPrompt + "\n\n" : "") + ATTACHMENT_SHARING_HINT;
+  }
   if (meta?.extraSettings) {
     ctx.extraSettings = meta.extraSettings;
   }
@@ -47317,7 +47343,7 @@ var import_node_crypto4 = require("crypto");
 var MAX_RUNS_PER_SHIFT = 30;
 var DEFAULT_TIMEOUT_MS = 30 * 6e4;
 var CONSECUTIVE_ERROR_THRESHOLD = 5;
-var TICK_INTERVAL_MS = 1e3;
+var TICK_INTERVAL_MS = 1e4;
 var STORE_FLUSH_DEBOUNCE_MS = 500;
 var CLOCK_JUMP_THRESHOLD_MS = 5 * 6e4;
 
@@ -49243,6 +49269,67 @@ function removeSubscription(client, sessionId) {
   else client.subscribedSessions.set(sessionId, next);
 }
 
+// src/transport/rpc-adapter.ts
+var EXPOSED_RPC_METHODS = [
+  "appBuilder.createProject",
+  "appBuilder.listProjects",
+  "appBuilder.updateProjectPort",
+  "appBuilder.setProdUrl",
+  // 单栏 refactor §5.6.2 stage fix：scaffold + install 完成调 startDevServer 起 dev server；
+  // 中间用 reportStage 上报阶段（scaffolding / installing / failed），UI 据 stage 推帧切 PreviewPane。
+  "appBuilder.startDevServer",
+  "appBuilder.reportStage",
+  // 单栏 §5.6.5 fix: UI 切 session 时调（assistant 不需要主动调，但暴露白名单避免误猜成 forbidden）
+  "appBuilder.setActiveSession",
+  // dataclaw-builder：persona 建页时取建页人身份（含 union_id）写进生成 app 的配置。
+  // 路由到 handlers['auth:getIdentity']，只返 identity、绝不带 ttcToken（见 handlers/feishu-auth.ts）。
+  "auth.getIdentity",
+  // Persona dispatch (Task 4): A 端 dispatch MCP server 调 run（hold-and-wait 一次）；
+  // B 端 dispatch MCP server 调 complete（带 outcome 触发 run 端 resolve）。详见
+  // protocol/src/dispatch.ts。
+  "personaDispatch.run",
+  "personaDispatch.complete",
+  // clawd-shift v1 (spec 2026-06-24-clawd-shift)：cc 子进程内的 shift MCP server 调
+  // 这 5 个 method 管理 owner 的 shift（fire-and-forget 排班）。鉴权靠 body.personaId
+  // （mcp-server 从 process.env.CLAWD_PERSONA_ID 读，源 = SessionFile.ownerPersonaId）。
+  // handler 内 cancel/update/history 校验 createdByPersona === personaId 防越权。
+  "shift-internal.add",
+  "shift-internal.list",
+  "shift-internal.cancel",
+  "shift-internal.update",
+  "shift-internal.history",
+  // file-sharing：persona guest agent 把自己工作目录内的产物入群+签名分享。
+  // 路径越界由 handlers/attachment.ts guardAttachmentPath（scope-based）拦截。
+  "attachment.groupAdd",
+  "attachment.signUrl"
+];
+async function handleRpcRequest(input) {
+  const { method, body, sessionId, dispatcher } = input;
+  if (!sessionId) {
+    return { status: 400, body: { ok: false, error: "MISSING_SESSION_ID", message: "X-Clawd-Session-Id header required" } };
+  }
+  if (!EXPOSED_RPC_METHODS.includes(method)) {
+    return { status: 403, body: { ok: false, error: "METHOD_NOT_EXPOSED", message: `method "${method}" not exposed via HTTP RPC` } };
+  }
+  const internalMethod = method.replace(".", ":");
+  const augmentedBody = {
+    ...typeof body === "object" && body != null ? body : {},
+    sessionId
+  };
+  try {
+    const result = await dispatcher.dispatch(internalMethod, augmentedBody, { sessionId });
+    return { status: 200, body: { ok: true, result } };
+  } catch (err) {
+    const e = err;
+    const code = e?.code ?? "INTERNAL";
+    const message = e?.message ?? String(err);
+    return { status: 400, body: { ok: false, error: code, message } };
+  }
+}
+function resolveExposedHandler(handlers, internalMethod) {
+  return handlers[internalMethod] ?? handlers[internalMethod.replace(":", ".")];
+}
+
 // src/transport/auth.ts
 init_protocol();
 var AuthGate = class {
@@ -50485,60 +50572,6 @@ async function importZip(buf, root) {
   }
 }
 
-// src/transport/rpc-adapter.ts
-var EXPOSED_RPC_METHODS = [
-  "appBuilder.createProject",
-  "appBuilder.listProjects",
-  "appBuilder.updateProjectPort",
-  "appBuilder.setProdUrl",
-  // 单栏 refactor §5.6.2 stage fix：scaffold + install 完成调 startDevServer 起 dev server；
-  // 中间用 reportStage 上报阶段（scaffolding / installing / failed），UI 据 stage 推帧切 PreviewPane。
-  "appBuilder.startDevServer",
-  "appBuilder.reportStage",
-  // 单栏 §5.6.5 fix: UI 切 session 时调（assistant 不需要主动调，但暴露白名单避免误猜成 forbidden）
-  "appBuilder.setActiveSession",
-  // dataclaw-builder：persona 建页时取建页人身份（含 union_id）写进生成 app 的配置。
-  // 路由到 handlers['auth:getIdentity']，只返 identity、绝不带 ttcToken（见 handlers/feishu-auth.ts）。
-  "auth.getIdentity",
-  // Persona dispatch (Task 4): A 端 dispatch MCP server 调 run（hold-and-wait 一次）；
-  // B 端 dispatch MCP server 调 complete（带 outcome 触发 run 端 resolve）。详见
-  // protocol/src/dispatch.ts。
-  "personaDispatch.run",
-  "personaDispatch.complete",
-  // clawd-shift v1 (spec 2026-06-24-clawd-shift)：cc 子进程内的 shift MCP server 调
-  // 这 5 个 method 管理 owner 的 shift（fire-and-forget 排班）。鉴权靠 body.personaId
-  // （mcp-server 从 process.env.CLAWD_PERSONA_ID 读，源 = SessionFile.ownerPersonaId）。
-  // handler 内 cancel/update/history 校验 createdByPersona === personaId 防越权。
-  "shift-internal.add",
-  "shift-internal.list",
-  "shift-internal.cancel",
-  "shift-internal.update",
-  "shift-internal.history"
-];
-async function handleRpcRequest(input) {
-  const { method, body, sessionId, dispatcher } = input;
-  if (!sessionId) {
-    return { status: 400, body: { ok: false, error: "MISSING_SESSION_ID", message: "X-Clawd-Session-Id header required" } };
-  }
-  if (!EXPOSED_RPC_METHODS.includes(method)) {
-    return { status: 403, body: { ok: false, error: "METHOD_NOT_EXPOSED", message: `method "${method}" not exposed via HTTP RPC` } };
-  }
-  const internalMethod = method.replace(".", ":");
-  const augmentedBody = {
-    ...typeof body === "object" && body != null ? body : {},
-    sessionId
-  };
-  try {
-    const result = await dispatcher.dispatch(internalMethod, augmentedBody, { sessionId });
-    return { status: 200, body: { ok: true, result } };
-  } catch (err) {
-    const e = err;
-    const code = e?.code ?? "INTERNAL";
-    const message = e?.message ?? String(err);
-    return { status: 400, body: { ok: false, error: code, message } };
-  }
-}
-
 // src/transport/http-router.ts
 var RPC_ROUTE_PREFIX = "/api/rpc/";
 var RPC_BODY_MAX_BYTES = 1 * 1024 * 1024;
@@ -52929,6 +52962,16 @@ function personaIdFromPath(absPath, personaRoot) {
   const id = rel.split(path44.sep)[0];
   return id || null;
 }
+function isPathWithin(dir, absPath) {
+  const d = path44.resolve(dir);
+  const t = path44.resolve(absPath);
+  const sep3 = d.endsWith(path44.sep) ? "" : path44.sep;
+  return t === d || t.startsWith(d + sep3);
+}
+function isPathInGuestBoundary(personaRoot, personaId, userWorkDir, absPath) {
+  if (userWorkDir && isPathWithin(userWorkDir, absPath)) return true;
+  return personaIdFromPath(path44.resolve(absPath), personaRoot) === personaId;
+}
 
 // src/handlers/history.ts
 init_protocol();
@@ -53740,6 +53783,31 @@ function assertGuestAttachmentPath(ctx, absPath, personaRoot, method, usersRoot)
   }
 }
 function buildAttachmentHandlers(deps) {
+  function guardAttachmentPath(ctx, sessionId, candidateAbs, method, nonGuestPolicy) {
+    if (ctx?.principal.kind === "owner") return;
+    const scope = deps.getSessionScope?.(sessionId);
+    if (!scope) return;
+    if (scope.kind === "persona" && scope.mode === "guest") {
+      if (!deps.personaRoot) return;
+      const userWorkDir = deps.usersRoot ? deriveUserWorkDir(scope.capId, deps.usersRoot) : void 0;
+      if (!isPathInGuestBoundary(deps.personaRoot, scope.personaId, userWorkDir, candidateAbs)) {
+        throw new ClawdError(
+          ERROR_CODES.UNAUTHORIZED,
+          `${method}: path outside guest work dir: ${candidateAbs}`
+        );
+      }
+      return;
+    }
+    if (nonGuestPolicy === "group-acl") return;
+    const cwd = deps.sessionStore?.read(sessionId)?.cwd;
+    if (!cwd) return;
+    if (!isPathWithin(cwd, candidateAbs)) {
+      throw new ClawdError(
+        ERROR_CODES.UNAUTHORIZED,
+        `${method}: path outside session work dir: ${candidateAbs}`
+      );
+    }
+  }
   const signUrl = async (frame, _client, ctx) => {
     const parsed = AttachmentSignUrlArgs.safeParse(frame);
     if (!parsed.success) {
@@ -53782,7 +53850,7 @@ function buildAttachmentHandlers(deps) {
     }
     const cwdAbs = import_node_path36.default.resolve(sessionFile.cwd);
     const candidateAbs = import_node_path36.default.isAbsolute(args.relPath) ? import_node_path36.default.resolve(args.relPath) : import_node_path36.default.resolve(cwdAbs, args.relPath);
-    assertGuestAttachmentPath(ctx, candidateAbs, deps.personaRoot, "attachment.signUrl", deps.usersRoot);
+    guardAttachmentPath(ctx, args.sessionId, candidateAbs, "attachment.signUrl", "group-acl");
     const entries = deps.groupFileStore.list(scope, args.sessionId);
     const entry = entries.find((e) => {
       const storedAbs = import_node_path36.default.isAbsolute(e.relPath) ? import_node_path36.default.resolve(e.relPath) : import_node_path36.default.resolve(cwdAbs, e.relPath);
@@ -53821,15 +53889,18 @@ function buildAttachmentHandlers(deps) {
       throw new ClawdError(ERROR_CODES.VALIDATION_ERROR, parsed.error.message);
     }
     const args = parsed.data;
-    guardGuestBySessionCwd(ctx, args.sessionId, "attachment.groupAdd");
     const scope = deps.getSessionScope(args.sessionId);
     if (!scope) {
       throw new ClawdError(ERROR_CODES.VALIDATION_ERROR, `session ${args.sessionId} not found`);
     }
+    const cwdAbs = import_node_path36.default.resolve(deps.sessionStore?.read(args.sessionId)?.cwd ?? ".");
+    const candidateAbs = import_node_path36.default.isAbsolute(args.relPath) ? import_node_path36.default.resolve(args.relPath) : import_node_path36.default.resolve(cwdAbs, args.relPath);
+    guardAttachmentPath(ctx, args.sessionId, candidateAbs, "attachment.groupAdd", "cwd-subtree");
+    const from = ctx?.principal.kind === "owner" ? "owner" : "agent";
     const size = 0;
     const entry = deps.groupFileStore.upsert(scope, args.sessionId, {
       relPath: args.relPath,
-      from: "owner",
+      from,
       label: args.label,
       size,
       mime: lookupMime(args.relPath)
@@ -55654,22 +55725,11 @@ function buildAppBuilderHandlers(deps) {
 }
 
 // src/handlers/shift.ts
-var UI_DEFAULT_DURATION_MS = 30 * 6e4;
-var UI_MAX_DURATION_MS = 60 * 6e4;
-function pickUiDurationMs(timeoutMs) {
-  return Math.min(timeoutMs ?? UI_DEFAULT_DURATION_MS, UI_MAX_DURATION_MS);
-}
-function everyMsToCron(everyMs) {
-  if (everyMs <= 6e4) return "* * * * *";
-  const minutes = Math.floor(everyMs / 6e4);
-  if (minutes < 60) return `*/${minutes} * * * *`;
-  const hours = Math.floor(minutes / 60);
-  if (hours < 24) return `0 */${hours} * * *`;
-  const days = Math.max(1, Math.floor(hours / 24));
-  return `0 0 */${days} * *`;
-}
-function daemonShiftToUiShift(d, nowMs) {
-  const durationMs = pickUiDurationMs(d.timeoutMs);
+function daemonShiftToUiShift(d, _nowMs) {
+  if (d.schedule.kind === "at") {
+    const atMs = Date.parse(d.schedule.at);
+    if (Number.isNaN(atMs)) return null;
+  }
   const noteParts = [d.name];
   if (d.prompt && d.prompt.length > 0) {
     const promptPreview = d.prompt.length > 120 ? `${d.prompt.slice(0, 117)}\u2026` : d.prompt;
@@ -55677,49 +55737,12 @@ function daemonShiftToUiShift(d, nowMs) {
   }
   if (!d.enabled) noteParts.push("(disabled)");
   const note = noteParts.join(" \u2014 ");
-  switch (d.schedule.kind) {
-    case "at": {
-      const startMs = Date.parse(d.schedule.at);
-      if (Number.isNaN(startMs)) return null;
-      if (startMs + durationMs <= nowMs) return null;
-      return {
-        id: d.id,
-        agentId: d.targetPersona,
-        schedule: {
-          kind: "single",
-          start: new Date(startMs).toISOString(),
-          end: new Date(startMs + durationMs).toISOString()
-        },
-        note
-      };
-    }
-    case "cron": {
-      return {
-        id: d.id,
-        agentId: d.targetPersona,
-        schedule: {
-          kind: "recurring",
-          cron: d.schedule.expr,
-          ...d.schedule.tz ? { tz: d.schedule.tz } : {},
-          durationMs
-        },
-        note
-      };
-    }
-    case "every": {
-      const cron = everyMsToCron(d.schedule.everyMs);
-      return {
-        id: d.id,
-        agentId: d.targetPersona,
-        schedule: {
-          kind: "recurring",
-          cron,
-          durationMs
-        },
-        note
-      };
-    }
-  }
+  return {
+    id: d.id,
+    agentId: d.targetPersona,
+    schedule: d.schedule,
+    note
+  };
 }
 function buildShiftHandlers(deps) {
   return {
@@ -57447,7 +57470,7 @@ async function startDaemon(config) {
   });
   const rpcDispatcher = {
     async dispatch(method, args, _ctx) {
-      const handler = handlers[method];
+      const handler = resolveExposedHandler(handlers, method);
       if (!handler) {
         throw Object.assign(new Error(`unknown RPC method "${method}"`), { code: "METHOD_NOT_IMPLEMENTED" });
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@clawos-dev/clawd",
-  "version": "0.2.179-beta.359.7bf1eca",
+  "version": "0.2.180-beta.360.ee0a26c",
   "description": "Standalone clawd daemon — Claude Code (and future Codex) session server over WebSocket",
   "type": "module",
   "license": "MIT",