@clawos-dev/clawd 0.2.287 → 0.2.289

package/dist/cli.cjs

@@ -7376,7 +7376,17 @@ var init_schemas = __esm({
     SessionForkArgs = external_exports.object({
       cwd: external_exports.string().min(1),
       toolSessionId: external_exports.string().min(1),
-      messageUuid: external_exports.string().min(1)
+      messageUuid: external_exports.string().min(1),
+      /**
+       * 派生 jsonl 的落点 cwd（缺省 = 源文件所在目录，保持老行为）。
+       *
+       * 必须传的场景：调用方随后要用这条 transcript 建 session，而那个 session 的 cwd 与
+       * 源 session 不同——最典型是 persona session（daemon 按 ownerPersonaId 把 cwd 强制
+       * 派生成 persona 根）。CC `--resume` 只在**当前 cwd 的** projects 目录里找 session，
+       * 落点与目标 cwd 分家 = 历史读不到 + resume 接不上（bug: quick-ask-blank-after-worktree）。
+       * 正确编排：先 sessionCreate 拿到 daemon 定的真实 cwd，再以它作 targetCwd fork。
+       */
+      targetCwd: external_exports.string().min(1).optional()
     });
     SessionForkResponseSchema = external_exports.object({
       forkedToolSessionId: external_exports.string().min(1),
@@ -8448,6 +8458,16 @@ var init_visitor_schemas = __esm({
   }
 });
 
+// ../protocol/src/lark-bot-format.ts
+function formatLarkSpeakerReminder(speaker) {
+  return `<system-reminder>\u6B64\u6D88\u606F\u6765\u81EA\u98DE\u4E66\u7FA4\u6210\u5458 ${speaker}</system-reminder>`;
+}
+var init_lark_bot_format = __esm({
+  "../protocol/src/lark-bot-format.ts"() {
+    "use strict";
+  }
+});
+
 // ../protocol/src/runtime.ts
 var init_runtime = __esm({
   "../protocol/src/runtime.ts"() {
@@ -8474,6 +8494,7 @@ var init_runtime = __esm({
     init_visitor_schemas();
     init_shift_internal();
     init_lark_bot_schemas();
+    init_lark_bot_format();
   }
 });
 
@@ -13968,6 +13989,26 @@ var init_claude_history = __esm({
         this.projectsRoot = import_node_path5.default.join(base, "projects");
         this.fileHistoryRoot = import_node_path5.default.join(base, "file-history");
       }
+      /**
+       * [T-17] 定位一条 session 的 transcript 所在 project 目录，带 relocation 兜底。
+       *
+       * 常规路径：`<projectsRoot>/cwdToHashDir(cwd)`。但 CC 中途改 cwd（典型：会话里
+       * EnterWorktree）会把 `<tsid>.jsonl` 挪到新 hash 目录，而调用方手里的 cwd 可能仍是老值——
+       * persona session 尤其顽固：fork 出的新 session 因带 ownerPersonaId 被 manager 强制
+       * 改写 cwd 回 persona 根（session/manager.ts derivePersonaSpawnCwd），与 jsonl 实际
+       * 落点（源文件所在目录，见 session/fork.ts）永久分家。
+       * 拼不出路径时按 tsid 全局兜底（与 fork.ts / observer 同款），命中则用它所在目录。
+       *
+       * 兜底失败仍返回按 cwd 算的目录：下游 readJsonlLines / readdir 都容忍不存在，
+       * 保持"查无此 session 返回空"的既有语义，不抛。
+       * bug: quick-ask-blank-after-worktree（fork 出的快速问答面板整片空白）
+       */
+      resolveSessionDir(cwd, toolSessionId) {
+        const byCwd = import_node_path5.default.join(this.projectsRoot, cwdToHashDir(cwd));
+        if (import_node_fs6.default.existsSync(import_node_path5.default.join(byCwd, `${toolSessionId}.jsonl`))) return byCwd;
+        const found = findTranscriptByToolSessionId(this.projectsRoot, toolSessionId);
+        return found ? import_node_path5.default.dirname(found) : byCwd;
+      }
       async listProjects() {
         let entries;
         try {
@@ -14059,8 +14100,7 @@ var init_claude_history = __esm({
       }
       async read(args) {
         const file = import_node_path5.default.join(
-          this.projectsRoot,
-          cwdToHashDir(args.cwd),
+          this.resolveSessionDir(args.cwd, args.toolSessionId),
           `${args.toolSessionId}.jsonl`
         );
         const lines = readJsonlLines(file);
@@ -14096,8 +14136,7 @@ var init_claude_history = __esm({
       // 返回 null 表示目录不存在（调用方回退旧实现）；返回空数组表示目录存在但无 jsonl
       listSubagentsFromDirectory(cwd, toolSessionId) {
         const dir = import_node_path5.default.join(
-          this.projectsRoot,
-          cwdToHashDir(cwd),
+          this.resolveSessionDir(cwd, toolSessionId),
           toolSessionId,
           "subagents"
         );
@@ -14131,8 +14170,7 @@ var init_claude_history = __esm({
       }
       listSubagentsFromMainJsonl(cwd, toolSessionId) {
         const file = import_node_path5.default.join(
-          this.projectsRoot,
-          cwdToHashDir(cwd),
+          this.resolveSessionDir(cwd, toolSessionId),
           `${toolSessionId}.jsonl`
         );
         const lines = readJsonlLines(file);
@@ -14166,8 +14204,7 @@ var init_claude_history = __esm({
       // 独立文件路径：agent-<subagentId>.jsonl；文件不存在返回 null 让调用方回退旧实现
       readSubagentFromFile(cwd, toolSessionId, subagentId) {
         const file = import_node_path5.default.join(
-          this.projectsRoot,
-          cwdToHashDir(cwd),
+          this.resolveSessionDir(cwd, toolSessionId),
           toolSessionId,
           "subagents",
           `agent-${subagentId}.jsonl`
@@ -14194,8 +14231,7 @@ var init_claude_history = __esm({
        */
       readFileHistorySnapshots(args) {
         const file = import_node_path5.default.join(
-          this.projectsRoot,
-          cwdToHashDir(args.cwd),
+          this.resolveSessionDir(args.cwd, args.toolSessionId),
           `${args.toolSessionId}.jsonl`
         );
         const lines = readJsonlLines(file);
@@ -14326,8 +14362,7 @@ var init_claude_history = __esm({
       }
       readSubagentFromMainJsonl(cwd, toolSessionId, subagentId) {
         const file = import_node_path5.default.join(
-          this.projectsRoot,
-          cwdToHashDir(cwd),
+          this.resolveSessionDir(cwd, toolSessionId),
           `${toolSessionId}.jsonl`
         );
         const lines = readJsonlLines(file);
@@ -46020,6 +46055,14 @@ var SessionManager = class {
         },
         this.deps.personaRoot
       );
+      if (args.forkedFromSessionId && args.cwd && args.cwd !== cwd) {
+        this.deps.logger?.info("session-create.fork-cwd-rewritten", {
+          argCwd: args.cwd,
+          derivedCwd: cwd,
+          ownerPersonaId: args.ownerPersonaId,
+          forkedFromSessionId: args.forkedFromSessionId
+        });
+      }
     } else if (args.cwd) {
       cwd = args.cwd;
     } else {
@@ -51906,6 +51949,7 @@ function createLarkBotCloudClient(opts) {
 }
 
 // src/lark-bot-connector/chat-router.ts
+init_protocol();
 var ERROR_REPLY_TEXT = "\u5904\u7406\u51FA\u9519\u4E86\uFF0C\u8BF7\u91CD\u8BD5";
 var DEFAULT_TURN_TIMEOUT_MS = 10 * 60 * 1e3;
 function createLarkChatRouter(deps) {
@@ -51919,8 +51963,11 @@ function createLarkChatRouter(deps) {
       deps.logger?.warn(`larkBot chat-router: message envelope missing messageId, drop ${env.eventId}`);
       return;
     }
-    const chatLabel = env.chatName ?? env.chatId;
-    const text = `[\u98DE\u4E66\u7FA4\xB7${chatLabel}] ${env.senderName ?? env.senderOpenId ?? "\u672A\u77E5\u6210\u5458"}: ${env.text ?? ""}`;
+    const speaker = env.senderName || env.senderOpenId || "\u672A\u77E5\u6210\u5458";
+    const body = env.text?.trim() ? env.text : "[\u975E\u6587\u672C\u6D88\u606F]";
+    const text = `${body}
+
+${formatLarkSpeakerReminder(speaker)}`;
     const turn = deps.manager.runLarkChatTurn({
       personaId: env.personaId,
       chatId: env.chatId,
@@ -57029,8 +57076,9 @@ function forkSession(input) {
     }
     forkedLines.push(JSON.stringify(forked));
   }
-  const forkedFilePath = import_node_path48.default.join(projectDir, `${forkedToolSessionId}.jsonl`);
-  import_node_fs43.default.mkdirSync(projectDir, { recursive: true });
+  const outDir = input.targetCwd ? import_node_path48.default.join(baseDir, "projects", cwdToHashDir(input.targetCwd)) : projectDir;
+  const forkedFilePath = import_node_path48.default.join(outDir, `${forkedToolSessionId}.jsonl`);
+  import_node_fs43.default.mkdirSync(outDir, { recursive: true });
   import_node_fs43.default.writeFileSync(forkedFilePath, forkedLines.join("\n") + "\n", { mode: 384 });
   return { forkedToolSessionId, forkedFilePath };
 }
@@ -57255,9 +57303,25 @@ function buildSessionHandlers(deps) {
       response: { type: "session:rewindable-message-ids", ...response }
     };
   };
-  const fork = async (frame) => {
+  const fork = async (frame, _client, ctx) => {
     const args = SessionForkArgs.parse(frame);
+    if (ctx && ctx.principal.kind === "guest") {
+      const src = store.list().find((s) => s.toolSessionId === args.toolSessionId);
+      const ok = src != null && canAccessPersona(ctx.grants, src.ownerPersonaId, "read") && src.creatorPrincipalId === ctx.principal.id;
+      if (!ok) {
+        throw new ClawdError(
+          ERROR_CODES.UNAUTHORIZED,
+          `principal guest:${ctx.principal.id} cannot fork tool session ${args.toolSessionId}`
+        );
+      }
+    }
     const result = forkSession(args);
+    deps.logger?.info("session-fork.done", {
+      argCwd: args.cwd,
+      sourceToolSessionId: args.toolSessionId,
+      forkedToolSessionId: result.forkedToolSessionId,
+      forkedFilePath: result.forkedFilePath
+    });
     return { response: { type: "session:fork", ...result } };
   };
   const newSession = async (frame, _client, ctx) => {
@@ -57635,15 +57699,28 @@ function buildHistoryHandlers(deps) {
     const messages = args.slim ? slimHistoryMessages(res.messages) : res.messages;
     return { response: { type: "history:read", ...res, messages } };
   };
+  const assertGuestOwnsToolSession = (ctx, toolSessionId, method) => {
+    if (!ctx || ctx.principal.kind !== "guest") return;
+    const f = store.list().find((s) => s.toolSessionId === toolSessionId);
+    const ok = f != null && canAccessPersona(ctx.grants, f.ownerPersonaId, "read") && f.creatorPrincipalId === ctx.principal.id;
+    if (!ok) {
+      throw new ClawdError(
+        ERROR_CODES.UNAUTHORIZED,
+        `principal guest:${ctx.principal.id} cannot ${method} of tool session ${toolSessionId}`
+      );
+    }
+  };
   const subagents = async (frame, _client, ctx) => {
     const args = HistorySubagentsArgs.parse(frame);
     assertGuestPath(ctx, path59.resolve(args.cwd), personaRoot, "history:subagents", usersRoot);
+    assertGuestOwnsToolSession(ctx, args.toolSessionId, "history:subagents");
     const subs = await history.listSubagents(args);
     return { response: { type: "history:subagents", subagents: subs } };
   };
   const subagentRead = async (frame, _client, ctx) => {
     const args = HistorySubagentReadArgs.parse(frame);
     assertGuestPath(ctx, path59.resolve(args.cwd), personaRoot, "history:subagent-read", usersRoot);
+    assertGuestOwnsToolSession(ctx, args.toolSessionId, "history:subagent-read");
     const res = await history.readSubagent(args);
     return { response: { type: "history:subagent-read", ...res } };
   };
@@ -58712,7 +58789,7 @@ function computeMethodAccess(args) {
 }
 
 // src/version.ts
-var version = "0.2.287".length > 0 ? "0.2.287" : "dev";
+var version = "0.2.289".length > 0 ? "0.2.289" : "dev";
 
 // src/cli-probe/probe.ts
 var fs55 = __toESM(require("fs"), 1);

package/dist/dispatch/mcp-server.cjs

@@ -22520,7 +22520,17 @@ var SessionResumeArgs = external_exports.object({
 var SessionForkArgs = external_exports.object({
   cwd: external_exports.string().min(1),
   toolSessionId: external_exports.string().min(1),
-  messageUuid: external_exports.string().min(1)
+  messageUuid: external_exports.string().min(1),
+  /**
+   * 派生 jsonl 的落点 cwd（缺省 = 源文件所在目录，保持老行为）。
+   *
+   * 必须传的场景：调用方随后要用这条 transcript 建 session，而那个 session 的 cwd 与
+   * 源 session 不同——最典型是 persona session（daemon 按 ownerPersonaId 把 cwd 强制
+   * 派生成 persona 根）。CC `--resume` 只在**当前 cwd 的** projects 目录里找 session，
+   * 落点与目标 cwd 分家 = 历史读不到 + resume 接不上（bug: quick-ask-blank-after-worktree）。
+   * 正确编排：先 sessionCreate 拿到 daemon 定的真实 cwd，再以它作 targetCwd fork。
+   */
+  targetCwd: external_exports.string().min(1).optional()
 });
 var SessionForkResponseSchema = external_exports.object({
   forkedToolSessionId: external_exports.string().min(1),