@clawos-dev/clawd 0.2.33 → 0.2.34-beta.50.1515dc2

package/dist/cli.cjs

@@ -296,8 +296,8 @@ var require_req = __commonJS({
       if (req.originalUrl) {
         _req.url = req.originalUrl;
       } else {
-        const path22 = req.path;
-        _req.url = typeof path22 === "string" ? path22 : req.url ? req.url.path || req.url : void 0;
+        const path23 = req.path;
+        _req.url = typeof path23 === "string" ? path23 : req.url ? req.url.path || req.url : void 0;
       }
       if (req.query) {
         _req.query = req.query;
@@ -462,14 +462,14 @@ var require_redact = __commonJS({
       }
       return obj;
     }
-    function parsePath(path22) {
+    function parsePath(path23) {
       const parts = [];
       let current = "";
       let inBrackets = false;
       let inQuotes = false;
       let quoteChar = "";
-      for (let i = 0; i < path22.length; i++) {
-        const char = path22[i];
+      for (let i = 0; i < path23.length; i++) {
+        const char = path23[i];
         if (!inBrackets && char === ".") {
           if (current) {
             parts.push(current);
@@ -600,10 +600,10 @@ var require_redact = __commonJS({
       return current;
     }
     function redactPaths(obj, paths, censor, remove = false) {
-      for (const path22 of paths) {
-        const parts = parsePath(path22);
+      for (const path23 of paths) {
+        const parts = parsePath(path23);
         if (parts.includes("*")) {
-          redactWildcardPath(obj, parts, censor, path22, remove);
+          redactWildcardPath(obj, parts, censor, path23, remove);
         } else {
           if (remove) {
             removeKey(obj, parts);
@@ -688,8 +688,8 @@ var require_redact = __commonJS({
           }
         } else {
           if (afterWildcard.includes("*")) {
-            const wrappedCensor = typeof censor === "function" ? (value, path22) => {
-              const fullPath = [...pathArray.slice(0, pathLength), ...path22];
+            const wrappedCensor = typeof censor === "function" ? (value, path23) => {
+              const fullPath = [...pathArray.slice(0, pathLength), ...path23];
               return censor(value, fullPath);
             } : censor;
             redactWildcardPath(current, afterWildcard, wrappedCensor, originalPath, remove);
@@ -724,8 +724,8 @@ var require_redact = __commonJS({
         return null;
       }
       const pathStructure = /* @__PURE__ */ new Map();
-      for (const path22 of pathsToClone) {
-        const parts = parsePath(path22);
+      for (const path23 of pathsToClone) {
+        const parts = parsePath(path23);
         let current = pathStructure;
         for (let i = 0; i < parts.length; i++) {
           const part = parts[i];
@@ -777,24 +777,24 @@ var require_redact = __commonJS({
       }
       return cloneSelectively(obj, pathStructure);
     }
-    function validatePath(path22) {
-      if (typeof path22 !== "string") {
+    function validatePath(path23) {
+      if (typeof path23 !== "string") {
         throw new Error("Paths must be (non-empty) strings");
       }
-      if (path22 === "") {
+      if (path23 === "") {
         throw new Error("Invalid redaction path ()");
       }
-      if (path22.includes("..")) {
-        throw new Error(`Invalid redaction path (${path22})`);
+      if (path23.includes("..")) {
+        throw new Error(`Invalid redaction path (${path23})`);
       }
-      if (path22.includes(",")) {
-        throw new Error(`Invalid redaction path (${path22})`);
+      if (path23.includes(",")) {
+        throw new Error(`Invalid redaction path (${path23})`);
       }
       let bracketCount = 0;
       let inQuotes = false;
       let quoteChar = "";
-      for (let i = 0; i < path22.length; i++) {
-        const char = path22[i];
+      for (let i = 0; i < path23.length; i++) {
+        const char = path23[i];
         if ((char === '"' || char === "'") && bracketCount > 0) {
           if (!inQuotes) {
             inQuotes = true;
@@ -808,20 +808,20 @@ var require_redact = __commonJS({
         } else if (char === "]" && !inQuotes) {
           bracketCount--;
           if (bracketCount < 0) {
-            throw new Error(`Invalid redaction path (${path22})`);
+            throw new Error(`Invalid redaction path (${path23})`);
           }
         }
       }
       if (bracketCount !== 0) {
-        throw new Error(`Invalid redaction path (${path22})`);
+        throw new Error(`Invalid redaction path (${path23})`);
       }
     }
     function validatePaths(paths) {
       if (!Array.isArray(paths)) {
         throw new TypeError("paths must be an array");
       }
-      for (const path22 of paths) {
-        validatePath(path22);
+      for (const path23 of paths) {
+        validatePath(path23);
       }
     }
     function slowRedact(options = {}) {
@@ -989,8 +989,8 @@ var require_redaction = __commonJS({
         if (shape[k] === null) {
           o[k] = (value) => topCensor(value, [k]);
         } else {
-          const wrappedCensor = typeof censor === "function" ? (value, path22) => {
-            return censor(value, [k, ...path22]);
+          const wrappedCensor = typeof censor === "function" ? (value, path23) => {
+            return censor(value, [k, ...path23]);
           } : censor;
           o[k] = Redact({
             paths: shape[k],
@@ -1211,7 +1211,7 @@ var require_sonic_boom = __commonJS({
     var fs22 = require("fs");
     var EventEmitter = require("events");
     var inherits = require("util").inherits;
-    var path22 = require("path");
+    var path23 = require("path");
     var sleep = require_atomic_sleep();
     var assert = require("assert");
     var BUSY_WRITE_TIMEOUT = 100;
@@ -1265,7 +1265,7 @@ var require_sonic_boom = __commonJS({
       const mode = sonic.mode;
       if (sonic.sync) {
         try {
-          if (sonic.mkdir) fs22.mkdirSync(path22.dirname(file), { recursive: true });
+          if (sonic.mkdir) fs22.mkdirSync(path23.dirname(file), { recursive: true });
           const fd = fs22.openSync(file, flags, mode);
           fileOpened(null, fd);
         } catch (err) {
@@ -1273,7 +1273,7 @@ var require_sonic_boom = __commonJS({
           throw err;
         }
       } else if (sonic.mkdir) {
-        fs22.mkdir(path22.dirname(file), { recursive: true }, (err) => {
+        fs22.mkdir(path23.dirname(file), { recursive: true }, (err) => {
           if (err) return fileOpened(err);
           fs22.open(file, flags, mode, fileOpened);
         });
@@ -4892,8 +4892,8 @@ var init_parseUtil = __esm({
     init_errors2();
     init_en();
     makeIssue = (params) => {
-      const { data, path: path22, errorMaps, issueData } = params;
-      const fullPath = [...path22, ...issueData.path || []];
+      const { data, path: path23, errorMaps, issueData } = params;
+      const fullPath = [...path23, ...issueData.path || []];
       const fullIssue = {
         ...issueData,
         path: fullPath
@@ -5204,11 +5204,11 @@ var init_types = __esm({
     init_parseUtil();
     init_util();
     ParseInputLazyPath = class {
-      constructor(parent, value, path22, key) {
+      constructor(parent, value, path23, key) {
         this._cachedPath = [];
         this.parent = parent;
         this.data = value;
-        this._path = path22;
+        this._path = path23;
         this._key = key;
       }
       get path() {
@@ -8741,6 +8741,9 @@ var init_schemas = __esm({
       // 由 session:fork 派生的 session 在 create 时记录源 transcript 的 toolSessionId；
       // sidebar 据此挂 fork 图标。非 fork session 该字段缺省
       forkedFromToolSessionId: external_exports.string().min(1).optional(),
+      // owner-mode persona session 身份标识；UI 用它在 SessionList 过滤 + jump，
+      // daemon 用它做 idempotent dedupe + spawn 时派生 ctx.personaMode='owner'
+      ownerPersonaId: external_exports.string().min(1).optional(),
       createdAt: external_exports.string().min(1),
       updatedAt: external_exports.string().min(1)
     });
@@ -8940,7 +8943,8 @@ var init_schemas = __esm({
       })
     ]);
     SessionCreateArgs = external_exports.object({
-      cwd: external_exports.string().min(1),
+      // 当 ownerPersonaId 存在时 cwd 由 daemon 派生，UI 可不传
+      cwd: external_exports.string().min(1).optional(),
       tool: external_exports.string().optional(),
       label: external_exports.string().optional(),
       model: external_exports.string().optional(),
@@ -8952,7 +8956,12 @@ var init_schemas = __esm({
       worktreeRoot: external_exports.string().min(1).optional(),
       worktreeBranch: external_exports.string().min(1).optional(),
       // session:fork 派生 session 时由 UI 传入，daemon 写到 SessionFile.forkedFromToolSessionId
-      forkedFromToolSessionId: external_exports.string().min(1).optional()
+      forkedFromToolSessionId: external_exports.string().min(1).optional(),
+      // owner-mode persona session：传此字段时 daemon 自行派生 cwd 和启动参数，
+      // 且按 ownerPersonaId 做 idempotent dedupe（每 persona 永远只有一个 owner session）
+      ownerPersonaId: external_exports.string().min(1).optional()
+    }).refine((args) => args.cwd != null || args.ownerPersonaId != null, {
+      message: "cwd \u4E0E ownerPersonaId \u81F3\u5C11\u4F20\u4E00\u4E2A"
     });
     SessionIdArgs = external_exports.object({ sessionId: external_exports.string().min(1) });
     SessionUpdateArgs = external_exports.object({
@@ -9202,6 +9211,13 @@ var init_frames = __esm({
   }
 });
 
+// ../protocol/src/persona-mode.ts
+var init_persona_mode = __esm({
+  "../protocol/src/persona-mode.ts"() {
+    "use strict";
+  }
+});
+
 // ../protocol/src/runtime.ts
 var init_runtime = __esm({
   "../protocol/src/runtime.ts"() {
@@ -9212,6 +9228,7 @@ var init_runtime = __esm({
     init_schemas();
     init_frames();
     init_persona_schemas();
+    init_persona_mode();
   }
 });
 
@@ -9788,11 +9805,11 @@ var init_lib = __esm({
           }
         }
       },
-      addToPath: function addToPath(path22, added, removed, oldPosInc, options) {
-        var last = path22.lastComponent;
+      addToPath: function addToPath(path23, added, removed, oldPosInc, options) {
+        var last = path23.lastComponent;
         if (last && !options.oneChangePerToken && last.added === added && last.removed === removed) {
           return {
-            oldPos: path22.oldPos + oldPosInc,
+            oldPos: path23.oldPos + oldPosInc,
             lastComponent: {
               count: last.count + 1,
               added,
@@ -9802,7 +9819,7 @@ var init_lib = __esm({
           };
         } else {
           return {
-            oldPos: path22.oldPos + oldPosInc,
+            oldPos: path23.oldPos + oldPosInc,
             lastComponent: {
               count: 1,
               added,
@@ -10233,10 +10250,10 @@ function attachmentToHistoryMessage(o, ts) {
     const memories = raw.map((m) => {
       if (!m || typeof m !== "object") return null;
       const rec = m;
-      const path22 = typeof rec.path === "string" ? rec.path : null;
+      const path23 = typeof rec.path === "string" ? rec.path : null;
       const content = typeof rec.content === "string" ? rec.content : null;
-      if (!path22 || content == null) return null;
-      const entry = { path: path22, content };
+      if (!path23 || content == null) return null;
+      const entry = { path: path23, content };
       if (typeof rec.mtimeMs === "number") entry.mtimeMs = rec.mtimeMs;
       return entry;
     }).filter((m) => m !== null);
@@ -10273,7 +10290,7 @@ function readBackupContent(fileHistoryRoot, toolSessionId, backupFileName) {
   if (backupFileName === null) return null;
   try {
     return import_node_fs6.default.readFileSync(
-      import_node_path5.default.join(fileHistoryRoot, toolSessionId, backupFileName),
+      import_node_path6.default.join(fileHistoryRoot, toolSessionId, backupFileName),
       "utf8"
     );
   } catch {
@@ -10288,13 +10305,13 @@ function readCurrentContent(filePath) {
     return null;
   }
 }
-var import_node_fs6, import_node_os2, import_node_path5, TASK_NOTIFICATION_RE, TASK_ID_RE, TOOL_USE_ID_RE, SLASH_COMMAND_RE, LOCAL_COMMAND_RE, SYSTEM_REMINDER_RE, OPENSPEC_BLOCK_RE, SKILL_HINT_RE, ATTACHMENT_SILENT_SUBTYPES, ClaudeHistoryReader;
+var import_node_fs6, import_node_os2, import_node_path6, TASK_NOTIFICATION_RE, TASK_ID_RE, TOOL_USE_ID_RE, SLASH_COMMAND_RE, LOCAL_COMMAND_RE, SYSTEM_REMINDER_RE, OPENSPEC_BLOCK_RE, SKILL_HINT_RE, ATTACHMENT_SILENT_SUBTYPES, ClaudeHistoryReader;
 var init_claude_history = __esm({
   "src/tools/claude-history.ts"() {
     "use strict";
     import_node_fs6 = __toESM(require("fs"), 1);
     import_node_os2 = __toESM(require("os"), 1);
-    import_node_path5 = __toESM(require("path"), 1);
+    import_node_path6 = __toESM(require("path"), 1);
     init_lib();
     init_tool_result_extra();
     TASK_NOTIFICATION_RE = /<task-notification\b[\s\S]*?<\/task-notification>/i;
@@ -10318,9 +10335,9 @@ var init_claude_history = __esm({
       // 每次 user 提交前 trackEdit 拷一份，作为 rewind 回退目标
       fileHistoryRoot;
       constructor(opts = {}) {
-        const base = opts.baseDir ?? import_node_path5.default.join(import_node_os2.default.homedir(), ".claude");
-        this.projectsRoot = import_node_path5.default.join(base, "projects");
-        this.fileHistoryRoot = import_node_path5.default.join(base, "file-history");
+        const base = opts.baseDir ?? import_node_path6.default.join(import_node_os2.default.homedir(), ".claude");
+        this.projectsRoot = import_node_path6.default.join(base, "projects");
+        this.fileHistoryRoot = import_node_path6.default.join(base, "file-history");
       }
       async listProjects() {
         let entries;
@@ -10333,9 +10350,9 @@ var init_claude_history = __esm({
         const out = [];
         for (const ent of entries) {
           if (!ent.isDirectory()) continue;
-          const dir = import_node_path5.default.join(this.projectsRoot, ent.name);
+          const dir = import_node_path6.default.join(this.projectsRoot, ent.name);
           const files = import_node_fs6.default.readdirSync(dir).filter((f) => f.endsWith(".jsonl"));
-          const updatedAtMs = files.reduce((m, f) => Math.max(m, safeStatMtime(import_node_path5.default.join(dir, f))), 0);
+          const updatedAtMs = files.reduce((m, f) => Math.max(m, safeStatMtime(import_node_path6.default.join(dir, f))), 0);
           out.push({
             projectPath: hashDirToCwd(ent.name),
             hashDir: ent.name,
@@ -10347,7 +10364,7 @@ var init_claude_history = __esm({
         return out;
       }
       async listSessions(args) {
-        const dir = import_node_path5.default.join(this.projectsRoot, cwdToHashDir(args.projectPath));
+        const dir = import_node_path6.default.join(this.projectsRoot, cwdToHashDir(args.projectPath));
         let files;
         try {
           files = import_node_fs6.default.readdirSync(dir).filter((f) => f.endsWith(".jsonl"));
@@ -10357,7 +10374,7 @@ var init_claude_history = __esm({
         }
         const out = [];
         for (const f of files) {
-          const full = import_node_path5.default.join(dir, f);
+          const full = import_node_path6.default.join(dir, f);
           const toolSessionId = f.slice(0, -".jsonl".length);
           const lines = readJsonlLines(full);
           let summary = "";
@@ -10412,7 +10429,7 @@ var init_claude_history = __esm({
         return out;
       }
       async read(args) {
-        const file = import_node_path5.default.join(
+        const file = import_node_path6.default.join(
           this.projectsRoot,
           cwdToHashDir(args.cwd),
           `${args.toolSessionId}.jsonl`
@@ -10445,7 +10462,7 @@ var init_claude_history = __esm({
       // 独立目录路径：<projectsRoot>/<cwdHash>/<toolSessionId>/subagents/*.jsonl
       // 返回 null 表示目录不存在（调用方回退旧实现）；返回空数组表示目录存在但无 jsonl
       listSubagentsFromDirectory(cwd, toolSessionId) {
-        const dir = import_node_path5.default.join(
+        const dir = import_node_path6.default.join(
           this.projectsRoot,
           cwdToHashDir(cwd),
           toolSessionId,
@@ -10463,7 +10480,7 @@ var init_claude_history = __esm({
           if (!e.isFile()) continue;
           if (!e.name.startsWith("agent-") || !e.name.endsWith(".jsonl")) continue;
           const subagentId = e.name.slice("agent-".length, -".jsonl".length);
-          const filePath = import_node_path5.default.join(dir, e.name);
+          const filePath = import_node_path6.default.join(dir, e.name);
           const lines = readJsonlLines(filePath);
           let firstText = "";
           let messageCount = 0;
@@ -10480,7 +10497,7 @@ var init_claude_history = __esm({
         return out;
       }
       listSubagentsFromMainJsonl(cwd, toolSessionId) {
-        const file = import_node_path5.default.join(
+        const file = import_node_path6.default.join(
           this.projectsRoot,
           cwdToHashDir(cwd),
           `${toolSessionId}.jsonl`
@@ -10515,7 +10532,7 @@ var init_claude_history = __esm({
       }
       // 独立文件路径：agent-<subagentId>.jsonl；文件不存在返回 null 让调用方回退旧实现
       readSubagentFromFile(cwd, toolSessionId, subagentId) {
-        const file = import_node_path5.default.join(
+        const file = import_node_path6.default.join(
           this.projectsRoot,
           cwdToHashDir(cwd),
           toolSessionId,
@@ -10543,7 +10560,7 @@ var init_claude_history = __esm({
        * "那一刻每个 tracked 文件对应的 backup 文件名"
        */
       readFileHistorySnapshots(args) {
-        const file = import_node_path5.default.join(
+        const file = import_node_path6.default.join(
           this.projectsRoot,
           cwdToHashDir(args.cwd),
           `${args.toolSessionId}.jsonl`
@@ -10588,7 +10605,7 @@ var init_claude_history = __esm({
         for (const [anchorId, target] of snapshots) {
           let hasAny = false;
           for (const [rawPath, backup] of Object.entries(target)) {
-            const absPath = import_node_path5.default.isAbsolute(rawPath) ? rawPath : import_node_path5.default.join(args.cwd, rawPath);
+            const absPath = import_node_path6.default.isAbsolute(rawPath) ? rawPath : import_node_path6.default.join(args.cwd, rawPath);
             const backupContent = readBackupContent(
               this.fileHistoryRoot,
               args.toolSessionId,
@@ -10628,7 +10645,7 @@ var init_claude_history = __esm({
         let totalInsertions = 0;
         let totalDeletions = 0;
         for (const [rawPath, backup] of Object.entries(target)) {
-          const absPath = import_node_path5.default.isAbsolute(rawPath) ? rawPath : import_node_path5.default.join(args.cwd, rawPath);
+          const absPath = import_node_path6.default.isAbsolute(rawPath) ? rawPath : import_node_path6.default.join(args.cwd, rawPath);
           const backupContent = readBackupContent(
             this.fileHistoryRoot,
             args.toolSessionId,
@@ -10675,7 +10692,7 @@ var init_claude_history = __esm({
         };
       }
       readSubagentFromMainJsonl(cwd, toolSessionId, subagentId) {
-        const file = import_node_path5.default.join(
+        const file = import_node_path6.default.join(
           this.projectsRoot,
           cwdToHashDir(cwd),
           `${toolSessionId}.jsonl`
@@ -10699,7 +10716,7 @@ var init_claude_history = __esm({
 // src/tools/claude.ts
 function macOSDesktopCandidates(home) {
   return [
-    import_node_path6.default.join(home, "Applications", "Claude.app", "Contents", "Resources", "app.asar.unpacked", "node_modules", "@anthropic-ai", "claude-code", "cli.js"),
+    import_node_path7.default.join(home, "Applications", "Claude.app", "Contents", "Resources", "app.asar.unpacked", "node_modules", "@anthropic-ai", "claude-code", "cli.js"),
     "/Applications/Claude.app/Contents/Resources/app.asar.unpacked/node_modules/@anthropic-ai/claude-code/cli.js"
   ];
 }
@@ -10744,10 +10761,21 @@ function buildSpawnArgs(ctx) {
     "--verbose"
   ];
   if (ctx.model) args.push("--model", ctx.model);
-  if (ctx.personaMode) {
-    args.push("--setting-sources", "project,local");
-  } else if (ctx.permissionMode) {
-    args.push("--permission-mode", ctx.permissionMode);
+  switch (ctx.personaMode) {
+    case "listener":
+      args.push("--setting-sources", "project,local");
+      break;
+    case "owner":
+      args.push("--setting-sources", "user");
+      args.push("--permission-mode", "bypassPermissions");
+      break;
+    case void 0:
+      if (ctx.permissionMode) args.push("--permission-mode", ctx.permissionMode);
+      break;
+    default: {
+      const _exhaustive = ctx.personaMode;
+      throw new Error(`unexpected personaMode: ${String(_exhaustive)}`);
+    }
   }
   if (ctx.effort) args.push("--effort", ctx.effort);
   if (ctx.toolSessionId) args.push("--resume", ctx.toolSessionId);
@@ -11027,10 +11055,10 @@ function parseAttachment(obj) {
     const memories = raw.map((m) => {
       if (!m || typeof m !== "object") return null;
       const rec = m;
-      const path22 = typeof rec.path === "string" ? rec.path : null;
+      const path23 = typeof rec.path === "string" ? rec.path : null;
       const content = typeof rec.content === "string" ? rec.content : null;
-      if (!path22 || content == null) return null;
-      const out = { path: path22, content };
+      if (!path23 || content == null) return null;
+      const out = { path: path23, content };
       if (typeof rec.mtimeMs === "number") out.mtimeMs = rec.mtimeMs;
       return out;
     }).filter((m) => m !== null);
@@ -11134,7 +11162,7 @@ function encodeClaudeStdin(text) {
   };
   return JSON.stringify(frame) + "\n";
 }
-var import_node_child_process, import_node_child_process2, import_node_fs7, import_node_os3, import_node_path6, ATTACHMENT_SILENT_SUBTYPES2, unknownTypeHandler, ATTACHMENT_RE, IMAGE_EXT_MIME, CLAUDE_MODELS, CLAUDE_PERMISSION_MODES, CLAUDE_CAPABILITIES, ClaudeAdapter;
+var import_node_child_process, import_node_child_process2, import_node_fs7, import_node_os3, import_node_path7, ATTACHMENT_SILENT_SUBTYPES2, unknownTypeHandler, ATTACHMENT_RE, IMAGE_EXT_MIME, CLAUDE_MODELS, CLAUDE_PERMISSION_MODES, CLAUDE_CAPABILITIES, ClaudeAdapter;
 var init_claude = __esm({
   "src/tools/claude.ts"() {
     "use strict";
@@ -11142,7 +11170,7 @@ var init_claude = __esm({
     import_node_child_process2 = require("child_process");
     import_node_fs7 = __toESM(require("fs"), 1);
     import_node_os3 = __toESM(require("os"), 1);
-    import_node_path6 = __toESM(require("path"), 1);
+    import_node_path7 = __toESM(require("path"), 1);
     init_protocol();
     init_claude_history();
     init_tool_result_extra();
@@ -14897,7 +14925,7 @@ var require_websocket_server = __commonJS({
 // src/run-case/recorder.ts
 function startRunCaseRecorder(opts) {
   const now = opts.now ?? Date.now;
-  const dir = import_node_path19.default.dirname(opts.recordPath);
+  const dir = import_node_path20.default.dirname(opts.recordPath);
   let stream = null;
   let closing = false;
   let closedSettled = false;
@@ -14937,12 +14965,12 @@ function startRunCaseRecorder(opts) {
   };
   return { tap, close, closed };
 }
-var import_node_fs20, import_node_path19;
+var import_node_fs20, import_node_path20;
 var init_recorder = __esm({
   "src/run-case/recorder.ts"() {
     "use strict";
     import_node_fs20 = __toESM(require("fs"), 1);
-    import_node_path19 = __toESM(require("path"), 1);
+    import_node_path20 = __toESM(require("path"), 1);
   }
 });
 
@@ -14985,7 +15013,7 @@ var init_wire = __esm({
 // src/run-case/controller.ts
 async function runController(opts) {
   const now = opts.now ?? Date.now;
-  const cwd = opts.cwd ?? (0, import_node_fs21.mkdtempSync)(import_node_path20.default.join(import_node_os13.default.tmpdir(), "clawd-runcase-"));
+  const cwd = opts.cwd ?? (0, import_node_fs21.mkdtempSync)(import_node_path21.default.join(import_node_os13.default.tmpdir(), "clawd-runcase-"));
   const ownsCwd = opts.cwd === void 0;
   const recorder = startRunCaseRecorder({ recordPath: opts.record, now });
   const spawnCtx = { cwd };
@@ -15152,13 +15180,13 @@ async function runController(opts) {
   }
   return exitCode ?? 0;
 }
-var import_node_fs21, import_node_os13, import_node_path20;
+var import_node_fs21, import_node_os13, import_node_path21;
 var init_controller = __esm({
   "src/run-case/controller.ts"() {
     "use strict";
     import_node_fs21 = require("fs");
     import_node_os13 = __toESM(require("os"), 1);
-    import_node_path20 = __toESM(require("path"), 1);
+    import_node_path21 = __toESM(require("path"), 1);
     init_claude();
     init_stdout_splitter();
     init_permission_stdio();
@@ -15383,7 +15411,7 @@ Env (advanced):
 `;
 
 // src/index.ts
-var import_node_path18 = __toESM(require("path"), 1);
+var import_node_path19 = __toESM(require("path"), 1);
 var import_node_fs19 = __toESM(require("fs"), 1);
 
 // src/logger.ts
@@ -15514,6 +15542,7 @@ var SessionStore = class {
 
 // src/session/manager.ts
 var import_node_fs5 = __toESM(require("fs"), 1);
+var import_node_path5 = __toESM(require("path"), 1);
 
 // ../node_modules/.pnpm/uuid@10.0.0/node_modules/uuid/dist/esm-node/stringify.js
 var byteToHex = [];
@@ -15660,7 +15689,7 @@ function buildSpawnContext(state) {
   };
   const meta = state.subSessionMeta;
   if (meta?.personaMode) {
-    ctx.personaMode = true;
+    ctx.personaMode = meta.personaMode;
   }
   return ctx;
 }
@@ -16657,10 +16686,22 @@ var SessionManager = class {
     this.capabilitiesCache.set(tool, caps);
     return caps;
   }
+  // 按优先级解析 SubSessionMeta：subSessionMetaBySid 缓存（内存，首次 create/registerSubSession 写入）
+  // → SessionFile.ownerPersonaId 派生（持久化兜底，daemon 重启后 subSessionMetaBySid 丢失时生效）
+  // → undefined（普通 session）
+  resolveSubSessionMeta(file) {
+    const cached = this.subSessionMetaBySid.get(file.sessionId);
+    if (cached) return cached;
+    if (file.ownerPersonaId) {
+      return { idleKillEnabled: false, personaMode: "owner" };
+    }
+    return void 0;
+  }
   // 创建 runner 时包一层 broadcast hook：所有外出 frame 统一走 routeFromRunner，
   // 经过 compressFrameForWire 后决定是 push collector 还是走 deps.broadcastFrame
   // store：默认 deps.store；persona sub-session 路径下传该 personaId 对应的 SessionStore
-  // subSessionMeta：persona 路径传 { idleKillEnabled: true }，其它路径不传
+  // subSessionMeta：listener 传 { idleKillEnabled: true, personaMode: 'listener' }；
+  // owner 传 { idleKillEnabled: false, personaMode: 'owner' }；普通 session 不传
   newRunner(file, opts = {}) {
     const adapter = this.deps.getAdapter(file.tool ?? "claude");
     const store = opts.store ?? this.deps.store;
@@ -16718,18 +16759,34 @@ var SessionManager = class {
   }
   // ---- 命令方法：均返回 { response, broadcast[] }，由 dispatcher 聚合 ----
   create(args) {
+    if (args.ownerPersonaId) {
+      const existing = this.deps.store.list().find((s) => s.ownerPersonaId === args.ownerPersonaId);
+      if (existing) {
+        return { response: existing, broadcast: [] };
+      }
+    }
+    let cwd = args.cwd;
+    if (args.ownerPersonaId && !cwd) {
+      if (!this.deps.personaRoot) {
+        throw new Error("personaRoot required to derive cwd from ownerPersonaId");
+      }
+      cwd = import_node_path5.default.join(this.deps.personaRoot, safeFileName(args.ownerPersonaId));
+    }
+    if (!cwd) {
+      throw new ClawdError(ERROR_CODES.INVALID_CWD, "cwd required when ownerPersonaId is absent");
+    }
     try {
-      const stat = import_node_fs5.default.statSync(args.cwd);
+      const stat = import_node_fs5.default.statSync(cwd);
       if (!stat.isDirectory()) throw new Error("not dir");
     } catch {
-      throw new ClawdError(ERROR_CODES.INVALID_CWD, `cwd not a directory: ${args.cwd}`);
+      throw new ClawdError(ERROR_CODES.INVALID_CWD, `cwd not a directory: ${cwd}`);
     }
     const tool = args.tool ?? "claude";
     this.deps.getAdapter(tool);
     const iso = nowIso2(this.deps);
     const file = {
       sessionId: newSessionId(),
-      cwd: args.cwd,
+      cwd,
       tool,
       label: args.label,
       model: args.model,
@@ -16739,10 +16796,17 @@ var SessionManager = class {
       worktreeRoot: args.worktreeRoot,
       worktreeBranch: args.worktreeBranch,
       forkedFromToolSessionId: args.forkedFromToolSessionId,
+      ownerPersonaId: args.ownerPersonaId,
       createdAt: iso,
       updatedAt: iso
     };
     const written = this.deps.store.write(file);
+    if (args.ownerPersonaId) {
+      this.subSessionMetaBySid.set(written.sessionId, {
+        idleKillEnabled: false,
+        personaMode: "owner"
+      });
+    }
     return { response: written, broadcast: [] };
   }
   pin(args) {
@@ -16898,7 +16962,8 @@ var SessionManager = class {
     const existing = this.getFile(args.sessionId);
     let runner = this.runners.get(args.sessionId);
     if (!runner) {
-      runner = this.newRunner(existing);
+      const subSessionMeta = this.resolveSubSessionMeta(existing);
+      runner = this.newRunner(existing, { subSessionMeta });
       this.runners.set(args.sessionId, runner);
     }
     const { broadcast } = this.withCollector(() => {
@@ -16992,7 +17057,8 @@ var SessionManager = class {
     const file = this.getFile(args.sessionId);
     let runner = this.runners.get(args.sessionId);
     if (!runner) {
-      runner = this.newRunner(file);
+      const subSessionMeta = this.resolveSubSessionMeta(file);
+      runner = this.newRunner(file, { subSessionMeta });
       this.runners.set(args.sessionId, runner);
     }
     if (!runner.getState().procAlive) {
@@ -17150,7 +17216,7 @@ var SessionManager = class {
   ensureSession(file) {
     let r = this.runners.get(file.sessionId);
     if (r) return r;
-    const subSessionMeta = this.subSessionMetaBySid.get(file.sessionId);
+    const subSessionMeta = this.resolveSubSessionMeta(file);
     r = this.newRunner(file, { subSessionMeta });
     this.runners.set(file.sessionId, r);
     return r;
@@ -17326,7 +17392,7 @@ var SessionManager = class {
     const existing = this.runners.get(file.sessionId);
     if (existing) return existing;
     const store = this.storeFor(agentId);
-    const subSessionMeta = this.subSessionMetaBySid.get(file.sessionId);
+    const subSessionMeta = this.resolveSubSessionMeta(file);
     const runner = this.newRunner(file, { store, subSessionMeta });
     this.runners.set(file.sessionId, runner);
     return runner;
@@ -17348,7 +17414,7 @@ var SessionManager = class {
     }
     let runner = this.runners.get(args.sessionId);
     if (!runner) {
-      const subSessionMeta = this.subSessionMetaBySid.get(args.sessionId);
+      const subSessionMeta = this.resolveSubSessionMeta(file);
       runner = this.newRunner(file, { store, subSessionMeta });
       this.runners.set(args.sessionId, runner);
     }
@@ -17420,7 +17486,7 @@ var SessionManager = class {
 
 // src/persona/store.ts
 var fs6 = __toESM(require("fs"), 1);
-var path5 = __toESM(require("path"), 1);
+var path6 = __toESM(require("path"), 1);
 init_protocol();
 var DEFAULT_SETTINGS = {
   permissions: {
@@ -17449,21 +17515,21 @@ var PersonaStore = class {
   }
   root;
   personaDir(personaId) {
-    return path5.join(this.root, safeFileName(personaId));
+    return path6.join(this.root, safeFileName(personaId));
   }
   metaPath(personaId) {
-    return path5.join(this.personaDir(personaId), ".clawd", "persona.json");
+    return path6.join(this.personaDir(personaId), ".clawd", "persona.json");
   }
   claudeMdPath(personaId) {
-    return path5.join(this.personaDir(personaId), "CLAUDE.md");
+    return path6.join(this.personaDir(personaId), "CLAUDE.md");
   }
   settingsPath(personaId) {
-    return path5.join(this.personaDir(personaId), ".claude", "settings.json");
+    return path6.join(this.personaDir(personaId), ".claude", "settings.json");
   }
   write(persona, personality) {
     const dir = this.personaDir(persona.personaId);
-    fs6.mkdirSync(path5.join(dir, ".claude"), { recursive: true });
-    fs6.mkdirSync(path5.join(dir, ".clawd"), { recursive: true });
+    fs6.mkdirSync(path6.join(dir, ".claude"), { recursive: true });
+    fs6.mkdirSync(path6.join(dir, ".clawd"), { recursive: true });
     this.atomicWrite(this.claudeMdPath(persona.personaId), personality);
     this.atomicWrite(this.settingsPath(persona.personaId), JSON.stringify(DEFAULT_SETTINGS, null, 2));
     this.atomicWrite(this.metaPath(persona.personaId), JSON.stringify(persona, null, 2));
@@ -17488,7 +17554,7 @@ var PersonaStore = class {
   list() {
     if (!fs6.existsSync(this.root)) return [];
     return fs6.readdirSync(this.root).filter((name) => {
-      return fs6.existsSync(path5.join(this.root, name, ".clawd", "persona.json"));
+      return fs6.existsSync(path6.join(this.root, name, ".clawd", "persona.json"));
     });
   }
   remove(personaId) {
@@ -17653,7 +17719,7 @@ var PersonaManager = class {
       tool: "claude",
       label: subLabel,
       model: persona.model,
-      subSessionMeta: { idleKillEnabled: true, personaMode: true }
+      subSessionMeta: { idleKillEnabled: true, personaMode: "listener" }
     });
     return { sessionFile, isNew: true };
   }
@@ -17689,14 +17755,14 @@ init_claude_history();
 // src/workspace/browser.ts
 var import_node_fs8 = __toESM(require("fs"), 1);
 var import_node_os4 = __toESM(require("os"), 1);
-var import_node_path7 = __toESM(require("path"), 1);
+var import_node_path8 = __toESM(require("path"), 1);
 init_protocol();
 var MAX_FILE_BYTES = 2 * 1024 * 1024;
 function resolveInsideCwd(cwd, subpath) {
-  const absCwd = import_node_path7.default.resolve(cwd);
-  const joined = import_node_path7.default.resolve(absCwd, subpath ?? ".");
-  const rel = import_node_path7.default.relative(absCwd, joined);
-  if (rel.startsWith("..") || import_node_path7.default.isAbsolute(rel)) {
+  const absCwd = import_node_path8.default.resolve(cwd);
+  const joined = import_node_path8.default.resolve(absCwd, subpath ?? ".");
+  const rel = import_node_path8.default.relative(absCwd, joined);
+  if (rel.startsWith("..") || import_node_path8.default.isAbsolute(rel)) {
     throw new ClawdError(ERROR_CODES.INVALID_PATH, `path escapes cwd: ${subpath}`);
   }
   return joined;
@@ -17727,7 +17793,7 @@ var WorkspaceBrowser = class {
         mtime: ""
       };
       try {
-        const st = import_node_fs8.default.statSync(import_node_path7.default.join(full, d.name));
+        const st = import_node_fs8.default.statSync(import_node_path8.default.join(full, d.name));
         entry.mtime = new Date(st.mtimeMs).toISOString();
         if (d.isFile()) entry.size = st.size;
       } catch {
@@ -17774,7 +17840,7 @@ var WorkspaceBrowser = class {
 // src/skills/scanner.ts
 var import_node_fs9 = __toESM(require("fs"), 1);
 var import_node_os5 = __toESM(require("os"), 1);
-var import_node_path8 = __toESM(require("path"), 1);
+var import_node_path9 = __toESM(require("path"), 1);
 
 // src/skills/frontmatter.ts
 var STRIP_QUOTES = /^["']|["']$/g;
@@ -17896,14 +17962,14 @@ function scanSkillDir(dir, source, seen, out, pluginName) {
     return;
   }
   for (const ent of entries) {
-    const entryPath = import_node_path8.default.join(dir, ent.name);
+    const entryPath = import_node_path9.default.join(dir, ent.name);
     if (!ent.isDirectory() && !(ent.isSymbolicLink() && isDirLikeSync(entryPath))) continue;
     let content;
     try {
-      content = import_node_fs9.default.readFileSync(import_node_path8.default.join(entryPath, "SKILL.md"), "utf8");
+      content = import_node_fs9.default.readFileSync(import_node_path9.default.join(entryPath, "SKILL.md"), "utf8");
     } catch {
       try {
-        content = import_node_fs9.default.readFileSync(import_node_path8.default.join(entryPath, "skill.md"), "utf8");
+        content = import_node_fs9.default.readFileSync(import_node_path9.default.join(entryPath, "skill.md"), "utf8");
       } catch {
         continue;
       }
@@ -17926,7 +17992,7 @@ function scanCommandDir(dir, source, seen, out, pluginName) {
     return;
   }
   for (const ent of entries) {
-    const entryPath = import_node_path8.default.join(dir, ent.name);
+    const entryPath = import_node_path9.default.join(dir, ent.name);
     if (ent.isDirectory() || ent.isSymbolicLink() && isDirLikeSync(entryPath)) {
       const ns = ent.name;
       let subEntries;
@@ -17937,7 +18003,7 @@ function scanCommandDir(dir, source, seen, out, pluginName) {
       }
       for (const se of subEntries) {
         if (!se.name.endsWith(".md")) continue;
-        const sePath = import_node_path8.default.join(entryPath, se.name);
+        const sePath = import_node_path9.default.join(entryPath, se.name);
         let content;
         try {
           content = import_node_fs9.default.readFileSync(sePath, "utf8");
@@ -17973,7 +18039,7 @@ function scanCommandDir(dir, source, seen, out, pluginName) {
   }
 }
 function readInstalledPlugins(home) {
-  const file = import_node_path8.default.join(home, ".claude", "plugins", "installed_plugins.json");
+  const file = import_node_path9.default.join(home, ".claude", "plugins", "installed_plugins.json");
   let raw;
   try {
     raw = import_node_fs9.default.readFileSync(file, "utf8");
@@ -18024,14 +18090,14 @@ var SkillsScanner = class {
       });
     }
     const fsBlock = [];
-    scanSkillDir(import_node_path8.default.join(this.home, ".claude", "skills"), "global", seen, fsBlock);
-    scanCommandDir(import_node_path8.default.join(this.home, ".claude", "commands"), "global", seen, fsBlock);
-    scanSkillDir(import_node_path8.default.join(args.cwd, ".claude", "skills"), "project", seen, fsBlock);
-    scanCommandDir(import_node_path8.default.join(args.cwd, ".claude", "commands"), "project", seen, fsBlock);
+    scanSkillDir(import_node_path9.default.join(this.home, ".claude", "skills"), "global", seen, fsBlock);
+    scanCommandDir(import_node_path9.default.join(this.home, ".claude", "commands"), "global", seen, fsBlock);
+    scanSkillDir(import_node_path9.default.join(args.cwd, ".claude", "skills"), "project", seen, fsBlock);
+    scanCommandDir(import_node_path9.default.join(args.cwd, ".claude", "commands"), "project", seen, fsBlock);
     const plugins = [...readInstalledPlugins(this.home), ...this.extraPluginRoots];
     for (const { name, root } of plugins) {
-      scanSkillDir(import_node_path8.default.join(root, "skills"), "plugin", seen, fsBlock, name);
-      scanCommandDir(import_node_path8.default.join(root, "commands"), "plugin", seen, fsBlock, name);
+      scanSkillDir(import_node_path9.default.join(root, "skills"), "plugin", seen, fsBlock, name);
+      scanCommandDir(import_node_path9.default.join(root, "commands"), "plugin", seen, fsBlock, name);
     }
     fsBlock.sort((a, b) => a.name < b.name ? -1 : a.name > b.name ? 1 : 0);
     return [...builtinBlock, ...fsBlock];
@@ -18041,7 +18107,7 @@ var SkillsScanner = class {
 // src/skills/agents-scanner.ts
 var import_node_fs10 = __toESM(require("fs"), 1);
 var import_node_os6 = __toESM(require("os"), 1);
-var import_node_path9 = __toESM(require("path"), 1);
+var import_node_path10 = __toESM(require("path"), 1);
 var DEFAULT_POLICY_DIR_DARWIN = "/Library/Application Support/ClaudeCode/.claude/agents";
 function isDirLikeSync2(p) {
   try {
@@ -18079,10 +18145,10 @@ function scanAgentsDir(dir, source, seen, out) {
   }
   for (const ent of entries) {
     if (!ent.name.endsWith(".md")) continue;
-    if (!ent.isFile() && !(ent.isSymbolicLink() && fileExistsSync(import_node_path9.default.join(dir, ent.name)))) {
+    if (!ent.isFile() && !(ent.isSymbolicLink() && fileExistsSync(import_node_path10.default.join(dir, ent.name)))) {
       continue;
     }
-    const filePath = import_node_path9.default.join(dir, ent.name);
+    const filePath = import_node_path10.default.join(dir, ent.name);
     const baseName = ent.name.replace(/\.md$/, "");
     if (seen.has(baseName)) continue;
     seen.add(baseName);
@@ -18105,7 +18171,7 @@ function scanPluginAgentsTree(root, pluginName, seen, out) {
       return;
     }
     for (const ent of entries) {
-      const childPath = import_node_path9.default.join(dir, ent.name);
+      const childPath = import_node_path10.default.join(dir, ent.name);
       if (ent.isDirectory() || ent.isSymbolicLink() && isDirLikeSync2(childPath)) {
         walk(childPath, [...namespaces, ent.name]);
         continue;
@@ -18130,9 +18196,9 @@ function scanPluginAgentsTree(root, pluginName, seen, out) {
   walk(root, []);
 }
 function readInstalledPlugins2(home) {
-  const pluginsDir = import_node_path9.default.join(home, ".claude", "plugins");
-  const v2 = import_node_path9.default.join(pluginsDir, "installed_plugins_v2.json");
-  const v1 = import_node_path9.default.join(pluginsDir, "installed_plugins.json");
+  const pluginsDir = import_node_path10.default.join(home, ".claude", "plugins");
+  const v2 = import_node_path10.default.join(pluginsDir, "installed_plugins_v2.json");
+  const v1 = import_node_path10.default.join(pluginsDir, "installed_plugins.json");
   let raw = null;
   for (const candidate of [v2, v1]) {
     try {
@@ -18161,19 +18227,19 @@ function readInstalledPlugins2(home) {
   return out;
 }
 function walkUpProjectAgentsDirs(startCwd, home, seen, out) {
-  let cur = import_node_path9.default.resolve(startCwd);
-  const fsRoot = import_node_path9.default.parse(cur).root;
+  let cur = import_node_path10.default.resolve(startCwd);
+  const fsRoot = import_node_path10.default.parse(cur).root;
   while (true) {
-    scanAgentsDir(import_node_path9.default.join(cur, ".claude", "agents"), "project", seen, out);
+    scanAgentsDir(import_node_path10.default.join(cur, ".claude", "agents"), "project", seen, out);
     let hasGit = false;
     try {
-      hasGit = import_node_fs10.default.existsSync(import_node_path9.default.join(cur, ".git"));
+      hasGit = import_node_fs10.default.existsSync(import_node_path10.default.join(cur, ".git"));
     } catch {
     }
     if (hasGit) return;
     if (cur === home) return;
     if (cur === fsRoot) return;
-    const parent = import_node_path9.default.dirname(cur);
+    const parent = import_node_path10.default.dirname(cur);
     if (parent === cur) return;
     cur = parent;
   }
@@ -18208,7 +18274,7 @@ var AgentsScanner = class {
     }
     const fsBlock = [];
     scanAgentsDir(
-      import_node_path9.default.join(this.home, ".claude", "agents"),
+      import_node_path10.default.join(this.home, ".claude", "agents"),
       "global",
       seen,
       fsBlock
@@ -18222,7 +18288,7 @@ var AgentsScanner = class {
       ...this.extraPluginRoots
     ];
     for (const { name, root } of plugins) {
-      const agentsRoot = import_node_path9.default.join(root, "agents");
+      const agentsRoot = import_node_path10.default.join(root, "agents");
       scanPluginAgentsTree(agentsRoot, name, seen, fsBlock);
     }
     return [...builtinBlock, ...fsBlock];
@@ -18232,7 +18298,7 @@ var AgentsScanner = class {
 // src/observer/session-observer.ts
 var import_node_fs11 = __toESM(require("fs"), 1);
 var import_node_os7 = __toESM(require("os"), 1);
-var import_node_path10 = __toESM(require("path"), 1);
+var import_node_path11 = __toESM(require("path"), 1);
 init_claude_history();
 var SessionObserver = class {
   constructor(opts) {
@@ -18244,7 +18310,7 @@ var SessionObserver = class {
   watches = /* @__PURE__ */ new Map();
   resolveJsonlPath(cwd, toolSessionId, override) {
     if (override) return override;
-    return import_node_path10.default.join(this.home, ".claude", "projects", cwdToHashDir(cwd), `${toolSessionId}.jsonl`);
+    return import_node_path11.default.join(this.home, ".claude", "projects", cwdToHashDir(cwd), `${toolSessionId}.jsonl`);
   }
   start(args) {
     this.stop(args.sessionId);
@@ -18264,10 +18330,10 @@ var SessionObserver = class {
       adapter: args.adapter
     };
     try {
-      import_node_fs11.default.mkdirSync(import_node_path10.default.dirname(filePath), { recursive: true });
+      import_node_fs11.default.mkdirSync(import_node_path11.default.dirname(filePath), { recursive: true });
     } catch {
     }
-    w.watcher = import_node_fs11.default.watch(import_node_path10.default.dirname(filePath), { persistent: false }, (_event, changedName) => {
+    w.watcher = import_node_fs11.default.watch(import_node_path11.default.dirname(filePath), { persistent: false }, (_event, changedName) => {
       if (!changedName || !filePath.endsWith(changedName)) return;
       this.poll(w);
     });
@@ -18983,9 +19049,9 @@ function isLocalhost(addr) {
 
 // src/discovery/state-file.ts
 var import_node_fs12 = __toESM(require("fs"), 1);
-var import_node_path11 = __toESM(require("path"), 1);
+var import_node_path12 = __toESM(require("path"), 1);
 function defaultStateFilePath(dataDir) {
-  return import_node_path11.default.join(dataDir, "state.json");
+  return import_node_path12.default.join(dataDir, "state.json");
 }
 function isPidAlive(pid) {
   if (!Number.isFinite(pid) || pid <= 0) return false;
@@ -19021,7 +19087,7 @@ var StateFileManager = class {
     return { status: "stale", existing };
   }
   write(state) {
-    import_node_fs12.default.mkdirSync(import_node_path11.default.dirname(this.file), { recursive: true });
+    import_node_fs12.default.mkdirSync(import_node_path12.default.dirname(this.file), { recursive: true });
     const tmp = `${this.file}.tmp.${process.pid}.${Date.now()}`;
     import_node_fs12.default.writeFileSync(tmp, JSON.stringify(state, null, 2), { mode: 384 });
     import_node_fs12.default.renameSync(tmp, this.file);
@@ -19042,13 +19108,13 @@ var StateFileManager = class {
 
 // src/tunnel/tunnel-manager.ts
 var import_node_fs15 = __toESM(require("fs"), 1);
-var import_node_path14 = __toESM(require("path"), 1);
+var import_node_path15 = __toESM(require("path"), 1);
 var import_node_crypto4 = __toESM(require("crypto"), 1);
 var import_node_child_process4 = require("child_process");
 
 // src/tunnel/tunnel-store.ts
 var import_node_fs13 = __toESM(require("fs"), 1);
-var import_node_path12 = __toESM(require("path"), 1);
+var import_node_path13 = __toESM(require("path"), 1);
 var TunnelStore = class {
   constructor(filePath) {
     this.filePath = filePath;
@@ -19067,7 +19133,7 @@ var TunnelStore = class {
     }
   }
   async set(v) {
-    const dir = import_node_path12.default.dirname(this.filePath);
+    const dir = import_node_path13.default.dirname(this.filePath);
     await import_node_fs13.default.promises.mkdir(dir, { recursive: true });
     const data = JSON.stringify(v, null, 2);
     const tmp = `${this.filePath}.tmp.${process.pid}.${Date.now()}`;
@@ -19179,7 +19245,7 @@ function escape(v) {
 // src/tunnel/frpc-binary.ts
 var import_node_fs14 = __toESM(require("fs"), 1);
 var import_node_os8 = __toESM(require("os"), 1);
-var import_node_path13 = __toESM(require("path"), 1);
+var import_node_path14 = __toESM(require("path"), 1);
 var import_node_child_process3 = require("child_process");
 var import_node_stream = require("stream");
 var import_promises = require("stream/promises");
@@ -19218,13 +19284,13 @@ async function ensureFrpcBinary(opts) {
   }
   const version2 = opts.version ?? FRPC_VERSION;
   const platform = opts.platform ?? detectPlatform();
-  const binDir = import_node_path13.default.join(opts.dataDir, "bin");
+  const binDir = import_node_path14.default.join(opts.dataDir, "bin");
   import_node_fs14.default.mkdirSync(binDir, { recursive: true });
   cleanupStaleArtifacts(binDir);
-  const stableBin = import_node_path13.default.join(binDir, "frpc");
+  const stableBin = import_node_path14.default.join(binDir, "frpc");
   if (import_node_fs14.default.existsSync(stableBin)) return stableBin;
   const partialBin = `${stableBin}.partial`;
-  const tarballPath = import_node_path13.default.join(binDir, `frp_${version2}_${platform.os}_${platform.arch}.tar.gz.partial`);
+  const tarballPath = import_node_path14.default.join(binDir, `frp_${version2}_${platform.os}_${platform.arch}.tar.gz.partial`);
   try {
     const url = frpcDownloadUrl(version2, platform);
     await downloadToFile(url, tarballPath, opts.fetchImpl);
@@ -19250,7 +19316,7 @@ function cleanupStaleArtifacts(binDir) {
   }
   for (const name of entries) {
     if (name.endsWith(".partial") || name.startsWith("extract-")) {
-      const full = import_node_path13.default.join(binDir, name);
+      const full = import_node_path14.default.join(binDir, name);
       try {
         import_node_fs14.default.rmSync(full, { recursive: true, force: true });
       } catch {
@@ -19276,7 +19342,7 @@ async function downloadToFile(url, dest, fetchImpl) {
   await (0, import_promises.pipeline)(nodeStream, out);
 }
 async function extractFrpcFromTarball(tarball, binDir, version2, platform, destBin) {
-  const work = import_node_path13.default.join(binDir, `extract-${process.pid}-${Date.now()}`);
+  const work = import_node_path14.default.join(binDir, `extract-${process.pid}-${Date.now()}`);
   import_node_fs14.default.mkdirSync(work, { recursive: true });
   try {
     await new Promise((resolve, reject) => {
@@ -19285,7 +19351,7 @@ async function extractFrpcFromTarball(tarball, binDir, version2, platform, destB
       proc.on("exit", (code) => code === 0 ? resolve() : reject(new Error(`tar exited ${code}`)));
     });
     const dirName = `frp_${version2}_${platform.os}_${platform.arch}`;
-    const src = import_node_path13.default.join(work, dirName, "frpc");
+    const src = import_node_path14.default.join(work, dirName, "frpc");
     if (!import_node_fs14.default.existsSync(src)) {
       throw new Error(`frpc not found inside tarball at ${src}`);
     }
@@ -19300,7 +19366,7 @@ var DEFAULT_TUNNEL_TTL_MS = 7 * 24 * 60 * 60 * 1e3;
 var TunnelManager = class {
   constructor(deps) {
     this.deps = deps;
-    this.store = deps.store ?? new TunnelStore(import_node_path14.default.join(deps.dataDir, "tunnel.json"));
+    this.store = deps.store ?? new TunnelStore(import_node_path15.default.join(deps.dataDir, "tunnel.json"));
     this.ttlMs = deps.ttlMs ?? DEFAULT_TUNNEL_TTL_MS;
     this.startupTimeoutMs = deps.startupTimeoutMs ?? 15e3;
   }
@@ -19417,7 +19483,7 @@ var TunnelManager = class {
         dataDir: this.deps.dataDir,
         override: this.deps.frpcBinaryOverride ?? void 0
       });
-      const tomlPath = import_node_path14.default.join(this.deps.dataDir, "frpc.toml");
+      const tomlPath = import_node_path15.default.join(this.deps.dataDir, "frpc.toml");
       const proxyName = `clawd-${t.subdomain}-${localPort}-${import_node_crypto4.default.randomBytes(3).toString("hex")}`;
       const toml = buildFrpcToml({
         serverAddr: t.frpsHost,
@@ -19432,7 +19498,7 @@ var TunnelManager = class {
       const proc = (this.deps.spawnImpl ?? import_node_child_process4.spawn)(frpcBin, ["-c", tomlPath], {
         stdio: ["ignore", "pipe", "pipe"]
       });
-      const logFilePath = import_node_path14.default.join(this.deps.dataDir, "frpc.log");
+      const logFilePath = import_node_path15.default.join(this.deps.dataDir, "frpc.log");
       const logStream = import_node_fs15.default.createWriteStream(logFilePath, { flags: "a", mode: 384 });
       logStream.on("error", () => {
       });
@@ -19526,11 +19592,11 @@ function deriveStableDeviceKey(opts = {}) {
 
 // src/auth-store.ts
 var import_node_fs16 = __toESM(require("fs"), 1);
-var import_node_path15 = __toESM(require("path"), 1);
+var import_node_path16 = __toESM(require("path"), 1);
 var import_node_crypto6 = __toESM(require("crypto"), 1);
 var AUTH_FILE_NAME = "auth.json";
 function authFilePath(dataDir) {
-  return import_node_path15.default.join(dataDir, AUTH_FILE_NAME);
+  return import_node_path16.default.join(dataDir, AUTH_FILE_NAME);
 }
 function loadOrCreateAuthToken(opts) {
   const file = authFilePath(opts.dataDir);
@@ -19562,7 +19628,7 @@ function readAuthFile(file) {
   }
 }
 function writeAuthFile(file, content) {
-  import_node_fs16.default.mkdirSync(import_node_path15.default.dirname(file), { recursive: true });
+  import_node_fs16.default.mkdirSync(import_node_path16.default.dirname(file), { recursive: true });
   import_node_fs16.default.writeFileSync(file, JSON.stringify(content, null, 2), { mode: 384 });
   try {
     import_node_fs16.default.chmodSync(file, 384);
@@ -19579,7 +19645,7 @@ init_protocol();
 // src/session/fork.ts
 var import_node_fs17 = __toESM(require("fs"), 1);
 var import_node_os10 = __toESM(require("os"), 1);
-var import_node_path16 = __toESM(require("path"), 1);
+var import_node_path17 = __toESM(require("path"), 1);
 init_claude_history();
 function readJsonlEntries(file) {
   const raw = import_node_fs17.default.readFileSync(file, "utf8");
@@ -19595,9 +19661,9 @@ function readJsonlEntries(file) {
   return out;
 }
 function forkSession(input) {
-  const baseDir = input.baseDir ?? import_node_path16.default.join(import_node_os10.default.homedir(), ".claude");
-  const projectDir = import_node_path16.default.join(baseDir, "projects", cwdToHashDir(input.cwd));
-  const sourceFile = import_node_path16.default.join(projectDir, `${input.toolSessionId}.jsonl`);
+  const baseDir = input.baseDir ?? import_node_path17.default.join(import_node_os10.default.homedir(), ".claude");
+  const projectDir = import_node_path17.default.join(baseDir, "projects", cwdToHashDir(input.cwd));
+  const sourceFile = import_node_path17.default.join(projectDir, `${input.toolSessionId}.jsonl`);
   if (!import_node_fs17.default.existsSync(sourceFile)) {
     throw new Error(`fork: source transcript not found: ${sourceFile}`);
   }
@@ -19628,7 +19694,7 @@ function forkSession(input) {
     }
     forkedLines.push(JSON.stringify(forked));
   }
-  const forkedFilePath = import_node_path16.default.join(projectDir, `${forkedToolSessionId}.jsonl`);
+  const forkedFilePath = import_node_path17.default.join(projectDir, `${forkedToolSessionId}.jsonl`);
   import_node_fs17.default.mkdirSync(projectDir, { recursive: true });
   import_node_fs17.default.writeFileSync(forkedFilePath, forkedLines.join("\n") + "\n", { mode: 384 });
   return { forkedToolSessionId, forkedFilePath };
@@ -19639,6 +19705,12 @@ function buildSessionHandlers(deps) {
   const { manager, observer, getAdapter: getAdapter2 } = deps;
   const create = async (frame) => {
     const args = SessionCreateArgs.parse(frame);
+    if (args.ownerPersonaId) {
+      const persona = deps.personaRegistry.get(args.ownerPersonaId);
+      if (!persona) {
+        throw new Error(`persona not found: ${args.ownerPersonaId}`);
+      }
+    }
     const { response, broadcast } = manager.create(args);
     return { response: { type: "session:info", ...response }, broadcast };
   };
@@ -19908,7 +19980,7 @@ init_protocol();
 var import_node_child_process5 = require("child_process");
 var import_node_fs18 = __toESM(require("fs"), 1);
 var import_node_os11 = __toESM(require("os"), 1);
-var import_node_path17 = __toESM(require("path"), 1);
+var import_node_path18 = __toESM(require("path"), 1);
 var import_node_util = require("util");
 var pexec = (0, import_node_util.promisify)(import_node_child_process5.execFile);
 function formatChildProcessError(err) {
@@ -19923,7 +19995,7 @@ function formatChildProcessError(err) {
   return e.message ?? "unknown error";
 }
 function normalizePath(p) {
-  const resolved = import_node_path17.default.resolve(p);
+  const resolved = import_node_path18.default.resolve(p);
   try {
     return import_node_fs18.default.realpathSync(resolved);
   } catch {
@@ -20026,13 +20098,13 @@ function flattenToDirName(branch) {
 }
 function encodeClaudeProjectDir(absPath) {
   if (!absPath || typeof absPath !== "string") return "";
-  let canonical = import_node_path17.default.resolve(absPath);
+  let canonical = import_node_path18.default.resolve(absPath);
   try {
     canonical = import_node_fs18.default.realpathSync(canonical);
   } catch {
     try {
-      const parent = import_node_fs18.default.realpathSync(import_node_path17.default.dirname(canonical));
-      canonical = import_node_path17.default.join(parent, import_node_path17.default.basename(canonical));
+      const parent = import_node_fs18.default.realpathSync(import_node_path18.default.dirname(canonical));
+      canonical = import_node_path18.default.join(parent, import_node_path18.default.basename(canonical));
     } catch {
     }
   }
@@ -20056,17 +20128,19 @@ async function createWorktree(input) {
   if (!isGitRoot) {
     throw new Error(`\u76EE\u5F55 ${cwd} \u4E0D\u662F git repo \u6839`);
   }
-  const parent = import_node_path17.default.dirname(import_node_path17.default.resolve(cwd));
-  if (parent === "/" || parent === import_node_path17.default.resolve(cwd)) {
+  const parent = import_node_path18.default.dirname(import_node_path18.default.resolve(cwd));
+  if (parent === "/" || parent === import_node_path18.default.resolve(cwd)) {
     throw new Error("repo \u5728\u78C1\u76D8\u6839\u76EE\u5F55\uFF0C\u65E0\u6CD5\u5728\u540C\u7EA7\u521B\u5EFA worktree");
   }
-  const worktreeRoot = import_node_path17.default.join(parent, dirName);
+  const worktreeRoot = import_node_path18.default.join(parent, dirName);
   try {
-    await pexec("git", ["-C", cwd, "rev-parse", "--verify", `refs/heads/${baseBranch}`], {
-      timeout: 3e3
+    await pexec("git", ["-C", cwd, "fetch", "origin", baseBranch, "--no-tags"], {
+      timeout: 3e4
     });
-  } catch {
-    throw new Error(`\u57FA\u51C6\u5206\u652F ${baseBranch} \u4E0D\u5B58\u5728`);
+  } catch (err) {
+    throw new Error(
+      `\u57FA\u51C6\u5206\u652F ${baseBranch} \u4E0D\u5B58\u5728\u6216 fetch \u8FDC\u7AEF\u5931\u8D25\uFF1A${formatChildProcessError(err)}`
+    );
   }
   try {
     await pexec("git", ["-C", cwd, "rev-parse", "--verify", `refs/heads/${branch}`], {
@@ -20083,7 +20157,7 @@ async function createWorktree(input) {
   try {
     await pexec(
       "git",
-      ["-C", cwd, "worktree", "add", worktreeRoot, "-b", branch, baseBranch],
+      ["-C", cwd, "worktree", "add", worktreeRoot, "-b", branch, `origin/${baseBranch}`],
       { timeout: 15e3 }
     );
   } catch (err) {
@@ -20105,8 +20179,8 @@ async function removeWorktree(input) {
     );
     const gitCommonDir = stdout.trim();
     if (!gitCommonDir) throw new Error("empty git-common-dir");
-    const absGitCommon = import_node_path17.default.isAbsolute(gitCommonDir) ? gitCommonDir : import_node_path17.default.resolve(worktreeRoot, gitCommonDir);
-    repoRoot = import_node_path17.default.dirname(absGitCommon);
+    const absGitCommon = import_node_path18.default.isAbsolute(gitCommonDir) ? gitCommonDir : import_node_path18.default.resolve(worktreeRoot, gitCommonDir);
+    repoRoot = import_node_path18.default.dirname(absGitCommon);
   } catch {
     repoRoot = null;
   }
@@ -20137,9 +20211,9 @@ async function removeWorktree(input) {
   try {
     const encoded = encodeClaudeProjectDir(worktreeRoot);
     if (encoded) {
-      const projectsRoot = import_node_path17.default.join(import_node_os11.default.homedir(), ".claude", "projects");
-      const target = import_node_path17.default.resolve(projectsRoot, encoded);
-      if (target.startsWith(projectsRoot + import_node_path17.default.sep) && target !== projectsRoot) {
+      const projectsRoot = import_node_path18.default.join(import_node_os11.default.homedir(), ".claude", "projects");
+      const target = import_node_path18.default.resolve(projectsRoot, encoded);
+      if (target.startsWith(projectsRoot + import_node_path18.default.sep) && target !== projectsRoot) {
         import_node_fs18.default.rmSync(target, { recursive: true, force: true });
       }
     }
@@ -20352,7 +20426,7 @@ function buildMethodHandlers(deps) {
 async function startDaemon(config) {
   const logger = createLogger({
     level: config.logLevel,
-    file: import_node_path18.default.join(config.dataDir, "clawd.log")
+    file: import_node_path19.default.join(config.dataDir, "clawd.log")
   });
   logger.info("starting clawd", { version, config: { port: config.port, host: config.host, dataDir: config.dataDir } });
   const stateMgr = new StateFileManager({ dataDir: config.dataDir });
@@ -20394,7 +20468,7 @@ async function startDaemon(config) {
     getAdapter,
     historyReader: history,
     dataDir: config.dataDir,
-    personaRoot: import_node_path18.default.join(config.dataDir, "personas"),
+    personaRoot: import_node_path19.default.join(config.dataDir, "personas"),
     broadcastFrame: (frame, target) => {
       if (target === "all") {
         transport?.broadcastAll(frame);
@@ -20434,7 +20508,7 @@ async function startDaemon(config) {
       manager.recordRealUserUuid({ sessionId, realUuid, text });
     }
   });
-  const personaStore = new PersonaStore(import_node_path18.default.join(config.dataDir, "personas"));
+  const personaStore = new PersonaStore(import_node_path19.default.join(config.dataDir, "personas"));
   const personaRegistry = new PersonaRegistry(personaStore);
   const personaManager = new PersonaManager({
     store: personaStore,
@@ -20567,8 +20641,8 @@ async function startDaemon(config) {
       const lines = [
         `Tunnel:      ${r.url}`,
         ...resolvedAuthToken ? [`Connect:     ${connectUrl}`] : [],
-        `Frpc config: ${import_node_path18.default.join(config.dataDir, "frpc.toml")}`,
-        `Frpc log:    ${import_node_path18.default.join(config.dataDir, "frpc.log")}`
+        `Frpc config: ${import_node_path19.default.join(config.dataDir, "frpc.toml")}`,
+        `Frpc log:    ${import_node_path19.default.join(config.dataDir, "frpc.log")}`
       ];
       const width = Math.max(...lines.map((l) => l.length));
       const bar = "\u2550".repeat(width + 4);
@@ -20581,7 +20655,7 @@ ${bar}
 
 `);
       try {
-        const connectPath = import_node_path18.default.join(config.dataDir, "connect.txt");
+        const connectPath = import_node_path19.default.join(config.dataDir, "connect.txt");
         import_node_fs19.default.writeFileSync(connectPath, lines.join("\n") + "\n", { mode: 384 });
       } catch {
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@clawos-dev/clawd",
-  "version": "0.2.33",
+  "version": "0.2.34-beta.50.1515dc2",
   "description": "Standalone clawd daemon — Claude Code (and future Codex) session server over WebSocket",
   "type": "module",
   "license": "MIT",