@clawos-dev/clawd 0.2.233 → 0.2.234

package/dist/cli.cjs

@@ -4820,6 +4820,14 @@ var init_schemas = __esm({
        * 或 deps.ownerDisplayName（owner）。
        */
       creatorDisplayName: external_exports.string().min(1).optional(),
+      /**
+       * 创建该 session 的连接者飞书 union_id（一次性 stamp，T-31 persona prompt injection）。
+       * session:create / dispatch spawnB handler 从 ctx.principal.feishuUnionId（guest 场景来自
+       * connect token subOwner）或 deps.ownerFeishuUnionId（owner 场景）传入；newRunner 时读这个
+       * 字段派生 SubSessionMeta.callerFeishuUnionId 注入 cc system prompt「身份卡」的 union_id 行。
+       * Optional：老 SessionFile / owner 未登飞书路径缺省，缺省时 prompt 不渲染该行（向后兼容）。
+       */
+      creatorFeishuUnionId: external_exports.string().min(1).optional(),
       /**
        * Mirror peer sessions (2026-05-26): mirror 标识。**我在朋友 daemon 上创建的 session**，
        * 远端是 source of truth，本机是持久化副本，方便 sidebar 跨设备聚合。
@@ -41423,11 +41431,17 @@ function scopeSubPath(scope) {
   if (scope.mode === "guest") return [scope.personaId, "guests", scope.capId];
   return [scope.personaId, scope.mode];
 }
-function metaFromScope(scope, personaRoot, usersRoot, ownerPrincipalId, callerDisplayName) {
+function metaFromScope(scope, personaRoot, usersRoot, ownerPrincipalId, callerDisplayName, callerFeishuUnionId) {
   if (scope.kind === "default") return void 0;
   if (scope.mode === "owner") {
     if (!ownerPrincipalId || !usersRoot) {
-      return { idleKillEnabled: false, personaMode: "owner", callerDisplayName };
+      return {
+        idleKillEnabled: false,
+        personaMode: "owner",
+        callerDisplayName,
+        callerDeviceId: ownerPrincipalId,
+        callerFeishuUnionId
+      };
     }
     const userWorkDir2 = deriveUserWorkDir(ownerPrincipalId, usersRoot);
     return {
@@ -41435,7 +41449,9 @@ function metaFromScope(scope, personaRoot, usersRoot, ownerPrincipalId, callerDi
       personaMode: "owner",
       userWorkDir: userWorkDir2,
       addDirs: [userWorkDir2],
-      callerDisplayName
+      callerDisplayName,
+      callerDeviceId: ownerPrincipalId,
+      callerFeishuUnionId
     };
   }
   const userWorkDir = deriveUserWorkDir(scope.capId, usersRoot);
@@ -41444,7 +41460,9 @@ function metaFromScope(scope, personaRoot, usersRoot, ownerPrincipalId, callerDi
     personaMode: "guest",
     userWorkDir,
     addDirs: [userWorkDir],
-    callerDisplayName
+    callerDisplayName,
+    callerDeviceId: scope.capId,
+    callerFeishuUnionId
   };
 }
 function scopeForFile(file, ownerPrincipalId) {
@@ -41844,30 +41862,61 @@ function buildRule(tool, input) {
 }
 
 // src/persona/connection-prompt.ts
-var OWNER_TEMPLATE = `# \u8FDE\u63A5\u4E0A\u4E0B\u6587
-\u4F60\u73B0\u5728\u4EE5 Owner \u8EAB\u4EFD\u88AB\u8FDE\u63A5\uFF0C\u5BF9\u65B9\u5C31\u662F owner \u672C\u4EBA\uFF08{ownerLabel}\uFF09\u3002
-\u81EA\u6211\u4ECB\u7ECD\u65F6\u4F7F\u7528\u7B2C\u4E00/\u7B2C\u4E8C\u4EBA\u79F0\uFF0C\u4F8B\u5982\u300C\u6211\u662F\u60A8\u7684 xxx \u52A9\u624B\u300D\u3002`;
-var GUEST_TEMPLATE = `# \u8FDE\u63A5\u4E0A\u4E0B\u6587
-\u4F60\u73B0\u5728\u4EE5 Guest \u8EAB\u4EFD\u88AB\u8FDE\u63A5\uFF0C\u672C persona \u7684 owner \u662F\u300C{ownerLabel}\u300D\uFF0C\u5F53\u524D\u5BF9\u8BDD\u7684\u5BF9\u65B9\u662F\u300C{guestLabel}\u300D\uFF0C\u4E0D\u662F owner \u672C\u4EBA\u3002
-\u81EA\u6211\u4ECB\u7ECD\u65F6\u7B2C\u4E09\u4EBA\u79F0\u6307\u4EE3 owner\u3001\u7B2C\u4E8C\u4EBA\u79F0\u79F0\u547C\u5BF9\u65B9\uFF0C\u4F8B\u5982\u300C{guestLabel}\uFF0C\u6211\u662F {ownerLabel} \u7684 xxx \u52A9\u624B\uFF0C\u4F60\u53EF\u4EE5\u901A\u8FC7\u6211\u770B\u5230\u4ED6\u7684 xxx\u300D\u3002\u4E0D\u8981\u628A\u5BF9\u65B9\u5F53\u6210 owner\uFF0C\u4E0D\u8981\u66FF owner \u505A\u51FA\u627F\u8BFA\u3002`;
+function renderIdentityLines(fields) {
+  const lines = [`- \u663E\u793A\u540D\uFF1A${fields.label}`];
+  if (fields.feishuUnionId) lines.push(`- \u98DE\u4E66 union_id\uFF1A${fields.feishuUnionId}`);
+  if (fields.deviceId) lines.push(`- \u8BBE\u5907 id\uFF1A${fields.deviceId}`);
+  if (fields.extraLastLine) lines.push(fields.extraLastLine);
+  return lines.join("\n");
+}
 function buildConnectionPrompt(args) {
-  let result;
-  if (args.mode === "guest") {
-    result = GUEST_TEMPLATE.replace(/\{ownerLabel\}/g, args.ownerLabel).replace(
-      /\{guestLabel\}/g,
-      args.guestLabel
+  const parts = ["# \u8FDE\u63A5\u4E0A\u4E0B\u6587"];
+  if (args.mode === "owner") {
+    parts.push("\u5F53\u524D\u8FDE\u63A5\u65B9\uFF08\u5C31\u662F owner \u672C\u4EBA\uFF09\uFF1A");
+    parts.push(
+      renderIdentityLines({
+        label: args.ownerLabel,
+        feishuUnionId: args.ownerFeishuUnionId,
+        deviceId: args.ownerDeviceId
+      })
     );
   } else {
-    result = OWNER_TEMPLATE.replace(/\{ownerLabel\}/g, args.ownerLabel);
+    parts.push("\u5F53\u524D\u8FDE\u63A5\u65B9\uFF08\u4E0D\u662F owner \u672C\u4EBA\uFF09\uFF1A");
+    parts.push(
+      renderIdentityLines({
+        label: args.guestLabel,
+        feishuUnionId: args.guestFeishuUnionId,
+        deviceId: args.guestDeviceId,
+        extraLastLine: "- \u8EAB\u4EFD\uFF1AGuest\uFF08\u8FDC\u7A0B\u8FDE\u63A5\u8FDB\u6765\u7684\u8054\u7CFB\u4EBA\uFF09"
+      })
+    );
+    parts.push("");
+    parts.push("\u672C persona \u7684 owner\uFF1A");
+    parts.push(
+      renderIdentityLines({
+        label: args.ownerLabel,
+        feishuUnionId: args.ownerFeishuUnionId,
+        deviceId: args.ownerDeviceId
+      })
+    );
   }
   if (args.workDir) {
-    result += `
-\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\u3002`;
+    parts.push("");
+    let line = `\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\u3002`;
     if (args.mode === "guest") {
-      result += "persona \u76EE\u5F55\u5BF9\u4F60\u53EA\u8BFB\uFF0C\u4E0D\u8981\u5F80\u91CC\u5199\u3002";
+      line += "persona \u76EE\u5F55\u5BF9\u4F60\u53EA\u8BFB\uFF0C\u4E0D\u8981\u5F80\u91CC\u5199\u3002";
     }
+    parts.push(line);
   }
-  return result;
+  parts.push("");
+  if (args.mode === "owner") {
+    parts.push("\u81EA\u6211\u4ECB\u7ECD\u65F6\u4F7F\u7528\u7B2C\u4E00/\u7B2C\u4E8C\u4EBA\u79F0\uFF0C\u4F8B\u5982\u300C\u6211\u662F\u60A8\u7684 xxx \u52A9\u624B\u300D\u3002");
+  } else {
+    parts.push(
+      `\u81EA\u6211\u4ECB\u7ECD\u65F6\u7B2C\u4E09\u4EBA\u79F0\u6307\u4EE3 owner\u3001\u7B2C\u4E8C\u4EBA\u79F0\u79F0\u547C\u5BF9\u65B9\uFF0C\u4F8B\u5982\u300C${args.guestLabel}\uFF0C\u6211\u662F ${args.ownerLabel} \u7684 xxx \u52A9\u624B\uFF0C\u4F60\u53EF\u4EE5\u901A\u8FC7\u6211\u770B\u5230\u4ED6\u7684 xxx\u300D\u3002\u4E0D\u8981\u628A\u5BF9\u65B9\u5F53\u6210 owner\uFF0C\u4E0D\u8981\u66FF owner \u505A\u51FA\u627F\u8BFA\u3002`
+    );
+  }
+  return parts.join("\n");
 }
 
 // src/persona/sharing-prompt.ts
@@ -42065,13 +42114,19 @@ function buildSpawnContext(state, deps) {
       promptArgs = {
         mode: "guest",
         ownerLabel: deps.ownerDisplayName,
+        ownerDeviceId: deps.ownerDeviceId,
+        ownerFeishuUnionId: deps.ownerFeishuUnionId,
         guestLabel: meta.callerDisplayName,
+        guestDeviceId: meta.callerDeviceId,
+        guestFeishuUnionId: meta.callerFeishuUnionId,
         workDir: meta.userWorkDir
       };
     } else {
       promptArgs = {
         mode: "owner",
         ownerLabel: meta.callerDisplayName ?? deps.ownerDisplayName,
+        ownerDeviceId: meta.callerDeviceId ?? deps.ownerDeviceId,
+        ownerFeishuUnionId: meta.callerFeishuUnionId ?? deps.ownerFeishuUnionId,
         workDir: meta.userWorkDir
       };
     }
@@ -42856,6 +42911,8 @@ var SessionRunner = class {
       resolveContextWindow: this.hooks.resolveContextWindow,
       genUuid: this.hooks.genUuid ?? v4_default,
       ownerDisplayName: this.hooks.ownerDisplayName,
+      ownerDeviceId: this.hooks.ownerDeviceId,
+      ownerFeishuUnionId: this.hooks.ownerFeishuUnionId,
       personaRoot: this.hooks.personaRoot,
       // 单栏 refactor (spec 2026-06-02 §5.1): cc 子进程 env 注入 CLAWD_DAEMON_URL，让 assistant
       // curl daemon HTTP RPC adapter (/api/rpc/<method>) 触发管理操作。null = HTTP adapter 未启。
@@ -43634,12 +43691,14 @@ var SessionManager = class {
     const adapter = this.deps.getAdapter(file.tool ?? "claude");
     const store = this.storeFor(scope);
     const callerDisplayName = file.creatorDisplayName ?? (scope.kind === "persona" ? scope.mode === "owner" ? this.deps.ownerDisplayName : this.deps.contactStore?.get(scope.capId)?.displayName : void 0);
+    const callerFeishuUnionId = file.creatorFeishuUnionId ?? (scope.kind === "persona" && scope.mode === "owner" ? this.deps.ownerFeishuUnionId : void 0);
     const subSessionMeta = metaFromScope(
       scope,
       this.deps.personaRoot ?? "",
       this.deps.usersRoot ?? "",
       this.deps.ownerPrincipalId,
-      callerDisplayName
+      callerDisplayName,
+      callerFeishuUnionId
     );
     if (subSessionMeta?.userWorkDir) {
       import_node_fs9.default.mkdirSync(subSessionMeta.userWorkDir, { recursive: true });
@@ -43686,6 +43745,11 @@ var SessionManager = class {
       // personaStore 不再透给 runner hooks（in-place mention 注入路径已删，runner 不用）；
       // manager 自身的 sandbox 派生仍直接读 this.deps.personaStore。
       ownerDisplayName: this.deps.ownerDisplayName,
+      // T-31 persona prompt injection：owner 设备 id（= ownerPrincipalId）+ 飞书 union_id
+      // 供 reducer 组 promptArgs 时作为「本 persona 的 owner」身份卡数据源（guest session 用）
+      // 或「当前连接方」身份卡的兜底源（owner session 老路径未 stamp caller 时）。
+      ownerDeviceId: this.deps.ownerPrincipalId,
+      ownerFeishuUnionId: this.deps.ownerFeishuUnionId,
       // Phase 2 capability platform (plan §3): 透传 personaRoot, buildSpawnArgs 据
       // cwd 是否在 personaRoot 下自动决定是否注入 --settings sandbox-settings.json.
       personaRoot: this.deps.personaRoot,
@@ -43801,7 +43865,7 @@ var SessionManager = class {
     }
   }
   // ---- 命令方法：均返回 { response, broadcast[] }，由 dispatcher 聚合 ----
-  create(args, creatorPrincipalId, creatorDisplayName) {
+  create(args, creatorPrincipalId, creatorDisplayName, creatorFeishuUnionId) {
     let cwd;
     if (args.ownerPersonaId) {
       cwd = derivePersonaSpawnCwd(
@@ -43846,6 +43910,7 @@ var SessionManager = class {
       ephemeral: args.ephemeral,
       creatorPrincipalId,
       creatorDisplayName,
+      ...creatorFeishuUnionId ? { creatorFeishuUnionId } : {},
       createdAt: iso,
       updatedAt: iso
     };
@@ -44616,7 +44681,9 @@ var SessionManager = class {
       // creatorDisplayName = A 的 displayName，供 guest meta callerDisplayName（reducer 要求）。
       ...args.guestPrincipalId ? {
         creatorPrincipalId: args.guestPrincipalId,
-        ...args.guestDisplayName ? { creatorDisplayName: args.guestDisplayName } : {}
+        ...args.guestDisplayName ? { creatorDisplayName: args.guestDisplayName } : {},
+        // T-31: A 的飞书 union_id stamp 到 B 的 SessionFile；guest meta 由 newRunner 派生
+        ...args.guestFeishuUnionId ? { creatorFeishuUnionId: args.guestFeishuUnionId } : {}
       } : {},
       // T-20：dispatch model override 落盘（reducer spawn 路径读 SessionFile.model 生成 --model flag）
       ...args.model ? { model: args.model } : {},
@@ -48890,6 +48957,8 @@ function buildPersonaDispatchHandlers(deps) {
         prompt: args.prompt,
         guestPrincipalId: ctx.principal.id,
         guestDisplayName: ctx.principal.displayName,
+        // T-31: 把 A 的飞书 union_id 透传给 B（connectGuestContext 已把它挂在 principal.feishuUnionId）
+        ...ctx.principal.feishuUnionId ? { guestFeishuUnionId: ctx.principal.feishuUnionId } : {},
         ...args.model ? { model: args.model } : {}
       }).then(() => logger?.info("dispatch.spawnB.ok", { dispatchId: dispatchId2 })).catch((err) => {
         const reason = err instanceof Error ? err.message : String(err);
@@ -50662,7 +50731,7 @@ function ownerContext(ownerPrincipalId, displayName, feishuUnionId) {
 }
 function connectGuestContext(subDevice, subOwner, provider, displayName) {
   return {
-    principal: { id: subDevice, kind: "guest", displayName },
+    principal: { id: subDevice, kind: "guest", displayName, feishuUnionId: subOwner },
     grants: PERSONAL_CAP_GRANTS.map((g2) => ({
       resource: { ...g2.resource },
       actions: [...g2.actions]
@@ -54920,10 +54989,12 @@ function buildSessionHandlers(deps) {
     ensurePersonaAccess(ctx, args.ownerPersonaId, "send");
     const creatorPrincipalId = ctx?.principal.id ?? ownerPrincipalId;
     const creatorDisplayName = ctx?.principal.displayName ?? "Owner";
+    const creatorFeishuUnionId = ctx?.principal.feishuUnionId;
     const { response, broadcast } = manager.create(
       { ...args, tool },
       creatorPrincipalId,
-      creatorDisplayName
+      creatorDisplayName,
+      creatorFeishuUnionId
     );
     return { response: { type: "session:info", ...response }, broadcast };
   };
@@ -60227,6 +60298,8 @@ async function startDaemon(config) {
         // B 角色（跨设备）：非空 → guest scope + creatorPrincipalId/creatorDisplayName = A。
         guestPrincipalId: args.guestPrincipalId,
         guestDisplayName: args.guestDisplayName,
+        // T-31: 把 A 的飞书 union_id stamp 到 B SessionFile，供 cc prompt 身份卡 union_id 行
+        guestFeishuUnionId: args.guestFeishuUnionId,
         // T-20: 可选 model override 透到 SessionFile.model
         ...args.model ? { model: args.model } : {}
       });

package/dist/dispatch/mcp-server.cjs

@@ -39876,6 +39876,14 @@ var SessionFileSchema = external_exports.object({
    * 或 deps.ownerDisplayName（owner）。
    */
   creatorDisplayName: external_exports.string().min(1).optional(),
+  /**
+   * 创建该 session 的连接者飞书 union_id（一次性 stamp，T-31 persona prompt injection）。
+   * session:create / dispatch spawnB handler 从 ctx.principal.feishuUnionId（guest 场景来自
+   * connect token subOwner）或 deps.ownerFeishuUnionId（owner 场景）传入；newRunner 时读这个
+   * 字段派生 SubSessionMeta.callerFeishuUnionId 注入 cc system prompt「身份卡」的 union_id 行。
+   * Optional：老 SessionFile / owner 未登飞书路径缺省，缺省时 prompt 不渲染该行（向后兼容）。
+   */
+  creatorFeishuUnionId: external_exports.string().min(1).optional(),
   /**
    * Mirror peer sessions (2026-05-26): mirror 标识。**我在朋友 daemon 上创建的 session**，
    * 远端是 source of truth，本机是持久化副本，方便 sidebar 跨设备聚合。