@clawos-dev/clawd 0.2.48-beta.74.b742e0f → 0.2.48-beta.76.f411c83

package/dist/cli.cjs

@@ -296,8 +296,8 @@ var require_req = __commonJS({
       if (req.originalUrl) {
         _req.url = req.originalUrl;
       } else {
-        const path26 = req.path;
-        _req.url = typeof path26 === "string" ? path26 : req.url ? req.url.path || req.url : void 0;
+        const path25 = req.path;
+        _req.url = typeof path25 === "string" ? path25 : 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(path26) {
+    function parsePath(path25) {
       const parts = [];
       let current = "";
       let inBrackets = false;
       let inQuotes = false;
       let quoteChar = "";
-      for (let i = 0; i < path26.length; i++) {
-        const char = path26[i];
+      for (let i = 0; i < path25.length; i++) {
+        const char = path25[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 path26 of paths) {
-        const parts = parsePath(path26);
+      for (const path25 of paths) {
+        const parts = parsePath(path25);
         if (parts.includes("*")) {
-          redactWildcardPath(obj, parts, censor, path26, remove);
+          redactWildcardPath(obj, parts, censor, path25, 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, path26) => {
-              const fullPath = [...pathArray.slice(0, pathLength), ...path26];
+            const wrappedCensor = typeof censor === "function" ? (value, path25) => {
+              const fullPath = [...pathArray.slice(0, pathLength), ...path25];
               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 path26 of pathsToClone) {
-        const parts = parsePath(path26);
+      for (const path25 of pathsToClone) {
+        const parts = parsePath(path25);
         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(path26) {
-      if (typeof path26 !== "string") {
+    function validatePath(path25) {
+      if (typeof path25 !== "string") {
         throw new Error("Paths must be (non-empty) strings");
       }
-      if (path26 === "") {
+      if (path25 === "") {
         throw new Error("Invalid redaction path ()");
       }
-      if (path26.includes("..")) {
-        throw new Error(`Invalid redaction path (${path26})`);
+      if (path25.includes("..")) {
+        throw new Error(`Invalid redaction path (${path25})`);
       }
-      if (path26.includes(",")) {
-        throw new Error(`Invalid redaction path (${path26})`);
+      if (path25.includes(",")) {
+        throw new Error(`Invalid redaction path (${path25})`);
       }
       let bracketCount = 0;
       let inQuotes = false;
       let quoteChar = "";
-      for (let i = 0; i < path26.length; i++) {
-        const char = path26[i];
+      for (let i = 0; i < path25.length; i++) {
+        const char = path25[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 (${path26})`);
+            throw new Error(`Invalid redaction path (${path25})`);
           }
         }
       }
       if (bracketCount !== 0) {
-        throw new Error(`Invalid redaction path (${path26})`);
+        throw new Error(`Invalid redaction path (${path25})`);
       }
     }
     function validatePaths(paths) {
       if (!Array.isArray(paths)) {
         throw new TypeError("paths must be an array");
       }
-      for (const path26 of paths) {
-        validatePath(path26);
+      for (const path25 of paths) {
+        validatePath(path25);
       }
     }
     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, path26) => {
-            return censor(value, [k, ...path26]);
+          const wrappedCensor = typeof censor === "function" ? (value, path25) => {
+            return censor(value, [k, ...path25]);
           } : censor;
           o[k] = Redact({
             paths: shape[k],
@@ -1211,7 +1211,7 @@ var require_sonic_boom = __commonJS({
     var fs24 = require("fs");
     var EventEmitter = require("events");
     var inherits = require("util").inherits;
-    var path26 = require("path");
+    var path25 = 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) fs24.mkdirSync(path26.dirname(file), { recursive: true });
+          if (sonic.mkdir) fs24.mkdirSync(path25.dirname(file), { recursive: true });
           const fd = fs24.openSync(file, flags, mode);
           fileOpened(null, fd);
         } catch (err) {
@@ -1273,7 +1273,7 @@ var require_sonic_boom = __commonJS({
           throw err;
         }
       } else if (sonic.mkdir) {
-        fs24.mkdir(path26.dirname(file), { recursive: true }, (err) => {
+        fs24.mkdir(path25.dirname(file), { recursive: true }, (err) => {
           if (err) return fileOpened(err);
           fs24.open(file, flags, mode, fileOpened);
         });
@@ -4895,8 +4895,8 @@ var init_parseUtil = __esm({
     init_errors2();
     init_en();
     makeIssue = (params) => {
-      const { data, path: path26, errorMaps, issueData } = params;
-      const fullPath = [...path26, ...issueData.path || []];
+      const { data, path: path25, errorMaps, issueData } = params;
+      const fullPath = [...path25, ...issueData.path || []];
       const fullIssue = {
         ...issueData,
         path: fullPath
@@ -5207,11 +5207,11 @@ var init_types = __esm({
     init_parseUtil();
     init_util();
     ParseInputLazyPath = class {
-      constructor(parent, value, path26, key) {
+      constructor(parent, value, path25, key) {
         this._cachedPath = [];
         this.parent = parent;
         this.data = value;
-        this._path = path26;
+        this._path = path25;
         this._key = key;
       }
       get path() {
@@ -9823,11 +9823,11 @@ var init_lib = __esm({
           }
         }
       },
-      addToPath: function addToPath(path26, added, removed, oldPosInc, options) {
-        var last = path26.lastComponent;
+      addToPath: function addToPath(path25, added, removed, oldPosInc, options) {
+        var last = path25.lastComponent;
         if (last && !options.oneChangePerToken && last.added === added && last.removed === removed) {
           return {
-            oldPos: path26.oldPos + oldPosInc,
+            oldPos: path25.oldPos + oldPosInc,
             lastComponent: {
               count: last.count + 1,
               added,
@@ -9837,7 +9837,7 @@ var init_lib = __esm({
           };
         } else {
           return {
-            oldPos: path26.oldPos + oldPosInc,
+            oldPos: path25.oldPos + oldPosInc,
             lastComponent: {
               count: 1,
               added,
@@ -10268,10 +10268,10 @@ function attachmentToHistoryMessage(o, ts) {
     const memories = raw.map((m) => {
       if (!m || typeof m !== "object") return null;
       const rec = m;
-      const path26 = typeof rec.path === "string" ? rec.path : null;
+      const path25 = typeof rec.path === "string" ? rec.path : null;
       const content = typeof rec.content === "string" ? rec.content : null;
-      if (!path26 || content == null) return null;
-      const entry = { path: path26, content };
+      if (!path25 || content == null) return null;
+      const entry = { path: path25, content };
       if (typeof rec.mtimeMs === "number") entry.mtimeMs = rec.mtimeMs;
       return entry;
     }).filter((m) => m !== null);
@@ -10308,7 +10308,7 @@ function readBackupContent(fileHistoryRoot, toolSessionId, backupFileName) {
   if (backupFileName === null) return null;
   try {
     return import_node_fs6.default.readFileSync(
-      import_node_path7.default.join(fileHistoryRoot, toolSessionId, backupFileName),
+      import_node_path6.default.join(fileHistoryRoot, toolSessionId, backupFileName),
       "utf8"
     );
   } catch {
@@ -10323,13 +10323,13 @@ function readCurrentContent(filePath) {
     return null;
   }
 }
-var import_node_fs6, import_node_os2, import_node_path7, 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_path7 = __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;
@@ -10353,9 +10353,9 @@ var init_claude_history = __esm({
       // 每次 user 提交前 trackEdit 拷一份，作为 rewind 回退目标
       fileHistoryRoot;
       constructor(opts = {}) {
-        const base = opts.baseDir ?? import_node_path7.default.join(import_node_os2.default.homedir(), ".claude");
-        this.projectsRoot = import_node_path7.default.join(base, "projects");
-        this.fileHistoryRoot = import_node_path7.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;
@@ -10368,9 +10368,9 @@ var init_claude_history = __esm({
         const out = [];
         for (const ent of entries) {
           if (!ent.isDirectory()) continue;
-          const dir = import_node_path7.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_path7.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,
@@ -10382,7 +10382,7 @@ var init_claude_history = __esm({
         return out;
       }
       async listSessions(args) {
-        const dir = import_node_path7.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"));
@@ -10392,7 +10392,7 @@ var init_claude_history = __esm({
         }
         const out = [];
         for (const f of files) {
-          const full = import_node_path7.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 = "";
@@ -10447,7 +10447,7 @@ var init_claude_history = __esm({
         return out;
       }
       async read(args) {
-        const file = import_node_path7.default.join(
+        const file = import_node_path6.default.join(
           this.projectsRoot,
           cwdToHashDir(args.cwd),
           `${args.toolSessionId}.jsonl`
@@ -10480,7 +10480,7 @@ var init_claude_history = __esm({
       // 独立目录路径：<projectsRoot>/<cwdHash>/<toolSessionId>/subagents/*.jsonl
       // 返回 null 表示目录不存在（调用方回退旧实现）；返回空数组表示目录存在但无 jsonl
       listSubagentsFromDirectory(cwd, toolSessionId) {
-        const dir = import_node_path7.default.join(
+        const dir = import_node_path6.default.join(
           this.projectsRoot,
           cwdToHashDir(cwd),
           toolSessionId,
@@ -10498,7 +10498,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_path7.default.join(dir, e.name);
+          const filePath = import_node_path6.default.join(dir, e.name);
           const lines = readJsonlLines(filePath);
           let firstText = "";
           let messageCount = 0;
@@ -10515,7 +10515,7 @@ var init_claude_history = __esm({
         return out;
       }
       listSubagentsFromMainJsonl(cwd, toolSessionId) {
-        const file = import_node_path7.default.join(
+        const file = import_node_path6.default.join(
           this.projectsRoot,
           cwdToHashDir(cwd),
           `${toolSessionId}.jsonl`
@@ -10550,7 +10550,7 @@ var init_claude_history = __esm({
       }
       // 独立文件路径：agent-<subagentId>.jsonl；文件不存在返回 null 让调用方回退旧实现
       readSubagentFromFile(cwd, toolSessionId, subagentId) {
-        const file = import_node_path7.default.join(
+        const file = import_node_path6.default.join(
           this.projectsRoot,
           cwdToHashDir(cwd),
           toolSessionId,
@@ -10578,7 +10578,7 @@ var init_claude_history = __esm({
        * "那一刻每个 tracked 文件对应的 backup 文件名"
        */
       readFileHistorySnapshots(args) {
-        const file = import_node_path7.default.join(
+        const file = import_node_path6.default.join(
           this.projectsRoot,
           cwdToHashDir(args.cwd),
           `${args.toolSessionId}.jsonl`
@@ -10623,7 +10623,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_path7.default.isAbsolute(rawPath) ? rawPath : import_node_path7.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,
@@ -10663,7 +10663,7 @@ var init_claude_history = __esm({
         let totalInsertions = 0;
         let totalDeletions = 0;
         for (const [rawPath, backup] of Object.entries(target)) {
-          const absPath = import_node_path7.default.isAbsolute(rawPath) ? rawPath : import_node_path7.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,
@@ -10710,7 +10710,7 @@ var init_claude_history = __esm({
         };
       }
       readSubagentFromMainJsonl(cwd, toolSessionId, subagentId) {
-        const file = import_node_path7.default.join(
+        const file = import_node_path6.default.join(
           this.projectsRoot,
           cwdToHashDir(cwd),
           `${toolSessionId}.jsonl`
@@ -10734,7 +10734,7 @@ var init_claude_history = __esm({
 // src/tools/claude.ts
 function macOSDesktopCandidates(home) {
   return [
-    import_node_path8.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"
   ];
 }
@@ -11075,10 +11075,10 @@ function parseAttachment(obj) {
     const memories = raw.map((m) => {
       if (!m || typeof m !== "object") return null;
       const rec = m;
-      const path26 = typeof rec.path === "string" ? rec.path : null;
+      const path25 = typeof rec.path === "string" ? rec.path : null;
       const content = typeof rec.content === "string" ? rec.content : null;
-      if (!path26 || content == null) return null;
-      const out = { path: path26, content };
+      if (!path25 || content == null) return null;
+      const out = { path: path25, content };
       if (typeof rec.mtimeMs === "number") out.mtimeMs = rec.mtimeMs;
       return out;
     }).filter((m) => m !== null);
@@ -11182,7 +11182,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_path8, 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";
@@ -11190,7 +11190,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_path8 = __toESM(require("path"), 1);
+    import_node_path7 = __toESM(require("path"), 1);
     init_protocol();
     init_claude_history();
     init_tool_result_extra();
@@ -14945,7 +14945,7 @@ var require_websocket_server = __commonJS({
 // src/run-case/recorder.ts
 function startRunCaseRecorder(opts) {
   const now = opts.now ?? Date.now;
-  const dir = import_node_path22.default.dirname(opts.recordPath);
+  const dir = import_node_path21.default.dirname(opts.recordPath);
   let stream = null;
   let closing = false;
   let closedSettled = false;
@@ -14985,12 +14985,12 @@ function startRunCaseRecorder(opts) {
   };
   return { tap, close, closed };
 }
-var import_node_fs21, import_node_path22;
+var import_node_fs21, import_node_path21;
 var init_recorder = __esm({
   "src/run-case/recorder.ts"() {
     "use strict";
     import_node_fs21 = __toESM(require("fs"), 1);
-    import_node_path22 = __toESM(require("path"), 1);
+    import_node_path21 = __toESM(require("path"), 1);
   }
 });
 
@@ -15033,7 +15033,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_fs22.mkdtempSync)(import_node_path23.default.join(import_node_os14.default.tmpdir(), "clawd-runcase-"));
+  const cwd = opts.cwd ?? (0, import_node_fs22.mkdtempSync)(import_node_path22.default.join(import_node_os14.default.tmpdir(), "clawd-runcase-"));
   const ownsCwd = opts.cwd === void 0;
   const recorder = startRunCaseRecorder({ recordPath: opts.record, now });
   const spawnCtx = { cwd };
@@ -15200,13 +15200,13 @@ async function runController(opts) {
   }
   return exitCode ?? 0;
 }
-var import_node_fs22, import_node_os14, import_node_path23;
+var import_node_fs22, import_node_os14, import_node_path22;
 var init_controller = __esm({
   "src/run-case/controller.ts"() {
     "use strict";
     import_node_fs22 = require("fs");
     import_node_os14 = __toESM(require("os"), 1);
-    import_node_path23 = __toESM(require("path"), 1);
+    import_node_path22 = __toESM(require("path"), 1);
     init_claude();
     init_stdout_splitter();
     init_permission_stdio();
@@ -15431,7 +15431,7 @@ Env (advanced):
 `;
 
 // src/index.ts
-var import_node_path21 = __toESM(require("path"), 1);
+var import_node_path20 = __toESM(require("path"), 1);
 var import_node_fs20 = __toESM(require("fs"), 1);
 
 // src/logger.ts
@@ -15471,30 +15471,9 @@ function createLogger(opts = {}) {
 
 // src/session/store.ts
 var import_node_fs3 = __toESM(require("fs"), 1);
-var import_node_path4 = __toESM(require("path"), 1);
-init_protocol();
-
-// src/session/scope.ts
 var import_node_path3 = __toESM(require("path"), 1);
-function scopeKey(scope) {
-  return scope.kind === "default" ? "default" : `persona:${scope.personaId}:${scope.mode}`;
-}
-function scopeSubPath(scope) {
-  return scope.kind === "default" ? ["default"] : [scope.personaId, scope.mode];
-}
-function metaFromScope(scope, personaRoot) {
-  if (scope.kind === "default") return void 0;
-  if (scope.mode === "owner") {
-    return { idleKillEnabled: false, personaMode: "owner" };
-  }
-  return {
-    idleKillEnabled: true,
-    personaMode: "listener",
-    extraSettings: import_node_path3.default.join(personaRoot, scope.personaId, ".clawd", "sandbox-settings.json")
-  };
-}
-
-// src/session/store.ts
+init_protocol();
+var DEFAULT_AGENT_ID = "default";
 function safeFileName(sessionId) {
   const base = sessionId.replace(/[^a-zA-Z0-9_\-.]/g, "_");
   const cleaned = base.replace(/^\.+/, (dots) => "_".repeat(dots.length));
@@ -15506,15 +15485,20 @@ function safeFileName(sessionId) {
 var SessionStore = class {
   root;
   constructor(opts) {
-    const scope = opts.scope ?? { kind: "default" };
-    this.root = import_node_path4.default.join(
-      opts.dataDir,
-      "sessions",
-      ...scopeSubPath(scope).map(safeFileName)
-    );
+    const agentId = opts.agentId ?? DEFAULT_AGENT_ID;
+    if (agentId !== DEFAULT_AGENT_ID) {
+      if (!opts.personaRoot) {
+        throw new Error(
+          `SessionStore: personaRoot is required for non-default agentId='${agentId}'. Bootstrap must wire personaRoot when constructing SessionStore for persona agents.`
+        );
+      }
+      this.root = import_node_path3.default.join(opts.personaRoot, safeFileName(agentId), ".clawd", "sub-sessions");
+    } else {
+      this.root = import_node_path3.default.join(opts.dataDir, "sessions", agentId);
+    }
   }
   filePath(sessionId) {
-    return import_node_path4.default.join(this.root, `${safeFileName(sessionId)}.json`);
+    return import_node_path3.default.join(this.root, `${safeFileName(sessionId)}.json`);
   }
   ensureDir() {
     import_node_fs3.default.mkdirSync(this.root, { recursive: true });
@@ -15562,7 +15546,7 @@ var SessionStore = class {
     for (const name of entries) {
       if (!name.endsWith(".json")) continue;
       if (name.includes(".tmp-")) continue;
-      const full = import_node_path4.default.join(this.root, name);
+      const full = import_node_path3.default.join(this.root, name);
       try {
         const raw = import_node_fs3.default.readFileSync(full, "utf8");
         const parsed = JSON.parse(raw);
@@ -15578,7 +15562,7 @@ var SessionStore = class {
 
 // src/session/manager.ts
 var import_node_fs5 = __toESM(require("fs"), 1);
-var import_node_path6 = __toESM(require("path"), 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 = [];
@@ -16306,7 +16290,7 @@ init_stdout_splitter();
 
 // src/ipc-recorder.ts
 var import_node_fs4 = __toESM(require("fs"), 1);
-var import_node_path5 = __toESM(require("path"), 1);
+var import_node_path4 = __toESM(require("path"), 1);
 function tsForFilename(ms) {
   return new Date(ms).toISOString().replace(/[:.]/g, "-");
 }
@@ -16317,8 +16301,8 @@ function startRecorder(opts) {
     return null;
   }
   const now = opts.now ?? Date.now;
-  const dir = import_node_path5.default.join(opts.dataDir, "ipc-recordings", opts.sessionId);
-  const filePath = import_node_path5.default.join(dir, `${tsForFilename(now())}.jsonl`);
+  const dir = import_node_path4.default.join(opts.dataDir, "ipc-recordings", opts.sessionId);
+  const filePath = import_node_path4.default.join(dir, `${tsForFilename(now())}.jsonl`);
   let stream = null;
   let closedResolve;
   const closed = new Promise((resolve2) => {
@@ -16760,6 +16744,7 @@ function makeInitialState(file, subSessionMeta) {
 var SessionManager = class {
   constructor(deps) {
     this.deps = deps;
+    this.storesByAgent.set(DEFAULT_AGENT_ID, deps.store);
   }
   deps;
   // sessionId → SessionRunner；在 send / ensureSession 时按需创建
@@ -16775,28 +16760,33 @@ var SessionManager = class {
   // 由 observer 监听 jsonl user 行后调 recordRealUserUuid 建立映射；rewind 系列 RPC 在
   // 入参 / 出参做转译，保证 UI 看到的 uuid 始终是 events 流里的 synth uuid
   realUuidBySynth = /* @__PURE__ */ new Map();
-  // SessionStore 按 scope 派生（root = <dataDir>/sessions/<scopeSubPath>/）。
-  // default scope 直接复用 deps.store；persona scope（owner / listener）第一次访问时按需创建并缓存。
-  // 取代旧的 storesByAgent —— agentId 概念由 SessionScope 取代，路径即身份，
-  // SubSessionMeta 由 scope 派生（metaFromScope），不再需要运行时 cache 或 ownerPersonaId 兜底。
-  storesByScope = /* @__PURE__ */ new Map();
+  // persona sub-session 路径：按 agentId 派生 SessionStore（root = dataDir/sessions/<agentId>/）。
+  // 'default' 直接复用 deps.store；其它 agentId 第一次访问时按需创建并缓存
+  storesByAgent = /* @__PURE__ */ new Map();
+  // sub-session 创建时记录的 subSessionMeta；ensureSession / runner 创建时塞入 reducer state。
+  // 不进 SessionFile schema（避免破坏现有 zod parse），仅运行时缓存
+  subSessionMetaBySid = /* @__PURE__ */ new Map();
   // persona-bound transport 订阅器：sessionId → Set<listener>。
   // 透传 owner 路径白名单 EventFrame（routeFromRunner 决定哪些 type 进入），listener 端按
   // `frame.type` narrow 出 'session:event'（ParsedEvent）/ 'session:status'（procAlive 同步）等。
   // 这样 owner / listener 共用同一组事件字面量，新增跨端信号时只需在 fan-out 白名单里加 type。
   eventSubscribers = /* @__PURE__ */ new Map();
-  // 按 scope 拿对应的 SessionStore。default scope 复用 deps.store（保证与
-  // bootstrap 注入的 store 一致）；persona scope 第一次访问时按需创建并缓存。
-  storeFor(scope) {
-    if (scope.kind === "default") return this.deps.store;
-    const key = scopeKey(scope);
-    const cached = this.storesByScope.get(key);
+  // 按 agentId 拿对应的 SessionStore；persona-* agentId 使用 personaRoot 路径。
+  // 'default' 直接复用 deps.store；其它 agentId 第一次访问时按需创建并缓存。
+  // personaRoot 必须与 PersonaStore 同源，两者共享相同的 persona 目录层级
+  storeFor(agentId) {
+    const cached = this.storesByAgent.get(agentId);
     if (cached) return cached;
     if (!this.deps.dataDir) {
-      throw new Error(`SessionManager: dataDir required to construct SessionStore for scope=${key}`);
+      throw new Error(`SessionManager: dataDir required to route agentId='${agentId}'`);
+    }
+    if (!this.deps.personaRoot) {
+      throw new Error(
+        `SessionManager: personaRoot is required to route agentId='${agentId}'. Bootstrap must wire personaRoot when constructing SessionManager for persona sub-sessions.`
+      );
     }
-    const st = new SessionStore({ dataDir: this.deps.dataDir, scope });
-    this.storesByScope.set(key, st);
+    const st = new SessionStore({ dataDir: this.deps.dataDir, agentId, personaRoot: this.deps.personaRoot });
+    this.storesByAgent.set(agentId, st);
     return st;
   }
   async getCapabilities(tool) {
@@ -16807,80 +16797,26 @@ var SessionManager = class {
     this.capabilitiesCache.set(tool, caps);
     return caps;
   }
-  // 由 SessionFile.ownerPersonaId schema 字段推回写入 scope。
-  // ownerPersonaId 由 create({ownerPersonaId}) 在 schema 落盘时记入，永远只反映
-  // session 出身（不可变）；此函数只用于 SessionStore 的写入路由，不参与运行时行为
-  // 决策（personaMode='owner' 等由路径 → scope → metaFromScope 派生）。
-  // 仅覆盖 owner + default 两类——listener sub-session 不会从 default RPC 路径进来。
-  scopeForFile(file) {
-    return file.ownerPersonaId ? { kind: "persona", personaId: file.ownerPersonaId, mode: "owner" } : { kind: "default" };
-  }
-  // 扫 <dataDir>/sessions/ 列出所有 persona 命名空间（不含 'default'）。
-  // 用于 findOwnedSession / listAllOwned 跨 scope 查询。
-  listPersonaIdsOnDisk() {
-    if (!this.deps.dataDir) return [];
-    const root = import_node_path6.default.join(this.deps.dataDir, "sessions");
-    let entries;
-    try {
-      entries = import_node_fs5.default.readdirSync(root, { withFileTypes: true });
-    } catch (err) {
-      const code = err?.code;
-      if (code === "ENOENT") return [];
-      throw err;
-    }
-    return entries.filter((e) => e.isDirectory() && e.name !== "default").map((e) => e.name);
-  }
-  // owner / default 两个分类下按 sessionId 找文件——前端只传 sessionId 不带 scope，
-  // SessionManager 在这里扫盘定位（default 直接试，未命中再轮询所有 persona owner 目录）。
-  // listener sub-session 不走这条——transport 始终明确传 (personaId, sessionId)。
-  findOwnedSession(sessionId) {
-    const dflt = this.deps.store.read(sessionId);
-    if (dflt) return dflt;
-    for (const personaId of this.listPersonaIdsOnDisk()) {
-      const ownerStore = this.storeFor({ kind: "persona", personaId, mode: "owner" });
-      const file = ownerStore.read(sessionId);
-      if (file) return file;
-    }
-    return null;
-  }
-  // 合并 default + 所有 persona owner 的 SessionFile —— 桌面 App 主 session 列表入口。
-  // 同样不含 listener sub-session（listener 走 persona:listSubSessions RPC 单独入口）。
-  listAllOwned() {
-    const out = [];
-    out.push(...this.deps.store.list());
-    for (const personaId of this.listPersonaIdsOnDisk()) {
-      const ownerStore = this.storeFor({ kind: "persona", personaId, mode: "owner" });
-      out.push(...ownerStore.list());
-    }
-    return out.sort(
-      (a, b) => a.updatedAt > b.updatedAt ? -1 : a.updatedAt < b.updatedAt ? 1 : 0
-    );
-  }
-  // 写回 SessionFile，自动根据 ownerPersonaId 派生写入 scope。
-  // 调用方原先都是 `deps.store.write(updated)`，全部走这里收口路由。
-  writeOwned(file) {
-    return this.storeFor(this.scopeForFile(file)).write(file);
-  }
-  // 删除 owned SessionFile（default 或 persona/owner），与 findOwnedSession 对称扫盘。
-  deleteOwned(sessionId) {
-    if (this.deps.store.delete(sessionId)) return true;
-    for (const personaId of this.listPersonaIdsOnDisk()) {
-      const ownerStore = this.storeFor({ kind: "persona", personaId, mode: "owner" });
-      if (ownerStore.delete(sessionId)) return true;
+  // 按优先级解析 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 false;
+    return void 0;
   }
   // 创建 runner 时包一层 broadcast hook：所有外出 frame 统一走 routeFromRunner，
-  // 经过 compressFrameForWire 后决定是 push collector 还是走 deps.broadcastFrame。
-  // scope 决定两件事：SessionStore 路由 + SubSessionMeta 派生（metaFromScope）。
-  //   - default → 复用 deps.store，无 subSessionMeta（普通 session）
-  //   - persona/owner → <dataDir>/sessions/<personaId>/owner/，meta={idleKillEnabled:false, personaMode:'owner'}
-  //   - persona/listener → <dataDir>/sessions/<personaId>/listener/，meta={idleKillEnabled:true, personaMode:'listener', extraSettings:<sandbox>}
-  newRunner(file, scope) {
+  // 经过 compressFrameForWire 后决定是 push collector 还是走 deps.broadcastFrame
+  // store：默认 deps.store；persona sub-session 路径下传该 personaId 对应的 SessionStore
+  // 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 = this.storeFor(scope);
-    const subSessionMeta = metaFromScope(scope, this.deps.personaRoot ?? "");
-    const runner = new SessionRunner(makeInitialState(file, subSessionMeta), {
+    const store = opts.store ?? this.deps.store;
+    const runner = new SessionRunner(makeInitialState(file, opts.subSessionMeta), {
       broadcastFrame: (frame, target) => this.routeFromRunner(frame, target),
       store,
       adapter,
@@ -16941,7 +16877,7 @@ var SessionManager = class {
       if (!this.deps.personaRoot) {
         throw new Error("personaRoot required to derive cwd from ownerPersonaId");
       }
-      cwd = import_node_path6.default.join(this.deps.personaRoot, safeFileName(args.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");
@@ -16971,8 +16907,13 @@ var SessionManager = class {
       createdAt: iso,
       updatedAt: iso
     };
-    const scope = args.ownerPersonaId ? { kind: "persona", personaId: args.ownerPersonaId, mode: "owner" } : { kind: "default" };
-    const written = this.storeFor(scope).write(file);
+    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) {
@@ -16987,13 +16928,13 @@ var SessionManager = class {
       return { response: value, broadcast };
     }
     const updated = { ...existing, pinnedAt };
-    this.writeOwned(updated);
+    this.deps.store.write(updated);
     return { response: updated, broadcast: [] };
   }
   // sidebar 拖拽完成 → 整体重写 pinned root 的 pinSortOrder（按 orderedIds 下标 0,1,2...）
   // orderedIds 必须正好覆盖所有当前 pinned root（既不能漏，也不能含 unpinned id）
   reorderPins(args) {
-    const all = this.listAllOwned();
+    const all = this.deps.store.list();
     const currentPinnedIds = new Set(
       all.filter((f) => typeof f.pinnedAt === "number").map((f) => f.sessionId)
     );
@@ -17023,14 +16964,14 @@ var SessionManager = class {
       } else {
         const existing = this.getFile(sessionId);
         const updated = { ...existing, pinSortOrder: index };
-        this.writeOwned(updated);
+        this.deps.store.write(updated);
         updatedFiles.push(updated);
       }
     });
     return { response: { sessions: updatedFiles }, broadcast };
   }
   list() {
-    return { response: { sessions: this.listAllOwned() }, broadcast: [] };
+    return { response: { sessions: this.deps.store.list() }, broadcast: [] };
   }
   get(args) {
     const file = this.getFile(args.sessionId);
@@ -17083,11 +17024,10 @@ var SessionManager = class {
     for (const [synth, real] of map) reverse.set(real, synth);
     return realUuids.map((r) => reverse.get(r) ?? r);
   }
-  // 内部帮手：不走 ManagerResult 的 get，直接拿 SessionFile。
-  // 优先 runner cache（hot path）；冷态走 findOwnedSession 跨 default + 所有 persona owner 扫盘。
+  // 内部帮手：不走 ManagerResult 的 get，直接拿 SessionFile
   getFile(sessionId) {
     const runner = this.runners.get(sessionId);
-    const existing = runner?.getState().file ?? this.findOwnedSession(sessionId);
+    const existing = runner?.getState().file ?? this.deps.store.read(sessionId);
     if (!existing) throw new ClawdError(ERROR_CODES.SESSION_NOT_FOUND, sessionId);
     return existing;
   }
@@ -17102,11 +17042,11 @@ var SessionManager = class {
       return { response: value, broadcast };
     }
     const updated = { ...existing, ...args.patch, updatedAt: nowIso2(this.deps) };
-    this.writeOwned(updated);
+    this.deps.store.write(updated);
     return { response: updated, broadcast: [] };
   }
   delete(args) {
-    const existing = this.findOwnedSession(args.sessionId);
+    const existing = this.deps.store.read(args.sessionId);
     if (!existing) throw new ClawdError(ERROR_CODES.SESSION_NOT_FOUND, args.sessionId);
     const runner = this.runners.get(args.sessionId);
     if (runner) {
@@ -17117,7 +17057,7 @@ var SessionManager = class {
       this.realUuidBySynth.delete(args.sessionId);
       return { response: { sessionId: args.sessionId }, broadcast };
     }
-    this.deleteOwned(args.sessionId);
+    this.deps.store.delete(args.sessionId);
     return {
       response: { sessionId: args.sessionId },
       broadcast: [
@@ -17129,7 +17069,8 @@ var SessionManager = class {
     const existing = this.getFile(args.sessionId);
     let runner = this.runners.get(args.sessionId);
     if (!runner) {
-      runner = this.newRunner(existing, this.scopeForFile(existing));
+      const subSessionMeta = this.resolveSubSessionMeta(existing);
+      runner = this.newRunner(existing, { subSessionMeta });
       this.runners.set(args.sessionId, runner);
     }
     const { broadcast } = this.withCollector(() => {
@@ -17223,7 +17164,8 @@ var SessionManager = class {
     const file = this.getFile(args.sessionId);
     let runner = this.runners.get(args.sessionId);
     if (!runner) {
-      runner = this.newRunner(file, this.scopeForFile(file));
+      const subSessionMeta = this.resolveSubSessionMeta(file);
+      runner = this.newRunner(file, { subSessionMeta });
       this.runners.set(args.sessionId, runner);
     }
     if (!runner.getState().procAlive) {
@@ -17274,7 +17216,7 @@ var SessionManager = class {
       });
       return { response: value, broadcast };
     }
-    const existing = this.findOwnedSession(args.sessionId);
+    const existing = this.deps.store.read(args.sessionId);
     const {
       toolSessionId: _drop,
       contextUsage: _ctx,
@@ -17289,7 +17231,7 @@ var SessionManager = class {
     void _branch;
     void _model;
     const updated = { ...rest, updatedAt: nowIso2(this.deps) };
-    return { response: this.writeOwned(updated), broadcast: [] };
+    return { response: this.deps.store.write(updated), broadcast: [] };
   }
   resume(args) {
     this.getFile(args.sessionId);
@@ -17304,13 +17246,13 @@ var SessionManager = class {
       });
       return { response: value, broadcast };
     }
-    const existing = this.findOwnedSession(args.sessionId);
+    const existing = this.deps.store.read(args.sessionId);
     const updated = {
       ...existing,
       toolSessionId: args.toolSessionId,
       updatedAt: nowIso2(this.deps)
     };
-    return { response: this.writeOwned(updated), broadcast: [] };
+    return { response: this.deps.store.write(updated), broadcast: [] };
   }
   getEvents(args) {
     const runner = this.runners.get(args.sessionId);
@@ -17378,44 +17320,39 @@ var SessionManager = class {
     if (!runner) return "idle";
     return compressStatus(runner.getState().status);
   }
-  // 给 observer 用：保证有 runner 但不 spawn（仅创建 state 容器）。
-  // observer 喂事件路径只走 default + owner（普通 + owner persona session）
-  // ——listener sub-session 的 observer 路径走 ensureRunnerForScope。
+  // 给 observer 用：保证有 runner 但不 spawn（仅创建 state 容器）
   ensureSession(file) {
     let r = this.runners.get(file.sessionId);
     if (r) return r;
-    r = this.newRunner(file, this.scopeForFile(file));
+    const subSessionMeta = this.resolveSubSessionMeta(file);
+    r = this.newRunner(file, { subSessionMeta });
     this.runners.set(file.sessionId, r);
     return r;
   }
-  // ---------------- persona / listener sub-session 专用 API ----------------
+  // ---------------- persona / sub-session 专用 API ----------------
   //
-  // PersonaManager 是 SessionManager 之上的薄编排层，listener sub-session 的持久化
-  // （SessionFile）仍由 SessionManager 持有。区别于普通 / owner session：
-  //   - SessionFile 落到 <dataDir>/sessions/<personaId>/listener/（拓扑分类）
+  // PersonaManager 是 SessionManager 之上的薄编排层，sub-session 的持久化（SessionFile）
+  // 仍由 SessionManager 持有。区别于普通 session：
+  //   - SessionFile 落到 <personaRoot>/<personaId>/.clawd/sub-sessions/ 而非 sessions/default/
   //   - reducer state.subSessionMeta.idleKillEnabled = true（turn_end 自动 idle-kill）
   //   - sessionId 由 PersonaManager 派生（personaId-<tokenHash>），不走自动 newSessionId
-  //
-  // 这些 API 接 SessionScope 参数（不再是单参 agentId）—— transport 始终明确传
-  // {kind:'persona', personaId, mode:'listener'}，与 owner / default 分类隔离。
-  /** 按 scope 读取 SessionFile；不存在返回 null */
-  readForScope(sessionId, scope) {
-    return this.storeFor(scope).read(sessionId);
+  /** 按 agentId 读取 SessionFile；不存在返回 null */
+  readForAgent(sessionId, agentId) {
+    return this.storeFor(agentId).read(sessionId);
   }
   /**
-   * 列出指定 persona 在指定 mode 下的所有 SessionFile。
-   * persona:listSubSessions RPC 入口（mode='listener'）；
-   * 路径下还未写过任何 session 时 list() 返回空数组（SessionStore.list 内部 ENOENT 处理）
+   * 按 agentId 列出该命名空间下所有 SessionFile（persona:listSubSessions 入口）。
+   * agentId 还未访问过 → storeFor 第一次创建对应 SessionStore（root 不存在则 list 返回 []）
    */
-  listPersonaSessions(personaId, mode) {
-    return this.storeFor({ kind: "persona", personaId, mode }).list();
+  listForAgent(agentId) {
+    return this.storeFor(agentId).list();
   }
   /**
    * 创建 sub-session 的 SessionFile + 准备 runner（不 spawn）。
-   * SubSessionMeta 不进 SessionFile schema，运行时由 scope → metaFromScope 派生。
-   * 同一 sessionId 重复调用：抛错（PersonaManager 应先调 readForScope 命中复用）
+   * subSessionMeta 不进 SessionFile schema，仅缓存进 runner state。
+   * 同一 sessionId 重复调用：抛错（PersonaManager 应先调 readForAgent 命中复用）
    */
-  createForScope(args) {
+  createForAgent(args) {
     try {
       const stat = import_node_fs5.default.statSync(args.cwd);
       if (!stat.isDirectory()) throw new Error("not dir");
@@ -17424,11 +17361,9 @@ var SessionManager = class {
     }
     const tool = args.tool ?? "claude";
     this.deps.getAdapter(tool);
-    const store = this.storeFor(args.scope);
+    const store = this.storeFor(args.agentId);
     if (store.read(args.sessionId)) {
-      throw new Error(
-        `session already exists for scope ${scopeKey(args.scope)}: ${args.sessionId}`
-      );
+      throw new Error(`session already exists for agent ${args.agentId}: ${args.sessionId}`);
     }
     const iso = nowIso2(this.deps);
     const file = {
@@ -17441,7 +17376,11 @@ var SessionManager = class {
       createdAt: iso,
       updatedAt: iso
     };
-    return store.write(file);
+    const written = store.write(file);
+    if (args.subSessionMeta) {
+      this.subSessionMetaBySid.set(args.sessionId, args.subSessionMeta);
+    }
+    return written;
   }
   /**
    * persona-bound transport 用：读取 sub-session 的历史 ParsedEvent[]。
@@ -17452,21 +17391,22 @@ var SessionManager = class {
    * 不读 jsonl：
    *   1. observer 路径在 spawn 后会自动接管 jsonl 回灌，进 reducer buffer。
    *   2. 第一次握手时 sub-session 还没 spawn → toolSessionId 为空 → jsonl 不存在。
-   * sessionFile 不存在抛 SESSION_NOT_FOUND；上层应先调 createForScope。
+   * sessionFile 不存在抛 SESSION_NOT_FOUND；上层应先调 createForAgent。
    */
-  readHistoryEventsForScope(sessionId, scope) {
-    const file = this.storeFor(scope).read(sessionId);
+  readHistoryEvents(sessionId, agentId) {
+    const store = this.storeFor(agentId);
+    const file = store.read(sessionId);
     if (!file) {
       throw new ClawdError(
         ERROR_CODES.SESSION_NOT_FOUND,
-        `sub-session not found: ${scopeKey(scope)}/${sessionId}`
+        `sub-session not found: ${agentId}/${sessionId}`
       );
     }
-    const runner = this.ensureRunnerForScope(file, scope);
+    const runner = this.ensureRunnerFor(file, agentId);
     return runner.getState().buffer.map((e) => e.event);
   }
   /**
-   * persona-bound transport 用：基于 readHistoryEventsForScope 的 buffer 切片视图，支持分页。
+   * persona-bound transport 用：基于 readHistoryEvents 的 buffer 切片视图，支持分页。
    *
    * Why a new method instead of reusing `history:read` RPC handler:
    *   - `history:read` 走 HandlerDeps.history.read()，读 CC 写盘的 jsonl 文件
@@ -17474,15 +17414,18 @@ var SessionManager = class {
    *   两条路径数据形态、时序、字段不同，不能共享 helper。persona-bound 客户端必须
    *   走 buffer 路径，才能保证首屏回放和实时帧无 gap、无重复。
    *
+   * Why not 改 readHistoryEvents 加 limit/offset：现有 readHistoryEvents 的语义是
+   * "返回 buffer 全部"，被其它路径（rewind uuid 转译等）依赖；保留它不动，新加分页方法。
+   *
    * 切片语义：clip 安全边界，response.offset 保留请求值便于客户端识别越界请求。
    * - offset >= total → events: [], offset: 请求值, total: 当前 buffer 长度
    * - offset + limit > total → 返回 tail [offset, total)，长度 = total - offset
    * - 正常 → 返回 [offset, offset + limit)
    *
-   * SESSION_NOT_FOUND 行为继承 readHistoryEventsForScope（store.read 返回 null 即抛）。
+   * SESSION_NOT_FOUND 行为继承 readHistoryEvents（store.read 返回 null 即抛）。
    */
-  readHistoryPageForScope(sessionId, scope, limit, offset) {
-    const all = this.readHistoryEventsForScope(sessionId, scope);
+  readHistoryPage(sessionId, agentId, limit, offset) {
+    const all = this.readHistoryEvents(sessionId, agentId);
     const total = all.length;
     const start = Math.min(offset, total);
     const end = Math.min(start + limit, total);
@@ -17495,34 +17438,36 @@ var SessionManager = class {
    * 返回 unsubscribe；不破坏现有 wire 广播路径——routeFromRunner 同时 fan-out 到
    * eventSubscribers 和 deps.broadcastFrame
    */
-  subscribe(sessionId, _scope, listener) {
-    let subs = this.eventSubscribers.get(sessionId);
+  subscribe(_sessionId, _agentId, listener) {
+    const sid = _sessionId;
+    let subs = this.eventSubscribers.get(sid);
     if (!subs) {
       subs = /* @__PURE__ */ new Set();
-      this.eventSubscribers.set(sessionId, subs);
+      this.eventSubscribers.set(sid, subs);
     }
     subs.add(listener);
     return () => {
-      const cur = this.eventSubscribers.get(sessionId);
+      const cur = this.eventSubscribers.get(sid);
       if (!cur) return;
       cur.delete(listener);
-      if (cur.size === 0) this.eventSubscribers.delete(sessionId);
+      if (cur.size === 0) this.eventSubscribers.delete(sid);
     };
   }
   /**
-   * persona-bound transport 用：sub-session 路径的 send（按 scope 路由 SessionStore）。
-   * 区别于 default scope 走 SessionManager.send：transport hello 已知 personaId 和 mode，
-   * 显式传 scope 避免跨命名空间 sessionId 撞车。
+   * persona-bound transport 用：sub-session 路径的 send（按 agentId 路由 SessionStore）。
+   * 现状 send(args.sessionId, args.text) 默认 'default' agent；这里按 agentId 拿对应 store
+   * + ensureRunnerFor 保证 runner 用同一个 store 写盘
    */
-  sendForScope(args) {
-    const file = this.storeFor(args.scope).read(args.sessionId);
+  sendForAgent(args) {
+    const store = this.storeFor(args.agentId);
+    const file = store.read(args.sessionId);
     if (!file) {
       throw new ClawdError(
         ERROR_CODES.SESSION_NOT_FOUND,
-        `sub-session not found: ${scopeKey(args.scope)}/${args.sessionId}`
+        `sub-session not found: ${args.agentId}/${args.sessionId}`
       );
     }
-    const runner = this.ensureRunnerForScope(file, args.scope);
+    const runner = this.ensureRunnerFor(file, args.agentId);
     const { broadcast } = this.withCollector(() => {
       runner.input({ kind: "command", command: { kind: "send", text: args.text } });
     });
@@ -17532,47 +17477,53 @@ var SessionManager = class {
    * persona-bound transport 用：sub-session reset。
    * 复用 reducer 'new' 命令：清 toolSessionId / buffer / nextSeq / pending* + kill proc + emit
    * session:cleared。语义上等价 alice 端"清空当前会话上下文"。
-   * 归档已写盘的 jsonl 不在本路径处理（CC 后续 spawn 会写新的 toolSessionId.jsonl，旧的留盘）。
+   * 归档已写盘的 jsonl 不在本路径处理（CC 后续 spawn 会写新的 toolSessionId.jsonl，旧的留盘）；
+   * 物理归档可在后续单独 task 加（spec § 6 待 plan 决定项）。
    */
-  resetForScope(args) {
-    const file = this.storeFor(args.scope).read(args.sessionId);
+  resetForAgent(args) {
+    const store = this.storeFor(args.agentId);
+    const file = store.read(args.sessionId);
     if (!file) {
       throw new ClawdError(
         ERROR_CODES.SESSION_NOT_FOUND,
-        `sub-session not found: ${scopeKey(args.scope)}/${args.sessionId}`
+        `sub-session not found: ${args.agentId}/${args.sessionId}`
       );
     }
-    const runner = this.ensureRunnerForScope(file, args.scope);
+    const runner = this.ensureRunnerFor(file, args.agentId);
     const { broadcast } = this.withCollector(() => {
       runner.input({ kind: "command", command: { kind: "new" } });
     });
     return { response: { ok: true }, broadcast };
   }
-  /** ensureSession 的 scope-aware 版本：复用现有 runner 或按 scope 创建（含 metaFromScope 派生 meta） */
-  ensureRunnerForScope(file, scope) {
+  /** ensureSession 的 agentId-aware 版本：复用现有 runner 或按 agentId 派生 store 创建 */
+  ensureRunnerFor(file, agentId) {
     const existing = this.runners.get(file.sessionId);
     if (existing) return existing;
-    const runner = this.newRunner(file, scope);
+    const store = this.storeFor(agentId);
+    const subSessionMeta = this.resolveSubSessionMeta(file);
+    const runner = this.newRunner(file, { store, subSessionMeta });
     this.runners.set(file.sessionId, runner);
     return runner;
   }
   /**
    * 老板插话：把 'inject-owner-text' input 喂给对应 runner，
-   * runner 不存在时按 scope 懒创建。
+   * runner 不存在时按 ensureSession 路径懒创建（以 subSessionMeta 缓存为准）。
    * frames 走异步路径（broadcastFrame）：调用方一般在 PersonaManager.appendOwnerMessage
    * 内部走 RPC 处理流，没有同步 collector 上下文
    */
   injectOwnerMessage(args) {
-    const file = this.storeFor(args.scope).read(args.sessionId);
+    const store = this.storeFor(args.agentId);
+    const file = store.read(args.sessionId);
     if (!file) {
       throw new ClawdError(
         ERROR_CODES.SESSION_NOT_FOUND,
-        `sub-session not found: ${scopeKey(args.scope)}/${args.sessionId}`
+        `sub-session not found: ${args.agentId}/${args.sessionId}`
       );
     }
     let runner = this.runners.get(args.sessionId);
     if (!runner) {
-      runner = this.newRunner(file, args.scope);
+      const subSessionMeta = this.resolveSubSessionMeta(file);
+      runner = this.newRunner(file, { store, subSessionMeta });
       this.runners.set(args.sessionId, runner);
     }
     runner.input({ kind: "inject-owner-text", text: args.text });
@@ -17668,7 +17619,7 @@ var SessionManager = class {
 
 // src/persona/store.ts
 var fs6 = __toESM(require("fs"), 1);
-var path7 = __toESM(require("path"), 1);
+var path6 = __toESM(require("path"), 1);
 init_protocol();
 var DEFAULT_SETTINGS = {
   permissions: {
@@ -17697,13 +17648,13 @@ var PersonaStore = class {
   }
   root;
   personaDir(personaId) {
-    return path7.join(this.root, safeFileName(personaId));
+    return path6.join(this.root, safeFileName(personaId));
   }
   metaPath(personaId) {
-    return path7.join(this.personaDir(personaId), ".clawd", "persona.json");
+    return path6.join(this.personaDir(personaId), ".clawd", "persona.json");
   }
   claudeMdPath(personaId) {
-    return path7.join(this.personaDir(personaId), "CLAUDE.md");
+    return path6.join(this.personaDir(personaId), "CLAUDE.md");
   }
   /**
    * Sandbox settings 落盘路径 —— 故意放在 `.clawd/` 而不是 `.claude/`，让 CC 的
@@ -17713,11 +17664,11 @@ var PersonaStore = class {
    * 加载 persona 人格，只有 listener 多一层 OS sandbox。
    */
   sandboxSettingsPath(personaId) {
-    return path7.join(this.personaDir(personaId), ".clawd", "sandbox-settings.json");
+    return path6.join(this.personaDir(personaId), ".clawd", "sandbox-settings.json");
   }
   write(persona, personality) {
     const dir = this.personaDir(persona.personaId);
-    fs6.mkdirSync(path7.join(dir, ".clawd"), { recursive: true });
+    fs6.mkdirSync(path6.join(dir, ".clawd"), { recursive: true });
     this.atomicWrite(this.claudeMdPath(persona.personaId), personality);
     this.atomicWrite(
       this.sandboxSettingsPath(persona.personaId),
@@ -17748,7 +17699,7 @@ var PersonaStore = class {
   list() {
     if (!fs6.existsSync(this.root)) return [];
     return fs6.readdirSync(this.root).filter((name) => {
-      return fs6.existsSync(path7.join(this.root, name, ".clawd", "persona.json"));
+      return fs6.existsSync(path6.join(this.root, name, ".clawd", "persona.json"));
     });
   }
   remove(personaId) {
@@ -17910,20 +17861,27 @@ var PersonaManager = class {
     const persona = this.deps.registry.get(personaId);
     if (!persona) throw new Error(`persona not found: ${personaId}`);
     const subSessionId = this.deriveSubSessionId(personaId, token);
-    const scope = { kind: "persona", personaId, mode: "listener" };
-    const existing = this.deps.sessionManager.readForScope(subSessionId, scope);
+    const existing = this.deps.sessionManager.readForAgent(subSessionId, personaId);
     if (existing) {
       return { sessionFile: existing, isNew: false };
     }
     const tokenEntry = persona.tokenMap[token];
     const subLabel = tokenEntry?.label ?? "unknown";
-    const sessionFile = this.deps.sessionManager.createForScope({
+    const sessionFile = this.deps.sessionManager.createForAgent({
       sessionId: subSessionId,
-      scope,
+      agentId: personaId,
       cwd: this.deps.store.personaDirPath(personaId),
       tool: "claude",
       label: subLabel,
-      model: persona.model
+      model: persona.model,
+      // listener 走 OS sandbox：sandbox JSON 不在 project 自动发现路径上（PersonaStore 把它
+      // 落在 .clawd/sandbox-settings.json），靠 extraSettings 透传到 spawn 的 `--settings <file>`
+      // 显式拉回。owner 路径不传 extraSettings，天然无 sandbox。
+      subSessionMeta: {
+        idleKillEnabled: true,
+        personaMode: "listener",
+        extraSettings: this.deps.store.sandboxSettingsPath(personaId)
+      }
     });
     return { sessionFile, isNew: true };
   }
@@ -17934,7 +17892,7 @@ var PersonaManager = class {
   appendOwnerMessage(personaId, subSessionId, text) {
     this.deps.sessionManager.injectOwnerMessage({
       sessionId: subSessionId,
-      scope: { kind: "persona", personaId, mode: "listener" },
+      agentId: personaId,
       text
     });
   }
@@ -17963,7 +17921,7 @@ var PersonaManager = class {
 
 // src/persona/seed.ts
 var fs7 = __toESM(require("fs"), 1);
-var path8 = __toESM(require("path"), 1);
+var path7 = __toESM(require("path"), 1);
 var import_node_url = require("url");
 var import_meta = {};
 var DEFAULT_PERSONAS = [
@@ -17980,19 +17938,26 @@ var DEFAULT_PERSONAS = [
     model: "opus",
     iconKey: "reading",
     public: false
+  },
+  {
+    personaId: "persona-clawd-helper",
+    label: "clawd\u4F7F\u7528\u52A9\u624B",
+    model: "opus",
+    iconKey: "assist",
+    public: false
   }
 ];
 function findDefaultsRoot() {
   const candidates = [];
   try {
-    const here = path8.dirname((0, import_node_url.fileURLToPath)(import_meta.url));
-    candidates.push(path8.resolve(here, "defaults"));
-    candidates.push(path8.resolve(here, "persona-defaults"));
+    const here = path7.dirname((0, import_node_url.fileURLToPath)(import_meta.url));
+    candidates.push(path7.resolve(here, "defaults"));
+    candidates.push(path7.resolve(here, "persona-defaults"));
   } catch {
   }
   if (process.argv[1]) {
-    const argvDir = path8.dirname(process.argv[1]);
-    candidates.push(path8.resolve(argvDir, "persona-defaults"));
+    const argvDir = path7.dirname(process.argv[1]);
+    candidates.push(path7.resolve(argvDir, "persona-defaults"));
   }
   for (const c of candidates) {
     try {
@@ -18009,7 +17974,7 @@ function seedDefaultPersonas(args) {
       args.logger.info("persona.seed.skip", { personaId: entry.personaId, reason: "exists" });
       continue;
     }
-    const bundleDir = path8.join(args.defaultsRoot, entry.personaId);
+    const bundleDir = path7.join(args.defaultsRoot, entry.personaId);
     if (!fs7.existsSync(bundleDir)) {
       args.logger.warn("persona.seed.skip", {
         personaId: entry.personaId,
@@ -18018,7 +17983,7 @@ function seedDefaultPersonas(args) {
       });
       continue;
     }
-    const claudeMdPath = path8.join(bundleDir, "CLAUDE.md");
+    const claudeMdPath = path7.join(bundleDir, "CLAUDE.md");
     if (!fs7.existsSync(claudeMdPath)) {
       args.logger.warn("persona.seed.skip", {
         personaId: entry.personaId,
@@ -18047,8 +18012,8 @@ function seedDefaultPersonas(args) {
 function copyBundleExtras(srcDir, dstDir) {
   for (const entry of fs7.readdirSync(srcDir, { withFileTypes: true })) {
     if (entry.name === "CLAUDE.md" || entry.name === ".clawd") continue;
-    const srcPath = path8.join(srcDir, entry.name);
-    const dstPath = path8.join(dstDir, entry.name);
+    const srcPath = path7.join(srcDir, entry.name);
+    const dstPath = path7.join(dstDir, entry.name);
     if (entry.isDirectory()) {
       fs7.cpSync(srcPath, dstPath, { recursive: true, dereference: true });
     } else if (entry.isFile()) {
@@ -18064,14 +18029,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_path9 = __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_path9.default.resolve(cwd);
-  const joined = import_node_path9.default.resolve(absCwd, subpath ?? ".");
-  const rel = import_node_path9.default.relative(absCwd, joined);
-  if (rel.startsWith("..") || import_node_path9.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;
@@ -18102,7 +18067,7 @@ var WorkspaceBrowser = class {
         mtime: ""
       };
       try {
-        const st = import_node_fs8.default.statSync(import_node_path9.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 {
@@ -18149,7 +18114,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_path10 = __toESM(require("path"), 1);
+var import_node_path9 = __toESM(require("path"), 1);
 
 // src/skills/frontmatter.ts
 var STRIP_QUOTES = /^["']|["']$/g;
@@ -18271,14 +18236,14 @@ function scanSkillDir(dir, source, seen, out, pluginName) {
     return;
   }
   for (const ent of entries) {
-    const entryPath = import_node_path10.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_path10.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_path10.default.join(entryPath, "skill.md"), "utf8");
+        content = import_node_fs9.default.readFileSync(import_node_path9.default.join(entryPath, "skill.md"), "utf8");
       } catch {
         continue;
       }
@@ -18301,7 +18266,7 @@ function scanCommandDir(dir, source, seen, out, pluginName) {
     return;
   }
   for (const ent of entries) {
-    const entryPath = import_node_path10.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;
@@ -18312,7 +18277,7 @@ function scanCommandDir(dir, source, seen, out, pluginName) {
       }
       for (const se of subEntries) {
         if (!se.name.endsWith(".md")) continue;
-        const sePath = import_node_path10.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");
@@ -18348,7 +18313,7 @@ function scanCommandDir(dir, source, seen, out, pluginName) {
   }
 }
 function readInstalledPlugins(home) {
-  const file = import_node_path10.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");
@@ -18399,14 +18364,14 @@ var SkillsScanner = class {
       });
     }
     const fsBlock = [];
-    scanSkillDir(import_node_path10.default.join(this.home, ".claude", "skills"), "global", seen, fsBlock);
-    scanCommandDir(import_node_path10.default.join(this.home, ".claude", "commands"), "global", seen, fsBlock);
-    scanSkillDir(import_node_path10.default.join(args.cwd, ".claude", "skills"), "project", seen, fsBlock);
-    scanCommandDir(import_node_path10.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_path10.default.join(root, "skills"), "plugin", seen, fsBlock, name);
-      scanCommandDir(import_node_path10.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];
@@ -18416,7 +18381,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_path11 = __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 {
@@ -18454,10 +18419,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_path11.default.join(dir, ent.name)))) {
+    if (!ent.isFile() && !(ent.isSymbolicLink() && fileExistsSync(import_node_path10.default.join(dir, ent.name)))) {
       continue;
     }
-    const filePath = import_node_path11.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);
@@ -18480,7 +18445,7 @@ function scanPluginAgentsTree(root, pluginName, seen, out) {
       return;
     }
     for (const ent of entries) {
-      const childPath = import_node_path11.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;
@@ -18505,9 +18470,9 @@ function scanPluginAgentsTree(root, pluginName, seen, out) {
   walk(root, []);
 }
 function readInstalledPlugins2(home) {
-  const pluginsDir = import_node_path11.default.join(home, ".claude", "plugins");
-  const v2 = import_node_path11.default.join(pluginsDir, "installed_plugins_v2.json");
-  const v1 = import_node_path11.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 {
@@ -18536,19 +18501,19 @@ function readInstalledPlugins2(home) {
   return out;
 }
 function walkUpProjectAgentsDirs(startCwd, home, seen, out) {
-  let cur = import_node_path11.default.resolve(startCwd);
-  const fsRoot = import_node_path11.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_path11.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_path11.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_path11.default.dirname(cur);
+    const parent = import_node_path10.default.dirname(cur);
     if (parent === cur) return;
     cur = parent;
   }
@@ -18583,7 +18548,7 @@ var AgentsScanner = class {
     }
     const fsBlock = [];
     scanAgentsDir(
-      import_node_path11.default.join(this.home, ".claude", "agents"),
+      import_node_path10.default.join(this.home, ".claude", "agents"),
       "global",
       seen,
       fsBlock
@@ -18597,7 +18562,7 @@ var AgentsScanner = class {
       ...this.extraPluginRoots
     ];
     for (const { name, root } of plugins) {
-      const agentsRoot = import_node_path11.default.join(root, "agents");
+      const agentsRoot = import_node_path10.default.join(root, "agents");
       scanPluginAgentsTree(agentsRoot, name, seen, fsBlock);
     }
     return [...builtinBlock, ...fsBlock];
@@ -18607,7 +18572,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_path12 = __toESM(require("path"), 1);
+var import_node_path11 = __toESM(require("path"), 1);
 init_claude_history();
 var SessionObserver = class {
   constructor(opts) {
@@ -18619,7 +18584,7 @@ var SessionObserver = class {
   watches = /* @__PURE__ */ new Map();
   resolveJsonlPath(cwd, toolSessionId, override) {
     if (override) return override;
-    return import_node_path12.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);
@@ -18639,10 +18604,10 @@ var SessionObserver = class {
       adapter: args.adapter
     };
     try {
-      import_node_fs11.default.mkdirSync(import_node_path12.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_path12.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);
     });
@@ -19158,18 +19123,13 @@ var PersonaBoundHandler = class {
         }
         return true;
       };
-      const listenerScope = () => ({
-        kind: "persona",
-        personaId: scope.personaId,
-        mode: "listener"
-      });
       switch (type) {
         case "session:subscribe": {
           if (!requireScopedSession()) return;
           if (unsubscribe) unsubscribe();
           unsubscribe = this.deps.sessionManager.subscribe(
             scope.subSessionId,
-            listenerScope(),
+            scope.personaId,
             (eventFrame) => send(eventFrame)
           );
           if (requestId)
@@ -19199,9 +19159,9 @@ var PersonaBoundHandler = class {
             return;
           }
           try {
-            this.deps.sessionManager.sendForScope({
+            this.deps.sessionManager.sendForAgent({
               sessionId: scope.subSessionId,
-              scope: listenerScope(),
+              agentId: scope.personaId,
               text
             });
             if (requestId) send({ type: "session:send", ok: true, requestId });
@@ -19214,9 +19174,9 @@ var PersonaBoundHandler = class {
         case "session:new": {
           if (!requireScopedSession()) return;
           try {
-            this.deps.sessionManager.resetForScope({
+            this.deps.sessionManager.resetForAgent({
               sessionId: scope.subSessionId,
-              scope: listenerScope()
+              agentId: scope.personaId
             });
             if (requestId) send({ type: "session:info", sessionId: scope.subSessionId, requestId });
           } catch (err) {
@@ -19230,9 +19190,9 @@ var PersonaBoundHandler = class {
           const limit = typeof frame.limit === "number" && frame.limit > 0 ? frame.limit : 50;
           const offset = typeof frame.offset === "number" && frame.offset >= 0 ? frame.offset : 0;
           try {
-            const page = this.deps.sessionManager.readHistoryPageForScope(
+            const page = this.deps.sessionManager.readHistoryPage(
               scope.subSessionId,
-              listenerScope(),
+              scope.personaId,
               limit,
               offset
             );
@@ -19363,9 +19323,9 @@ function isLocalhost(addr) {
 
 // src/discovery/state-file.ts
 var import_node_fs12 = __toESM(require("fs"), 1);
-var import_node_path13 = __toESM(require("path"), 1);
+var import_node_path12 = __toESM(require("path"), 1);
 function defaultStateFilePath(dataDir) {
-  return import_node_path13.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;
@@ -19401,7 +19361,7 @@ var StateFileManager = class {
     return { status: "stale", existing };
   }
   write(state) {
-    import_node_fs12.default.mkdirSync(import_node_path13.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);
@@ -19422,13 +19382,13 @@ var StateFileManager = class {
 
 // src/tunnel/tunnel-manager.ts
 var import_node_fs15 = __toESM(require("fs"), 1);
-var import_node_path16 = __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_path14 = __toESM(require("path"), 1);
+var import_node_path13 = __toESM(require("path"), 1);
 var TunnelStore = class {
   constructor(filePath) {
     this.filePath = filePath;
@@ -19447,7 +19407,7 @@ var TunnelStore = class {
     }
   }
   async set(v) {
-    const dir = import_node_path14.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()}`;
@@ -19559,7 +19519,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_path15 = __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");
@@ -19598,13 +19558,13 @@ async function ensureFrpcBinary(opts) {
   }
   const version2 = opts.version ?? FRPC_VERSION;
   const platform = opts.platform ?? detectPlatform();
-  const binDir = import_node_path15.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_path15.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_path15.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);
@@ -19630,7 +19590,7 @@ function cleanupStaleArtifacts(binDir) {
   }
   for (const name of entries) {
     if (name.endsWith(".partial") || name.startsWith("extract-")) {
-      const full = import_node_path15.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 {
@@ -19656,7 +19616,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_path15.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((resolve2, reject) => {
@@ -19665,7 +19625,7 @@ async function extractFrpcFromTarball(tarball, binDir, version2, platform, destB
       proc.on("exit", (code) => code === 0 ? resolve2() : reject(new Error(`tar exited ${code}`)));
     });
     const dirName = `frp_${version2}_${platform.os}_${platform.arch}`;
-    const src = import_node_path15.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}`);
     }
@@ -19680,7 +19640,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_path16.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;
   }
@@ -19797,7 +19757,7 @@ var TunnelManager = class {
         dataDir: this.deps.dataDir,
         override: this.deps.frpcBinaryOverride ?? void 0
       });
-      const tomlPath = import_node_path16.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,
@@ -19812,7 +19772,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_path16.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", () => {
       });
@@ -19906,11 +19866,11 @@ function deriveStableDeviceKey(opts = {}) {
 
 // src/auth-store.ts
 var import_node_fs16 = __toESM(require("fs"), 1);
-var import_node_path17 = __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_path17.default.join(dataDir, AUTH_FILE_NAME);
+  return import_node_path16.default.join(dataDir, AUTH_FILE_NAME);
 }
 function loadOrCreateAuthToken(opts) {
   const file = authFilePath(opts.dataDir);
@@ -19942,7 +19902,7 @@ function readAuthFile(file) {
   }
 }
 function writeAuthFile(file, content) {
-  import_node_fs16.default.mkdirSync(import_node_path17.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);
@@ -19953,11 +19913,11 @@ function writeAuthFile(file, content) {
 // src/owner-profile.ts
 var import_node_fs17 = __toESM(require("fs"), 1);
 var import_node_os10 = __toESM(require("os"), 1);
-var import_node_path18 = __toESM(require("path"), 1);
+var import_node_path17 = __toESM(require("path"), 1);
 var PROFILE_FILENAME = "profile.json";
 function loadOwnerDisplayName(dataDir) {
   const fallback = import_node_os10.default.userInfo().username;
-  const profilePath = import_node_path18.default.join(dataDir, PROFILE_FILENAME);
+  const profilePath = import_node_path17.default.join(dataDir, PROFILE_FILENAME);
   let raw;
   try {
     raw = import_node_fs17.default.readFileSync(profilePath, "utf8");
@@ -19991,7 +19951,7 @@ init_protocol();
 // src/session/fork.ts
 var import_node_fs18 = __toESM(require("fs"), 1);
 var import_node_os11 = __toESM(require("os"), 1);
-var import_node_path19 = __toESM(require("path"), 1);
+var import_node_path18 = __toESM(require("path"), 1);
 init_claude_history();
 function readJsonlEntries(file) {
   const raw = import_node_fs18.default.readFileSync(file, "utf8");
@@ -20007,9 +19967,9 @@ function readJsonlEntries(file) {
   return out;
 }
 function forkSession(input) {
-  const baseDir = input.baseDir ?? import_node_path19.default.join(import_node_os11.default.homedir(), ".claude");
-  const projectDir = import_node_path19.default.join(baseDir, "projects", cwdToHashDir(input.cwd));
-  const sourceFile = import_node_path19.default.join(projectDir, `${input.toolSessionId}.jsonl`);
+  const baseDir = input.baseDir ?? import_node_path18.default.join(import_node_os11.default.homedir(), ".claude");
+  const projectDir = import_node_path18.default.join(baseDir, "projects", cwdToHashDir(input.cwd));
+  const sourceFile = import_node_path18.default.join(projectDir, `${input.toolSessionId}.jsonl`);
   if (!import_node_fs18.default.existsSync(sourceFile)) {
     throw new Error(`fork: source transcript not found: ${sourceFile}`);
   }
@@ -20040,7 +20000,7 @@ function forkSession(input) {
     }
     forkedLines.push(JSON.stringify(forked));
   }
-  const forkedFilePath = import_node_path19.default.join(projectDir, `${forkedToolSessionId}.jsonl`);
+  const forkedFilePath = import_node_path18.default.join(projectDir, `${forkedToolSessionId}.jsonl`);
   import_node_fs18.default.mkdirSync(projectDir, { recursive: true });
   import_node_fs18.default.writeFileSync(forkedFilePath, forkedLines.join("\n") + "\n", { mode: 384 });
   return { forkedToolSessionId, forkedFilePath };
@@ -20332,7 +20292,7 @@ init_protocol();
 var import_node_child_process5 = require("child_process");
 var import_node_fs19 = __toESM(require("fs"), 1);
 var import_node_os12 = __toESM(require("os"), 1);
-var import_node_path20 = __toESM(require("path"), 1);
+var import_node_path19 = __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) {
@@ -20347,7 +20307,7 @@ function formatChildProcessError(err) {
   return e.message ?? "unknown error";
 }
 function normalizePath(p) {
-  const resolved = import_node_path20.default.resolve(p);
+  const resolved = import_node_path19.default.resolve(p);
   try {
     return import_node_fs19.default.realpathSync(resolved);
   } catch {
@@ -20450,13 +20410,13 @@ function flattenToDirName(branch) {
 }
 function encodeClaudeProjectDir(absPath) {
   if (!absPath || typeof absPath !== "string") return "";
-  let canonical = import_node_path20.default.resolve(absPath);
+  let canonical = import_node_path19.default.resolve(absPath);
   try {
     canonical = import_node_fs19.default.realpathSync(canonical);
   } catch {
     try {
-      const parent = import_node_fs19.default.realpathSync(import_node_path20.default.dirname(canonical));
-      canonical = import_node_path20.default.join(parent, import_node_path20.default.basename(canonical));
+      const parent = import_node_fs19.default.realpathSync(import_node_path19.default.dirname(canonical));
+      canonical = import_node_path19.default.join(parent, import_node_path19.default.basename(canonical));
     } catch {
     }
   }
@@ -20480,11 +20440,11 @@ async function createWorktree(input) {
   if (!isGitRoot) {
     throw new Error(`\u76EE\u5F55 ${cwd} \u4E0D\u662F git repo \u6839`);
   }
-  const parent = import_node_path20.default.dirname(import_node_path20.default.resolve(cwd));
-  if (parent === "/" || parent === import_node_path20.default.resolve(cwd)) {
+  const parent = import_node_path19.default.dirname(import_node_path19.default.resolve(cwd));
+  if (parent === "/" || parent === import_node_path19.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_path20.default.join(parent, dirName);
+  const worktreeRoot = import_node_path19.default.join(parent, dirName);
   try {
     await pexec("git", ["-C", cwd, "fetch", "origin", baseBranch, "--no-tags"], {
       timeout: 3e4
@@ -20531,8 +20491,8 @@ async function removeWorktree(input) {
     );
     const gitCommonDir = stdout.trim();
     if (!gitCommonDir) throw new Error("empty git-common-dir");
-    const absGitCommon = import_node_path20.default.isAbsolute(gitCommonDir) ? gitCommonDir : import_node_path20.default.resolve(worktreeRoot, gitCommonDir);
-    repoRoot = import_node_path20.default.dirname(absGitCommon);
+    const absGitCommon = import_node_path19.default.isAbsolute(gitCommonDir) ? gitCommonDir : import_node_path19.default.resolve(worktreeRoot, gitCommonDir);
+    repoRoot = import_node_path19.default.dirname(absGitCommon);
   } catch {
     repoRoot = null;
   }
@@ -20563,9 +20523,9 @@ async function removeWorktree(input) {
   try {
     const encoded = encodeClaudeProjectDir(worktreeRoot);
     if (encoded) {
-      const projectsRoot = import_node_path20.default.join(import_node_os12.default.homedir(), ".claude", "projects");
-      const target = import_node_path20.default.resolve(projectsRoot, encoded);
-      if (target.startsWith(projectsRoot + import_node_path20.default.sep) && target !== projectsRoot) {
+      const projectsRoot = import_node_path19.default.join(import_node_os12.default.homedir(), ".claude", "projects");
+      const target = import_node_path19.default.resolve(projectsRoot, encoded);
+      if (target.startsWith(projectsRoot + import_node_path19.default.sep) && target !== projectsRoot) {
         import_node_fs19.default.rmSync(target, { recursive: true, force: true });
       }
     }
@@ -20734,7 +20694,7 @@ function buildPersonaHandlers(deps) {
   };
   const listSubSessions = async (frame) => {
     const args = PersonaIdArgsSchema.parse(frame);
-    const sessions = sessionManager.listPersonaSessions(args.personaId, "listener");
+    const sessions = sessionManager.listForAgent(args.personaId);
     return {
       response: { type: "persona:subSessions", sessions }
     };
@@ -20781,7 +20741,7 @@ function buildMethodHandlers(deps) {
 async function startDaemon(config) {
   const logger = createLogger({
     level: config.logLevel,
-    file: import_node_path21.default.join(config.dataDir, "clawd.log")
+    file: import_node_path20.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 });
@@ -20817,7 +20777,7 @@ async function startDaemon(config) {
   const agents = new AgentsScanner();
   const history = new ClaudeHistoryReader();
   let transport = null;
-  const personaStore = new PersonaStore(import_node_path21.default.join(config.dataDir, "personas"));
+  const personaStore = new PersonaStore(import_node_path20.default.join(config.dataDir, "personas"));
   const defaultsRoot = findDefaultsRoot();
   if (defaultsRoot) {
     seedDefaultPersonas({ store: personaStore, defaultsRoot, logger });
@@ -20831,7 +20791,7 @@ async function startDaemon(config) {
     getAdapter,
     historyReader: history,
     dataDir: config.dataDir,
-    personaRoot: import_node_path21.default.join(config.dataDir, "personas"),
+    personaRoot: import_node_path20.default.join(config.dataDir, "personas"),
     personaStore,
     ownerDisplayName,
     broadcastFrame: (frame, target) => {
@@ -21005,8 +20965,8 @@ async function startDaemon(config) {
       const lines = [
         `Tunnel:      ${r.url}`,
         ...resolvedAuthToken ? [`Connect:     ${connectUrl}`] : [],
-        `Frpc config: ${import_node_path21.default.join(config.dataDir, "frpc.toml")}`,
-        `Frpc log:    ${import_node_path21.default.join(config.dataDir, "frpc.log")}`
+        `Frpc config: ${import_node_path20.default.join(config.dataDir, "frpc.toml")}`,
+        `Frpc log:    ${import_node_path20.default.join(config.dataDir, "frpc.log")}`
       ];
       const width = Math.max(...lines.map((l) => l.length));
       const bar = "\u2550".repeat(width + 4);
@@ -21019,7 +20979,7 @@ ${bar}
 
 `);
       try {
-        const connectPath = import_node_path21.default.join(config.dataDir, "connect.txt");
+        const connectPath = import_node_path20.default.join(config.dataDir, "connect.txt");
         import_node_fs20.default.writeFileSync(connectPath, lines.join("\n") + "\n", { mode: 384 });
       } catch {
       }