@clawos-dev/clawd 0.2.286 → 0.2.288

package/dist/cli.cjs

@@ -6585,15 +6585,14 @@ var init_shift_internal = __esm({
 });
 
 // ../protocol/src/lark-bot-schemas.ts
-var LarkBotProvisionArgs, LarkBotProvisionCancelArgs, LarkBotUnbindArgs, LarkBotStatusArgs, LarkBotBindManualArgs, LarkBotGroupSchema, LarkBotStatusResultSchema, LarkBotStateFrameSchema;
+var LarkBotPersonaArgs, LarkBotUnbindArgs, LarkBotStatusArgs, LarkBotBindManualArgs, LarkBotGroupSchema, LarkBotStatusResultSchema, LarkBotStateFrameSchema;
 var init_lark_bot_schemas = __esm({
   "../protocol/src/lark-bot-schemas.ts"() {
     "use strict";
     init_zod();
-    LarkBotProvisionArgs = external_exports.object({ personaId: external_exports.string().min(1) });
-    LarkBotProvisionCancelArgs = LarkBotProvisionArgs;
-    LarkBotUnbindArgs = LarkBotProvisionArgs;
-    LarkBotStatusArgs = LarkBotProvisionArgs;
+    LarkBotPersonaArgs = external_exports.object({ personaId: external_exports.string().min(1) });
+    LarkBotUnbindArgs = LarkBotPersonaArgs;
+    LarkBotStatusArgs = LarkBotPersonaArgs;
     LarkBotBindManualArgs = external_exports.object({
       personaId: external_exports.string().min(1),
       appId: external_exports.string().min(1),
@@ -6607,14 +6606,9 @@ var init_lark_bot_schemas = __esm({
       lastActiveAt: external_exports.number().int().optional()
     });
     LarkBotStatusResultSchema = external_exports.object({
-      state: external_exports.enum(["unbound", "provisioning", "bound", "broken"]),
+      state: external_exports.enum(["unbound", "bound", "broken"]),
       appId: external_exports.string().optional(),
       botName: external_exports.string().optional(),
-      /** state='provisioning' 时的当前步骤与待用户打开的授权 URL */
-      provisioning: external_exports.object({
-        step: external_exports.enum(["register", "authorize"]),
-        verificationUrl: external_exports.string().optional()
-      }).optional(),
       brokenReason: external_exports.string().optional(),
       groups: external_exports.array(LarkBotGroupSchema)
     });
@@ -7382,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),
@@ -8028,16 +8032,8 @@ var init_methods = __esm({
         summary: "\u67E5 shift \u7684\u6267\u884C\u5386\u53F2\uFF08\u4EC5\u521B\u5EFA\u8005\uFF09",
         args: ShiftInternalHistoryArgs
       },
-      "larkBot:provision": {
-        summary: "\u53D1\u8D77 persona \u7684\u98DE\u4E66 bot \u4E00\u952E\u88C5\u914D\uFF08\u5EFA app + \u6388 scope\uFF09\uFF0C\u8FDB\u5EA6\u4E0E\u6388\u6743 URL \u8D70 larkBot:state \u5E27\uFF1Bowner-only",
-        args: LarkBotProvisionArgs
-      },
-      "larkBot:provisionCancel": {
-        summary: "\u53D6\u6D88\u8FDB\u884C\u4E2D\u7684\u98DE\u4E66 bot \u88C5\u914D\u6D41\u7A0B\uFF1Bowner-only",
-        args: LarkBotProvisionCancelArgs
-      },
       "larkBot:bindManual": {
-        summary: "\u624B\u586B app_id/app_secret \u76F4\u63A5\u7ED1\u5B9A\u98DE\u4E66 bot\uFF08\u88C5\u914D\u9003\u751F\u8231\uFF09\uFF1Bowner-only",
+        summary: "\u624B\u586B app_id/app_secret \u7ED1\u5B9A\u73B0\u6709\u98DE\u4E66 bot\uFF08\u552F\u4E00\u7ED1\u5B9A\u5165\u53E3\uFF09\uFF1Bowner-only",
         args: LarkBotBindManualArgs
       },
       "larkBot:unbind": {
@@ -8045,7 +8041,7 @@ var init_methods = __esm({
         args: LarkBotUnbindArgs
       },
       "larkBot:status": {
-        summary: "\u67E5 persona \u7684\u98DE\u4E66 bot \u72B6\u6001\uFF08unbound/provisioning/bound/broken + \u670D\u52A1\u4E2D\u7FA4\u6E05\u5355\uFF09\uFF1Bowner-only",
+        summary: "\u67E5 persona \u7684\u98DE\u4E66 bot \u72B6\u6001\uFF08unbound/bound/broken + \u670D\u52A1\u4E2D\u7FA4\u6E05\u5355\uFF09\uFF1Bowner-only",
         args: LarkBotStatusArgs
       },
       "skills:list": {
@@ -13982,6 +13978,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 {
@@ -14073,8 +14089,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);
@@ -14110,8 +14125,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"
         );
@@ -14145,8 +14159,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);
@@ -14180,8 +14193,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`
@@ -14208,8 +14220,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);
@@ -14340,8 +14351,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);
@@ -46034,6 +46044,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 {
@@ -51722,163 +51740,6 @@ function buildShiftInternalHandlers(deps) {
   };
 }
 
-// src/lark-bot-connector/provisioner.ts
-var LARK_BOT_V1_SCOPES = [
-  "offline_access",
-  "im:chat:readonly",
-  "im:resource",
-  "contact:user.base:readonly"
-];
-var REGISTRATION_URL = "https://accounts.feishu.cn/oauth/v1/app/registration";
-var DEVICE_AUTHORIZE_URL = "https://accounts.feishu.cn/oauth/v1/device/authorize";
-var DEVICE_TOKEN_URL = "https://open.feishu.cn/open-apis/authen/v2/oauth/token";
-var DEFAULT_POLL_INTERVAL_MS = 6e3;
-var DEFAULT_TIMEOUT_MS2 = 10 * 60 * 1e3;
-var SLOW_DOWN_STEP_MS = 5e3;
-var FlowCtx = class {
-  fetchImpl;
-  sleep;
-  now;
-  timeoutMs;
-  intervalMs;
-  cancelled = false;
-  constructor(opts) {
-    const f = opts.fetchImpl ?? globalThis.fetch;
-    if (!f) throw new Error("fetch is not available (Node >= 18 required)");
-    this.fetchImpl = f;
-    this.sleep = opts.sleepImpl ?? ((ms) => new Promise((r) => setTimeout(r, ms)));
-    this.now = opts.nowImpl ?? Date.now;
-    this.timeoutMs = opts.timeoutMs ?? DEFAULT_TIMEOUT_MS2;
-    this.intervalMs = opts.pollIntervalMs ?? DEFAULT_POLL_INTERVAL_MS;
-  }
-  /**
-   * RFC 8628 轮询循环：pollOnce 返回 null 表示 pending 继续；'slow_down' 加间隔；
-   * 非 null 结果即完成。超时 / cancel reject。
-   */
-  async poll(pollOnce) {
-    const start = this.now();
-    for (; ; ) {
-      if (this.cancelled) throw new Error("flow cancelled");
-      if (this.now() - start >= this.timeoutMs) throw new Error("flow timeout");
-      const r = await pollOnce();
-      if (r === "slow_down") {
-        this.intervalMs += SLOW_DOWN_STEP_MS;
-      } else if (r !== "pending") {
-        return r;
-      }
-      await this.sleep(this.intervalMs);
-    }
-  }
-};
-var POST_TIMEOUT_MS = 15e3;
-async function postJson(ctx, url, body) {
-  const ac = new AbortController();
-  const timer = setTimeout(() => ac.abort(), POST_TIMEOUT_MS);
-  let res;
-  try {
-    res = await ctx.fetchImpl(url, {
-      method: "POST",
-      headers: { "content-type": "application/json" },
-      body: JSON.stringify(body),
-      signal: ac.signal
-    });
-  } finally {
-    clearTimeout(timer);
-  }
-  let parsed = {};
-  try {
-    parsed = await res.json();
-  } catch {
-    parsed = {};
-  }
-  return { status: res.status, json: parsed };
-}
-var TERMINAL_OAUTH_ERRORS = /* @__PURE__ */ new Set(["access_denied", "expired_token", "invalid_grant"]);
-function pollSignal(status, json, what) {
-  if (status >= 200 && status < 300) return "done";
-  const err = String(json.error ?? "");
-  if (TERMINAL_OAUTH_ERRORS.has(err)) {
-    throw new Error(`${what} rejected: ${err}`);
-  }
-  if (err === "authorization_pending" || status === 400) {
-    if (err === "slow_down") return "slow_down";
-    if (err === "authorization_pending") return "pending";
-    return "pending";
-  }
-  if (status === 429) return "slow_down";
-  throw new Error(`${what} failed: HTTP ${status} ${JSON.stringify(json).slice(0, 200)}`);
-}
-async function startAppRegistration(opts = {}) {
-  const ctx = new FlowCtx(opts);
-  const init = await postJson(ctx, REGISTRATION_URL, { action: "start", brand: "feishu" });
-  const verificationUrl = String(init.json.verification_url ?? init.json.verification_uri ?? "");
-  const flowId = String(init.json.flow_id ?? "");
-  if (init.status < 200 || init.status >= 300 || !verificationUrl || !flowId) {
-    throw new Error(
-      `app registration start failed: HTTP ${init.status} ${JSON.stringify(init.json).slice(0, 200)}`
-    );
-  }
-  return {
-    verificationUrl,
-    cancel: () => {
-      ctx.cancelled = true;
-    },
-    complete: () => ctx.poll(async () => {
-      const r = await postJson(ctx, REGISTRATION_URL, {
-        action: "poll",
-        brand: "feishu",
-        flow_id: flowId
-      });
-      const sig = pollSignal(r.status, r.json, "app registration");
-      if (sig !== "done") return sig;
-      const appId = String(r.json.client_id ?? "");
-      const appSecret = String(r.json.client_secret ?? "");
-      if (!appId || !appSecret) {
-        throw new Error("app registration succeeded but missing client_id or client_secret");
-      }
-      return { appId, appSecret };
-    })
-  };
-}
-async function startScopeAuthorization(args) {
-  const ctx = new FlowCtx(args);
-  const init = await postJson(ctx, DEVICE_AUTHORIZE_URL, {
-    client_id: args.appId,
-    scope: args.scopes.join(" ")
-  });
-  const verificationUrl = String(init.json.verification_url ?? init.json.verification_uri ?? "");
-  const deviceCode = String(init.json.device_code ?? "");
-  if (init.status < 200 || init.status >= 300 || !verificationUrl || !deviceCode) {
-    throw new Error(
-      `scope authorization start failed: HTTP ${init.status} ${JSON.stringify(init.json).slice(0, 200)}`
-    );
-  }
-  return {
-    verificationUrl,
-    cancel: () => {
-      ctx.cancelled = true;
-    },
-    complete: () => ctx.poll(async () => {
-      const r = await postJson(ctx, DEVICE_TOKEN_URL, {
-        grant_type: "urn:ietf:params:oauth:grant-type:device_code",
-        client_id: args.appId,
-        device_code: deviceCode
-      });
-      const sig = pollSignal(r.status, r.json, "scope authorization");
-      if (sig !== "done") return sig;
-      const grantedSet = new Set(
-        String(r.json.scope ?? "").split(/\s+/).filter(Boolean)
-      );
-      const granted = args.scopes.filter((s) => grantedSet.has(s));
-      const denied = args.scopes.filter((s) => !grantedSet.has(s));
-      if (granted.length === 0) {
-        throw new Error(`scope authorization: no scopes granted (requested: ${args.scopes.join(" ")})`);
-      }
-      return { granted: [...granted], denied: [...denied] };
-    })
-  };
-}
-
 // src/handlers/lark-bot.ts
 init_protocol();
 function statusFrame(personaId2, status) {
@@ -51886,7 +51747,6 @@ function statusFrame(personaId2, status) {
 }
 function buildLarkBotHandlers(deps) {
   const now = deps.now ?? Date.now;
-  const inFlight = /* @__PURE__ */ new Map();
   const groupsOf = (personaId2) => {
     const removed = new Set(deps.store.read(personaId2)?.removedChatIds ?? []);
     return deps.listLarkSessions(personaId2).filter((g2) => !removed.has(g2.chatId));
@@ -51894,82 +51754,6 @@ function buildLarkBotHandlers(deps) {
   const emit = (personaId2, status2) => {
     deps.broadcast(statusFrame(personaId2, status2));
   };
-  const runProvision = async (personaId2, flight) => {
-    const finish = () => {
-      if (inFlight.get(personaId2) === flight) inFlight.delete(personaId2);
-    };
-    const tunnelUrl = deps.getTunnelUrl();
-    const ownerId = deps.getOwnerId();
-    if (!tunnelUrl || !ownerId) {
-      finish();
-      emit(personaId2, { state: "unbound", brokenReason: "tunnel or owner identity unavailable", groups: [] });
-      return;
-    }
-    try {
-      const reg = await deps.provisioner.startAppRegistration();
-      if (flight.cancelled) return finish();
-      flight.cancelFn = reg.cancel;
-      emit(personaId2, {
-        state: "provisioning",
-        provisioning: { step: "register", verificationUrl: reg.verificationUrl },
-        groups: []
-      });
-      const { appId, appSecret } = await reg.complete();
-      if (flight.cancelled) return finish();
-      const auth = await deps.provisioner.startScopeAuthorization({
-        appId,
-        scopes: LARK_BOT_V1_SCOPES
-      });
-      if (flight.cancelled) return finish();
-      flight.cancelFn = auth.cancel;
-      emit(personaId2, {
-        state: "provisioning",
-        provisioning: { step: "authorize", verificationUrl: auth.verificationUrl },
-        groups: []
-      });
-      const { denied } = await auth.complete();
-      if (flight.cancelled) return finish();
-      if (denied.length > 0) {
-        deps.logger?.warn(`larkBot provision ${personaId2}: scopes denied (accepted): ${denied.join(" ")}`);
-      }
-      const botName = deps.getPersonaName(personaId2) ?? personaId2;
-      await deps.cloud.bind({ personaId: personaId2, appId, appSecret, botName, tunnelUrl, ownerId });
-      deps.store.write(personaId2, { appId, botName, boundAt: now() });
-      finish();
-      emit(personaId2, { state: "bound", appId, botName, groups: groupsOf(personaId2) });
-    } catch (err) {
-      finish();
-      if (flight.cancelled) return;
-      emit(personaId2, {
-        state: "unbound",
-        brokenReason: err.message,
-        groups: []
-      });
-    }
-  };
-  const provision = async (frame) => {
-    const { personaId: personaId2 } = parseArgs2(LarkBotProvisionArgs, frame, "larkBot:provision");
-    if (deps.store.read(personaId2)) throw new Error(`larkBot already bound: ${personaId2}`);
-    if (inFlight.has(personaId2)) throw new Error(`larkBot provision already in progress: ${personaId2}`);
-    if (!deps.getTunnelUrl()) throw new Error("larkBot provision requires tunnel to be up");
-    if (!deps.getOwnerId()) throw new Error("larkBot provision requires feishu login (owner identity)");
-    const flight = { cancelled: false, cancelFn: () => {
-    } };
-    inFlight.set(personaId2, flight);
-    void runProvision(personaId2, flight);
-    return { response: { type: "larkBot:provision:ok" } };
-  };
-  const provisionCancel = async (frame) => {
-    const { personaId: personaId2 } = parseArgs2(LarkBotProvisionCancelArgs, frame, "larkBot:provisionCancel");
-    const flight = inFlight.get(personaId2);
-    if (flight) {
-      flight.cancelled = true;
-      inFlight.delete(personaId2);
-      flight.cancelFn();
-    }
-    emit(personaId2, { state: "unbound", groups: [] });
-    return { response: { type: "larkBot:provisionCancel:ok" } };
-  };
   const bindManual = async (frame) => {
     const { personaId: personaId2, appId, appSecret, botName } = parseArgs2(
       LarkBotBindManualArgs,
@@ -52025,8 +51809,6 @@ function buildLarkBotHandlers(deps) {
     return { response: { type: "larkBot:status:ok", ...result } };
   };
   return {
-    "larkBot:provision": provision,
-    "larkBot:provisionCancel": provisionCancel,
     "larkBot:bindManual": bindManual,
     "larkBot:unbind": unbind,
     "larkBot:status": status
@@ -57082,11 +56864,11 @@ var DeviceBindingClientError = class extends Error {
   code;
   cause;
 };
-var DEFAULT_TIMEOUT_MS3 = 8e3;
+var DEFAULT_TIMEOUT_MS2 = 8e3;
 async function upsertDeviceBinding(opts) {
   const doFetch = opts.fetchImpl ?? fetch;
   const ac = new AbortController();
-  const timer = setTimeout(() => ac.abort(), opts.timeoutMs ?? DEFAULT_TIMEOUT_MS3);
+  const timer = setTimeout(() => ac.abort(), opts.timeoutMs ?? DEFAULT_TIMEOUT_MS2);
   const body = { unionId: opts.unionId };
   if (opts.avatarUrl != null) body.avatarUrl = opts.avatarUrl;
   let res;
@@ -57279,8 +57061,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 };
 }
@@ -57505,9 +57288,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) => {
@@ -57885,15 +57684,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 } };
   };
@@ -58827,9 +58639,7 @@ var METHOD_GRANT_MAP = {
   "shift-internal:cancel": ADMIN_ANY,
   "shift-internal:update": ADMIN_ANY,
   "shift-internal:history": ADMIN_ANY,
-  // ---- larkBot:* (LarkBotConnector 装配/状态，owner-only) ----
-  "larkBot:provision": ADMIN_ANY,
-  "larkBot:provisionCancel": ADMIN_ANY,
+  // ---- larkBot:* (LarkBotConnector 绑定/状态，owner-only) ----
   "larkBot:bindManual": ADMIN_ANY,
   "larkBot:unbind": ADMIN_ANY,
   "larkBot:status": ADMIN_ANY,
@@ -58964,7 +58774,7 @@ function computeMethodAccess(args) {
 }
 
 // src/version.ts
-var version = "0.2.286".length > 0 ? "0.2.286" : "dev";
+var version = "0.2.288".length > 0 ? "0.2.288" : "dev";
 
 // src/cli-probe/probe.ts
 var fs55 = __toESM(require("fs"), 1);
@@ -61221,11 +61031,11 @@ init_protocol();
 // src/peer-ops/run-command.ts
 var import_node_child_process14 = require("child_process");
 var import_node_os21 = __toESM(require("os"), 1);
-var DEFAULT_TIMEOUT_MS4 = 3e4;
+var DEFAULT_TIMEOUT_MS3 = 3e4;
 var MAX_TIMEOUT_MS = 3e5;
 var MAX_OUTPUT_BYTES = 1048576;
 function runCommand(command, opts = {}) {
-  const timeoutMs = Math.min(opts.timeoutMs ?? DEFAULT_TIMEOUT_MS4, MAX_TIMEOUT_MS);
+  const timeoutMs = Math.min(opts.timeoutMs ?? DEFAULT_TIMEOUT_MS3, MAX_TIMEOUT_MS);
   return new Promise((resolve6) => {
     const child = (0, import_node_child_process14.spawn)("bash", ["-c", command], { cwd: import_node_os21.default.homedir() });
     const out = [];
@@ -62988,7 +62798,6 @@ async function startDaemon(config) {
     logger: { warn: (msg) => logger.warn(msg) }
   });
   const larkBotDeps = {
-    provisioner: { startAppRegistration, startScopeAuthorization },
     cloud: larkBotCloud,
     store: larkBotStore,
     broadcast: (frame) => wsServer?.broadcastToOwners(frame),

package/dist/dispatch/mcp-server.cjs

@@ -21791,10 +21791,9 @@ var ShiftInternalHistoryArgs = external_exports.object({
 });
 
 // ../protocol/src/lark-bot-schemas.ts
-var LarkBotProvisionArgs = external_exports.object({ personaId: external_exports.string().min(1) });
-var LarkBotProvisionCancelArgs = LarkBotProvisionArgs;
-var LarkBotUnbindArgs = LarkBotProvisionArgs;
-var LarkBotStatusArgs = LarkBotProvisionArgs;
+var LarkBotPersonaArgs = external_exports.object({ personaId: external_exports.string().min(1) });
+var LarkBotUnbindArgs = LarkBotPersonaArgs;
+var LarkBotStatusArgs = LarkBotPersonaArgs;
 var LarkBotBindManualArgs = external_exports.object({
   personaId: external_exports.string().min(1),
   appId: external_exports.string().min(1),
@@ -21808,14 +21807,9 @@ var LarkBotGroupSchema = external_exports.object({
   lastActiveAt: external_exports.number().int().optional()
 });
 var LarkBotStatusResultSchema = external_exports.object({
-  state: external_exports.enum(["unbound", "provisioning", "bound", "broken"]),
+  state: external_exports.enum(["unbound", "bound", "broken"]),
   appId: external_exports.string().optional(),
   botName: external_exports.string().optional(),
-  /** state='provisioning' 时的当前步骤与待用户打开的授权 URL */
-  provisioning: external_exports.object({
-    step: external_exports.enum(["register", "authorize"]),
-    verificationUrl: external_exports.string().optional()
-  }).optional(),
   brokenReason: external_exports.string().optional(),
   groups: external_exports.array(LarkBotGroupSchema)
 });
@@ -22526,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),
@@ -23134,16 +23138,8 @@ var METHOD_DOCS = {
     summary: "\u67E5 shift \u7684\u6267\u884C\u5386\u53F2\uFF08\u4EC5\u521B\u5EFA\u8005\uFF09",
     args: ShiftInternalHistoryArgs
   },
-  "larkBot:provision": {
-    summary: "\u53D1\u8D77 persona \u7684\u98DE\u4E66 bot \u4E00\u952E\u88C5\u914D\uFF08\u5EFA app + \u6388 scope\uFF09\uFF0C\u8FDB\u5EA6\u4E0E\u6388\u6743 URL \u8D70 larkBot:state \u5E27\uFF1Bowner-only",
-    args: LarkBotProvisionArgs
-  },
-  "larkBot:provisionCancel": {
-    summary: "\u53D6\u6D88\u8FDB\u884C\u4E2D\u7684\u98DE\u4E66 bot \u88C5\u914D\u6D41\u7A0B\uFF1Bowner-only",
-    args: LarkBotProvisionCancelArgs
-  },
   "larkBot:bindManual": {
-    summary: "\u624B\u586B app_id/app_secret \u76F4\u63A5\u7ED1\u5B9A\u98DE\u4E66 bot\uFF08\u88C5\u914D\u9003\u751F\u8231\uFF09\uFF1Bowner-only",
+    summary: "\u624B\u586B app_id/app_secret \u7ED1\u5B9A\u73B0\u6709\u98DE\u4E66 bot\uFF08\u552F\u4E00\u7ED1\u5B9A\u5165\u53E3\uFF09\uFF1Bowner-only",
     args: LarkBotBindManualArgs
   },
   "larkBot:unbind": {
@@ -23151,7 +23147,7 @@ var METHOD_DOCS = {
     args: LarkBotUnbindArgs
   },
   "larkBot:status": {
-    summary: "\u67E5 persona \u7684\u98DE\u4E66 bot \u72B6\u6001\uFF08unbound/provisioning/bound/broken + \u670D\u52A1\u4E2D\u7FA4\u6E05\u5355\uFF09\uFF1Bowner-only",
+    summary: "\u67E5 persona \u7684\u98DE\u4E66 bot \u72B6\u6001\uFF08unbound/bound/broken + \u670D\u52A1\u4E2D\u7FA4\u6E05\u5355\uFF09\uFF1Bowner-only",
     args: LarkBotStatusArgs
   },
   "skills:list": {