@clawos-dev/clawd 0.2.33-beta.48.5d86147 → 0.2.34-beta.49.e300ede

package/dist/cli.cjs

@@ -1208,7 +1208,7 @@ var require_atomic_sleep = __commonJS({
 var require_sonic_boom = __commonJS({
   "../node_modules/.pnpm/sonic-boom@4.2.1/node_modules/sonic-boom/index.js"(exports2, module2) {
     "use strict";
-    var fs22 = require("fs");
+    var fs21 = require("fs");
     var EventEmitter = require("events");
     var inherits = require("util").inherits;
     var path22 = require("path");
@@ -1265,20 +1265,20 @@ var require_sonic_boom = __commonJS({
       const mode = sonic.mode;
       if (sonic.sync) {
         try {
-          if (sonic.mkdir) fs22.mkdirSync(path22.dirname(file), { recursive: true });
-          const fd = fs22.openSync(file, flags, mode);
+          if (sonic.mkdir) fs21.mkdirSync(path22.dirname(file), { recursive: true });
+          const fd = fs21.openSync(file, flags, mode);
           fileOpened(null, fd);
         } catch (err) {
           fileOpened(err);
           throw err;
         }
       } else if (sonic.mkdir) {
-        fs22.mkdir(path22.dirname(file), { recursive: true }, (err) => {
+        fs21.mkdir(path22.dirname(file), { recursive: true }, (err) => {
           if (err) return fileOpened(err);
-          fs22.open(file, flags, mode, fileOpened);
+          fs21.open(file, flags, mode, fileOpened);
         });
       } else {
-        fs22.open(file, flags, mode, fileOpened);
+        fs21.open(file, flags, mode, fileOpened);
       }
     }
     function SonicBoom(opts) {
@@ -1319,8 +1319,8 @@ var require_sonic_boom = __commonJS({
         this.flush = flushBuffer;
         this.flushSync = flushBufferSync;
         this._actualWrite = actualWriteBuffer;
-        fsWriteSync = () => fs22.writeSync(this.fd, this._writingBuf);
-        fsWrite = () => fs22.write(this.fd, this._writingBuf, this.release);
+        fsWriteSync = () => fs21.writeSync(this.fd, this._writingBuf);
+        fsWrite = () => fs21.write(this.fd, this._writingBuf, this.release);
       } else if (contentMode === void 0 || contentMode === kContentModeUtf8) {
         this._writingBuf = "";
         this.write = write;
@@ -1329,15 +1329,15 @@ var require_sonic_boom = __commonJS({
         this._actualWrite = actualWrite;
         fsWriteSync = () => {
           if (Buffer.isBuffer(this._writingBuf)) {
-            return fs22.writeSync(this.fd, this._writingBuf);
+            return fs21.writeSync(this.fd, this._writingBuf);
           }
-          return fs22.writeSync(this.fd, this._writingBuf, "utf8");
+          return fs21.writeSync(this.fd, this._writingBuf, "utf8");
         };
         fsWrite = () => {
           if (Buffer.isBuffer(this._writingBuf)) {
-            return fs22.write(this.fd, this._writingBuf, this.release);
+            return fs21.write(this.fd, this._writingBuf, this.release);
           }
-          return fs22.write(this.fd, this._writingBuf, "utf8", this.release);
+          return fs21.write(this.fd, this._writingBuf, "utf8", this.release);
         };
       } else {
         throw new Error(`SonicBoom supports "${kContentModeUtf8}" and "${kContentModeBuffer}", but passed ${contentMode}`);
@@ -1394,7 +1394,7 @@ var require_sonic_boom = __commonJS({
           }
         }
         if (this._fsync) {
-          fs22.fsyncSync(this.fd);
+          fs21.fsyncSync(this.fd);
         }
         const len = this._len;
         if (this._reopening) {
@@ -1508,7 +1508,7 @@ var require_sonic_boom = __commonJS({
       const onDrain = () => {
         if (!this._fsync) {
           try {
-            fs22.fsync(this.fd, (err) => {
+            fs21.fsync(this.fd, (err) => {
               this._flushPending = false;
               cb(err);
             });
@@ -1610,7 +1610,7 @@ var require_sonic_boom = __commonJS({
       const fd = this.fd;
       this.once("ready", () => {
         if (fd !== this.fd) {
-          fs22.close(fd, (err) => {
+          fs21.close(fd, (err) => {
             if (err) {
               return this.emit("error", err);
             }
@@ -1659,7 +1659,7 @@ var require_sonic_boom = __commonJS({
           buf = this._bufs[0];
         }
         try {
-          const n = Buffer.isBuffer(buf) ? fs22.writeSync(this.fd, buf) : fs22.writeSync(this.fd, buf, "utf8");
+          const n = Buffer.isBuffer(buf) ? fs21.writeSync(this.fd, buf) : fs21.writeSync(this.fd, buf, "utf8");
           const releasedBufObj = releaseWritingBuf(buf, this._len, n);
           buf = releasedBufObj.writingBuf;
           this._len = releasedBufObj.len;
@@ -1675,7 +1675,7 @@ var require_sonic_boom = __commonJS({
         }
       }
       try {
-        fs22.fsyncSync(this.fd);
+        fs21.fsyncSync(this.fd);
       } catch {
       }
     }
@@ -1696,7 +1696,7 @@ var require_sonic_boom = __commonJS({
           buf = mergeBuf(this._bufs[0], this._lens[0]);
         }
         try {
-          const n = fs22.writeSync(this.fd, buf);
+          const n = fs21.writeSync(this.fd, buf);
           buf = buf.subarray(n);
           this._len = Math.max(this._len - n, 0);
           if (buf.length <= 0) {
@@ -1724,13 +1724,13 @@ var require_sonic_boom = __commonJS({
       this._writingBuf = this._writingBuf.length ? this._writingBuf : this._bufs.shift() || "";
       if (this.sync) {
         try {
-          const written = Buffer.isBuffer(this._writingBuf) ? fs22.writeSync(this.fd, this._writingBuf) : fs22.writeSync(this.fd, this._writingBuf, "utf8");
+          const written = Buffer.isBuffer(this._writingBuf) ? fs21.writeSync(this.fd, this._writingBuf) : fs21.writeSync(this.fd, this._writingBuf, "utf8");
           release(null, written);
         } catch (err) {
           release(err);
         }
       } else {
-        fs22.write(this.fd, this._writingBuf, release);
+        fs21.write(this.fd, this._writingBuf, release);
       }
     }
     function actualWriteBuffer() {
@@ -1739,7 +1739,7 @@ var require_sonic_boom = __commonJS({
       this._writingBuf = this._writingBuf.length ? this._writingBuf : mergeBuf(this._bufs.shift(), this._lens.shift());
       if (this.sync) {
         try {
-          const written = fs22.writeSync(this.fd, this._writingBuf);
+          const written = fs21.writeSync(this.fd, this._writingBuf);
           release(null, written);
         } catch (err) {
           release(err);
@@ -1748,7 +1748,7 @@ var require_sonic_boom = __commonJS({
         if (kCopyBuffer) {
           this._writingBuf = Buffer.from(this._writingBuf);
         }
-        fs22.write(this.fd, this._writingBuf, release);
+        fs21.write(this.fd, this._writingBuf, release);
       }
     }
     function actualClose(sonic) {
@@ -1764,12 +1764,12 @@ var require_sonic_boom = __commonJS({
       sonic._lens = [];
       assert(typeof sonic.fd === "number", `sonic.fd must be a number, got ${typeof sonic.fd}`);
       try {
-        fs22.fsync(sonic.fd, closeWrapped);
+        fs21.fsync(sonic.fd, closeWrapped);
       } catch {
       }
       function closeWrapped() {
         if (sonic.fd !== 1 && sonic.fd !== 2) {
-          fs22.close(sonic.fd, done);
+          fs21.close(sonic.fd, done);
         } else {
           done();
         }
@@ -4133,7 +4133,7 @@ var require_multistream = __commonJS({
 var require_pino = __commonJS({
   "../node_modules/.pnpm/pino@9.14.0/node_modules/pino/pino.js"(exports2, module2) {
     "use strict";
-    var os14 = require("os");
+    var os13 = require("os");
     var stdSerializers = require_pino_std_serializers();
     var caller = require_caller();
     var redaction = require_redaction();
@@ -4180,7 +4180,7 @@ var require_pino = __commonJS({
     } = symbols;
     var { epochTime, nullTime } = time;
     var { pid } = process;
-    var hostname = os14.hostname();
+    var hostname = os13.hostname();
     var defaultErrorSerializer = stdSerializers.err;
     var defaultOptions = {
       level: "info",
@@ -4384,7 +4384,6 @@ var init_methods = __esm({
       "workspace:list",
       "workspace:read",
       "skills:list",
-      "agents:list",
       "git:root",
       "git:branch",
       "git:branches",
@@ -4409,7 +4408,7 @@ var init_methods = __esm({
 });
 
 // ../protocol/src/events.ts
-var SESSION_STATUS_VALUES, HISTORY_USER_META_VALUES, SKILL_SOURCE_VALUES, AGENT_SOURCE_VALUES, ASK_USER_QUESTION_TOOL_NAME;
+var SESSION_STATUS_VALUES, HISTORY_USER_META_VALUES, ASK_USER_QUESTION_TOOL_NAME;
 var init_events = __esm({
   "../protocol/src/events.ts"() {
     "use strict";
@@ -4430,14 +4429,6 @@ var init_events = __esm({
       "attachment-skills",
       "attachment-deferred-tools"
     ];
-    SKILL_SOURCE_VALUES = ["builtin", "global", "project", "plugin"];
-    AGENT_SOURCE_VALUES = [
-      "builtin",
-      "global",
-      "project",
-      "policy",
-      "plugin"
-    ];
     ASK_USER_QUESTION_TOOL_NAME = "AskUserQuestion";
   }
 });
@@ -8646,7 +8637,7 @@ var init_persona_schemas = __esm({
 });
 
 // ../protocol/src/schemas.ts
-var SessionStatusSchema, UsageSchema, ContextUsageSchema, sessionMetaShape, SessionMetaSchema, ModelInfoSchema, ModeInfoSchema, ConfigFieldSchemaSchema, CapabilitiesGetArgs, CapabilitiesResponseSchema, AllowRuleSchema, SessionFileSchema, ParsedEventBase, HistoryUserMetaSchema, SubagentToolStatsSchema, StructuredPatchHunkSchema, ToolResultExtraSchema, MemoryEntrySchema, AskQuestionOptionSchema, AskQuestionItemSchema, ParsedEventSchema, SessionCreateArgs, SessionIdArgs, SessionUpdateArgs, SessionSendArgs, SessionRewindArgs, SessionRewindResponseSchema, SessionRewindDiffArgs, RewindDiffHunkSchema, RewindDiffFileSchema, SessionRewindDiffResponseSchema, SessionRewindableMessageIdsArgs, SessionRewindableMessageIdsResponseSchema, SessionResumeArgs, SessionForkArgs, SessionForkResponseSchema, SessionObserveArgs, SessionEventsArgs, PermissionRespondArgs, HistoryListArgs, HistoryReadArgs, HistorySubagentsArgs, HistorySubagentReadArgs, WorkspaceListArgs, WorkspaceReadArgs, SkillsListArgs, SkillEntrySchema, AgentEntrySchema, AgentsListArgs, AgentsListResponseSchema, SessionSubscribeArgs, SessionPinArgs, SessionReorderPinsArgs, GitRootArgs, GitRootResponseSchema, GitBranchArgs, GitBranchResponseSchema, GitBranchesArgs, GitBranchesResponseSchema, GitWorktreePrefixArgs, GitWorktreePrefixResponseSchema, GitWorktreeCreateArgs, GitWorktreeCreateResponseSchema, GitWorktreeRemoveArgs, GitWorktreeRemoveResponseSchema, HistoryRecentDirsArgs, RecentDirEntrySchema, HistoryRecentDirsResponseSchema, SessionQuestionFrameSchema, SessionQuestionClearedFrameSchema, AnswerQuestionArgs, AnswerQuestionResponseSchema, AuthRequestFrameSchema, AuthOkFrameSchema, TunnelExitedEventSchema, InfoRunningSessionSchema, InfoResponseSchema;
+var SessionStatusSchema, UsageSchema, ContextUsageSchema, sessionMetaShape, SessionMetaSchema, ModelInfoSchema, ModeInfoSchema, ConfigFieldSchemaSchema, CapabilitiesGetArgs, CapabilitiesResponseSchema, AllowRuleSchema, SessionFileSchema, ParsedEventBase, HistoryUserMetaSchema, SubagentToolStatsSchema, StructuredPatchHunkSchema, ToolResultExtraSchema, MemoryEntrySchema, AskQuestionOptionSchema, AskQuestionItemSchema, ParsedEventSchema, SessionCreateArgs, SessionIdArgs, SessionUpdateArgs, SessionSendArgs, SessionRewindArgs, SessionRewindResponseSchema, SessionRewindDiffArgs, RewindDiffHunkSchema, RewindDiffFileSchema, SessionRewindDiffResponseSchema, SessionRewindableMessageIdsArgs, SessionRewindableMessageIdsResponseSchema, SessionResumeArgs, SessionForkArgs, SessionForkResponseSchema, SessionObserveArgs, SessionEventsArgs, PermissionRespondArgs, HistoryListArgs, HistoryReadArgs, HistorySubagentsArgs, HistorySubagentReadArgs, WorkspaceListArgs, WorkspaceReadArgs, SkillsListArgs, SessionSubscribeArgs, SessionPinArgs, SessionReorderPinsArgs, GitRootArgs, GitRootResponseSchema, GitBranchArgs, GitBranchResponseSchema, GitBranchesArgs, GitBranchesResponseSchema, GitWorktreePrefixArgs, GitWorktreePrefixResponseSchema, GitWorktreeCreateArgs, GitWorktreeCreateResponseSchema, GitWorktreeRemoveArgs, GitWorktreeRemoveResponseSchema, HistoryRecentDirsArgs, RecentDirEntrySchema, HistoryRecentDirsResponseSchema, SessionQuestionFrameSchema, SessionQuestionClearedFrameSchema, AnswerQuestionArgs, AnswerQuestionResponseSchema, AuthRequestFrameSchema, AuthOkFrameSchema, TunnelExitedEventSchema, InfoRunningSessionSchema, InfoResponseSchema;
 var init_schemas = __esm({
   "../protocol/src/schemas.ts"() {
     "use strict";
@@ -8741,6 +8732,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 +8934,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 +8947,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({
@@ -9069,25 +9069,6 @@ var init_schemas = __esm({
       path: external_exports.string().min(1)
     });
     SkillsListArgs = external_exports.object({ cwd: external_exports.string().min(1) });
-    SkillEntrySchema = external_exports.object({
-      name: external_exports.string().min(1),
-      source: external_exports.enum(SKILL_SOURCE_VALUES),
-      path: external_exports.string().optional(),
-      description: external_exports.string().optional(),
-      plugin: external_exports.string().optional()
-    });
-    AgentEntrySchema = external_exports.object({
-      name: external_exports.string().min(1),
-      source: external_exports.enum(AGENT_SOURCE_VALUES),
-      path: external_exports.string().optional(),
-      description: external_exports.string().optional(),
-      whenToUse: external_exports.string().optional(),
-      plugin: external_exports.string().optional()
-    });
-    AgentsListArgs = external_exports.object({ cwd: external_exports.string().min(1) });
-    AgentsListResponseSchema = external_exports.object({
-      agents: external_exports.array(AgentEntrySchema)
-    });
     SessionSubscribeArgs = external_exports.object({ sessionId: external_exports.string().min(1) });
     SessionPinArgs = external_exports.object({
       sessionId: external_exports.string().min(1),
@@ -9202,6 +9183,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 +9200,7 @@ var init_runtime = __esm({
     init_schemas();
     init_frames();
     init_persona_schemas();
+    init_persona_mode();
   }
 });
 
@@ -10273,7 +10262,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 +10277,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 +10307,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 +10322,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 +10336,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 +10346,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 +10401,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 +10434,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 +10452,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 +10469,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 +10504,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 +10532,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 +10577,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 +10617,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 +10664,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 +10688,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 +10733,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);
@@ -11134,7 +11134,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 +11142,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();
@@ -14911,8 +14911,8 @@ function startRunCaseRecorder(opts) {
   });
   const ensureStream = () => {
     if (stream) return stream;
-    import_node_fs20.default.mkdirSync(dir, { recursive: true });
-    stream = import_node_fs20.default.createWriteStream(opts.recordPath, { flags: "a" });
+    import_node_fs19.default.mkdirSync(dir, { recursive: true });
+    stream = import_node_fs19.default.createWriteStream(opts.recordPath, { flags: "a" });
     stream.on("close", () => closedResolve());
     return stream;
   };
@@ -14937,11 +14937,11 @@ function startRunCaseRecorder(opts) {
   };
   return { tap, close, closed };
 }
-var import_node_fs20, import_node_path19;
+var import_node_fs19, import_node_path19;
 var init_recorder = __esm({
   "src/run-case/recorder.ts"() {
     "use strict";
-    import_node_fs20 = __toESM(require("fs"), 1);
+    import_node_fs19 = __toESM(require("fs"), 1);
     import_node_path19 = __toESM(require("path"), 1);
   }
 });
@@ -14985,7 +14985,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_fs20.mkdtempSync)(import_node_path20.default.join(import_node_os12.default.tmpdir(), "clawd-runcase-"));
   const ownsCwd = opts.cwd === void 0;
   const recorder = startRunCaseRecorder({ recordPath: opts.record, now });
   const spawnCtx = { cwd };
@@ -15146,18 +15146,18 @@ async function runController(opts) {
   if (sigintHandler) process.off("SIGINT", sigintHandler);
   if (ownsCwd) {
     try {
-      (0, import_node_fs21.rmSync)(cwd, { recursive: true, force: true });
+      (0, import_node_fs20.rmSync)(cwd, { recursive: true, force: true });
     } catch {
     }
   }
   return exitCode ?? 0;
 }
-var import_node_fs21, import_node_os13, import_node_path20;
+var import_node_fs20, import_node_os12, import_node_path20;
 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_fs20 = require("fs");
+    import_node_os12 = __toESM(require("os"), 1);
     import_node_path20 = __toESM(require("path"), 1);
     init_claude();
     init_stdout_splitter();
@@ -15384,7 +15384,7 @@ Env (advanced):
 
 // src/index.ts
 var import_node_path18 = __toESM(require("path"), 1);
-var import_node_fs19 = __toESM(require("fs"), 1);
+var import_node_fs18 = __toESM(require("fs"), 1);
 
 // src/logger.ts
 var import_node_fs2 = __toESM(require("fs"), 1);
@@ -15514,6 +15514,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 +15661,7 @@ function buildSpawnContext(state) {
   };
   const meta = state.subSessionMeta;
   if (meta?.personaMode) {
-    ctx.personaMode = true;
+    ctx.personaMode = meta.personaMode;
   }
   return ctx;
 }
@@ -16642,10 +16643,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;
@@ -16703,18 +16716,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,
@@ -16724,10 +16753,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) {
@@ -16887,7 +16923,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(() => {
@@ -16981,7 +17018,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) {
@@ -17139,7 +17177,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;
@@ -17315,7 +17353,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;
@@ -17337,7 +17375,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);
     }
@@ -17409,7 +17447,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: {
@@ -17438,21 +17476,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));
@@ -17477,7 +17515,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) {
@@ -17642,7 +17680,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 };
   }
@@ -17678,14 +17716,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;
@@ -17716,7 +17754,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 {
@@ -17763,25 +17801,21 @@ 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);
-
-// src/skills/frontmatter.ts
-var STRIP_QUOTES = /^["']|["']$/g;
-function strip(s) {
-  return s.trim().replace(STRIP_QUOTES, "");
-}
-function parseFrontmatter(content, keys) {
-  const out = {};
-  if (!content.startsWith("---")) return out;
+var import_node_path9 = __toESM(require("path"), 1);
+function parseFrontmatter(content) {
+  if (!content.startsWith("---")) return { name: "", description: "" };
   const end = content.indexOf("---", 3);
-  if (end === -1) return out;
+  if (end === -1) return { name: "", description: "" };
   const lines = content.slice(3, end).split("\n");
+  const strip = (s) => s.trim().replace(/^["']|["']$/g, "");
+  let name = "";
+  let description = "";
   for (let i = 0; i < lines.length; i++) {
     const trimmed = lines[i].trim();
-    for (const key of keys) {
-      const prefix = `${key}:`;
-      if (!trimmed.startsWith(prefix)) continue;
-      const rest = trimmed.slice(prefix.length).trim();
+    if (trimmed.startsWith("name:")) {
+      name = strip(trimmed.slice(5));
+    } else if (trimmed.startsWith("description:")) {
+      const rest = trimmed.slice(12).trim();
       if (rest === "|" || rest === ">" || rest === "|-" || rest === ">-") {
         const parts = [];
         for (let j = i + 1; j < lines.length; j++) {
@@ -17793,82 +17827,13 @@ function parseFrontmatter(content, keys) {
           if (!/^\s/.test(next)) break;
           parts.push(next.replace(/^\s+/, ""));
         }
-        const value = parts.filter(Boolean).join(" ").trim();
-        if (value) out[key] = value;
+        description = parts.filter(Boolean).join(" ").trim();
       } else {
-        const value = strip(rest);
-        if (value) out[key] = value;
+        description = strip(rest);
       }
-      break;
     }
   }
-  return out;
-}
-
-// src/skills/builtin-cc-resources.ts
-var BUILTIN_SKILLS = [
-  { name: "update-config", source: "builtin", description: "Update Claude Code configuration." },
-  { name: "keybindings-help", source: "builtin", description: "Show available keybindings." },
-  { name: "verify", source: "builtin", description: "Verify the implementation." },
-  { name: "debug", source: "builtin", description: "Debug current issue." },
-  { name: "lorem-ipsum", source: "builtin", description: "Generate lorem ipsum placeholder text." },
-  { name: "skillify", source: "builtin", description: "Convert a process into a reusable skill." },
-  { name: "remember", source: "builtin", description: "Remember context for later use." },
-  { name: "simplify", source: "builtin", description: "Simplify the code or message." },
-  { name: "batch", source: "builtin", description: "Run a batch of similar operations." },
-  { name: "stuck", source: "builtin", description: "Help unstick a stalled task." },
-  { name: "loop", source: "builtin", description: "Loop a task until a condition is met." },
-  { name: "cron-list", source: "builtin", description: "List scheduled cron tasks." },
-  { name: "cron-delete", source: "builtin", description: "Delete a scheduled cron task." },
-  { name: "dream", source: "builtin", description: "Brainstorm freely without constraints." },
-  { name: "hunter", source: "builtin", description: "Hunt down a bug or root cause." },
-  { name: "schedule", source: "builtin", description: "Schedule a task to run later." },
-  { name: "claude-api", source: "builtin", description: "Use the Claude API directly." },
-  { name: "claude-in-chrome", source: "builtin", description: "Drive Claude inside Chrome via the Chrome extension." }
-];
-var BUILTIN_AGENTS = [
-  {
-    name: "general-purpose",
-    source: "builtin",
-    description: "General-purpose agent for researching complex questions and executing multi-step tasks.",
-    whenToUse: "When you are searching for a keyword or file and are not confident you will find the right match in the first few tries."
-  },
-  {
-    name: "statusline-setup",
-    source: "builtin",
-    description: "Configure the user's Claude Code status line setting.",
-    whenToUse: "When the user is setting up or changing their status line configuration."
-  },
-  {
-    name: "Explore",
-    source: "builtin",
-    description: "Explore the codebase to gather context.",
-    whenToUse: "Before making changes that require understanding the surrounding code."
-  },
-  {
-    name: "Plan",
-    source: "builtin",
-    description: "Produce an implementation plan before writing code.",
-    whenToUse: "When the task is non-trivial and would benefit from an explicit plan."
-  },
-  {
-    name: "claude-code-guide",
-    source: "builtin",
-    description: "Guide the user through Claude Code features.",
-    whenToUse: "When the user needs help understanding what Claude Code can do."
-  },
-  {
-    name: "verification",
-    source: "builtin",
-    description: "Verify that a change works as intended.",
-    whenToUse: "After implementing a change, before declaring it done."
-  }
-];
-
-// src/skills/scanner.ts
-function parseDescription(content) {
-  const fields = parseFrontmatter(content, ["description"]);
-  return { description: fields.description ?? "" };
+  return { name, description };
 }
 function isDirLikeSync(p) {
   try {
@@ -17885,19 +17850,19 @@ 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;
       }
     }
-    const { description } = parseDescription(content);
+    const { description } = parseFrontmatter(content);
     const baseName = ent.name;
     const name = pluginName ? `${pluginName}:${baseName}` : baseName;
     if (seen.has(name)) continue;
@@ -17915,7 +17880,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;
@@ -17926,7 +17891,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");
@@ -17934,7 +17899,7 @@ function scanCommandDir(dir, source, seen, out, pluginName) {
           continue;
         }
         const cmd = se.name.replace(/\.md$/, "");
-        const { description } = parseDescription(content);
+        const { description } = parseFrontmatter(content);
         const qualified = `${ns}:${cmd}`;
         const name = pluginName ? `${pluginName}:${qualified}` : qualified;
         if (seen.has(name)) continue;
@@ -17951,7 +17916,7 @@ function scanCommandDir(dir, source, seen, out, pluginName) {
         continue;
       }
       const cmd = ent.name.replace(/\.md$/, "");
-      const { description } = parseDescription(content);
+      const { description } = parseFrontmatter(content);
       const name = pluginName ? `${pluginName}:${cmd}` : cmd;
       if (seen.has(name)) continue;
       seen.add(name);
@@ -17962,7 +17927,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");
@@ -18002,231 +17967,30 @@ var SkillsScanner = class {
    */
   list(args) {
     const seen = /* @__PURE__ */ new Set();
-    const builtinBlock = [];
-    for (const b of BUILTIN_SKILLS) {
-      if (seen.has(b.name)) continue;
-      seen.add(b.name);
-      builtinBlock.push({
-        name: b.name,
-        source: "builtin",
-        description: b.description
-      });
-    }
-    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);
+    const out = [];
+    scanSkillDir(import_node_path9.default.join(this.home, ".claude", "skills"), "global", seen, out);
+    scanCommandDir(import_node_path9.default.join(this.home, ".claude", "commands"), "global", seen, out);
+    scanSkillDir(import_node_path9.default.join(args.cwd, ".claude", "skills"), "project", seen, out);
+    scanCommandDir(import_node_path9.default.join(args.cwd, ".claude", "commands"), "project", seen, out);
     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, out, name);
+      scanCommandDir(import_node_path9.default.join(root, "commands"), "plugin", seen, out, name);
     }
-    fsBlock.sort((a, b) => a.name < b.name ? -1 : a.name > b.name ? 1 : 0);
-    return [...builtinBlock, ...fsBlock];
+    out.sort((a, b) => a.name < b.name ? -1 : a.name > b.name ? 1 : 0);
+    return out;
   }
 };
 
-// src/skills/agents-scanner.ts
+// src/observer/session-observer.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 DEFAULT_POLICY_DIR_DARWIN = "/Library/Application Support/ClaudeCode/.claude/agents";
-function isDirLikeSync2(p) {
-  try {
-    return import_node_fs10.default.statSync(p).isDirectory();
-  } catch {
-    return false;
-  }
-}
-function fileExistsSync(p) {
-  try {
-    return import_node_fs10.default.statSync(p).isFile();
-  } catch {
-    return false;
-  }
-}
-function parseAgentFile(filePath) {
-  let content;
-  try {
-    content = import_node_fs10.default.readFileSync(filePath, "utf8");
-  } catch {
-    return {};
-  }
-  const fm = parseFrontmatter(content, ["description", "whenToUse"]);
-  return {
-    description: fm.description,
-    whenToUse: fm.whenToUse
-  };
-}
-function scanAgentsDir(dir, source, seen, out) {
-  let entries;
-  try {
-    entries = import_node_fs10.default.readdirSync(dir, { withFileTypes: true });
-  } catch {
-    return;
-  }
-  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)))) {
-      continue;
-    }
-    const filePath = import_node_path9.default.join(dir, ent.name);
-    const baseName = ent.name.replace(/\.md$/, "");
-    if (seen.has(baseName)) continue;
-    seen.add(baseName);
-    const { description, whenToUse } = parseAgentFile(filePath);
-    out.push({
-      name: baseName,
-      source,
-      path: filePath,
-      ...description ? { description } : {},
-      ...whenToUse ? { whenToUse } : {}
-    });
-  }
-}
-function scanPluginAgentsTree(root, pluginName, seen, out) {
-  function walk(dir, namespaces) {
-    let entries;
-    try {
-      entries = import_node_fs10.default.readdirSync(dir, { withFileTypes: true });
-    } catch {
-      return;
-    }
-    for (const ent of entries) {
-      const childPath = import_node_path9.default.join(dir, ent.name);
-      if (ent.isDirectory() || ent.isSymbolicLink() && isDirLikeSync2(childPath)) {
-        walk(childPath, [...namespaces, ent.name]);
-        continue;
-      }
-      if (!ent.name.endsWith(".md")) continue;
-      const baseName = ent.name.replace(/\.md$/, "");
-      const nameParts = [pluginName, ...namespaces, baseName];
-      const name = nameParts.join(":");
-      if (seen.has(name)) continue;
-      seen.add(name);
-      const { description, whenToUse } = parseAgentFile(childPath);
-      out.push({
-        name,
-        source: "plugin",
-        path: childPath,
-        plugin: pluginName,
-        ...description ? { description } : {},
-        ...whenToUse ? { whenToUse } : {}
-      });
-    }
-  }
-  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");
-  let raw = null;
-  for (const candidate of [v2, v1]) {
-    try {
-      raw = import_node_fs10.default.readFileSync(candidate, "utf8");
-      break;
-    } catch {
-    }
-  }
-  if (!raw) return [];
-  let parsed;
-  try {
-    parsed = JSON.parse(raw);
-  } catch {
-    return [];
-  }
-  const out = [];
-  for (const [key, entries] of Object.entries(parsed.plugins ?? {})) {
-    if (!Array.isArray(entries) || entries.length === 0) continue;
-    const entry = entries[0];
-    if (!entry?.installPath) continue;
-    if (entry.enabled === false) continue;
-    const pluginName = key.includes("@") ? key.slice(0, key.indexOf("@")) : key;
-    if (!pluginName) continue;
-    out.push({ name: pluginName, root: entry.installPath });
-  }
-  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;
-  while (true) {
-    scanAgentsDir(import_node_path9.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"));
-    } catch {
-    }
-    if (hasGit) return;
-    if (cur === home) return;
-    if (cur === fsRoot) return;
-    const parent = import_node_path9.default.dirname(cur);
-    if (parent === cur) return;
-    cur = parent;
-  }
-}
-var AgentsScanner = class {
-  home;
-  extraPluginRoots;
-  policyDir;
-  constructor(opts = {}) {
-    this.home = opts.home ?? process.env.CLAUDE_CONFIG_DIR ?? import_node_os6.default.homedir();
-    this.extraPluginRoots = opts.extraPluginRoots ?? [];
-    if (opts.policyDir !== void 0) {
-      this.policyDir = opts.policyDir;
-    } else if (process.platform === "darwin") {
-      this.policyDir = DEFAULT_POLICY_DIR_DARWIN;
-    } else {
-      this.policyDir = null;
-    }
-  }
-  list(args) {
-    const seen = /* @__PURE__ */ new Set();
-    const builtinBlock = [];
-    for (const b of BUILTIN_AGENTS) {
-      if (seen.has(b.name)) continue;
-      seen.add(b.name);
-      builtinBlock.push({
-        name: b.name,
-        source: "builtin",
-        ...b.description ? { description: b.description } : {},
-        ...b.whenToUse ? { whenToUse: b.whenToUse } : {}
-      });
-    }
-    const fsBlock = [];
-    scanAgentsDir(
-      import_node_path9.default.join(this.home, ".claude", "agents"),
-      "global",
-      seen,
-      fsBlock
-    );
-    walkUpProjectAgentsDirs(args.cwd, this.home, seen, fsBlock);
-    if (this.policyDir) {
-      scanAgentsDir(this.policyDir, "policy", seen, fsBlock);
-    }
-    const plugins = [
-      ...readInstalledPlugins2(this.home),
-      ...this.extraPluginRoots
-    ];
-    for (const { name, root } of plugins) {
-      const agentsRoot = import_node_path9.default.join(root, "agents");
-      scanPluginAgentsTree(agentsRoot, name, seen, fsBlock);
-    }
-    return [...builtinBlock, ...fsBlock];
-  }
-};
-
-// 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);
 init_claude_history();
 var SessionObserver = class {
   constructor(opts) {
     this.opts = opts;
-    this.home = opts.home ?? import_node_os7.default.homedir();
+    this.home = opts.home ?? import_node_os6.default.homedir();
   }
   opts;
   home;
@@ -18240,7 +18004,7 @@ var SessionObserver = class {
     const filePath = this.resolveJsonlPath(args.cwd, args.toolSessionId, args.jsonlPath);
     let size = 0;
     try {
-      size = import_node_fs11.default.statSync(filePath).size;
+      size = import_node_fs10.default.statSync(filePath).size;
     } catch {
     }
     const w = {
@@ -18253,10 +18017,10 @@ var SessionObserver = class {
       adapter: args.adapter
     };
     try {
-      import_node_fs11.default.mkdirSync(import_node_path10.default.dirname(filePath), { recursive: true });
+      import_node_fs10.default.mkdirSync(import_node_path10.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_fs10.default.watch(import_node_path10.default.dirname(filePath), { persistent: false }, (_event, changedName) => {
       if (!changedName || !filePath.endsWith(changedName)) return;
       this.poll(w);
     });
@@ -18271,7 +18035,7 @@ var SessionObserver = class {
   // reducer.shallowEqMeta diff 让重复 patch 静默吞掉；异常静默吞，不阻塞 watcher 启动
   hydrateMetaTail(w, maxLines = 200) {
     try {
-      const raw = import_node_fs11.default.readFileSync(w.filePath, "utf8");
+      const raw = import_node_fs10.default.readFileSync(w.filePath, "utf8");
       if (!raw) return;
       const allLines = raw.split("\n").filter((l) => l.trim().length > 0);
       if (allLines.length === 0) return;
@@ -18292,7 +18056,7 @@ var SessionObserver = class {
   poll(w) {
     let size = 0;
     try {
-      size = import_node_fs11.default.statSync(w.filePath).size;
+      size = import_node_fs10.default.statSync(w.filePath).size;
     } catch {
       return;
     }
@@ -18301,11 +18065,11 @@ var SessionObserver = class {
       w.buf = "";
     }
     if (size === w.lastSize) return;
-    const fd = import_node_fs11.default.openSync(w.filePath, "r");
+    const fd = import_node_fs10.default.openSync(w.filePath, "r");
     try {
       const len = size - w.lastSize;
       const buf = Buffer.alloc(len);
-      import_node_fs11.default.readSync(fd, buf, 0, len, w.lastSize);
+      import_node_fs10.default.readSync(fd, buf, 0, len, w.lastSize);
       w.lastSize = size;
       w.buf += buf.toString("utf8");
       let newlineIndex;
@@ -18319,7 +18083,7 @@ var SessionObserver = class {
         this.maybeReportUserMessage(w.sessionId, line);
       }
     } finally {
-      import_node_fs11.default.closeSync(fd);
+      import_node_fs10.default.closeSync(fd);
     }
   }
   // 解析 JSONL 单行：仅当是主链 user 文本行（非 sidechain / 非 sub-agent / message.role='user'
@@ -18971,7 +18735,7 @@ function isLocalhost(addr) {
 }
 
 // src/discovery/state-file.ts
-var import_node_fs12 = __toESM(require("fs"), 1);
+var import_node_fs11 = __toESM(require("fs"), 1);
 var import_node_path11 = __toESM(require("path"), 1);
 function defaultStateFilePath(dataDir) {
   return import_node_path11.default.join(dataDir, "state.json");
@@ -18996,7 +18760,7 @@ var StateFileManager = class {
   }
   read() {
     try {
-      const raw = import_node_fs12.default.readFileSync(this.file, "utf8");
+      const raw = import_node_fs11.default.readFileSync(this.file, "utf8");
       const parsed = JSON.parse(raw);
       return parsed;
     } catch {
@@ -19010,33 +18774,33 @@ 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_fs11.default.mkdirSync(import_node_path11.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);
+    import_node_fs11.default.writeFileSync(tmp, JSON.stringify(state, null, 2), { mode: 384 });
+    import_node_fs11.default.renameSync(tmp, this.file);
     if (process.platform !== "win32") {
       try {
-        import_node_fs12.default.chmodSync(this.file, 384);
+        import_node_fs11.default.chmodSync(this.file, 384);
       } catch {
       }
     }
   }
   delete() {
     try {
-      import_node_fs12.default.unlinkSync(this.file);
+      import_node_fs11.default.unlinkSync(this.file);
     } catch {
     }
   }
 };
 
 // src/tunnel/tunnel-manager.ts
-var import_node_fs15 = __toESM(require("fs"), 1);
+var import_node_fs14 = __toESM(require("fs"), 1);
 var import_node_path14 = __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_fs12 = __toESM(require("fs"), 1);
 var import_node_path12 = __toESM(require("path"), 1);
 var TunnelStore = class {
   constructor(filePath) {
@@ -19045,7 +18809,7 @@ var TunnelStore = class {
   filePath;
   async get() {
     try {
-      const raw = await import_node_fs13.default.promises.readFile(this.filePath, "utf8");
+      const raw = await import_node_fs12.default.promises.readFile(this.filePath, "utf8");
       const obj = JSON.parse(raw);
       if (!isPersistedTunnel(obj)) return null;
       return obj;
@@ -19057,21 +18821,21 @@ var TunnelStore = class {
   }
   async set(v) {
     const dir = import_node_path12.default.dirname(this.filePath);
-    await import_node_fs13.default.promises.mkdir(dir, { recursive: true });
+    await import_node_fs12.default.promises.mkdir(dir, { recursive: true });
     const data = JSON.stringify(v, null, 2);
     const tmp = `${this.filePath}.tmp.${process.pid}.${Date.now()}`;
-    await import_node_fs13.default.promises.writeFile(tmp, data, { mode: 384 });
+    await import_node_fs12.default.promises.writeFile(tmp, data, { mode: 384 });
     if (process.platform !== "win32") {
       try {
-        await import_node_fs13.default.promises.chmod(tmp, 384);
+        await import_node_fs12.default.promises.chmod(tmp, 384);
       } catch {
       }
     }
-    await import_node_fs13.default.promises.rename(tmp, this.filePath);
+    await import_node_fs12.default.promises.rename(tmp, this.filePath);
   }
   async clear() {
     try {
-      await import_node_fs13.default.promises.unlink(this.filePath);
+      await import_node_fs12.default.promises.unlink(this.filePath);
     } catch (err) {
       const code = err?.code;
       if (code !== "ENOENT") throw err;
@@ -19166,8 +18930,8 @@ 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_fs13 = __toESM(require("fs"), 1);
+var import_node_os7 = __toESM(require("os"), 1);
 var import_node_path13 = __toESM(require("path"), 1);
 var import_node_child_process3 = require("child_process");
 var import_node_stream = require("stream");
@@ -19200,7 +18964,7 @@ function frpcDownloadUrl(version2, p) {
 }
 async function ensureFrpcBinary(opts) {
   if (opts.override) {
-    if (!import_node_fs14.default.existsSync(opts.override)) {
+    if (!import_node_fs13.default.existsSync(opts.override)) {
       throw new Error(`frpc binary not found at override path: ${opts.override}`);
     }
     return opts.override;
@@ -19208,10 +18972,10 @@ 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");
-  import_node_fs14.default.mkdirSync(binDir, { recursive: true });
+  import_node_fs13.default.mkdirSync(binDir, { recursive: true });
   cleanupStaleArtifacts(binDir);
   const stableBin = import_node_path13.default.join(binDir, "frpc");
-  if (import_node_fs14.default.existsSync(stableBin)) return stableBin;
+  if (import_node_fs13.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`);
   try {
@@ -19222,8 +18986,8 @@ async function ensureFrpcBinary(opts) {
     } else {
       await extractFrpcFromTarball(tarballPath, binDir, version2, platform, partialBin);
     }
-    import_node_fs14.default.chmodSync(partialBin, 493);
-    import_node_fs14.default.renameSync(partialBin, stableBin);
+    import_node_fs13.default.chmodSync(partialBin, 493);
+    import_node_fs13.default.renameSync(partialBin, stableBin);
   } finally {
     safeUnlink(tarballPath);
     safeUnlink(partialBin);
@@ -19233,7 +18997,7 @@ async function ensureFrpcBinary(opts) {
 function cleanupStaleArtifacts(binDir) {
   let entries;
   try {
-    entries = import_node_fs14.default.readdirSync(binDir);
+    entries = import_node_fs13.default.readdirSync(binDir);
   } catch {
     return;
   }
@@ -19241,7 +19005,7 @@ function cleanupStaleArtifacts(binDir) {
     if (name.endsWith(".partial") || name.startsWith("extract-")) {
       const full = import_node_path13.default.join(binDir, name);
       try {
-        import_node_fs14.default.rmSync(full, { recursive: true, force: true });
+        import_node_fs13.default.rmSync(full, { recursive: true, force: true });
       } catch {
       }
     }
@@ -19249,7 +19013,7 @@ function cleanupStaleArtifacts(binDir) {
 }
 function safeUnlink(p) {
   try {
-    import_node_fs14.default.unlinkSync(p);
+    import_node_fs13.default.unlinkSync(p);
   } catch {
   }
 }
@@ -19260,13 +19024,13 @@ async function downloadToFile(url, dest, fetchImpl) {
   if (!res.ok || !res.body) {
     throw new Error(`download failed: ${res.status} ${res.statusText}`);
   }
-  const out = import_node_fs14.default.createWriteStream(dest);
+  const out = import_node_fs13.default.createWriteStream(dest);
   const nodeStream = import_node_stream.Readable.fromWeb(res.body);
   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()}`);
-  import_node_fs14.default.mkdirSync(work, { recursive: true });
+  import_node_fs13.default.mkdirSync(work, { recursive: true });
   try {
     await new Promise((resolve, reject) => {
       const proc = (0, import_node_child_process3.spawn)("tar", ["xzf", tarball, "-C", work], { stdio: "pipe" });
@@ -19275,12 +19039,12 @@ async function extractFrpcFromTarball(tarball, binDir, version2, platform, destB
     });
     const dirName = `frp_${version2}_${platform.os}_${platform.arch}`;
     const src = import_node_path13.default.join(work, dirName, "frpc");
-    if (!import_node_fs14.default.existsSync(src)) {
+    if (!import_node_fs13.default.existsSync(src)) {
       throw new Error(`frpc not found inside tarball at ${src}`);
     }
-    import_node_fs14.default.copyFileSync(src, destBin);
+    import_node_fs13.default.copyFileSync(src, destBin);
   } finally {
-    import_node_fs14.default.rmSync(work, { recursive: true, force: true });
+    import_node_fs13.default.rmSync(work, { recursive: true, force: true });
   }
 }
 
@@ -19417,12 +19181,12 @@ var TunnelManager = class {
         localPort,
         logLevel: "info"
       });
-      await import_node_fs15.default.promises.writeFile(tomlPath, toml, { mode: 384 });
+      await import_node_fs14.default.promises.writeFile(tomlPath, toml, { mode: 384 });
       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 logStream = import_node_fs15.default.createWriteStream(logFilePath, { flags: "a", mode: 384 });
+      const logStream = import_node_fs14.default.createWriteStream(logFilePath, { flags: "a", mode: 384 });
       logStream.on("error", () => {
       });
       const tee = (chunk) => {
@@ -19503,18 +19267,18 @@ async function waitForFrpcReady(proc, timeoutMs) {
 }
 
 // src/tunnel/device-key.ts
-var import_node_os9 = __toESM(require("os"), 1);
+var import_node_os8 = __toESM(require("os"), 1);
 var import_node_crypto5 = __toESM(require("crypto"), 1);
 var DERIVE_SALT = "clawd-tunnel-device-v1";
 function deriveStableDeviceKey(opts = {}) {
-  const hostname = opts.hostname ?? import_node_os9.default.hostname();
-  const uid = opts.uid ?? (typeof import_node_os9.default.userInfo === "function" ? import_node_os9.default.userInfo().uid : 0);
+  const hostname = opts.hostname ?? import_node_os8.default.hostname();
+  const uid = opts.uid ?? (typeof import_node_os8.default.userInfo === "function" ? import_node_os8.default.userInfo().uid : 0);
   const input = `${hostname}::${uid}`;
   return import_node_crypto5.default.createHmac("sha256", DERIVE_SALT).update(input).digest("hex").slice(0, 32);
 }
 
 // src/auth-store.ts
-var import_node_fs16 = __toESM(require("fs"), 1);
+var import_node_fs15 = __toESM(require("fs"), 1);
 var import_node_path15 = __toESM(require("path"), 1);
 var import_node_crypto6 = __toESM(require("crypto"), 1);
 var AUTH_FILE_NAME = "auth.json";
@@ -19535,7 +19299,7 @@ function defaultGenerate() {
 }
 function readAuthFile(file) {
   try {
-    const raw = import_node_fs16.default.readFileSync(file, "utf8");
+    const raw = import_node_fs15.default.readFileSync(file, "utf8");
     const parsed = JSON.parse(raw);
     if (typeof parsed?.token === "string" && parsed.token.length > 0) {
       return {
@@ -19551,10 +19315,10 @@ function readAuthFile(file) {
   }
 }
 function writeAuthFile(file, content) {
-  import_node_fs16.default.mkdirSync(import_node_path15.default.dirname(file), { recursive: true });
-  import_node_fs16.default.writeFileSync(file, JSON.stringify(content, null, 2), { mode: 384 });
+  import_node_fs15.default.mkdirSync(import_node_path15.default.dirname(file), { recursive: true });
+  import_node_fs15.default.writeFileSync(file, JSON.stringify(content, null, 2), { mode: 384 });
   try {
-    import_node_fs16.default.chmodSync(file, 384);
+    import_node_fs15.default.chmodSync(file, 384);
   } catch {
   }
 }
@@ -19566,12 +19330,12 @@ init_protocol();
 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_fs16 = __toESM(require("fs"), 1);
+var import_node_os9 = __toESM(require("os"), 1);
 var import_node_path16 = __toESM(require("path"), 1);
 init_claude_history();
 function readJsonlEntries(file) {
-  const raw = import_node_fs17.default.readFileSync(file, "utf8");
+  const raw = import_node_fs16.default.readFileSync(file, "utf8");
   const out = [];
   for (const line of raw.split("\n")) {
     const t = line.trim();
@@ -19584,10 +19348,10 @@ function readJsonlEntries(file) {
   return out;
 }
 function forkSession(input) {
-  const baseDir = input.baseDir ?? import_node_path16.default.join(import_node_os10.default.homedir(), ".claude");
+  const baseDir = input.baseDir ?? import_node_path16.default.join(import_node_os9.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`);
-  if (!import_node_fs17.default.existsSync(sourceFile)) {
+  if (!import_node_fs16.default.existsSync(sourceFile)) {
     throw new Error(`fork: source transcript not found: ${sourceFile}`);
   }
   const entries = readJsonlEntries(sourceFile);
@@ -19618,8 +19382,8 @@ function forkSession(input) {
     forkedLines.push(JSON.stringify(forked));
   }
   const forkedFilePath = import_node_path16.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 });
+  import_node_fs16.default.mkdirSync(projectDir, { recursive: true });
+  import_node_fs16.default.writeFileSync(forkedFilePath, forkedLines.join("\n") + "\n", { mode: 384 });
   return { forkedToolSessionId, forkedFilePath };
 }
 
@@ -19628,6 +19392,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 };
   };
@@ -19861,7 +19631,7 @@ function buildHistoryHandlers(deps) {
 // src/handlers/workspace.ts
 init_protocol();
 function buildWorkspaceHandlers(deps) {
-  const { workspace, skills, agents } = deps;
+  const { workspace, skills } = deps;
   const list = async (frame) => {
     const args = WorkspaceListArgs.parse(frame);
     const res = workspace.list(args);
@@ -19877,16 +19647,10 @@ function buildWorkspaceHandlers(deps) {
     const list2 = skills.list(args);
     return { response: { type: "skills:list", skills: list2 } };
   };
-  const agentsList = async (frame) => {
-    const args = AgentsListArgs.parse(frame);
-    const list2 = agents.list(args);
-    return { response: { type: "agents:list", agents: list2 } };
-  };
   return {
     "workspace:list": list,
     "workspace:read": read,
-    "skills:list": skillsList,
-    "agents:list": agentsList
+    "skills:list": skillsList
   };
 }
 
@@ -19895,8 +19659,8 @@ init_protocol();
 
 // src/workspace/git.ts
 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_fs17 = __toESM(require("fs"), 1);
+var import_node_os10 = __toESM(require("os"), 1);
 var import_node_path17 = __toESM(require("path"), 1);
 var import_node_util = require("util");
 var pexec = (0, import_node_util.promisify)(import_node_child_process5.execFile);
@@ -19914,7 +19678,7 @@ function formatChildProcessError(err) {
 function normalizePath(p) {
   const resolved = import_node_path17.default.resolve(p);
   try {
-    return import_node_fs18.default.realpathSync(resolved);
+    return import_node_fs17.default.realpathSync(resolved);
   } catch {
     return resolved;
   }
@@ -20001,7 +19765,7 @@ function sanitizeLabel(raw) {
 function computePrefix() {
   let username;
   try {
-    username = import_node_os11.default.userInfo().username;
+    username = import_node_os10.default.userInfo().username;
   } catch {
     username = void 0;
   }
@@ -20017,10 +19781,10 @@ function encodeClaudeProjectDir(absPath) {
   if (!absPath || typeof absPath !== "string") return "";
   let canonical = import_node_path17.default.resolve(absPath);
   try {
-    canonical = import_node_fs18.default.realpathSync(canonical);
+    canonical = import_node_fs17.default.realpathSync(canonical);
   } catch {
     try {
-      const parent = import_node_fs18.default.realpathSync(import_node_path17.default.dirname(canonical));
+      const parent = import_node_fs17.default.realpathSync(import_node_path17.default.dirname(canonical));
       canonical = import_node_path17.default.join(parent, import_node_path17.default.basename(canonical));
     } catch {
     }
@@ -20051,11 +19815,13 @@ async function createWorktree(input) {
   }
   const worktreeRoot = import_node_path17.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}`], {
@@ -20066,13 +19832,13 @@ async function createWorktree(input) {
     const msg = err.message;
     if (msg.startsWith("\u5206\u652F ")) throw err;
   }
-  if (import_node_fs18.default.existsSync(worktreeRoot)) {
+  if (import_node_fs17.default.existsSync(worktreeRoot)) {
     throw new Error(`\u76EE\u5F55 ${worktreeRoot} \u5DF2\u5B58\u5728\uFF0C\u8BF7\u6362\u4E00\u4E2A label \u6216\u6E05\u7406\u540E\u91CD\u8BD5`);
   }
   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) {
@@ -20107,7 +19873,7 @@ async function removeWorktree(input) {
     } catch (err) {
       const stderr = err.stderr ?? "";
       const lower = stderr.toLowerCase();
-      const vanished = lower.includes("not a working tree") || lower.includes("is not a working tree") || !import_node_fs18.default.existsSync(worktreeRoot);
+      const vanished = lower.includes("not a working tree") || lower.includes("is not a working tree") || !import_node_fs17.default.existsSync(worktreeRoot);
       if (!vanished) {
         throw new Error(`\u6E05\u7406 worktree \u5931\u8D25\uFF1A${formatChildProcessError(err)}`);
       }
@@ -20126,10 +19892,10 @@ 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 projectsRoot = import_node_path17.default.join(import_node_os10.default.homedir(), ".claude", "projects");
       const target = import_node_path17.default.resolve(projectsRoot, encoded);
       if (target.startsWith(projectsRoot + import_node_path17.default.sep) && target !== projectsRoot) {
-        import_node_fs18.default.rmSync(target, { recursive: true, force: true });
+        import_node_fs17.default.rmSync(target, { recursive: true, force: true });
       }
     }
   } catch {
@@ -20201,7 +19967,7 @@ function buildCapabilitiesHandlers(deps) {
 }
 
 // src/handlers/meta.ts
-var import_node_os12 = __toESM(require("os"), 1);
+var import_node_os11 = __toESM(require("os"), 1);
 init_protocol();
 
 // src/version.ts
@@ -20223,7 +19989,7 @@ function buildReadyFrame(deps) {
   return {
     version,
     protocolVersion: PROTOCOL_VERSION,
-    hostname: import_node_os12.default.hostname(),
+    hostname: import_node_os11.default.hostname(),
     os: process.platform,
     tools,
     runningSessions: info.runningSessions,
@@ -20374,7 +20140,6 @@ async function startDaemon(config) {
   const store = new SessionStore({ dataDir: config.dataDir });
   const workspace = new WorkspaceBrowser();
   const skills = new SkillsScanner();
-  const agents = new AgentsScanner();
   const history = new ClaudeHistoryReader();
   let transport = null;
   const manager = new SessionManager({
@@ -20435,7 +20200,6 @@ async function startDaemon(config) {
     manager,
     workspace,
     skills,
-    agents,
     history,
     observer,
     getAdapter,
@@ -20571,7 +20335,7 @@ ${bar}
 `);
       try {
         const connectPath = import_node_path18.default.join(config.dataDir, "connect.txt");
-        import_node_fs19.default.writeFileSync(connectPath, lines.join("\n") + "\n", { mode: 384 });
+        import_node_fs18.default.writeFileSync(connectPath, lines.join("\n") + "\n", { mode: 384 });
       } catch {
       }
     } catch (err) {