@clawos-dev/clawd 0.2.220-beta.431.c9364d8 → 0.2.221-beta.432.4424967

package/dist/cli.cjs

@@ -45,6 +45,9 @@ var init_methods = __esm({
       "session:update",
       "session:delete",
       "session:send",
+      // per-turn sender 2026-07-08 spec §4.6：MCP servers (ticket / inbox ...) 走 HTTP RPC
+      // /api/rpc/session.currentTurnSender 拉当前 turn caller；WS handler 同名（loopback path 复用）
+      "session:currentTurnSender",
       "session:stop",
       // 温柔中断当前轮次，不杀进程（走 CC IPC control_request.subtype=interrupt）
       "session:interrupt",
@@ -4520,6 +4523,59 @@ var init_attachment_schemas = __esm({
   }
 });
 
+// ../protocol/src/principal.ts
+function makeOwnerPrincipal(id, displayName, feishuUnionId) {
+  return PrincipalSchema.parse({
+    id,
+    kind: "owner",
+    displayName,
+    ...feishuUnionId ? { feishuUnionId } : {}
+  });
+}
+function principalToSender(p2) {
+  return {
+    did: p2.id,
+    displayName: p2.displayName,
+    principal: p2.kind,
+    ...p2.feishuUnionId ? { feishuUnionId: p2.feishuUnionId } : {}
+  };
+}
+function makeGuestSender(did, displayName, feishuUnionId) {
+  return SenderInfoSchema.parse({
+    did,
+    displayName,
+    principal: "guest",
+    ...feishuUnionId ? { feishuUnionId } : {}
+  });
+}
+var PrincipalKindSchema, PrincipalSchema, SenderInfoSchema;
+var init_principal = __esm({
+  "../protocol/src/principal.ts"() {
+    "use strict";
+    init_zod();
+    PrincipalKindSchema = external_exports.enum(["owner", "guest"]);
+    PrincipalSchema = external_exports.object({
+      id: external_exports.string().min(1),
+      kind: PrincipalKindSchema,
+      displayName: external_exports.string(),
+      /**
+       * 飞书 union_id。owner: 本机 daemon 已飞书登录时透传自 owner-identity.json；未登录 undefined。
+       * guest: v1 保持 undefined（connect token 当前不携带 unionId；未来若签名 payload 加字段可透传）。
+       * 消费方（如 ticket MCP / 未来别的飞书身份挂钩场景）按 undefined 决定是否降级；本层不做 fallback。
+       */
+      feishuUnionId: external_exports.string().optional()
+    }).strict();
+    SenderInfoSchema = external_exports.object({
+      /** = principal.id = deviceId（决策 #16）。稳定路由 id */
+      did: external_exports.string().min(1),
+      displayName: external_exports.string(),
+      /** owner 未登录 / guest 无飞书身份时缺省。消费方各自决定是否降级 */
+      feishuUnionId: external_exports.string().optional(),
+      principal: PrincipalKindSchema
+    }).strict();
+  }
+});
+
 // ../protocol/src/persona-schemas.ts
 var PersonaFileSchema, PersonaSkillSummarySchema, PersonaPluginSummarySchema, PersonaSandboxSettingsSchema, PersonaInfoResponseSchema, PersonaCreateArgsSchema, PersonaIdArgsSchema, PersonaUpdateArgsSchema, CodexSandboxSettingsSchema;
 var init_persona_schemas = __esm({
@@ -4628,6 +4684,7 @@ var init_schemas = __esm({
     init_zod();
     init_events();
     init_attachment_schemas();
+    init_principal();
     init_persona_schemas();
     SessionStatusSchema = external_exports.enum(SESSION_STATUS_VALUES);
     UsageSchema = external_exports.object({
@@ -4894,13 +4951,18 @@ var init_schemas = __esm({
       // 真实用户输入：daemon 通过 --replay-user-messages 拿到 stdin 回显，区分于 assistant text。
       // meta 非空表示是 CC 注入的系统消息（task-notification / slash-command / system-reminder 等），
       // UI 据此走低视觉权重渲染或子 agent 通知卡。
+      //
+      // sender（2026-07-08 spec §4.1）：daemon 'send' 命令 synth 的 user_text 携带发起人 SenderInfo；
+      // observer 回灌路径（cc jsonl）永远不带 —— cc 自己写盘不知道 daemon 层身份。
+      // UI 端 sender 缺省 → 不渲染 displayName label；有 → 气泡下方渲染。
       external_exports.object({
         ...ParsedEventBase,
         kind: external_exports.literal("user_text"),
         text: external_exports.string(),
         meta: HistoryUserMetaSchema.optional(),
         taskId: external_exports.string().optional(),
-        parentToolUseId: external_exports.string().optional()
+        parentToolUseId: external_exports.string().optional(),
+        sender: SenderInfoSchema.optional()
       }),
       external_exports.object({
         ...ParsedEventBase,
@@ -5509,24 +5571,6 @@ var init_persona_mode = __esm({
   }
 });
 
-// ../protocol/src/principal.ts
-function makeOwnerPrincipal(id, displayName) {
-  return PrincipalSchema.parse({ id, kind: "owner", displayName });
-}
-var PrincipalKindSchema, PrincipalSchema;
-var init_principal = __esm({
-  "../protocol/src/principal.ts"() {
-    "use strict";
-    init_zod();
-    PrincipalKindSchema = external_exports.enum(["owner", "guest"]);
-    PrincipalSchema = external_exports.object({
-      id: external_exports.string().min(1),
-      kind: PrincipalKindSchema,
-      displayName: external_exports.string()
-    }).strict();
-  }
-});
-
 // ../protocol/src/capability.ts
 function stripSecretHash(cap) {
   const { secretHash: _hash, ...wire } = cap;
@@ -41858,7 +41902,9 @@ function cloneState(s) {
     // ReadyGate v2：readyForSend 是基础类型直接复制；pendingSend 必须浅拷贝防止
     // reduce 内 push/shift 在调用方原 state 上副作用（reducer 纯函数契约）
     readyForSend: s.readyForSend,
-    pendingSend: s.pendingSend.slice()
+    pendingSend: s.pendingSend.slice(),
+    // per-turn sender (spec §4.3)：SenderInfo 只在 case 'send' 覆盖，其它 kind 直接复用引用
+    currentTurnSender: s.currentTurnSender
   };
 }
 var IDLE_KILL_DELAY_MS = 6e5;
@@ -42197,10 +42243,12 @@ function applyCommand(state, command, deps) {
           }
         });
       }
+      next.currentTurnSender = command.senderPrincipal;
       const userEvent = {
         kind: "user_text",
         text: command.text,
-        uuid: deps.genUuid?.()
+        uuid: deps.genUuid?.(),
+        sender: command.senderPrincipal
       };
       const pushed = pushEventToBuffer(next, userEvent, deps);
       effects.push(...pushed.effects);
@@ -43267,7 +43315,9 @@ function makeInitialState(file, subSessionMeta) {
     // ReadyGate v2：默认值兼容 SDK happy path（直写 stdin，不走队列）。
     // TUI 模式由 reducer send 分支按 deps.mode='tui' 主动翻 readyForSend=false
     readyForSend: true,
-    pendingSend: []
+    pendingSend: [],
+    // per-turn sender 2026-07-08 spec §4.3：初始 null；case 'send' 首次覆盖
+    currentTurnSender: null
   };
 }
 var SessionManager = class {
@@ -43940,7 +43990,7 @@ var SessionManager = class {
       ]
     };
   }
-  send(args) {
+  send(args, senderPrincipal) {
     const existing = this.getFile(args.sessionId);
     let runner = this.runners.get(args.sessionId);
     if (!runner) {
@@ -43948,10 +43998,22 @@ var SessionManager = class {
       this.runners.set(args.sessionId, runner);
     }
     const { broadcast } = this.withCollector(() => {
-      runner.input({ kind: "command", command: { kind: "send", text: args.text } });
+      runner.input({
+        kind: "command",
+        command: { kind: "send", text: args.text, senderPrincipal }
+      });
     });
     return { response: { ok: true }, broadcast };
   }
+  /**
+   * 只读拿 SessionState；session 不存在返 null（不 throw）。
+   * handlers/session.ts:currentTurnSender 用（loopback HTTP RPC 绝对不能因不存在的 sid 崩）。
+   * 2026-07-08 spec §4.6。
+   */
+  tryGetState(sessionId) {
+    const runner = this.runners.get(sessionId);
+    return runner?.getState() ?? null;
+  }
   // 等子进程真退出再 ack。reducer 推 SIGKILL effect（见 reducer.ts），内核立即回收子进程，
   // proc.on('exit') 几乎瞬时触发；waitUntilStopped 的 3s 超时只在子进程已是 zombie 或
   // 极端 OS 异常时才会用上。这样修掉了"前端 sessionStop 还没等 CC 退就去删 worktree
@@ -44351,7 +44413,10 @@ var SessionManager = class {
     }
     const runner = this.ensureRunnerForScope(file, args.scope);
     const { broadcast } = this.withCollector(() => {
-      runner.input({ kind: "command", command: { kind: "send", text: args.text } });
+      runner.input({
+        kind: "command",
+        command: { kind: "send", text: args.text, senderPrincipal: args.senderPrincipal }
+      });
     });
     return { response: { ok: true }, broadcast };
   }
@@ -44495,7 +44560,27 @@ var SessionManager = class {
       sourceJsonlPath: args.sourceJsonlPath,
       dispatchId: args.dispatchId
     });
-    runner.input({ kind: "command", command: { kind: "send", text: taskPack } });
+    let dispatchSender;
+    if (args.guestPrincipalId) {
+      dispatchSender = makeGuestSender(args.guestPrincipalId, args.guestDisplayName ?? args.guestPrincipalId);
+    } else {
+      if (!this.deps.ownerPrincipalId) {
+        throw new Error(
+          "createDispatchedSession requires ManagerDeps.ownerPrincipalId to build owner sender"
+        );
+      }
+      dispatchSender = principalToSender(
+        makeOwnerPrincipal(
+          this.deps.ownerPrincipalId,
+          this.deps.ownerDisplayName ?? "Owner",
+          this.deps.ownerFeishuUnionId
+        )
+      );
+    }
+    runner.input({
+      kind: "command",
+      command: { kind: "send", text: taskPack, senderPrincipal: dispatchSender }
+    });
     this.deps.logger?.info("dispatch.createDispatchedSession.task-pack-sent", {
       dispatchId: args.dispatchId,
       bSessionId: sessionId
@@ -44570,6 +44655,18 @@ var SessionManager = class {
     );
     const runner = this.ensureRunnerForScope(file, scope);
     this.deps.logger?.info("shift.createShiftSession.runner-ready", { sessionId });
+    if (!this.deps.ownerPrincipalId) {
+      throw new Error(
+        "createShiftSession requires ManagerDeps.ownerPrincipalId to build owner sender"
+      );
+    }
+    const shiftSender = principalToSender(
+      makeOwnerPrincipal(
+        this.deps.ownerPrincipalId,
+        this.deps.ownerDisplayName ?? "Owner",
+        this.deps.ownerFeishuUnionId
+      )
+    );
     runner.input({
       kind: "command",
       command: {
@@ -44577,7 +44674,8 @@ var SessionManager = class {
         text: wrapShiftFirePrompt({
           prompt: args.prompt,
           targetPersona: args.targetPersona
-        })
+        }),
+        senderPrincipal: shiftSender
       }
     });
     return { sessionId, ended, kill: killImpl };
@@ -48090,7 +48188,7 @@ function ticketMcpConfigPath(dataDir) {
 function writeTicketMcpConfig(args) {
   const cfgPath = ticketMcpConfigPath(args.dataDir);
   const content = {
-    _comment: "daemon \u542F\u52A8\u65F6\u81EA\u52A8\u751F\u6210\uFF1Bcc spawn \u901A\u8FC7 --mcp-config \u6CE8\u5165\u3002ticket-mcp-server.cjs \u662F daemon \u81EA\u5E26\u7684 stdio MCP server\uFF0CHTTP client \u8C03 clawos api /api/tickets/*\u3002env \u542B api url\u3001\u5199\u6B7B API key\u3001caller did/name/scene\uFF1BCLAWD_TICKET_LOG \u6307 server \u5199\u65E5\u5FD7\u7684 append \u6587\u4EF6\u8DEF\u5F84\u3002cc \u573A\u666F scene \u56FA\u5B9A persona\u3002",
+    _comment: "daemon \u542F\u52A8\u65F6\u81EA\u52A8\u751F\u6210\uFF1Bcc spawn \u901A\u8FC7 --mcp-config \u6CE8\u5165\u3002ticket-mcp-server.cjs \u662F daemon \u81EA\u5E26\u7684 stdio MCP server\uFF0CHTTP client \u8C03 clawos api /api/tickets/*\u3002env \u542B api url\u3001\u5199\u6B7B API key\u3001scene\uFF1Bdid/name \u6BCF\u6B21 tool call \u8D70 CLAWD_DAEMON_URL + CLAWD_SESSION_ID (cc \u5DF2\u6CE8) fetch /api/rpc/session.currentTurnSender \u62FF\u5F53\u524D turn caller (2026-07-08 spec \xA74.7)\u3002CLAWD_TICKET_LOG \u6307 server \u5199\u65E5\u5FD7\u7684 append \u6587\u4EF6\u8DEF\u5F84\u3002cc \u573A\u666F scene \u56FA\u5B9A persona\u3002",
     mcpServers: {
       "clawd-ticket": {
         type: "stdio",
@@ -48099,8 +48197,6 @@ function writeTicketMcpConfig(args) {
         env: {
           CLAWD_TICKET_API_URL: args.apiBaseUrl,
           CLAWD_TICKET_API_KEY: args.apiKey,
-          CLAWD_TICKET_DID: args.did,
-          CLAWD_TICKET_NAME: args.name,
           CLAWD_TICKET_SCENE: "persona",
           ...args.logPath ? { CLAWD_TICKET_LOG: args.logPath } : {}
         }
@@ -50211,7 +50307,12 @@ var EXPOSED_RPC_METHODS = [
   "attachment.groupAdd",
   "attachment.signUrl",
   // persona 受控发 P2P IM DM（sender 由 session scope 推，driver 分级授权见 handlers/inbox.ts）
-  "inbox.sendDm"
+  "inbox.sendDm",
+  // per-turn sender 2026-07-08 spec §4.1：MCP servers (ticket / inbox / ...) 每 tool call
+  // 查当前 turn caller —— cc 长驻 + owner/guest 交替驱动同一 session 时不能靠启动时 env
+  // 写死身份，必须运行时 fetch。header X-Clawd-Session-Id 作 session 定位，handler 内查
+  // manager.tryGetState(sid).currentTurnSender 返 SenderInfo | null。
+  "session.currentTurnSender"
 ];
 async function handleRpcRequest(input) {
   const { method, body, sessionId, dispatcher } = input;
@@ -50396,9 +50497,9 @@ function constantTimeEqual2(a, b2) {
 }
 
 // src/transport/connection-context.ts
-function ownerContext(ownerPrincipalId, displayName) {
+function ownerContext(ownerPrincipalId, displayName, feishuUnionId) {
   return {
-    principal: makeOwnerPrincipal(ownerPrincipalId, displayName),
+    principal: makeOwnerPrincipal(ownerPrincipalId, displayName, feishuUnionId),
     grants: [{ resource: { type: "*" }, actions: ["admin"] }]
   };
 }
@@ -50427,7 +50528,10 @@ function visitorGuestContext(p2) {
 async function authenticate(token, deps) {
   if (!token) return { ok: false, code: "NO_TOKEN" };
   if (deps.isOwnerToken(token)) {
-    return { ok: true, context: ownerContext(deps.ownerPrincipalId, deps.ownerDisplayName) };
+    return {
+      ok: true,
+      context: ownerContext(deps.ownerPrincipalId, deps.ownerDisplayName, deps.ownerFeishuUnionId)
+    };
   }
   if (deps.verifyVisitorToken) {
     const vr = deps.verifyVisitorToken(token);
@@ -54720,9 +54824,25 @@ function buildSessionHandlers(deps) {
   const send = async (frame, _client, ctx) => {
     const args = SessionSendArgs.parse(frame);
     ensureSessionAccess(ctx, args.sessionId, "send");
-    const { broadcast } = manager.send(args);
+    const sender = ctx ? principalToSender(ctx.principal) : principalToSender(
+      makeOwnerPrincipal(ownerPrincipalId, deps.ownerDisplayName, deps.ownerFeishuUnionId)
+    );
+    const { broadcast } = manager.send(args, sender);
     return { response: { type: "session:send", ok: true }, broadcast };
   };
+  const currentTurnSender = async (frame, _client, ctx) => {
+    const sid = typeof frame === "object" && frame != null && "sessionId" in frame ? String(frame.sessionId) : "";
+    if (!sid) {
+      return { response: { type: "session:currentTurnSender", sender: null } };
+    }
+    if (ctx && "principal" in ctx) {
+      ensureSessionAccess(ctx, sid, "read");
+    }
+    const state = manager.tryGetState(sid);
+    return {
+      response: { type: "session:currentTurnSender", sender: state?.currentTurnSender ?? null }
+    };
+  };
   const stop = async (frame, _client, ctx) => {
     const args = SessionIdArgs.parse(frame);
     ensureSessionAccess(ctx, args.sessionId, "send");
@@ -54925,6 +55045,7 @@ function buildSessionHandlers(deps) {
     "session:update": update,
     "session:delete": del,
     "session:send": send,
+    "session:currentTurnSender": currentTurnSender,
     "session:stop": stop,
     "session:interrupt": interrupt,
     "session:rewind": rewind,
@@ -57993,7 +58114,14 @@ function buildAppBuilderHandlers(deps) {
           broadcastProjectUpdated(f);
         },
         injectUserText: async (sessionId, text) => {
-          const { broadcast } = sessionManager.send({ sessionId, text });
+          const ownerSender = principalToSender(
+            makeOwnerPrincipal(
+              deps.ownerPrincipalId,
+              deps.ownerDisplayName ?? "Owner",
+              deps.ownerFeishuUnionId
+            )
+          );
+          const { broadcast } = sessionManager.send({ sessionId, text }, ownerSender);
           for (const entry of broadcast) {
             deps.broadcastSessionFrame(entry.frame, entry.target);
           }
@@ -58292,6 +58420,9 @@ function buildMethodHandlers(deps) {
       usersRoot: deps.usersRoot,
       devServerLifecycle: deps.devServerLifecycle,
       sessionManager: deps.manager,
+      ownerPrincipalId: deps.ownerPrincipalId,
+      ownerDisplayName: deps.ownerDisplayName,
+      ownerFeishuUnionId: deps.ownerFeishuUnionId,
       getTunnelUrl: deps.getTunnelUrl,
       broadcastProjectUpdated: deps.broadcastProjectUpdated,
       logger: deps.logger,
@@ -58620,6 +58751,10 @@ var METHOD_GRANT_MAP = {
   "session:update": CAPABILITY_SCOPED,
   "session:delete": CAPABILITY_SCOPED,
   "session:send": CAPABILITY_SCOPED,
+  // per-turn sender 2026-07-08 spec §4.6：dispatcher 层走 'public'（HTTP RPC path 需 dispatcher 放行）；
+  // WS path 的隐私边界（防 guest 猜 sid 枚举 owner feishuUnionId）由 handler 内 ensureSessionAccess
+  // 显式兜底——见 handlers/session.ts:currentTurnSender。dispatcher 'public' ≠ handler 免检。
+  "session:currentTurnSender": { kind: "public" },
   "session:stop": CAPABILITY_SCOPED,
   "session:interrupt": CAPABILITY_SCOPED,
   "session:rewind": CAPABILITY_SCOPED,
@@ -59192,6 +59327,7 @@ async function startDaemon(config) {
   let ownerId = feishuIdentity?.identity.ownerId ?? "";
   let ownerProvider = feishuIdentity?.identity.provider ?? "";
   let ownerDisplayName = feishuIdentity?.identity.displayName ?? loadOwnerDisplayName(config.dataDir);
+  let ownerFeishuUnionId = feishuIdentity?.identity.unionId;
   const authMode = resolvedAuthToken == null ? "none" : "first-message";
   const inboxStore = new InboxStore(config.dataDir);
   const inboxManager = new InboxManager(inboxStore, (_peerDeviceId, frame) => {
@@ -59204,6 +59340,7 @@ async function startDaemon(config) {
     isOwnerToken: (x) => resolvedAuthToken != null && constantTimeEqual(x, resolvedAuthToken),
     ownerPrincipalId,
     ownerDisplayName,
+    ownerFeishuUnionId,
     // persona web 分享：访客 visitor token = daemon 自签 HMAC（无 aud），独立于飞书 connect token
     // 基建——secret 恒存在（auth-store backfill），故无条件注入。验签 ok → guest ctx（persona wildcard）。
     verifyVisitorToken: (t) => {
@@ -59287,7 +59424,7 @@ async function startDaemon(config) {
       return result;
     },
     onAuthed: (h, ctx) => wsServer?.attachClientContext(h.id, ctx),
-    buildOwnerContext: () => ownerContext(ownerPrincipalId, ownerDisplayName),
+    buildOwnerContext: () => ownerContext(ownerPrincipalId, ownerDisplayName, ownerFeishuUnionId),
     closeConnection: (h, code, reason) => wsServer?.closeClient(h.id, code, reason),
     sendOk: (h, payload) => wsServer?.sendToClient(h.id, payload)
   }) : null;
@@ -59359,8 +59496,6 @@ async function startDaemon(config) {
     import_node_path64.default.join(here, "..", "dist", "ticket", "mcp-server.cjs")
   ];
   const ticketServerScriptPath = ticketServerCandidates.find((p2) => import_node_fs51.default.existsSync(p2));
-  const ticketCallerDid = authFile.deviceId;
-  const ticketCallerName = ownerDisplayName;
   let ticketMcpConfigPath2;
   if (ticketServerScriptPath) {
     const ticketLogPath = import_node_path64.default.join(config.dataDir, "ticket-mcp-server.log");
@@ -59369,8 +59504,6 @@ async function startDaemon(config) {
       serverScriptPath: ticketServerScriptPath,
       apiBaseUrl: config.clawosApi ?? DEFAULT_CLAWOS_API,
       apiKey: resolveClawdTicketsApiKey(),
-      did: ticketCallerDid,
-      name: ticketCallerName,
       logPath: ticketLogPath
     });
     logger.info("ticket.mcp.json written", {
@@ -59459,6 +59592,7 @@ async function startDaemon(config) {
     personaStore,
     ownerDisplayName,
     ownerPrincipalId,
+    ownerFeishuUnionId,
     contactStore,
     mode: config.mode,
     // 单栏 refactor (spec 2026-06-02 §5.1)：cc 子进程 env CLAWD_DAEMON_URL 闭包来源。
@@ -59721,6 +59855,8 @@ async function startDaemon(config) {
     ownerDisplayName,
     // 决策 #16: whoami owner.id = 本机 deviceId（路由主键）+ ownerId/provider 归属人
     ownerPrincipalId,
+    // per-turn sender §4.6：send handler 无 ctx 兜底 + AppBuilder publish injectUserText 需要
+    ownerFeishuUnionId,
     ownerId,
     ownerProvider,
     personaStore,
@@ -60004,6 +60140,7 @@ async function startDaemon(config) {
           ownerId = result.identity.ownerId;
           ownerProvider = result.identity.provider;
           ownerDisplayName = result.identity.displayName;
+          ownerFeishuUnionId = result.identity.unionId;
           handlers = makeHandlers();
           wsServer?.broadcastToOwners({ type: "auth:login:done", identity: result.identity });
           setImmediate(() => wsServer?.closeAllClients());
@@ -60142,7 +60279,7 @@ async function startDaemon(config) {
   wss.onFrame(async (client, frame) => {
     const type = frame.type;
     const requestId = typeof frame.requestId === "string" ? frame.requestId : void 0;
-    const ctx = wsServer.getClientContext(client.id) ?? ownerContext(ownerPrincipalId, ownerDisplayName);
+    const ctx = wsServer.getClientContext(client.id) ?? ownerContext(ownerPrincipalId, ownerDisplayName, ownerFeishuUnionId);
     const result = await dispatchRpc(type, frame, client, ctx, {
       handlers,
       feishuActive: () => feishuActive