@clawos-dev/clawd 0.2.134-beta.278.7c624cd → 0.2.135-beta.279.732f6db

package/dist/cli.cjs

@@ -4579,7 +4579,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, PeerSessionUpsertArgs, PeerSessionUpsertResponseSchema, PeerSessionRemoveArgs, PeerSessionRemoveResponseSchema, SessionReorderPinsArgs, GitRootArgs, GitRootResponseSchema, GitBranchArgs, GitBranchResponseSchema, GitBranchesArgs, GitBranchesResponseSchema, HistoryRecentDirsArgs, RecentDirEntrySchema, HistoryRecentDirsResponseSchema, SessionQuestionFrameSchema, SessionQuestionClearedFrameSchema, AnswerQuestionArgs, AnswerQuestionResponseSchema, CancelQuestionArgs, CancelQuestionResponseSchema, AuthRequestFrameSchema, AuthOkFrameSchema, TunnelReadyEventSchema, TunnelExitedEventSchema, TunnelUnavailableEventSchema, InfoRunningSessionSchema, InfoResponseSchema, PROJECT_PORT_MIN, PROJECT_PORT_MAX, projectNameRegex, DEFAULT_DEV_COMMAND, ProjectMetadataSchema, PROJECT_STAGE_VALUES, ProjectStageSchema, ProjectWithStatusSchema, ListProjectsArgsSchema, ListProjectsResultSchema, GetProjectArgsSchema, GetProjectResultSchema, CreateProjectArgsSchema, CreateProjectResultSchema, DeleteProjectArgsSchema, DeleteProjectResultSchema, UpdateProjectPortArgsSchema, UpdateProjectPortResultSchema, SetProdUrlArgsSchema, SetProdUrlResultSchema, StartDevServerArgsSchema, StartDevServerResultSchema, ASSISTANT_REPORTABLE_STAGES, ReportStageArgsSchema, ReportStageResultSchema, StopDevServerArgsSchema, StopDevServerResultSchema, AppBuilderProjectUpdatedEventSchema, PublishArgsSchema, PublishResultSchema, DismissPublishJobArgsSchema, DismissPublishJobResultSchema, AppBuilderPublishProgressEventSchema, AppBuilderPublishFailedEventSchema;
+var SessionStatusSchema, UsageSchema, ContextUsageSchema, sessionMetaShape, SessionMetaSchema, ModelInfoSchema, ModeInfoSchema, ConfigFieldSchemaSchema, CapabilitiesGetArgs, ToolFeaturesSchema, 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, PeerSessionUpsertArgs, PeerSessionUpsertResponseSchema, PeerSessionRemoveArgs, PeerSessionRemoveResponseSchema, SessionReorderPinsArgs, GitRootArgs, GitRootResponseSchema, GitBranchArgs, GitBranchResponseSchema, GitBranchesArgs, GitBranchesResponseSchema, HistoryRecentDirsArgs, RecentDirEntrySchema, HistoryRecentDirsResponseSchema, SessionQuestionFrameSchema, SessionQuestionClearedFrameSchema, AnswerQuestionArgs, AnswerQuestionResponseSchema, CancelQuestionArgs, CancelQuestionResponseSchema, AuthRequestFrameSchema, AuthOkFrameSchema, TunnelReadyEventSchema, TunnelExitedEventSchema, TunnelUnavailableEventSchema, InfoRunningSessionSchema, InfoResponseSchema, PROJECT_PORT_MIN, PROJECT_PORT_MAX, projectNameRegex, DEFAULT_DEV_COMMAND, ProjectMetadataSchema, PROJECT_STAGE_VALUES, ProjectStageSchema, ProjectWithStatusSchema, ListProjectsArgsSchema, ListProjectsResultSchema, GetProjectArgsSchema, GetProjectResultSchema, CreateProjectArgsSchema, CreateProjectResultSchema, DeleteProjectArgsSchema, DeleteProjectResultSchema, UpdateProjectPortArgsSchema, UpdateProjectPortResultSchema, SetProdUrlArgsSchema, SetProdUrlResultSchema, StartDevServerArgsSchema, StartDevServerResultSchema, ASSISTANT_REPORTABLE_STAGES, ReportStageArgsSchema, ReportStageResultSchema, StopDevServerArgsSchema, StopDevServerResultSchema, AppBuilderProjectUpdatedEventSchema, PublishArgsSchema, PublishResultSchema, DismissPublishJobArgsSchema, DismissPublishJobResultSchema, AppBuilderPublishProgressEventSchema, AppBuilderPublishFailedEventSchema;
 var init_schemas = __esm({
   "../protocol/src/schemas.ts"() {
     "use strict";
@@ -4637,12 +4637,23 @@ var init_schemas = __esm({
     CapabilitiesGetArgs = external_exports.object({
       tool: external_exports.string().min(1)
     });
+    ToolFeaturesSchema = external_exports.object({
+      rewind: external_exports.boolean(),
+      subagents: external_exports.boolean(),
+      tui: external_exports.boolean(),
+      observe: external_exports.boolean(),
+      fileSharing: external_exports.boolean(),
+      // fork：session:fork 走 forkSession（claude jsonl 专用，派生新 jsonl）。codex 无 claude jsonl
+      // → fork 不可用。UI 据此 gate assistant 消息上的 fork 按钮（codex 一轮多条消息会刷出一堆按钮且点了报错）。
+      fork: external_exports.boolean()
+    });
     CapabilitiesResponseSchema = external_exports.object({
       tool: external_exports.string().min(1),
       toolSessionIdLabel: external_exports.string().optional(),
       models: external_exports.array(ModelInfoSchema),
       permissionModes: external_exports.array(ModeInfoSchema),
-      configSchema: external_exports.array(ConfigFieldSchemaSchema)
+      configSchema: external_exports.array(ConfigFieldSchemaSchema),
+      features: ToolFeaturesSchema
     });
     AllowRuleSchema = external_exports.object({
       tool: external_exports.string().min(1),
@@ -5034,7 +5045,11 @@ var init_schemas = __esm({
     });
     PermissionRespondArgs = external_exports.object({
       sessionId: external_exports.string().min(1),
-      requestId: external_exports.string().min(1),
+      // 权限请求 id 用 `permissionRequestId`，**不能**叫 `requestId`：WS 传输层用帧顶层的
+      // `requestId` 做 RPC 请求/响应关联（daemon-client 发帧时 `{...args, type, requestId}`，
+      // 传输 id 在最后会覆盖 args 同名字段）。若沿用 `requestId`，权限 id 会被传输 id（如 "r61"）
+      // 覆盖，daemon 查 pendingPermissions 永远 miss → 点了允许一直卡住。
+      permissionRequestId: external_exports.string().min(1),
       allow: external_exports.boolean(),
       permanent: external_exports.boolean().optional(),
       pattern: external_exports.string().optional()
@@ -5065,7 +5080,7 @@ var init_schemas = __esm({
       cwd: external_exports.string().min(1),
       path: external_exports.string().min(1)
     });
-    SkillsListArgs = external_exports.object({ cwd: external_exports.string().min(1) });
+    SkillsListArgs = external_exports.object({ cwd: external_exports.string().min(1), tool: external_exports.string().optional() });
     SkillEntrySchema = external_exports.object({
       name: external_exports.string().min(1),
       source: external_exports.enum(SKILL_SOURCE_VALUES),
@@ -5081,7 +5096,7 @@ var init_schemas = __esm({
       whenToUse: external_exports.string().optional(),
       plugin: external_exports.string().optional()
     });
-    AgentsListArgs = external_exports.object({ cwd: external_exports.string().min(1) });
+    AgentsListArgs = external_exports.object({ cwd: external_exports.string().min(1), tool: external_exports.string().optional() });
     AgentsListResponseSchema = external_exports.object({
       agents: external_exports.array(AgentEntrySchema)
     });
@@ -6842,10 +6857,10 @@ var require_redaction = __commonJS({
     var strict = false;
     function redaction(opts, serialize) {
       const { paths, censor, remove } = handle(opts);
-      const shape = paths.reduce((o, str) => {
+      const shape = paths.reduce((o, str4) => {
         rx.lastIndex = 0;
-        const first = rx.exec(str);
-        const next = rx.exec(str);
+        const first = rx.exec(str4);
+        const next = rx.exec(str4);
         let ns = first[1] !== void 0 ? first[1].replace(/^(?:"|'|`)(.*)(?:"|'|`)$/, "$1") : first[0];
         if (ns === "*") {
           ns = wildcardFirstSym;
@@ -6858,7 +6873,7 @@ var require_redaction = __commonJS({
           return o;
         }
         const { index } = next;
-        const nextPath = `${str.substr(index, str.length - 1)}`;
+        const nextPath = `${str4.substr(index, str4.length - 1)}`;
         o[ns] = o[ns] || [];
         if (ns !== wildcardFirstSym && o[ns].length === 0) {
           o[ns].push(...o[wildcardFirstSym] || []);
@@ -6974,7 +6989,7 @@ var require_quick_format_unescaped = __commonJS({
       }
       var argLen = args.length;
       if (argLen === 0) return f;
-      var str = "";
+      var str4 = "";
       var a = 1 - offset;
       var lastPos = -1;
       var flen = f && f.length || 0;
@@ -6989,8 +7004,8 @@ var require_quick_format_unescaped = __commonJS({
                 break;
               if (args[a] == null) break;
               if (lastPos < i)
-                str += f.slice(lastPos, i);
-              str += Number(args[a]);
+                str4 += f.slice(lastPos, i);
+              str4 += Number(args[a]);
               lastPos = i + 2;
               i++;
               break;
@@ -6999,8 +7014,8 @@ var require_quick_format_unescaped = __commonJS({
                 break;
               if (args[a] == null) break;
               if (lastPos < i)
-                str += f.slice(lastPos, i);
-              str += Math.floor(Number(args[a]));
+                str4 += f.slice(lastPos, i);
+              str4 += Math.floor(Number(args[a]));
               lastPos = i + 2;
               i++;
               break;
@@ -7013,21 +7028,21 @@ var require_quick_format_unescaped = __commonJS({
                 break;
               if (args[a] === void 0) break;
               if (lastPos < i)
-                str += f.slice(lastPos, i);
+                str4 += f.slice(lastPos, i);
               var type = typeof args[a];
               if (type === "string") {
-                str += "'" + args[a] + "'";
+                str4 += "'" + args[a] + "'";
                 lastPos = i + 2;
                 i++;
                 break;
               }
               if (type === "function") {
-                str += args[a].name || "<anonymous>";
+                str4 += args[a].name || "<anonymous>";
                 lastPos = i + 2;
                 i++;
                 break;
               }
-              str += ss(args[a]);
+              str4 += ss(args[a]);
               lastPos = i + 2;
               i++;
               break;
@@ -7035,15 +7050,15 @@ var require_quick_format_unescaped = __commonJS({
               if (a >= argLen)
                 break;
               if (lastPos < i)
-                str += f.slice(lastPos, i);
-              str += String(args[a]);
+                str4 += f.slice(lastPos, i);
+              str4 += String(args[a]);
               lastPos = i + 2;
               i++;
               break;
             case 37:
               if (lastPos < i)
-                str += f.slice(lastPos, i);
-              str += "%";
+                str4 += f.slice(lastPos, i);
+              str4 += "%";
               lastPos = i + 2;
               i++;
               a--;
@@ -7056,9 +7071,9 @@ var require_quick_format_unescaped = __commonJS({
       if (lastPos === -1)
         return f;
       else if (lastPos < flen) {
-        str += f.slice(lastPos);
+        str4 += f.slice(lastPos);
       }
-      return str;
+      return str4;
     }
   }
 });
@@ -7102,7 +7117,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 fs50 = require("fs");
+    var fs51 = require("fs");
     var EventEmitter3 = require("events");
     var inherits = require("util").inherits;
     var path59 = require("path");
@@ -7159,20 +7174,20 @@ var require_sonic_boom = __commonJS({
       const mode = sonic.mode;
       if (sonic.sync) {
         try {
-          if (sonic.mkdir) fs50.mkdirSync(path59.dirname(file), { recursive: true });
-          const fd = fs50.openSync(file, flags, mode);
+          if (sonic.mkdir) fs51.mkdirSync(path59.dirname(file), { recursive: true });
+          const fd = fs51.openSync(file, flags, mode);
           fileOpened(null, fd);
         } catch (err) {
           fileOpened(err);
           throw err;
         }
       } else if (sonic.mkdir) {
-        fs50.mkdir(path59.dirname(file), { recursive: true }, (err) => {
+        fs51.mkdir(path59.dirname(file), { recursive: true }, (err) => {
           if (err) return fileOpened(err);
-          fs50.open(file, flags, mode, fileOpened);
+          fs51.open(file, flags, mode, fileOpened);
         });
       } else {
-        fs50.open(file, flags, mode, fileOpened);
+        fs51.open(file, flags, mode, fileOpened);
       }
     }
     function SonicBoom(opts) {
@@ -7213,8 +7228,8 @@ var require_sonic_boom = __commonJS({
         this.flush = flushBuffer;
         this.flushSync = flushBufferSync;
         this._actualWrite = actualWriteBuffer;
-        fsWriteSync = () => fs50.writeSync(this.fd, this._writingBuf);
-        fsWrite = () => fs50.write(this.fd, this._writingBuf, this.release);
+        fsWriteSync = () => fs51.writeSync(this.fd, this._writingBuf);
+        fsWrite = () => fs51.write(this.fd, this._writingBuf, this.release);
       } else if (contentMode === void 0 || contentMode === kContentModeUtf8) {
         this._writingBuf = "";
         this.write = write;
@@ -7223,15 +7238,15 @@ var require_sonic_boom = __commonJS({
         this._actualWrite = actualWrite;
         fsWriteSync = () => {
           if (Buffer.isBuffer(this._writingBuf)) {
-            return fs50.writeSync(this.fd, this._writingBuf);
+            return fs51.writeSync(this.fd, this._writingBuf);
           }
-          return fs50.writeSync(this.fd, this._writingBuf, "utf8");
+          return fs51.writeSync(this.fd, this._writingBuf, "utf8");
         };
         fsWrite = () => {
           if (Buffer.isBuffer(this._writingBuf)) {
-            return fs50.write(this.fd, this._writingBuf, this.release);
+            return fs51.write(this.fd, this._writingBuf, this.release);
           }
-          return fs50.write(this.fd, this._writingBuf, "utf8", this.release);
+          return fs51.write(this.fd, this._writingBuf, "utf8", this.release);
         };
       } else {
         throw new Error(`SonicBoom supports "${kContentModeUtf8}" and "${kContentModeBuffer}", but passed ${contentMode}`);
@@ -7288,7 +7303,7 @@ var require_sonic_boom = __commonJS({
           }
         }
         if (this._fsync) {
-          fs50.fsyncSync(this.fd);
+          fs51.fsyncSync(this.fd);
         }
         const len = this._len;
         if (this._reopening) {
@@ -7402,7 +7417,7 @@ var require_sonic_boom = __commonJS({
       const onDrain = () => {
         if (!this._fsync) {
           try {
-            fs50.fsync(this.fd, (err) => {
+            fs51.fsync(this.fd, (err) => {
               this._flushPending = false;
               cb(err);
             });
@@ -7504,7 +7519,7 @@ var require_sonic_boom = __commonJS({
       const fd = this.fd;
       this.once("ready", () => {
         if (fd !== this.fd) {
-          fs50.close(fd, (err) => {
+          fs51.close(fd, (err) => {
             if (err) {
               return this.emit("error", err);
             }
@@ -7553,7 +7568,7 @@ var require_sonic_boom = __commonJS({
           buf = this._bufs[0];
         }
         try {
-          const n = Buffer.isBuffer(buf) ? fs50.writeSync(this.fd, buf) : fs50.writeSync(this.fd, buf, "utf8");
+          const n = Buffer.isBuffer(buf) ? fs51.writeSync(this.fd, buf) : fs51.writeSync(this.fd, buf, "utf8");
           const releasedBufObj = releaseWritingBuf(buf, this._len, n);
           buf = releasedBufObj.writingBuf;
           this._len = releasedBufObj.len;
@@ -7569,7 +7584,7 @@ var require_sonic_boom = __commonJS({
         }
       }
       try {
-        fs50.fsyncSync(this.fd);
+        fs51.fsyncSync(this.fd);
       } catch {
       }
     }
@@ -7590,7 +7605,7 @@ var require_sonic_boom = __commonJS({
           buf = mergeBuf(this._bufs[0], this._lens[0]);
         }
         try {
-          const n = fs50.writeSync(this.fd, buf);
+          const n = fs51.writeSync(this.fd, buf);
           buf = buf.subarray(n);
           this._len = Math.max(this._len - n, 0);
           if (buf.length <= 0) {
@@ -7618,13 +7633,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) ? fs50.writeSync(this.fd, this._writingBuf) : fs50.writeSync(this.fd, this._writingBuf, "utf8");
+          const written = Buffer.isBuffer(this._writingBuf) ? fs51.writeSync(this.fd, this._writingBuf) : fs51.writeSync(this.fd, this._writingBuf, "utf8");
           release(null, written);
         } catch (err) {
           release(err);
         }
       } else {
-        fs50.write(this.fd, this._writingBuf, release);
+        fs51.write(this.fd, this._writingBuf, release);
       }
     }
     function actualWriteBuffer() {
@@ -7633,7 +7648,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 = fs50.writeSync(this.fd, this._writingBuf);
+          const written = fs51.writeSync(this.fd, this._writingBuf);
           release(null, written);
         } catch (err) {
           release(err);
@@ -7642,7 +7657,7 @@ var require_sonic_boom = __commonJS({
         if (kCopyBuffer) {
           this._writingBuf = Buffer.from(this._writingBuf);
         }
-        fs50.write(this.fd, this._writingBuf, release);
+        fs51.write(this.fd, this._writingBuf, release);
       }
     }
     function actualClose(sonic) {
@@ -7658,12 +7673,12 @@ var require_sonic_boom = __commonJS({
       sonic._lens = [];
       assert(typeof sonic.fd === "number", `sonic.fd must be a number, got ${typeof sonic.fd}`);
       try {
-        fs50.fsync(sonic.fd, closeWrapped);
+        fs51.fsync(sonic.fd, closeWrapped);
       } catch {
       }
       function closeWrapped() {
         if (sonic.fd !== 1 && sonic.fd !== 2) {
-          fs50.close(sonic.fd, done);
+          fs51.close(sonic.fd, done);
         } else {
           done();
         }
@@ -8544,38 +8559,38 @@ var require_tools = __commonJS({
         }
       }
     }
-    function asString(str) {
+    function asString(str4) {
       let result = "";
       let last = 0;
       let found = false;
       let point = 255;
-      const l = str.length;
+      const l = str4.length;
       if (l > 100) {
-        return JSON.stringify(str);
+        return JSON.stringify(str4);
       }
       for (var i = 0; i < l && point >= 32; i++) {
-        point = str.charCodeAt(i);
+        point = str4.charCodeAt(i);
         if (point === 34 || point === 92) {
-          result += str.slice(last, i) + "\\";
+          result += str4.slice(last, i) + "\\";
           last = i;
           found = true;
         }
       }
       if (!found) {
-        result = str;
+        result = str4;
       } else {
-        result += str.slice(last);
+        result += str4.slice(last);
       }
-      return point < 32 ? JSON.stringify(str) : '"' + result + '"';
+      return point < 32 ? JSON.stringify(str4) : '"' + result + '"';
     }
-    function asJson(obj, msg, num, time) {
+    function asJson(obj, msg, num3, time) {
       if (asJsonChan.hasSubscribers === false) {
-        return _asJson.call(this, obj, msg, num, time);
+        return _asJson.call(this, obj, msg, num3, time);
       }
       const store = { instance: this, arguments };
-      return asJsonChan.traceSync(_asJson, store, this, obj, msg, num, time);
+      return asJsonChan.traceSync(_asJson, store, this, obj, msg, num3, time);
     }
-    function _asJson(obj, msg, num, time) {
+    function _asJson(obj, msg, num3, time) {
       const stringify2 = this[stringifySym];
       const stringifySafe = this[stringifySafeSym];
       const stringifiers = this[stringifiersSym];
@@ -8585,7 +8600,7 @@ var require_tools = __commonJS({
       const formatters = this[formattersSym];
       const messageKey = this[messageKeySym];
       const errorKey = this[errorKeySym];
-      let data = this[lsCacheSym][num] + time;
+      let data = this[lsCacheSym][num3] + time;
       data = data + chindings;
       let value;
       if (formatters.log) {
@@ -9212,7 +9227,7 @@ var require_proto = __commonJS({
     function defaultMixinMergeStrategy(mergeObject, mixinObject) {
       return Object.assign(mixinObject, mergeObject);
     }
-    function write(_obj, msg, num) {
+    function write(_obj, msg, num3) {
       const t = this[timeSym]();
       const mixin = this[mixinSym];
       const errorKey = this[errorKeySym];
@@ -9234,12 +9249,12 @@ var require_proto = __commonJS({
         }
       }
       if (mixin) {
-        obj = mixinMergeStrategy(obj, mixin(obj, num, this));
+        obj = mixinMergeStrategy(obj, mixin(obj, num3, this));
       }
-      const s = this[asJsonSym](obj, msg, num, t);
+      const s = this[asJsonSym](obj, msg, num3, t);
       const stream = this[streamSym];
       if (stream[needsMetadataGsym] === true) {
-        stream.lastLevel = num;
+        stream.lastLevel = num3;
         stream.lastObj = obj;
         stream.lastMsg = msg;
         stream.lastTime = t.slice(this[timeSliceIndexSym]);
@@ -9272,11 +9287,11 @@ var require_safe_stable_stringify = __commonJS({
     exports2.configure = configure;
     module2.exports = stringify;
     var strEscapeSequencesRegExp = /[\u0000-\u001f\u0022\u005c\ud800-\udfff]/;
-    function strEscape(str) {
-      if (str.length < 5e3 && !strEscapeSequencesRegExp.test(str)) {
-        return `"${str}"`;
+    function strEscape(str4) {
+      if (str4.length < 5e3 && !strEscapeSequencesRegExp.test(str4)) {
+        return `"${str4}"`;
       }
-      return JSON.stringify(str);
+      return JSON.stringify(str4);
     }
     function sort(array, comparator) {
       if (array.length > 200 || comparator) {
@@ -10233,6 +10248,23 @@ var require_pino = __commonJS({
   }
 });
 
+// src/session/stdout-splitter.ts
+function splitStdoutChunk(buf, chunk) {
+  let next = buf + (typeof chunk === "string" ? chunk : chunk.toString("utf8"));
+  const lines = [];
+  let idx;
+  while ((idx = next.indexOf("\n")) >= 0) {
+    lines.push(next.slice(0, idx));
+    next = next.slice(idx + 1);
+  }
+  return { newBuf: next, lines };
+}
+var init_stdout_splitter = __esm({
+  "src/session/stdout-splitter.ts"() {
+    "use strict";
+  }
+});
+
 // src/session/permission-stdio.ts
 function encodePermissionResponse(requestId, approved, input, message) {
   const innerResponse = approved ? {
@@ -10255,23 +10287,6 @@ var init_permission_stdio = __esm({
   }
 });
 
-// src/session/stdout-splitter.ts
-function splitStdoutChunk(buf, chunk) {
-  let next = buf + (typeof chunk === "string" ? chunk : chunk.toString("utf8"));
-  const lines = [];
-  let idx;
-  while ((idx = next.indexOf("\n")) >= 0) {
-    lines.push(next.slice(0, idx));
-    next = next.slice(idx + 1);
-  }
-  return { newBuf: next, lines };
-}
-var init_stdout_splitter = __esm({
-  "src/session/stdout-splitter.ts"() {
-    "use strict";
-  }
-});
-
 // ../node_modules/.pnpm/diff@7.0.0/node_modules/diff/lib/index.mjs
 function Diff() {
 }
@@ -10310,22 +10325,22 @@ function buildValues(diff2, lastComponent, newString, oldString, useLongestToken
   }
   return components;
 }
-function longestCommonPrefix(str1, str2) {
+function longestCommonPrefix(str1, str22) {
   var i;
-  for (i = 0; i < str1.length && i < str2.length; i++) {
-    if (str1[i] != str2[i]) {
+  for (i = 0; i < str1.length && i < str22.length; i++) {
+    if (str1[i] != str22[i]) {
       return str1.slice(0, i);
     }
   }
   return str1.slice(0, i);
 }
-function longestCommonSuffix(str1, str2) {
+function longestCommonSuffix(str1, str22) {
   var i;
-  if (!str1 || !str2 || str1[str1.length - 1] != str2[str2.length - 1]) {
+  if (!str1 || !str22 || str1[str1.length - 1] != str22[str22.length - 1]) {
     return "";
   }
-  for (i = 0; i < str1.length && i < str2.length; i++) {
-    if (str1[str1.length - (i + 1)] != str2[str2.length - (i + 1)]) {
+  for (i = 0; i < str1.length && i < str22.length; i++) {
+    if (str1[str1.length - (i + 1)] != str22[str22.length - (i + 1)]) {
       return str1.slice(-i);
     }
   }
@@ -11257,12 +11272,12 @@ function attachmentToHistoryMessage(o, ts) {
     const raw = Array.isArray(a.memories) ? a.memories : [];
     const memories = raw.map((m2) => {
       if (!m2 || typeof m2 !== "object") return null;
-      const rec = m2;
-      const path59 = typeof rec.path === "string" ? rec.path : null;
-      const content = typeof rec.content === "string" ? rec.content : null;
+      const rec3 = m2;
+      const path59 = typeof rec3.path === "string" ? rec3.path : null;
+      const content = typeof rec3.content === "string" ? rec3.content : null;
       if (!path59 || content == null) return null;
       const entry = { path: path59, content };
-      if (typeof rec.mtimeMs === "number") entry.mtimeMs = rec.mtimeMs;
+      if (typeof rec3.mtimeMs === "number") entry.mtimeMs = rec3.mtimeMs;
       return entry;
     }).filter((m2) => m2 !== null);
     if (memories.length === 0) return null;
@@ -12072,12 +12087,12 @@ function parseAttachment(obj) {
     const raw = Array.isArray(a.memories) ? a.memories : [];
     const memories = raw.map((m2) => {
       if (!m2 || typeof m2 !== "object") return null;
-      const rec = m2;
-      const path59 = typeof rec.path === "string" ? rec.path : null;
-      const content = typeof rec.content === "string" ? rec.content : null;
+      const rec3 = m2;
+      const path59 = typeof rec3.path === "string" ? rec3.path : null;
+      const content = typeof rec3.content === "string" ? rec3.content : null;
       if (!path59 || content == null) return null;
       const out = { path: path59, content };
-      if (typeof rec.mtimeMs === "number") out.mtimeMs = rec.mtimeMs;
+      if (typeof rec3.mtimeMs === "number") out.mtimeMs = rec3.mtimeMs;
       return out;
     }).filter((m2) => m2 !== null);
     if (memories.length === 0) return null;
@@ -12224,6 +12239,7 @@ var init_claude = __esm({
       toolSessionIdLabel: "Claude Session ID",
       models: CLAUDE_MODELS,
       permissionModes: CLAUDE_PERMISSION_MODES,
+      features: { rewind: true, subagents: true, tui: true, observe: true, fileSharing: true, fork: true },
       configSchema: [
         {
           name: "model",
@@ -17712,26 +17728,26 @@ var require_permessage_deflate = __commonJS({
             value = value[0];
             if (key === "client_max_window_bits") {
               if (value !== true) {
-                const num = +value;
-                if (!Number.isInteger(num) || num < 8 || num > 15) {
+                const num3 = +value;
+                if (!Number.isInteger(num3) || num3 < 8 || num3 > 15) {
                   throw new TypeError(
                     `Invalid value for parameter "${key}": ${value}`
                   );
                 }
-                value = num;
+                value = num3;
               } else if (!this._isServer) {
                 throw new TypeError(
                   `Invalid value for parameter "${key}": ${value}`
                 );
               }
             } else if (key === "server_max_window_bits") {
-              const num = +value;
-              if (!Number.isInteger(num) || num < 8 || num > 15) {
+              const num3 = +value;
+              if (!Number.isInteger(num3) || num3 < 8 || num3 > 15) {
                 throw new TypeError(
                   `Invalid value for parameter "${key}": ${value}`
                 );
               }
-              value = num;
+              value = num3;
             } else if (key === "client_no_context_takeover" || key === "server_no_context_takeover") {
               if (value !== true) {
                 throw new TypeError(
@@ -18426,8 +18442,8 @@ var require_receiver = __commonJS({
           return;
         }
         const buf = this.consume(8);
-        const num = buf.readUInt32BE(0);
-        if (num > Math.pow(2, 53 - 32) - 1) {
+        const num3 = buf.readUInt32BE(0);
+        if (num3 > Math.pow(2, 53 - 32) - 1) {
           const error = this.createError(
             RangeError,
             "Unsupported WebSocket frame: payload length > 2^53 - 1",
@@ -18438,7 +18454,7 @@ var require_receiver = __commonJS({
           cb(error);
           return;
         }
-        this._payloadLength = num * Math.pow(2, 32) + buf.readUInt32BE(4);
+        this._payloadLength = num3 * Math.pow(2, 32) + buf.readUInt32BE(4);
         this.haveLength(cb);
       }
       /**
@@ -22752,19 +22768,19 @@ var require_stream_readable = __commonJS({
       var ret = p2.data;
       n -= ret.length;
       while (p2 = p2.next) {
-        var str = p2.data;
-        var nb = n > str.length ? str.length : n;
-        if (nb === str.length) ret += str;
-        else ret += str.slice(0, n);
+        var str4 = p2.data;
+        var nb = n > str4.length ? str4.length : n;
+        if (nb === str4.length) ret += str4;
+        else ret += str4.slice(0, n);
         n -= nb;
         if (n === 0) {
-          if (nb === str.length) {
+          if (nb === str4.length) {
             ++c;
             if (p2.next) list.head = p2.next;
             else list.head = list.tail = null;
           } else {
             list.head = p2;
-            p2.data = str.slice(nb);
+            p2.data = str4.slice(nb);
           }
           break;
         }
@@ -23660,14 +23676,14 @@ var require_utils = __commonJS({
     var nodejsUtils = require_nodejsUtils();
     var external = require_external();
     require_setImmediate();
-    function string2binary(str) {
+    function string2binary(str4) {
       var result = null;
       if (support.uint8array) {
-        result = new Uint8Array(str.length);
+        result = new Uint8Array(str4.length);
       } else {
-        result = new Array(str.length);
+        result = new Array(str4.length);
       }
-      return stringToArrayLike(str, result);
+      return stringToArrayLike(str4, result);
     }
     exports2.newBlob = function(part, type) {
       exports2.checkSupport("blob");
@@ -23689,9 +23705,9 @@ var require_utils = __commonJS({
     function identity(input) {
       return input;
     }
-    function stringToArrayLike(str, array) {
-      for (var i = 0; i < str.length; ++i) {
-        array[i] = str.charCodeAt(i) & 255;
+    function stringToArrayLike(str4, array) {
+      for (var i = 0; i < str4.length; ++i) {
+        array[i] = str4.charCodeAt(i) & 255;
       }
       return array;
     }
@@ -23904,10 +23920,10 @@ var require_utils = __commonJS({
     };
     exports2.MAX_VALUE_16BITS = 65535;
     exports2.MAX_VALUE_32BITS = -1;
-    exports2.pretty = function(str) {
+    exports2.pretty = function(str4) {
       var res = "", code, i;
-      for (i = 0; i < (str || "").length; i++) {
-        code = str.charCodeAt(i);
+      for (i = 0; i < (str4 || "").length; i++) {
+        code = str4.charCodeAt(i);
         res += "\\x" + (code < 16 ? "0" : "") + code.toString(16).toUpperCase();
       }
       return res;
@@ -24217,12 +24233,12 @@ var require_utf8 = __commonJS({
     }
     var i;
     _utf8len[254] = _utf8len[254] = 1;
-    var string2buf = function(str) {
-      var buf, c, c2, m_pos, i2, str_len = str.length, buf_len = 0;
+    var string2buf = function(str4) {
+      var buf, c, c2, m_pos, i2, str_len = str4.length, buf_len = 0;
       for (m_pos = 0; m_pos < str_len; m_pos++) {
-        c = str.charCodeAt(m_pos);
+        c = str4.charCodeAt(m_pos);
         if ((c & 64512) === 55296 && m_pos + 1 < str_len) {
-          c2 = str.charCodeAt(m_pos + 1);
+          c2 = str4.charCodeAt(m_pos + 1);
           if ((c2 & 64512) === 56320) {
             c = 65536 + (c - 55296 << 10) + (c2 - 56320);
             m_pos++;
@@ -24236,9 +24252,9 @@ var require_utf8 = __commonJS({
         buf = new Array(buf_len);
       }
       for (i2 = 0, m_pos = 0; i2 < buf_len; m_pos++) {
-        c = str.charCodeAt(m_pos);
+        c = str4.charCodeAt(m_pos);
         if ((c & 64512) === 55296 && m_pos + 1 < str_len) {
-          c2 = str.charCodeAt(m_pos + 1);
+          c2 = str4.charCodeAt(m_pos + 1);
           if ((c2 & 64512) === 56320) {
             c = 65536 + (c - 55296 << 10) + (c2 - 56320);
             m_pos++;
@@ -24322,11 +24338,11 @@ var require_utf8 = __commonJS({
       }
       return utils.applyFromCharCode(utf16buf);
     };
-    exports2.utf8encode = function utf8encode(str) {
+    exports2.utf8encode = function utf8encode(str4) {
       if (support.nodebuffer) {
-        return nodejsUtils.newBufferFrom(str, "utf-8");
+        return nodejsUtils.newBufferFrom(str4, "utf-8");
       }
-      return string2buf(str);
+      return string2buf(str4);
     };
     exports2.utf8decode = function utf8decode(buf) {
       if (support.nodebuffer) {
@@ -24735,11 +24751,11 @@ var require_crc32 = __commonJS({
       }
       return crc ^ -1;
     }
-    function crc32str(crc, str, len, pos) {
+    function crc32str(crc, str4, len, pos) {
       var t = crcTable, end = pos + len;
       crc = crc ^ -1;
       for (var i = pos; i < end; i++) {
-        crc = crc >>> 8 ^ t[(crc ^ str.charCodeAt(i)) & 255];
+        crc = crc >>> 8 ^ t[(crc ^ str4.charCodeAt(i)) & 255];
       }
       return crc ^ -1;
     }
@@ -25936,7 +25952,7 @@ var require_deflate = __commonJS({
     }
     function fill_window(s) {
       var _w_size = s.w_size;
-      var p2, n, m2, more, str;
+      var p2, n, m2, more, str4;
       do {
         more = s.window_size - s.lookahead - s.strstart;
         if (s.strstart >= _w_size + (_w_size - MIN_LOOKAHEAD)) {
@@ -25964,14 +25980,14 @@ var require_deflate = __commonJS({
         n = read_buf(s.strm, s.window, s.strstart + s.lookahead, more);
         s.lookahead += n;
         if (s.lookahead + s.insert >= MIN_MATCH) {
-          str = s.strstart - s.insert;
-          s.ins_h = s.window[str];
-          s.ins_h = (s.ins_h << s.hash_shift ^ s.window[str + 1]) & s.hash_mask;
+          str4 = s.strstart - s.insert;
+          s.ins_h = s.window[str4];
+          s.ins_h = (s.ins_h << s.hash_shift ^ s.window[str4 + 1]) & s.hash_mask;
           while (s.insert) {
-            s.ins_h = (s.ins_h << s.hash_shift ^ s.window[str + MIN_MATCH - 1]) & s.hash_mask;
-            s.prev[str & s.w_mask] = s.head[s.ins_h];
-            s.head[s.ins_h] = str;
-            str++;
+            s.ins_h = (s.ins_h << s.hash_shift ^ s.window[str4 + MIN_MATCH - 1]) & s.hash_mask;
+            s.prev[str4 & s.w_mask] = s.head[s.ins_h];
+            s.head[s.ins_h] = str4;
+            str4++;
             s.insert--;
             if (s.lookahead + s.insert < MIN_MATCH) {
               break;
@@ -26747,7 +26763,7 @@ var require_deflate = __commonJS({
     function deflateSetDictionary(strm, dictionary) {
       var dictLength = dictionary.length;
       var s;
-      var str, n;
+      var str4, n;
       var wrap2;
       var avail;
       var next;
@@ -26785,15 +26801,15 @@ var require_deflate = __commonJS({
       strm.input = dictionary;
       fill_window(s);
       while (s.lookahead >= MIN_MATCH) {
-        str = s.strstart;
+        str4 = s.strstart;
         n = s.lookahead - (MIN_MATCH - 1);
         do {
-          s.ins_h = (s.ins_h << s.hash_shift ^ s.window[str + MIN_MATCH - 1]) & s.hash_mask;
-          s.prev[str & s.w_mask] = s.head[s.ins_h];
-          s.head[s.ins_h] = str;
-          str++;
+          s.ins_h = (s.ins_h << s.hash_shift ^ s.window[str4 + MIN_MATCH - 1]) & s.hash_mask;
+          s.prev[str4 & s.w_mask] = s.head[s.ins_h];
+          s.head[s.ins_h] = str4;
+          str4++;
         } while (--n);
-        s.strstart = str;
+        s.strstart = str4;
         s.lookahead = MIN_MATCH - 1;
         fill_window(s);
       }
@@ -26844,12 +26860,12 @@ var require_strings = __commonJS({
     }
     var q;
     _utf8len[254] = _utf8len[254] = 1;
-    exports2.string2buf = function(str) {
-      var buf, c, c2, m_pos, i, str_len = str.length, buf_len = 0;
+    exports2.string2buf = function(str4) {
+      var buf, c, c2, m_pos, i, str_len = str4.length, buf_len = 0;
       for (m_pos = 0; m_pos < str_len; m_pos++) {
-        c = str.charCodeAt(m_pos);
+        c = str4.charCodeAt(m_pos);
         if ((c & 64512) === 55296 && m_pos + 1 < str_len) {
-          c2 = str.charCodeAt(m_pos + 1);
+          c2 = str4.charCodeAt(m_pos + 1);
           if ((c2 & 64512) === 56320) {
             c = 65536 + (c - 55296 << 10) + (c2 - 56320);
             m_pos++;
@@ -26859,9 +26875,9 @@ var require_strings = __commonJS({
       }
       buf = new utils.Buf8(buf_len);
       for (i = 0, m_pos = 0; i < buf_len; m_pos++) {
-        c = str.charCodeAt(m_pos);
+        c = str4.charCodeAt(m_pos);
         if ((c & 64512) === 55296 && m_pos + 1 < str_len) {
-          c2 = str.charCodeAt(m_pos + 1);
+          c2 = str4.charCodeAt(m_pos + 1);
           if ((c2 & 64512) === 56320) {
             c = 65536 + (c - 55296 << 10) + (c2 - 56320);
             m_pos++;
@@ -26900,10 +26916,10 @@ var require_strings = __commonJS({
     exports2.buf2binstring = function(buf) {
       return buf2binstring(buf, buf.length);
     };
-    exports2.binstring2buf = function(str) {
-      var buf = new utils.Buf8(str.length);
+    exports2.binstring2buf = function(str4) {
+      var buf = new utils.Buf8(str4.length);
       for (var i = 0, len = buf.length; i < len; i++) {
-        buf[i] = str.charCodeAt(i);
+        buf[i] = str4.charCodeAt(i);
       }
       return buf;
     };
@@ -30745,8 +30761,8 @@ function startRunCaseRecorder(opts) {
   });
   const ensureStream = () => {
     if (stream) return stream;
-    import_node_fs33.default.mkdirSync(dir, { recursive: true });
-    stream = import_node_fs33.default.createWriteStream(opts.recordPath, { flags: "a" });
+    import_node_fs34.default.mkdirSync(dir, { recursive: true });
+    stream = import_node_fs34.default.createWriteStream(opts.recordPath, { flags: "a" });
     stream.on("close", () => closedResolve());
     return stream;
   };
@@ -30771,11 +30787,11 @@ function startRunCaseRecorder(opts) {
   };
   return { tap, close, closed };
 }
-var import_node_fs33, import_node_path47;
+var import_node_fs34, import_node_path47;
 var init_recorder = __esm({
   "src/run-case/recorder.ts"() {
     "use strict";
-    import_node_fs33 = __toESM(require("fs"), 1);
+    import_node_fs34 = __toESM(require("fs"), 1);
     import_node_path47 = __toESM(require("path"), 1);
   }
 });
@@ -30819,7 +30835,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_fs34.mkdtempSync)(import_node_path48.default.join(import_node_os19.default.tmpdir(), "clawd-runcase-"));
+  const cwd = opts.cwd ?? (0, import_node_fs35.mkdtempSync)(import_node_path48.default.join(import_node_os19.default.tmpdir(), "clawd-runcase-"));
   const ownsCwd = opts.cwd === void 0;
   const recorder = startRunCaseRecorder({ recordPath: opts.record, now });
   const spawnCtx = { cwd };
@@ -30980,17 +30996,17 @@ async function runController(opts) {
   if (sigintHandler) process.off("SIGINT", sigintHandler);
   if (ownsCwd) {
     try {
-      (0, import_node_fs34.rmSync)(cwd, { recursive: true, force: true });
+      (0, import_node_fs35.rmSync)(cwd, { recursive: true, force: true });
     } catch {
     }
   }
   return exitCode ?? 0;
 }
-var import_node_fs34, import_node_os19, import_node_path48;
+var import_node_fs35, import_node_os19, import_node_path48;
 var init_controller = __esm({
   "src/run-case/controller.ts"() {
     "use strict";
-    import_node_fs34 = require("fs");
+    import_node_fs35 = require("fs");
     import_node_os19 = __toESM(require("os"), 1);
     import_node_path48 = __toESM(require("path"), 1);
     init_claude();
@@ -31228,7 +31244,7 @@ Env (advanced):
 
 // src/index.ts
 var import_node_path46 = __toESM(require("path"), 1);
-var import_node_fs32 = __toESM(require("fs"), 1);
+var import_node_fs33 = __toESM(require("fs"), 1);
 
 // src/logger.ts
 var import_node_fs2 = __toESM(require("fs"), 1);
@@ -31625,9 +31641,6 @@ function buildRule(tool, input) {
   return { tool, pattern, createdAt: (/* @__PURE__ */ new Date()).toISOString() };
 }
 
-// src/session/reducer.ts
-init_permission_stdio();
-
 // src/persona/connection-prompt.ts
 var OWNER_TEMPLATE = `# \u8FDE\u63A5\u4E0A\u4E0B\u6587
 \u4F60\u73B0\u5728\u4EE5 Owner \u8EAB\u4EFD\u88AB\u8FDE\u63A5\uFF0C\u5BF9\u65B9\u5C31\u662F owner \u672C\u4EBA\uFF08{ownerLabel}\uFF09\u3002
@@ -31814,10 +31827,7 @@ function applyParsedEvent(state, event, deps) {
     effects.push(...pushed2.effects);
     const hit = matchesAnyRule(next.file.permissionRules, tool, input);
     if (hit) {
-      effects.push({
-        kind: "write-stdin",
-        payload: encodePermissionResponse(requestId, true, input)
-      });
+      effects.push({ kind: "respond-permission", requestId, allow: true, input });
     } else {
       const pending = {
         tool,
@@ -32210,13 +32220,11 @@ function reduceSession(state, input, deps) {
       next.pendingPermissions = nextPending;
       const effects = [
         {
-          kind: "write-stdin",
-          payload: encodePermissionResponse(
-            input.requestId,
-            input.allow,
-            pending.input,
-            input.message
-          )
+          kind: "respond-permission",
+          requestId: input.requestId,
+          allow: input.allow,
+          input: pending.input,
+          message: input.message
         }
       ];
       if (input.allow && input.permanent) {
@@ -32356,6 +32364,7 @@ function reduceSession(state, input, deps) {
 
 // src/session/runner.ts
 init_stdout_splitter();
+init_permission_stdio();
 
 // src/ipc-recorder.ts
 var import_node_fs4 = __toESM(require("fs"), 1);
@@ -32463,6 +32472,9 @@ var SessionRunner = class {
   hooks;
   state;
   proc = null;
+  // JSON-RPC 类 agent(codex app-server) 的 per-session 驱动器；非 null 时 runner 不用 spawn()/ChildProcess，
+  // effect 路由到 session 一等方法（startTurn/respondPermission/answerQuestion/interrupt/stop）。claude 恒 null。
+  session = null;
   stdoutBuf = "";
   // 未决 control_request 表；key = request_id
   pendingControlRequests = /* @__PURE__ */ new Map();
@@ -32571,6 +32583,15 @@ var SessionRunner = class {
     if (this.hooks.onFileEdit) this.observeForFileEdit(events);
     this.input({ kind: "inject-events", events });
   }
+  // session:interrupt 的 SDK 通道分流：codex → AgentSession.interrupt()；claude → control_request('interrupt')。
+  // TUI(pty) 路径在 manager.dispatchInterrupt 里先于此处理，不进这里。
+  async interrupt() {
+    if (this.session) {
+      this.session.interrupt();
+      return;
+    }
+    await this.sendControlRequest("interrupt");
+  }
   /**
    * file-sharing tool_use ↔ tool_result 配对（spec §6 PR 3）。
    *
@@ -32695,9 +32716,17 @@ var SessionRunner = class {
         this.doSpawn(effect.ctx);
         break;
       case "kill":
+        if (this.session) {
+          void this.session.stop(effect.signal);
+          break;
+        }
         this.doKill(effect.signal);
         break;
       case "write-stdin":
+        if (this.session) {
+          this.session.startTurn(effect.payload);
+          break;
+        }
         this.hooks.logger?.debug("[RG] write-stdin", {
           procAlive: !!this.proc,
           stdinWritable: !!this.proc?.stdin,
@@ -32707,6 +32736,16 @@ var SessionRunner = class {
         this.proc?.stdin?.write(effect.payload);
         this.recorder?.tapStdinWrite(effect.payload);
         break;
+      case "respond-permission": {
+        if (this.session) {
+          this.session.respondPermission(effect.requestId, effect.allow);
+          break;
+        }
+        const payload = encodePermissionResponse(effect.requestId, effect.allow, effect.input, effect.message);
+        this.proc?.stdin?.write(payload);
+        this.recorder?.tapStdinWrite(payload);
+        break;
+      }
       case "send-control-response-allow-with-input": {
         const payload = encodeAllowWithInputControlResponse(effect.requestId, effect.updatedInput);
         this.proc?.stdin?.write(payload);
@@ -32764,6 +32803,22 @@ var SessionRunner = class {
   }
   // 启动子进程，绑定 stdout line buffer → 回灌 reducer
   doSpawn(ctx) {
+    if (this.hooks.adapter.createSession) {
+      this.session = this.hooks.adapter.createSession(ctx, {
+        pushEvents: (events) => {
+          if (events.length === 0) return;
+          const uuid = (this.hooks.genUuid ?? v4_default)();
+          this.input({ kind: "inject-events", events: events.map((e) => e.uuid ? e : { ...e, uuid }) });
+        },
+        onExit: (code) => {
+          this.session = null;
+          this.clearIdleKillTimers();
+          this.input({ kind: "proc-exit", code });
+        },
+        onError: (message) => this.input({ kind: "proc-error", message })
+      });
+      return;
+    }
     const proc = this.hooks.spawnOverride ? this.hooks.spawnOverride(ctx) : this.hooks.adapter.spawn(ctx);
     this.proc = proc;
     this.stdoutBuf = "";
@@ -33634,7 +33689,7 @@ var SessionManager = class {
       tsid,
       mode: this.deps.mode
     });
-    await runner.sendControlRequest("interrupt");
+    await runner.interrupt();
   }
   // 批量版本：UI 打开 session 时一次性拿到"磁盘和快照有差异"的 user message id 集合，
   // 用来在消息流里精准控制 rewind 按钮的显示。session 没 toolSessionId 时返回空
@@ -34192,17 +34247,17 @@ var SessionManager = class {
     if (!runner) {
       throw new ClawdError(
         ERROR_CODES.PERMISSION_REQUEST_STALE,
-        `no pending permission request: ${args.requestId}`
+        `no pending permission request: ${args.permissionRequestId}`
       );
     }
-    const pending = runner.getState().pendingPermissions[args.requestId];
+    const pending = runner.getState().pendingPermissions[args.permissionRequestId];
     if (!pending) {
       return { response: { ok: true }, broadcast: [] };
     }
     const { broadcast } = this.withCollector(() => {
       runner.input({
         kind: "permission-decision",
-        requestId: args.requestId,
+        requestId: args.permissionRequestId,
         allow: args.allow,
         permanent: args.permanent,
         pattern: args.pattern,
@@ -35154,8 +35209,445 @@ function refreshDaemonManagedDirs(args) {
 // src/index.ts
 init_claude();
 
-// src/tools/claude-tui.ts
+// src/tools/codex.ts
+var import_node_child_process4 = require("child_process");
 var import_node_fs10 = __toESM(require("fs"), 1);
+
+// src/tools/codex-session.ts
+var import_node_child_process3 = require("child_process");
+
+// src/tools/codex-app-server-client.ts
+var import_node_readline = require("readline");
+var CodexAppServerClient = class {
+  constructor(proc, opts = {}) {
+    this.proc = proc;
+    this.opts = opts;
+    const rl = (0, import_node_readline.createInterface)({ input: proc.stdout, crlfDelay: Infinity });
+    rl.on("line", (l) => this.onLine(l));
+    rl.on("close", () => {
+      for (const p2 of this.pending.values()) p2.reject(new Error("app-server connection closed"));
+      this.pending.clear();
+      this.opts.onClose?.();
+    });
+  }
+  proc;
+  opts;
+  nextId = 1;
+  pending = /* @__PURE__ */ new Map();
+  request(method, params) {
+    const id = this.nextId++;
+    return new Promise((resolve6, reject) => {
+      this.pending.set(id, { resolve: resolve6, reject });
+      this.write({ jsonrpc: "2.0", method, id, params });
+    });
+  }
+  notify(method, params) {
+    this.write({ jsonrpc: "2.0", method, params });
+  }
+  // server-request 的响应也必须带 jsonrpc:'2.0'，否则 codex app-server 忽略它 → 审批/问答永远卡住。
+  respond(id, result) {
+    this.write({ jsonrpc: "2.0", id, result });
+  }
+  onLine(line) {
+    const t = line.trim();
+    if (!t) return;
+    let m2;
+    try {
+      m2 = JSON.parse(t);
+    } catch {
+      return;
+    }
+    if (!isRecord(m2)) return;
+    const hasId = typeof m2.id === "number", hasMethod = typeof m2.method === "string";
+    if (hasId && !hasMethod) {
+      const p2 = this.pending.get(m2.id);
+      if (!p2) return;
+      this.pending.delete(m2.id);
+      if (m2.error) {
+        const e = isRecord(m2.error) ? m2.error : {};
+        p2.reject(new Error(typeof e.message === "string" ? e.message : "app-server error"));
+      } else p2.resolve(m2.result);
+      return;
+    }
+    if (hasId && hasMethod) {
+      this.opts.onServerRequest?.(m2.id, m2.method, m2.params);
+      return;
+    }
+    if (hasMethod) this.opts.onNotification?.(m2.method, m2.params);
+  }
+  write(o) {
+    this.proc.stdin.write(JSON.stringify(o) + "\n");
+  }
+};
+function isRecord(v2) {
+  return typeof v2 === "object" && v2 !== null;
+}
+
+// src/tools/codex-app-server-events.ts
+function translateNotification(method, params) {
+  const p2 = rec(params);
+  switch (method) {
+    case "thread/started": {
+      const id = str(rec(p2?.thread)?.id);
+      return id ? [{ kind: "session_init", toolSessionId: id }] : [];
+    }
+    case "item/agentMessage/delta": {
+      const text = str(p2?.delta);
+      const id = str(p2?.itemId);
+      return text ? [{ kind: "text", text, ...id ? { partialId: id } : {} }] : [];
+    }
+    case "item/reasoning/textDelta":
+    case "item/reasoning/summaryTextDelta": {
+      const text = str(p2?.delta);
+      const id = str(p2?.itemId);
+      return text ? [{ kind: "thinking", text, ...id ? { partialId: id } : {} }] : [];
+    }
+    case "item/commandExecution/outputDelta":
+      return [];
+    // 命令输出增量 v1 不逐字（完成时整段给）
+    case "item/started":
+      return itemStarted(rec(p2?.item));
+    case "item/completed":
+      return itemCompleted(rec(p2?.item));
+    case "thread/tokenUsage/updated":
+      return tokenUsage(rec(rec(p2?.tokenUsage)));
+    case "turn/completed":
+      return turnCompleted(rec(p2?.turn));
+    default:
+      return [];
+  }
+}
+function itemStarted(item) {
+  if (!item) return [];
+  const id = str(item.id);
+  if (!id) return [];
+  if (item.type === "commandExecution") {
+    return [{ kind: "tool_call", toolUseId: id, tool: "commandExecution", toolKind: "codex", input: { command: str(item.command) ?? "" } }];
+  }
+  if (item.type === "fileChange") {
+    return [{ kind: "tool_call", toolUseId: id, tool: "fileChange", toolKind: "codex", input: { changes: Array.isArray(item.changes) ? item.changes : [] } }];
+  }
+  return [];
+}
+function itemCompleted(item) {
+  if (!item) return [];
+  switch (item.type) {
+    case "userMessage":
+      return [];
+    // 用户输入回显, clawd 自己 synthesize user_text
+    case "agentMessage": {
+      const text = str(item.text);
+      return text ? [{ kind: "text", text }] : [];
+    }
+    case "reasoning": {
+      const text = str(item.text);
+      return text ? [{ kind: "thinking", text }] : [];
+    }
+    case "commandExecution": {
+      const id = str(item.id);
+      if (!id) return [];
+      const exit = num(item.exitCode);
+      const ev = { kind: "tool_result", toolUseId: id, output: str(item.aggregatedOutput ?? item.output) ?? "" };
+      if (exit !== void 0 && exit !== 0) ev.error = `exit ${exit}`;
+      return [ev];
+    }
+    case "fileChange": {
+      const id = str(item.id);
+      if (!id) return [];
+      const changes = Array.isArray(item.changes) ? item.changes : [];
+      const output = changes.map((c) => str(c.diff) ?? "").filter(Boolean).join("\n");
+      const ev = { kind: "tool_result", toolUseId: id, output };
+      const status = str(item.status);
+      if (status === "failed" || status === "declined") ev.error = `patch ${status}`;
+      return [ev];
+    }
+    default:
+      return [];
+  }
+}
+function tokenUsage(usage) {
+  if (!usage) return [];
+  const last = rec(usage.last);
+  if (!last) return [];
+  const i = num(last.inputTokens), o = num(last.outputTokens);
+  const patch = {};
+  if (i !== void 0 && o !== void 0) patch.contextUsage = { inputTokens: i, outputTokens: o };
+  const w2 = num(usage.modelContextWindow);
+  if (w2 !== void 0) patch.contextWindowSize = w2;
+  return Object.keys(patch).length ? [{ kind: "meta_update", patch }] : [];
+}
+function turnCompleted(turn) {
+  if (turn?.status === "failed") return [{ kind: "error", message: str(rec(turn.error)?.message) ?? "codex turn failed" }, { kind: "turn_end" }];
+  return [{ kind: "turn_end" }];
+}
+function rec(v2) {
+  return typeof v2 === "object" && v2 !== null ? v2 : void 0;
+}
+function str(v2) {
+  return typeof v2 === "string" ? v2 : void 0;
+}
+function num(v2) {
+  return typeof v2 === "number" ? v2 : void 0;
+}
+
+// src/tools/codex-app-server-params.ts
+function resolveSandbox(ctx) {
+  if (ctx.personaMode === "guest") throw new Error("codex \u6682\u4E0D\u652F\u6301 guest persona session\uFF1B\u8BF7\u7528 claude \u6216 owner");
+  return "danger-full-access";
+}
+function resolveApprovalPolicy(ctx) {
+  const m2 = ctx.permissionMode ?? "";
+  if (m2 === "untrusted" || m2 === "on-failure" || m2 === "on-request" || m2 === "never") return m2;
+  return "on-request";
+}
+function threadStartParams(ctx) {
+  return {
+    cwd: ctx.cwd,
+    sandbox: resolveSandbox(ctx),
+    // persona 侧
+    approvalPolicy: resolveApprovalPolicy(ctx),
+    // 会话设置侧
+    approvalsReviewer: "user",
+    ...ctx.model ? { model: ctx.model } : {}
+  };
+}
+var ATTACHMENT_RE2 = /\[attachment:(image|file):([^\]]+)\]/g;
+var SKILL_RE = /\[skill:(.+?):(\/[^\]]+)\]/g;
+function turnStartInput(text) {
+  const items = [];
+  let leftover = text;
+  for (const m2 of text.matchAll(SKILL_RE)) {
+    const [marker, name, path59] = m2;
+    items.push({ type: "skill", name, path: path59 });
+    leftover = leftover.replace(marker, "");
+  }
+  for (const m2 of text.matchAll(ATTACHMENT_RE2)) {
+    const [marker, kind, url] = m2;
+    if (kind === "image") {
+      items.push({ type: "image", url });
+      leftover = leftover.replace(marker, "");
+    }
+  }
+  const trimmed = leftover.trim();
+  if (trimmed || items.length === 0) items.push({ type: "text", text: trimmed, text_elements: [] });
+  return items;
+}
+
+// src/tools/codex-session.ts
+function createCodexSession(ctx, sink, deps = {}) {
+  const cmd = process.env.CODEX_BIN ?? "codex";
+  const args = ["app-server", "--listen", "stdio://"];
+  const env = { ...process.env, ...ctx.env };
+  const proc = deps.spawnOverride ? deps.spawnOverride(cmd, args, ctx.cwd, env) : (0, import_node_child_process3.spawn)(cmd, args, { cwd: ctx.cwd, env, stdio: ["pipe", "pipe", "pipe"] });
+  let threadId = ctx.toolSessionId;
+  let turnId;
+  const approvalIds = /* @__PURE__ */ new Map();
+  let pendingSystemPrompt = ctx.toolSessionId ? void 0 : ctx.extraSystemPrompt;
+  const effort = ctx.effort;
+  let exited = false;
+  const finish = (code) => {
+    if (exited) return;
+    exited = true;
+    sink.onExit(code);
+  };
+  const client = new CodexAppServerClient(proc, {
+    onNotification: (method, params) => {
+      if (method === "turn/started") {
+        const id = params?.turn?.id;
+        if (id) turnId = id;
+      }
+      const events = translateNotification(method, params);
+      if (events.length) sink.pushEvents(events);
+    },
+    onServerRequest: (id, method, params) => {
+      const p2 = params ?? {};
+      if (method === "item/commandExecution/requestApproval" || method === "item/fileChange/requestApproval") {
+        const reqId = String(id);
+        approvalIds.set(reqId, id);
+        sink.pushEvents([
+          {
+            kind: "permission_request",
+            requestId: reqId,
+            tool: method.includes("fileChange") ? "fileChange" : "commandExecution",
+            input: p2,
+            ...typeof p2.itemId === "string" ? { toolUseId: p2.itemId } : {}
+          }
+        ]);
+        return;
+      }
+      client.respond(id, "cancel");
+    },
+    onClose: () => finish(proc.exitCode)
+  });
+  proc.stderr?.on(
+    "data",
+    (c) => deps.logger?.warn("codex app-server stderr", { line: c.toString().slice(0, 500) })
+  );
+  proc.on("error", (err) => {
+    const message = err.message;
+    deps.logger?.error("codex app-server spawn failed", { message });
+    sink.onError(`codex app-server spawn failed: ${message}`);
+  });
+  proc.on("exit", (code) => finish(code));
+  const ready = (async () => {
+    await client.request("initialize", {
+      clientInfo: { name: "clawd", title: "clawd", version: "0" },
+      capabilities: null
+    });
+    client.notify("initialized", {});
+    if (threadId) {
+      await client.request("thread/resume", { threadId, ...threadStartParams(ctx) });
+    } else {
+      const res = await client.request("thread/start", threadStartParams(ctx));
+      threadId = res?.thread?.id;
+      if (threadId) sink.pushEvents([{ kind: "session_init", toolSessionId: threadId }]);
+    }
+  })().catch((e) => sink.onError(`codex app-server init failed: ${e.message}`));
+  return {
+    startTurn(text) {
+      const body = pendingSystemPrompt ? `${pendingSystemPrompt}
+
+${text}` : text;
+      pendingSystemPrompt = void 0;
+      void ready.then(() => {
+        if (threadId)
+          void client.request("turn/start", {
+            threadId,
+            input: turnStartInput(body),
+            // TurnStartParams 字段是 `effort`（不是 `reasoningEffort`，0.138 改名）——传错名字
+            // codex 静默忽略, reasoning effort 改了不生效。"override for this turn and subsequent turns"。
+            ...effort ? { effort } : {}
+          }).catch((e) => sink.onError(`turn/start failed: ${e.message}`));
+      });
+    },
+    respondPermission(requestId, allow) {
+      const id = approvalIds.get(requestId);
+      if (id === void 0) return;
+      approvalIds.delete(requestId);
+      client.respond(id, { decision: allow ? "accept" : "decline" });
+    },
+    interrupt() {
+      if (threadId && turnId) {
+        void client.request("turn/interrupt", { threadId, turnId }).catch(() => {
+        });
+        return;
+      }
+      if (proc.exitCode === null && proc.signalCode === null) proc.kill("SIGTERM");
+    },
+    // signal 由 runner 透传 reducer 的 kill effect（runtime-patch / stop 恒 SIGKILL），与 claude doKill 语义统一：
+    // SIGTERM 兜底会在 app-server 卡死收不到时泄漏进程，故尊重 SIGKILL 强杀。
+    async stop(signal = "SIGTERM") {
+      if (threadId && turnId) void client.request("turn/interrupt", { threadId, turnId }).catch(() => {
+      });
+      if (proc.exitCode === null && proc.signalCode === null) proc.kill(signal);
+    }
+  };
+}
+
+// src/tools/codex.ts
+var CODEX_MODELS = [
+  { id: "", label: "Default", description: "codex config.toml \u9ED8\u8BA4", contextWindowSize: 258400, default: true },
+  { id: "gpt-5.5", label: "GPT-5.5", description: "Frontier model for complex coding", contextWindowSize: 258400 },
+  { id: "gpt-5.4", label: "GPT-5.4", contextWindowSize: 258400 },
+  { id: "gpt-5.4-mini", label: "GPT-5.4-Mini", contextWindowSize: 258400 }
+];
+var CODEX_EFFORTS = [
+  { value: "low", label: "Low", description: "Fast responses with lighter reasoning" },
+  { value: "medium", label: "Medium", description: "Balances speed and reasoning depth for everyday tasks" },
+  { value: "high", label: "High", description: "Greater reasoning depth for complex problems" },
+  { value: "xhigh", label: "Extra high", description: "Extra high reasoning depth for complex problems" }
+];
+var CODEX_APPROVAL_PRESETS = [
+  { id: "untrusted", label: "Ask for approval", description: "\u51E0\u4E4E\u6BCF\u6761\u547D\u4EE4\u90FD\u95EE\u4F60\uFF08\u6700\u8C28\u614E\uFF09" },
+  { id: "on-request", label: "Approve for me", description: "\u6A21\u578B\u81EA\u5DF1\u5224\u65AD\uFF0C\u53EA\u5BF9\u9AD8\u98CE\u9669\u64CD\u4F5C\u95EE\u4F60\uFF08\u9ED8\u8BA4\uFF09" },
+  { id: "never", label: "Full Access", description: "\u4ECE\u4E0D\u8BE2\u95EE\uFF0C\u81EA\u4E3B\u6267\u884C" }
+];
+var CODEX_CAPABILITIES = {
+  tool: "codex",
+  toolSessionIdLabel: "Codex Thread ID",
+  models: CODEX_MODELS,
+  permissionModes: CODEX_APPROVAL_PRESETS,
+  // codex 不支持这些 clawd 功能(rewind 无 file-snapshot / 无子 agent / 无 TUI pty /
+  // 无 observe 推送 / 无文件分享 / fork 是 claude jsonl 专用)；UI 据此 gate 入口。
+  features: { rewind: false, subagents: false, tui: false, observe: false, fileSharing: false, fork: false },
+  configSchema: [
+    {
+      name: "model",
+      type: "select",
+      label: "Model",
+      scope: "core",
+      options: CODEX_MODELS.map((m2) => ({ value: m2.id, label: m2.label, description: m2.description })),
+      default: ""
+    },
+    {
+      name: "permissionMode",
+      type: "select",
+      label: "Approval",
+      scope: "core",
+      options: CODEX_APPROVAL_PRESETS.map((m2) => ({ value: m2.id, label: m2.label, description: m2.description })),
+      default: "on-request"
+    },
+    {
+      name: "effort",
+      type: "select",
+      label: "Reasoning effort",
+      scope: "tool-specific",
+      // 渲染在 Advanced 区（与 claude effort 一致）
+      options: CODEX_EFFORTS,
+      default: "medium"
+    }
+  ]
+};
+async function probeCodex(env = process.env) {
+  if (env.CODEX_BIN && import_node_fs10.default.existsSync(env.CODEX_BIN)) return { available: true, path: env.CODEX_BIN };
+  try {
+    const out = (0, import_node_child_process4.execFileSync)("which", ["codex"], { encoding: "utf8" }).trim();
+    if (out && import_node_fs10.default.existsSync(out)) return { available: true, path: out };
+  } catch {
+  }
+  return { available: false };
+}
+var CodexAdapter = class {
+  id = "codex";
+  // 历史读取器：history:read 按 session.tool 路由到这里（thread/read）。
+  historyReader;
+  probeCache = null;
+  logger;
+  probeOverride;
+  constructor(opts = {}) {
+    this.logger = opts.logger;
+    this.probeOverride = opts.probeOverride;
+    this.historyReader = opts.historyReader;
+  }
+  async probe() {
+    if (this.probeCache) return this.probeCache;
+    this.probeCache = this.probeOverride ? await this.probeOverride() : await probeCodex();
+    return this.probeCache;
+  }
+  async capabilities() {
+    return CODEX_CAPABILITIES;
+  }
+  resolveContextWindow(modelId) {
+    return (CODEX_MODELS.find((m2) => m2.id === (modelId ?? "")) ?? CODEX_MODELS[0]).contextWindowSize;
+  }
+  createSession(ctx, sink) {
+    return createCodexSession(ctx, sink, { logger: this.logger });
+  }
+  spawn(_ctx) {
+    throw new Error("CodexAdapter uses createSession, not spawn");
+  }
+  parseLine(_line) {
+    return [];
+  }
+  // 原样返回带 marker 的文本；附件 marker → codex image 多模态由 turnStartInput 解析
+  // (codex-app-server-params.ts, PR1)。encodeStdin 不动 markers。
+  encodeStdin(text, _ctx) {
+    return text;
+  }
+};
+
+// src/tools/claude-tui.ts
+var import_node_fs11 = __toESM(require("fs"), 1);
 var import_node_os5 = __toESM(require("os"), 1);
 var import_node_path10 = __toESM(require("path"), 1);
 var import_headless = __toESM(require_xterm_headless(), 1);
@@ -36139,7 +36631,7 @@ function jsonlExistsForCtx(ctx) {
   const home = import_node_os5.default.homedir();
   const file = import_node_path10.default.join(home, ".claude", "projects", cwdToHashDir(ctx.cwd), `${ctx.toolSessionId}.jsonl`);
   try {
-    return import_node_fs10.default.statSync(file).isFile();
+    return import_node_fs11.default.statSync(file).isFile();
   } catch {
     return false;
   }
@@ -36148,8 +36640,238 @@ function jsonlExistsForCtx(ctx) {
 // src/index.ts
 init_claude_history();
 
+// src/tools/codex-history.ts
+var import_node_child_process5 = require("child_process");
+var DEFAULT_TIMEOUT_MS = 8e3;
+function rec2(v2) {
+  return v2 && typeof v2 === "object" && !Array.isArray(v2) ? v2 : void 0;
+}
+function str2(v2) {
+  return typeof v2 === "string" ? v2 : void 0;
+}
+function num2(v2) {
+  return typeof v2 === "number" && Number.isFinite(v2) ? v2 : void 0;
+}
+function userInputText(content) {
+  if (!Array.isArray(content)) return "";
+  return content.map((c) => {
+    const r = rec2(c);
+    return r && r.type === "text" ? str2(r.text) ?? "" : "";
+  }).filter(Boolean).join("");
+}
+function threadItemToHistoryMessages(item) {
+  const it = rec2(item);
+  if (!it) return [];
+  switch (it.type) {
+    case "userMessage": {
+      const text = userInputText(it.content);
+      return text ? [{ kind: "user-text", text, raw: item }] : [];
+    }
+    case "agentMessage": {
+      const text = str2(it.text);
+      return text ? [{ kind: "assistant-text", text, raw: item }] : [];
+    }
+    case "commandExecution": {
+      const id = str2(it.id);
+      if (!id) return [];
+      const msgs = [
+        {
+          kind: "tool_call",
+          tool: "commandExecution",
+          toolUseId: id,
+          input: { command: str2(it.command) ?? "" },
+          raw: item
+        }
+      ];
+      if (it.status === "completed" || it.aggregatedOutput != null || it.exitCode != null) {
+        const exit = num2(it.exitCode);
+        const result = {
+          kind: "tool_result",
+          toolUseId: id,
+          output: str2(it.aggregatedOutput) ?? "",
+          raw: item
+        };
+        if (exit !== void 0 && exit !== 0) result.output = `${result.output ?? ""}
+(exit ${exit})`;
+        msgs.push(result);
+      }
+      return msgs;
+    }
+    default:
+      return [];
+  }
+}
+async function queryCodexAppServer(cwd, method, params, deps) {
+  const cmd = process.env.CODEX_BIN ?? "codex";
+  const args = ["app-server", "--listen", "stdio://"];
+  const proc = deps.spawnOverride ? deps.spawnOverride(cmd, args, cwd) : (0, import_node_child_process5.spawn)(cmd, args, { cwd, env: process.env, stdio: ["pipe", "pipe", "pipe"] });
+  const client = new CodexAppServerClient(proc, {});
+  const timeoutMs = deps.timeoutMs ?? DEFAULT_TIMEOUT_MS;
+  let timer;
+  const timeout = new Promise((_2, reject) => {
+    timer = setTimeout(() => reject(new Error(`codex app-server ${method} timed out after ${timeoutMs}ms`)), timeoutMs);
+    proc.on("error", (err) => reject(new Error(`codex app-server spawn failed: ${err.message}`)));
+  });
+  try {
+    await Promise.race([
+      (async () => {
+        await client.request("initialize", {
+          clientInfo: { name: "clawd", title: "clawd", version: "0" },
+          capabilities: null
+        });
+        client.notify("initialized", {});
+      })(),
+      timeout
+    ]);
+    return await Promise.race([client.request(method, params), timeout]);
+  } finally {
+    if (timer) clearTimeout(timer);
+    if (proc.exitCode === null && proc.signalCode === null) proc.kill("SIGTERM");
+  }
+}
+var CodexHistoryReader = class {
+  deps;
+  constructor(deps = {}) {
+    this.deps = deps;
+  }
+  // v1 先返回 []：projects/list 非 session-scoped、不知 tool，跨-tool 项目浏览器合并排后续。
+  // codex 旧会话仍能经 clawd 活跃列表(session:list, tool-agnostic) + read 打开。
+  async listProjects() {
+    return [];
+  }
+  async listSessions(args) {
+    const res = rec2(
+      await queryCodexAppServer(
+        args.projectPath,
+        "thread/list",
+        {
+          limit: 100,
+          sortKey: "updated_at",
+          sortDirection: "desc",
+          archived: false,
+          cwd: args.projectPath,
+          useStateDbOnly: true
+        },
+        this.deps
+      )
+    );
+    const data = res && Array.isArray(res.data) ? res.data : [];
+    const out = [];
+    for (const entry of data) {
+      const e = rec2(entry);
+      const id = e && str2(e.id);
+      if (!e || !id) continue;
+      const updatedAtMs = Math.round((num2(e.updatedAt) ?? 0) * 1e3);
+      out.push({
+        toolSessionId: id,
+        summary: str2(e.preview) || "(\u7A7A\u4F1A\u8BDD)",
+        messageCount: 0,
+        // thread/list 不提供条数；活跃/read 时才知
+        updatedAt: new Date(updatedAtMs).toISOString()
+      });
+    }
+    return out;
+  }
+  async read(args) {
+    const res = rec2(
+      await queryCodexAppServer(
+        args.cwd,
+        "thread/read",
+        { threadId: args.toolSessionId, includeTurns: true },
+        this.deps
+      )
+    );
+    const thread = res && rec2(res.thread);
+    const turns = thread && Array.isArray(thread.turns) ? thread.turns : [];
+    const messages = [];
+    for (const turn of turns) {
+      const t = rec2(turn);
+      const items = t && Array.isArray(t.items) ? t.items : [];
+      for (const item of items) messages.push(...threadItemToHistoryMessages(item));
+    }
+    const total = messages.length;
+    const limit = args.limit ?? total;
+    const offset = typeof args.offset === "number" ? Math.min(Math.max(0, args.offset), total) : Math.max(0, total - limit);
+    return { messages: messages.slice(offset, offset + limit), total, offset };
+  }
+  // codex 无 sidechain 子 agent / file-history-snapshot → 全 stub 空（对齐 claude-history 同方法空返回）
+  async listSubagents() {
+    return [];
+  }
+  async readSubagent() {
+    return { messages: [] };
+  }
+  computeRewindDiff() {
+    return { canRewind: false, files: [], totalInsertions: 0, totalDeletions: 0 };
+  }
+  listRewindableUserMessageIds() {
+    return [];
+  }
+};
+
+// src/tools/codex-skills.ts
+var import_node_child_process6 = require("child_process");
+var DEFAULT_TIMEOUT_MS2 = 8e3;
+function str3(v2) {
+  return typeof v2 === "string" ? v2 : void 0;
+}
+function mapSkillsListResponse(res) {
+  const data = res?.data;
+  if (!Array.isArray(data)) return [];
+  const out = [];
+  for (const entry of data) {
+    const skills = entry?.skills;
+    if (!Array.isArray(skills)) continue;
+    for (const s of skills) {
+      const r = s ?? {};
+      const name = str3(r.name);
+      if (!name) continue;
+      const path59 = str3(r.path);
+      const description = str3(r.description);
+      const isPlugin = name.includes(":");
+      out.push({
+        name,
+        source: isPlugin ? "plugin" : "project",
+        ...path59 ? { path: path59 } : {},
+        ...description ? { description } : {},
+        ...isPlugin ? { plugin: name.split(":")[0] } : {}
+      });
+    }
+  }
+  return out;
+}
+async function listCodexSkills(cwd, deps = {}) {
+  const cmd = process.env.CODEX_BIN ?? "codex";
+  const args = ["app-server", "--listen", "stdio://"];
+  const proc = deps.spawnOverride ? deps.spawnOverride(cmd, args, cwd) : (0, import_node_child_process6.spawn)(cmd, args, { cwd, env: process.env, stdio: ["pipe", "pipe", "pipe"] });
+  const client = new CodexAppServerClient(proc, {});
+  const timeoutMs = deps.timeoutMs ?? DEFAULT_TIMEOUT_MS2;
+  let timer;
+  const timeout = new Promise((_2, reject) => {
+    timer = setTimeout(() => reject(new Error(`codex app-server skills/list timed out after ${timeoutMs}ms`)), timeoutMs);
+    proc.on("error", (err) => reject(new Error(`codex app-server spawn failed: ${err.message}`)));
+  });
+  try {
+    await Promise.race([
+      (async () => {
+        await client.request("initialize", {
+          clientInfo: { name: "clawd", title: "clawd", version: "0" },
+          capabilities: null
+        });
+        client.notify("initialized", {});
+      })(),
+      timeout
+    ]);
+    const res = await Promise.race([client.request("skills/list", { cwds: [cwd] }), timeout]);
+    return mapSkillsListResponse(res);
+  } finally {
+    if (timer) clearTimeout(timer);
+    if (proc.exitCode === null && proc.signalCode === null) proc.kill("SIGTERM");
+  }
+}
+
 // src/workspace/browser.ts
-var import_node_fs11 = __toESM(require("fs"), 1);
+var import_node_fs12 = __toESM(require("fs"), 1);
 var import_node_os6 = __toESM(require("os"), 1);
 var import_node_path11 = __toESM(require("path"), 1);
 init_protocol();
@@ -36165,7 +36887,7 @@ function resolveInsideCwd(cwd, subpath) {
 }
 function ensureCwd(cwd) {
   try {
-    const stat = import_node_fs11.default.statSync(cwd);
+    const stat = import_node_fs12.default.statSync(cwd);
     if (!stat.isDirectory()) {
       throw new ClawdError(ERROR_CODES.INVALID_CWD, `not a directory: ${cwd}`);
     }
@@ -36179,7 +36901,7 @@ var WorkspaceBrowser = class {
     const cwd = args.cwd && args.cwd.length > 0 ? args.cwd : import_node_os6.default.homedir();
     ensureCwd(cwd);
     const full = resolveInsideCwd(cwd, args.path);
-    const dirents = import_node_fs11.default.readdirSync(full, { withFileTypes: true });
+    const dirents = import_node_fs12.default.readdirSync(full, { withFileTypes: true });
     const entries = [];
     for (const d of dirents) {
       if (!args.showHidden && d.name.startsWith(".")) continue;
@@ -36189,7 +36911,7 @@ var WorkspaceBrowser = class {
         mtime: ""
       };
       try {
-        const st = import_node_fs11.default.statSync(import_node_path11.default.join(full, d.name));
+        const st = import_node_fs12.default.statSync(import_node_path11.default.join(full, d.name));
         entry.mtime = new Date(st.mtimeMs).toISOString();
         if (d.isFile()) entry.size = st.size;
       } catch {
@@ -36205,14 +36927,14 @@ var WorkspaceBrowser = class {
   read(args) {
     ensureCwd(args.cwd);
     const full = resolveInsideCwd(args.cwd, args.path);
-    const st = import_node_fs11.default.statSync(full);
+    const st = import_node_fs12.default.statSync(full);
     if (!st.isFile()) {
       throw new ClawdError(ERROR_CODES.INVALID_PATH, `not a file: ${args.path}`);
     }
     if (st.size > MAX_FILE_BYTES) {
       throw new ClawdError(ERROR_CODES.FILE_TOO_LARGE, `file > ${MAX_FILE_BYTES} bytes`);
     }
-    const buf = import_node_fs11.default.readFileSync(full);
+    const buf = import_node_fs12.default.readFileSync(full);
     const isBinary = buf.includes(0);
     if (isBinary) {
       return {
@@ -36234,20 +36956,20 @@ var WorkspaceBrowser = class {
 };
 
 // src/skills/agents-scanner.ts
-var import_node_fs12 = __toESM(require("fs"), 1);
+var import_node_fs13 = __toESM(require("fs"), 1);
 var import_node_os7 = __toESM(require("os"), 1);
 var import_node_path12 = __toESM(require("path"), 1);
 var DEFAULT_POLICY_DIR_DARWIN = "/Library/Application Support/ClaudeCode/.claude/agents";
 function isDirLikeSync2(p2) {
   try {
-    return import_node_fs12.default.statSync(p2).isDirectory();
+    return import_node_fs13.default.statSync(p2).isDirectory();
   } catch {
     return false;
   }
 }
 function fileExistsSync(p2) {
   try {
-    return import_node_fs12.default.statSync(p2).isFile();
+    return import_node_fs13.default.statSync(p2).isFile();
   } catch {
     return false;
   }
@@ -36255,7 +36977,7 @@ function fileExistsSync(p2) {
 function parseAgentFile(filePath) {
   let content;
   try {
-    content = import_node_fs12.default.readFileSync(filePath, "utf8");
+    content = import_node_fs13.default.readFileSync(filePath, "utf8");
   } catch {
     return {};
   }
@@ -36268,7 +36990,7 @@ function parseAgentFile(filePath) {
 function scanAgentsDir(dir, source, seen, out) {
   let entries;
   try {
-    entries = import_node_fs12.default.readdirSync(dir, { withFileTypes: true });
+    entries = import_node_fs13.default.readdirSync(dir, { withFileTypes: true });
   } catch {
     return;
   }
@@ -36295,7 +37017,7 @@ function scanPluginAgentsTree(root, pluginName, seen, out) {
   function walk2(dir, namespaces) {
     let entries;
     try {
-      entries = import_node_fs12.default.readdirSync(dir, { withFileTypes: true });
+      entries = import_node_fs13.default.readdirSync(dir, { withFileTypes: true });
     } catch {
       return;
     }
@@ -36331,7 +37053,7 @@ function readInstalledPlugins2(home) {
   let raw = null;
   for (const candidate of [v2, v1]) {
     try {
-      raw = import_node_fs12.default.readFileSync(candidate, "utf8");
+      raw = import_node_fs13.default.readFileSync(candidate, "utf8");
       break;
     } catch {
     }
@@ -36362,7 +37084,7 @@ function walkUpProjectAgentsDirs(startCwd, home, seen, out) {
     scanAgentsDir(import_node_path12.default.join(cur, ".claude", "agents"), "project", seen, out);
     let hasGit = false;
     try {
-      hasGit = import_node_fs12.default.existsSync(import_node_path12.default.join(cur, ".git"));
+      hasGit = import_node_fs13.default.existsSync(import_node_path12.default.join(cur, ".git"));
     } catch {
     }
     if (hasGit) return;
@@ -36425,13 +37147,13 @@ var AgentsScanner = class {
 };
 
 // src/observer/session-observer.ts
-var import_node_fs14 = __toESM(require("fs"), 1);
+var import_node_fs15 = __toESM(require("fs"), 1);
 var import_node_os9 = __toESM(require("os"), 1);
 var import_node_path14 = __toESM(require("path"), 1);
 init_claude_history();
 
 // src/observer/subagent-meta-observer.ts
-var import_node_fs13 = __toESM(require("fs"), 1);
+var import_node_fs14 = __toESM(require("fs"), 1);
 var import_node_os8 = __toESM(require("os"), 1);
 var import_node_path13 = __toESM(require("path"), 1);
 init_claude_history();
@@ -36476,7 +37198,7 @@ var SubagentMetaObserver = class {
   attachWatcher(w2) {
     if (w2.watcher) return;
     try {
-      w2.watcher = import_node_fs13.default.watch(w2.dirPath, { persistent: false }, (_evt, name) => {
+      w2.watcher = import_node_fs14.default.watch(w2.dirPath, { persistent: false }, (_evt, name) => {
         if (!name) return;
         const m2 = META_RE.exec(String(name));
         if (!m2) return;
@@ -36488,7 +37210,7 @@ var SubagentMetaObserver = class {
   scan(w2) {
     let entries;
     try {
-      entries = import_node_fs13.default.readdirSync(w2.dirPath);
+      entries = import_node_fs14.default.readdirSync(w2.dirPath);
     } catch {
       return;
     }
@@ -36505,7 +37227,7 @@ var SubagentMetaObserver = class {
     const file = import_node_path13.default.join(w2.dirPath, name);
     let raw;
     try {
-      raw = import_node_fs13.default.readFileSync(file, "utf8");
+      raw = import_node_fs14.default.readFileSync(file, "utf8");
     } catch {
       return;
     }
@@ -36569,7 +37291,7 @@ var SessionObserver = class {
     const filePath = this.resolveJsonlPath(args.cwd, args.toolSessionId, args.jsonlPath);
     let size = 0;
     try {
-      size = import_node_fs14.default.statSync(filePath).size;
+      size = import_node_fs15.default.statSync(filePath).size;
     } catch {
     }
     const w2 = {
@@ -36583,10 +37305,10 @@ var SessionObserver = class {
       prevIsRejectSentinel: false
     };
     try {
-      import_node_fs14.default.mkdirSync(import_node_path14.default.dirname(filePath), { recursive: true });
+      import_node_fs15.default.mkdirSync(import_node_path14.default.dirname(filePath), { recursive: true });
     } catch {
     }
-    w2.watcher = import_node_fs14.default.watch(import_node_path14.default.dirname(filePath), { persistent: false }, (_event, changedName) => {
+    w2.watcher = import_node_fs15.default.watch(import_node_path14.default.dirname(filePath), { persistent: false }, (_event, changedName) => {
       if (!changedName || !filePath.endsWith(changedName)) return;
       this.poll(w2);
     });
@@ -36609,7 +37331,7 @@ var SessionObserver = class {
   // 异常静默吞，不阻塞 watcher 启动
   hydrateMetaTail(w2, maxLines = 200) {
     try {
-      const raw = import_node_fs14.default.readFileSync(w2.filePath, "utf8");
+      const raw = import_node_fs15.default.readFileSync(w2.filePath, "utf8");
       if (!raw) return;
       const allLines = raw.split("\n").filter((l) => l.trim().length > 0);
       if (allLines.length === 0) return;
@@ -36633,7 +37355,7 @@ var SessionObserver = class {
   poll(w2) {
     let size = 0;
     try {
-      size = import_node_fs14.default.statSync(w2.filePath).size;
+      size = import_node_fs15.default.statSync(w2.filePath).size;
     } catch {
       return;
     }
@@ -36642,11 +37364,11 @@ var SessionObserver = class {
       w2.buf = "";
     }
     if (size === w2.lastSize) return;
-    const fd = import_node_fs14.default.openSync(w2.filePath, "r");
+    const fd = import_node_fs15.default.openSync(w2.filePath, "r");
     try {
       const len = size - w2.lastSize;
       const buf = Buffer.alloc(len);
-      import_node_fs14.default.readSync(fd, buf, 0, len, w2.lastSize);
+      import_node_fs15.default.readSync(fd, buf, 0, len, w2.lastSize);
       w2.lastSize = size;
       w2.buf += buf.toString("utf8");
       let newlineIndex;
@@ -36669,7 +37391,7 @@ var SessionObserver = class {
         }
       }
     } finally {
-      import_node_fs14.default.closeSync(fd);
+      import_node_fs15.default.closeSync(fd);
     }
   }
   // 解析 JSONL 单行：仅当是主链 user 文本行（非 sidechain / 非 sub-agent / message.role='user'
@@ -37392,14 +38114,14 @@ async function authenticate(token, deps) {
 }
 
 // src/permission/capability-store.ts
-var fs17 = __toESM(require("fs"), 1);
+var fs18 = __toESM(require("fs"), 1);
 var path19 = __toESM(require("path"), 1);
 var CAPABILITIES_FILE_NAME = "capabilities.json";
 var FILE_VERSION = 1;
 var CapabilityStore = class {
   constructor(dataDir) {
     this.dataDir = dataDir;
-    fs17.mkdirSync(dataDir, { recursive: true });
+    fs18.mkdirSync(dataDir, { recursive: true });
     this.cache = this.readFromDisk();
   }
   dataDir;
@@ -37429,7 +38151,7 @@ var CapabilityStore = class {
     const file = this.filePath();
     let raw;
     try {
-      raw = fs17.readFileSync(file, "utf8");
+      raw = fs18.readFileSync(file, "utf8");
     } catch (err) {
       if (err?.code === "ENOENT") return [];
       return [];
@@ -37457,10 +38179,10 @@ var CapabilityStore = class {
   }
   atomicWrite(file, content) {
     const tmp = `${file}.tmp-${process.pid}-${Date.now()}-${Math.random().toString(36).slice(2)}`;
-    fs17.writeFileSync(tmp, content, { mode: 384 });
-    fs17.renameSync(tmp, file);
+    fs18.writeFileSync(tmp, content, { mode: 384 });
+    fs18.renameSync(tmp, file);
     try {
-      fs17.chmodSync(file, 384);
+      fs18.chmodSync(file, 384);
     } catch {
     }
   }
@@ -37553,14 +38275,14 @@ var CapabilityManager = class {
 };
 
 // src/permission/cleanup.ts
-var fs18 = __toESM(require("fs"), 1);
+var fs19 = __toESM(require("fs"), 1);
 function cleanupGuestSessionsForCapability(cap, factory) {
   const removed = [];
   for (const g2 of cap.grants) {
     if (g2.resource.type !== "persona") continue;
     const dir = factory.vmGuestRoot(g2.resource.id, cap.id);
     try {
-      fs18.rmSync(dir, { recursive: true, force: true });
+      fs19.rmSync(dir, { recursive: true, force: true });
       removed.push(dir);
     } catch {
     }
@@ -37569,13 +38291,13 @@ function cleanupGuestSessionsForCapability(cap, factory) {
 }
 
 // src/inbox/inbox-store.ts
-var fs19 = __toESM(require("fs"), 1);
+var fs20 = __toESM(require("fs"), 1);
 var path20 = __toESM(require("path"), 1);
 var INBOX_SUBDIR = "inbox";
 var InboxStore = class {
   constructor(dataDir) {
     this.dataDir = dataDir;
-    fs19.mkdirSync(this.dirPath(), { recursive: true });
+    fs20.mkdirSync(this.dirPath(), { recursive: true });
   }
   dataDir;
   /**
@@ -37587,7 +38309,7 @@ var InboxStore = class {
     const file = this.filePath(peerDeviceId);
     let raw;
     try {
-      raw = fs19.readFileSync(file, "utf8");
+      raw = fs20.readFileSync(file, "utf8");
     } catch (err) {
       if (err?.code === "ENOENT") return [];
       return [];
@@ -37603,7 +38325,7 @@ var InboxStore = class {
     const dir = this.dirPath();
     let entries;
     try {
-      entries = fs19.readdirSync(dir);
+      entries = fs20.readdirSync(dir);
     } catch (err) {
       if (err?.code === "ENOENT") return [];
       return [];
@@ -37619,9 +38341,9 @@ var InboxStore = class {
     if (existing.some((m2) => m2.id === message.id)) return;
     const file = this.filePath(message.peerDeviceId);
     const line = JSON.stringify(message) + "\n";
-    fs19.appendFileSync(file, line, { mode: 384 });
+    fs20.appendFileSync(file, line, { mode: 384 });
     try {
-      fs19.chmodSync(file, 384);
+      fs20.chmodSync(file, 384);
     } catch {
     }
   }
@@ -37651,7 +38373,7 @@ var InboxStore = class {
   removeByPeerDeviceId(peerDeviceId) {
     const file = this.filePath(peerDeviceId);
     try {
-      fs19.unlinkSync(file);
+      fs20.unlinkSync(file);
     } catch (err) {
       if (err?.code === "ENOENT") return;
     }
@@ -37660,10 +38382,10 @@ var InboxStore = class {
     const file = this.filePath(peerDeviceId);
     const tmp = `${file}.tmp-${process.pid}-${Date.now()}-${Math.random().toString(36).slice(2)}`;
     const content = messages.map((m2) => JSON.stringify(m2)).join("\n") + (messages.length > 0 ? "\n" : "");
-    fs19.writeFileSync(tmp, content, { mode: 384 });
-    fs19.renameSync(tmp, file);
+    fs20.writeFileSync(tmp, content, { mode: 384 });
+    fs20.renameSync(tmp, file);
     try {
-      fs19.chmodSync(file, 384);
+      fs20.chmodSync(file, 384);
     } catch {
     }
   }
@@ -37758,7 +38480,7 @@ var InboxManager = class {
 };
 
 // src/state/contact-store.ts
-var fs20 = __toESM(require("fs"), 1);
+var fs21 = __toESM(require("fs"), 1);
 var path21 = __toESM(require("path"), 1);
 var FILE_NAME = "contacts.json";
 var ContactStore = class {
@@ -37772,7 +38494,7 @@ var ContactStore = class {
     const file = path21.join(this.dataDir, FILE_NAME);
     let raw;
     try {
-      raw = fs20.readFileSync(file, "utf8");
+      raw = fs21.readFileSync(file, "utf8");
     } catch (err) {
       if (err?.code !== "ENOENT") this.renameBak(file);
       return;
@@ -37822,13 +38544,13 @@ var ContactStore = class {
       null,
       2
     );
-    fs20.mkdirSync(this.dataDir, { recursive: true });
-    fs20.writeFileSync(tmp, content, { mode: 384 });
-    fs20.renameSync(tmp, file);
+    fs21.mkdirSync(this.dataDir, { recursive: true });
+    fs21.writeFileSync(tmp, content, { mode: 384 });
+    fs21.renameSync(tmp, file);
   }
   renameBak(file) {
     try {
-      fs20.renameSync(file, `${file}.bak`);
+      fs21.renameSync(file, `${file}.bak`);
     } catch {
     }
   }
@@ -37963,7 +38685,7 @@ async function autoReverseContact(args) {
 }
 
 // src/migrations/2026-05-20-flatten-sessions.ts
-var fs21 = __toESM(require("fs"), 1);
+var fs22 = __toESM(require("fs"), 1);
 var path22 = __toESM(require("path"), 1);
 var MIGRATION_FLAG_NAME = ".migration.v1.done";
 function migrateFlattenSessions(opts) {
@@ -37983,7 +38705,7 @@ function migrateFlattenSessions(opts) {
       if (!entry.endsWith(".json")) continue;
       const src = path22.join(defaultDir, entry);
       const dst = path22.join(sessionsDir, entry);
-      fs21.renameSync(src, dst);
+      fs22.renameSync(src, dst);
       movedBare += 1;
     }
     rmdirIfEmpty(defaultDir);
@@ -37995,10 +38717,10 @@ function migrateFlattenSessions(opts) {
     const ownerSrc = path22.join(personaDir, "owner");
     if (existsSync3(ownerSrc) && isDir(ownerSrc)) {
       const ownerDst = path22.join(dataDir, "personas", pid, ".clawd", "sessions", "owner");
-      fs21.mkdirSync(ownerDst, { recursive: true });
+      fs22.mkdirSync(ownerDst, { recursive: true });
       for (const file of readdirSafe(ownerSrc)) {
         if (!file.endsWith(".json")) continue;
-        fs21.renameSync(path22.join(ownerSrc, file), path22.join(ownerDst, file));
+        fs22.renameSync(path22.join(ownerSrc, file), path22.join(ownerDst, file));
         movedVmOwner += 1;
       }
       rmdirIfEmpty(ownerSrc);
@@ -38006,18 +38728,18 @@ function migrateFlattenSessions(opts) {
     const listenerSrc = path22.join(personaDir, "listener");
     if (existsSync3(listenerSrc) && isDir(listenerSrc)) {
       const archiveDst = path22.join(dataDir, ".legacy", `listener-${pid}`);
-      fs21.mkdirSync(archiveDst, { recursive: true });
+      fs22.mkdirSync(archiveDst, { recursive: true });
       for (const file of readdirSafe(listenerSrc)) {
         if (!file.endsWith(".json")) continue;
-        fs21.renameSync(path22.join(listenerSrc, file), path22.join(archiveDst, file));
+        fs22.renameSync(path22.join(listenerSrc, file), path22.join(archiveDst, file));
         archivedListener += 1;
       }
       rmdirIfEmpty(listenerSrc);
     }
     rmdirIfEmpty(personaDir);
   }
-  fs21.mkdirSync(sessionsDir, { recursive: true });
-  fs21.writeFileSync(flagPath, JSON.stringify({ migratedAt: now() }, null, 2));
+  fs22.mkdirSync(sessionsDir, { recursive: true });
+  fs22.writeFileSync(flagPath, JSON.stringify({ migratedAt: now() }, null, 2));
   return {
     skipped: false,
     flagWritten: true,
@@ -38028,7 +38750,7 @@ function migrateFlattenSessions(opts) {
 }
 function existsSync3(p2) {
   try {
-    fs21.statSync(p2);
+    fs22.statSync(p2);
     return true;
   } catch {
     return false;
@@ -38036,27 +38758,27 @@ function existsSync3(p2) {
 }
 function isDir(p2) {
   try {
-    return fs21.statSync(p2).isDirectory();
+    return fs22.statSync(p2).isDirectory();
   } catch {
     return false;
   }
 }
 function readdirSafe(p2) {
   try {
-    return fs21.readdirSync(p2);
+    return fs22.readdirSync(p2);
   } catch {
     return [];
   }
 }
 function rmdirIfEmpty(p2) {
   try {
-    fs21.rmdirSync(p2);
+    fs22.rmdirSync(p2);
   } catch {
   }
 }
 
 // src/transport/http-router.ts
-var import_node_fs16 = __toESM(require("fs"), 1);
+var import_node_fs17 = __toESM(require("fs"), 1);
 var import_node_path18 = __toESM(require("path"), 1);
 
 // src/attachment/mime.ts
@@ -38236,7 +38958,7 @@ function verifySignedUrl(secret, absPath, eRaw, s, now = Date.now) {
 }
 
 // src/attachment/upload.ts
-var import_node_fs15 = __toESM(require("fs"), 1);
+var import_node_fs16 = __toESM(require("fs"), 1);
 var import_node_path16 = __toESM(require("path"), 1);
 var import_node_crypto5 = __toESM(require("crypto"), 1);
 var import_promises = require("stream/promises");
@@ -38258,7 +38980,7 @@ async function writeUploadedAttachment(args) {
   assertValidFileName(args.fileName);
   const attachmentsRoot = import_node_path16.default.join(args.sessionDir, ".attachments");
   try {
-    import_node_fs15.default.mkdirSync(attachmentsRoot, { recursive: true });
+    import_node_fs16.default.mkdirSync(attachmentsRoot, { recursive: true });
   } catch (err) {
     throw new UploadError("STORAGE_ERROR", `mkdir failed: ${err.message}`);
   }
@@ -38279,18 +39001,18 @@ async function writeUploadedAttachment(args) {
           yield buf;
         }
       },
-      import_node_fs15.default.createWriteStream(tmpPath, { mode: 384 })
+      import_node_fs16.default.createWriteStream(tmpPath, { mode: 384 })
     );
   } catch (err) {
     try {
-      import_node_fs15.default.unlinkSync(tmpPath);
+      import_node_fs16.default.unlinkSync(tmpPath);
     } catch {
     }
     throw new UploadError("STORAGE_ERROR", `write failed: ${err.message}`);
   }
   if (actualSize !== args.contentLength) {
     try {
-      import_node_fs15.default.unlinkSync(tmpPath);
+      import_node_fs16.default.unlinkSync(tmpPath);
     } catch {
     }
     throw new UploadError(
@@ -38303,24 +39025,24 @@ async function writeUploadedAttachment(args) {
   let finalFileName;
   let hashDirExists = false;
   try {
-    hashDirExists = import_node_fs15.default.statSync(hashDir).isDirectory();
+    hashDirExists = import_node_fs16.default.statSync(hashDir).isDirectory();
   } catch {
   }
   if (hashDirExists) {
-    const existing = import_node_fs15.default.readdirSync(hashDir).filter((n) => !n.startsWith("."));
+    const existing = import_node_fs16.default.readdirSync(hashDir).filter((n) => !n.startsWith("."));
     finalFileName = existing[0] ?? args.fileName;
     try {
-      import_node_fs15.default.unlinkSync(tmpPath);
+      import_node_fs16.default.unlinkSync(tmpPath);
     } catch {
     }
   } else {
     try {
-      import_node_fs15.default.mkdirSync(hashDir, { recursive: true });
+      import_node_fs16.default.mkdirSync(hashDir, { recursive: true });
       finalFileName = args.fileName;
-      import_node_fs15.default.renameSync(tmpPath, import_node_path16.default.join(hashDir, finalFileName));
+      import_node_fs16.default.renameSync(tmpPath, import_node_path16.default.join(hashDir, finalFileName));
     } catch (err) {
       try {
-        import_node_fs15.default.unlinkSync(tmpPath);
+        import_node_fs16.default.unlinkSync(tmpPath);
       } catch {
       }
       throw new UploadError("STORAGE_ERROR", `rename failed: ${err.message}`);
@@ -38844,7 +39566,7 @@ function withCtx(ctx, body) {
 function streamFile(res, absPath, logger) {
   let stat;
   try {
-    stat = import_node_fs16.default.statSync(absPath);
+    stat = import_node_fs17.default.statSync(absPath);
   } catch (err) {
     const code = err?.code;
     if (code === "ENOENT") {
@@ -38867,7 +39589,7 @@ function streamFile(res, absPath, logger) {
     // 防止浏览器把任意 mime 当 html 渲染
     "X-Content-Type-Options": "nosniff"
   });
-  const stream = import_node_fs16.default.createReadStream(absPath);
+  const stream = import_node_fs17.default.createReadStream(absPath);
   stream.on("error", (err) => {
     logger?.warn("streamFile read error", { absPath, err: err.message });
     res.destroy();
@@ -38876,7 +39598,7 @@ function streamFile(res, absPath, logger) {
 }
 
 // src/attachment/gc.ts
-var import_node_fs17 = __toESM(require("fs"), 1);
+var import_node_fs18 = __toESM(require("fs"), 1);
 var import_node_path19 = __toESM(require("path"), 1);
 var DEFAULT_TTL_MS = 30 * 24 * 3600 * 1e3;
 function runAttachmentGc(args) {
@@ -38899,7 +39621,7 @@ function runAttachmentGc(args) {
     const attRoot = import_node_path19.default.join(sessionDir, ".attachments");
     let hashDirs;
     try {
-      hashDirs = import_node_fs17.default.readdirSync(attRoot);
+      hashDirs = import_node_fs18.default.readdirSync(attRoot);
     } catch (err) {
       if (err.code === "ENOENT") continue;
       args.logger?.warn("attachment gc: readdir failed", { attRoot, err: err.message });
@@ -38909,7 +39631,7 @@ function runAttachmentGc(args) {
       const hashDirAbs = import_node_path19.default.join(attRoot, hashDir);
       let files;
       try {
-        files = import_node_fs17.default.readdirSync(hashDirAbs);
+        files = import_node_fs18.default.readdirSync(hashDirAbs);
       } catch {
         continue;
       }
@@ -38917,7 +39639,7 @@ function runAttachmentGc(args) {
         const file = import_node_path19.default.join(hashDirAbs, name);
         let stat;
         try {
-          stat = import_node_fs17.default.statSync(file);
+          stat = import_node_fs18.default.statSync(file);
         } catch {
           continue;
         }
@@ -38926,25 +39648,25 @@ function runAttachmentGc(args) {
         if (age < ttlMs) continue;
         if (liveAbs.has(file)) continue;
         try {
-          import_node_fs17.default.unlinkSync(file);
+          import_node_fs18.default.unlinkSync(file);
         } catch (err) {
           args.logger?.warn("attachment gc: unlink failed", { file, err: err.message });
         }
       }
       try {
-        if (import_node_fs17.default.readdirSync(hashDirAbs).length === 0) import_node_fs17.default.rmdirSync(hashDirAbs);
+        if (import_node_fs18.default.readdirSync(hashDirAbs).length === 0) import_node_fs18.default.rmdirSync(hashDirAbs);
       } catch {
       }
     }
     try {
-      if (import_node_fs17.default.readdirSync(attRoot).length === 0) import_node_fs17.default.rmdirSync(attRoot);
+      if (import_node_fs18.default.readdirSync(attRoot).length === 0) import_node_fs18.default.rmdirSync(attRoot);
     } catch {
     }
   }
 }
 
 // src/attachment/group.ts
-var import_node_fs18 = __toESM(require("fs"), 1);
+var import_node_fs19 = __toESM(require("fs"), 1);
 var import_node_path20 = __toESM(require("path"), 1);
 var import_node_crypto6 = __toESM(require("crypto"), 1);
 init_protocol();
@@ -38970,7 +39692,7 @@ var GroupFileStore = class {
   readFile(scope, sessionId) {
     const file = this.filePath(scope, sessionId);
     try {
-      const raw = import_node_fs18.default.readFileSync(file, "utf8");
+      const raw = import_node_fs19.default.readFileSync(file, "utf8");
       const parsed = JSON.parse(raw);
       if (!Array.isArray(parsed)) {
         this.logger?.warn("GroupFileStore.readFile: not an array; resetting session entries", {
@@ -38996,10 +39718,10 @@ var GroupFileStore = class {
   }
   writeFile(scope, sessionId, entries) {
     const file = this.filePath(scope, sessionId);
-    import_node_fs18.default.mkdirSync(import_node_path20.default.dirname(file), { recursive: true });
+    import_node_fs19.default.mkdirSync(import_node_path20.default.dirname(file), { recursive: true });
     const tmp = `${file}.tmp-${process.pid}-${Date.now()}`;
-    import_node_fs18.default.writeFileSync(tmp, JSON.stringify(entries, null, 2), { mode: 384 });
-    import_node_fs18.default.renameSync(tmp, file);
+    import_node_fs19.default.writeFileSync(tmp, JSON.stringify(entries, null, 2), { mode: 384 });
+    import_node_fs19.default.renameSync(tmp, file);
   }
   /** 拉一份当前 session 的清单。读盘 → cache；之后调用复用 cache */
   list(scope, sessionId) {
@@ -39085,7 +39807,7 @@ var GroupFileStore = class {
 };
 
 // src/discovery/state-file.ts
-var import_node_fs19 = __toESM(require("fs"), 1);
+var import_node_fs20 = __toESM(require("fs"), 1);
 var import_node_path21 = __toESM(require("path"), 1);
 function defaultStateFilePath(dataDir) {
   return import_node_path21.default.join(dataDir, "state.json");
@@ -39110,7 +39832,7 @@ var StateFileManager = class {
   }
   read() {
     try {
-      const raw = import_node_fs19.default.readFileSync(this.file, "utf8");
+      const raw = import_node_fs20.default.readFileSync(this.file, "utf8");
       const parsed = JSON.parse(raw);
       return parsed;
     } catch {
@@ -39124,41 +39846,33 @@ var StateFileManager = class {
     return { status: "stale", existing };
   }
   write(state) {
-    import_node_fs19.default.mkdirSync(import_node_path21.default.dirname(this.file), { recursive: true });
+    import_node_fs20.default.mkdirSync(import_node_path21.default.dirname(this.file), { recursive: true });
     const tmp = `${this.file}.tmp.${process.pid}.${Date.now()}`;
-    import_node_fs19.default.writeFileSync(tmp, JSON.stringify(state, null, 2), { mode: 384 });
-    import_node_fs19.default.renameSync(tmp, this.file);
+    import_node_fs20.default.writeFileSync(tmp, JSON.stringify(state, null, 2), { mode: 384 });
+    import_node_fs20.default.renameSync(tmp, this.file);
     if (process.platform !== "win32") {
       try {
-        import_node_fs19.default.chmodSync(this.file, 384);
+        import_node_fs20.default.chmodSync(this.file, 384);
       } catch {
       }
     }
   }
   delete() {
     try {
-      import_node_fs19.default.unlinkSync(this.file);
+      import_node_fs20.default.unlinkSync(this.file);
     } catch {
     }
   }
 };
 
-// src/discovery/source-from-env.ts
-function readDaemonSourceFromEnv(env = process.env) {
-  const v2 = env.CLAWD_DAEMON_SOURCE;
-  if (typeof v2 !== "string") return void 0;
-  const trimmed = v2.trim();
-  return trimmed.length > 0 ? trimmed : void 0;
-}
-
 // src/tunnel/tunnel-manager.ts
-var import_node_fs23 = __toESM(require("fs"), 1);
+var import_node_fs24 = __toESM(require("fs"), 1);
 var import_node_path25 = __toESM(require("path"), 1);
 var import_node_crypto7 = __toESM(require("crypto"), 1);
-var import_node_child_process5 = require("child_process");
+var import_node_child_process9 = require("child_process");
 
 // src/tunnel/tunnel-store.ts
-var import_node_fs20 = __toESM(require("fs"), 1);
+var import_node_fs21 = __toESM(require("fs"), 1);
 var import_node_path22 = __toESM(require("path"), 1);
 var TunnelStore = class {
   constructor(filePath) {
@@ -39167,7 +39881,7 @@ var TunnelStore = class {
   filePath;
   async get() {
     try {
-      const raw = await import_node_fs20.default.promises.readFile(this.filePath, "utf8");
+      const raw = await import_node_fs21.default.promises.readFile(this.filePath, "utf8");
       const obj = JSON.parse(raw);
       if (!isPersistedTunnel(obj)) return null;
       return obj;
@@ -39179,21 +39893,21 @@ var TunnelStore = class {
   }
   async set(v2) {
     const dir = import_node_path22.default.dirname(this.filePath);
-    await import_node_fs20.default.promises.mkdir(dir, { recursive: true });
+    await import_node_fs21.default.promises.mkdir(dir, { recursive: true });
     const data = JSON.stringify(v2, null, 2);
     const tmp = `${this.filePath}.tmp.${process.pid}.${Date.now()}`;
-    await import_node_fs20.default.promises.writeFile(tmp, data, { mode: 384 });
+    await import_node_fs21.default.promises.writeFile(tmp, data, { mode: 384 });
     if (process.platform !== "win32") {
       try {
-        await import_node_fs20.default.promises.chmod(tmp, 384);
+        await import_node_fs21.default.promises.chmod(tmp, 384);
       } catch {
       }
     }
-    await import_node_fs20.default.promises.rename(tmp, this.filePath);
+    await import_node_fs21.default.promises.rename(tmp, this.filePath);
   }
   async clear() {
     try {
-      await import_node_fs20.default.promises.unlink(this.filePath);
+      await import_node_fs21.default.promises.unlink(this.filePath);
     } catch (err) {
       const code = err?.code;
       if (code !== "ENOENT") throw err;
@@ -39288,10 +40002,10 @@ function escape(v2) {
 }
 
 // src/tunnel/frpc-binary.ts
-var import_node_fs21 = __toESM(require("fs"), 1);
+var import_node_fs22 = __toESM(require("fs"), 1);
 var import_node_os11 = __toESM(require("os"), 1);
 var import_node_path23 = __toESM(require("path"), 1);
-var import_node_child_process3 = require("child_process");
+var import_node_child_process7 = require("child_process");
 var import_node_stream2 = require("stream");
 var import_promises3 = require("stream/promises");
 var FRPC_VERSION = "0.68.0";
@@ -39322,7 +40036,7 @@ function frpcDownloadUrl(version2, p2) {
 }
 async function ensureFrpcBinary(opts) {
   if (opts.override) {
-    if (!import_node_fs21.default.existsSync(opts.override)) {
+    if (!import_node_fs22.default.existsSync(opts.override)) {
       throw new Error(`frpc binary not found at override path: ${opts.override}`);
     }
     return opts.override;
@@ -39330,10 +40044,10 @@ async function ensureFrpcBinary(opts) {
   const version2 = opts.version ?? FRPC_VERSION;
   const platform = opts.platform ?? detectPlatform();
   const binDir = import_node_path23.default.join(opts.dataDir, "bin");
-  import_node_fs21.default.mkdirSync(binDir, { recursive: true });
+  import_node_fs22.default.mkdirSync(binDir, { recursive: true });
   cleanupStaleArtifacts(binDir);
   const stableBin = import_node_path23.default.join(binDir, "frpc");
-  if (import_node_fs21.default.existsSync(stableBin)) return stableBin;
+  if (import_node_fs22.default.existsSync(stableBin)) return stableBin;
   const partialBin = `${stableBin}.partial`;
   const tarballPath = import_node_path23.default.join(binDir, `frp_${version2}_${platform.os}_${platform.arch}.tar.gz.partial`);
   try {
@@ -39344,8 +40058,8 @@ async function ensureFrpcBinary(opts) {
     } else {
       await extractFrpcFromTarball(tarballPath, binDir, version2, platform, partialBin);
     }
-    import_node_fs21.default.chmodSync(partialBin, 493);
-    import_node_fs21.default.renameSync(partialBin, stableBin);
+    import_node_fs22.default.chmodSync(partialBin, 493);
+    import_node_fs22.default.renameSync(partialBin, stableBin);
   } finally {
     safeUnlink(tarballPath);
     safeUnlink(partialBin);
@@ -39355,7 +40069,7 @@ async function ensureFrpcBinary(opts) {
 function cleanupStaleArtifacts(binDir) {
   let entries;
   try {
-    entries = import_node_fs21.default.readdirSync(binDir);
+    entries = import_node_fs22.default.readdirSync(binDir);
   } catch {
     return;
   }
@@ -39363,7 +40077,7 @@ function cleanupStaleArtifacts(binDir) {
     if (name.endsWith(".partial") || name.startsWith("extract-")) {
       const full = import_node_path23.default.join(binDir, name);
       try {
-        import_node_fs21.default.rmSync(full, { recursive: true, force: true });
+        import_node_fs22.default.rmSync(full, { recursive: true, force: true });
       } catch {
       }
     }
@@ -39371,7 +40085,7 @@ function cleanupStaleArtifacts(binDir) {
 }
 function safeUnlink(p2) {
   try {
-    import_node_fs21.default.unlinkSync(p2);
+    import_node_fs22.default.unlinkSync(p2);
   } catch {
   }
 }
@@ -39382,46 +40096,46 @@ async function downloadToFile(url, dest, fetchImpl) {
   if (!res.ok || !res.body) {
     throw new Error(`download failed: ${res.status} ${res.statusText}`);
   }
-  const out = import_node_fs21.default.createWriteStream(dest);
+  const out = import_node_fs22.default.createWriteStream(dest);
   const nodeStream = import_node_stream2.Readable.fromWeb(res.body);
   await (0, import_promises3.pipeline)(nodeStream, out);
 }
 async function extractFrpcFromTarball(tarball, binDir, version2, platform, destBin) {
   const work = import_node_path23.default.join(binDir, `extract-${process.pid}-${Date.now()}`);
-  import_node_fs21.default.mkdirSync(work, { recursive: true });
+  import_node_fs22.default.mkdirSync(work, { recursive: true });
   try {
     await new Promise((resolve6, reject) => {
-      const proc = (0, import_node_child_process3.spawn)("tar", ["xzf", tarball, "-C", work], { stdio: "pipe" });
+      const proc = (0, import_node_child_process7.spawn)("tar", ["xzf", tarball, "-C", work], { stdio: "pipe" });
       proc.on("error", reject);
       proc.on("exit", (code) => code === 0 ? resolve6() : reject(new Error(`tar exited ${code}`)));
     });
     const dirName = `frp_${version2}_${platform.os}_${platform.arch}`;
     const src = import_node_path23.default.join(work, dirName, "frpc");
-    if (!import_node_fs21.default.existsSync(src)) {
+    if (!import_node_fs22.default.existsSync(src)) {
       throw new Error(`frpc not found inside tarball at ${src}`);
     }
-    import_node_fs21.default.copyFileSync(src, destBin);
+    import_node_fs22.default.copyFileSync(src, destBin);
   } finally {
-    import_node_fs21.default.rmSync(work, { recursive: true, force: true });
+    import_node_fs22.default.rmSync(work, { recursive: true, force: true });
   }
 }
 
 // src/tunnel/frpc-process.ts
-var import_node_fs22 = __toESM(require("fs"), 1);
+var import_node_fs23 = __toESM(require("fs"), 1);
 var import_node_path24 = __toESM(require("path"), 1);
-var import_node_child_process4 = require("child_process");
+var import_node_child_process8 = require("child_process");
 function frpcPidFilePath(dataDir) {
   return import_node_path24.default.join(dataDir, "frpc.pid");
 }
 function writeFrpcPid(dataDir, pid) {
   try {
-    import_node_fs22.default.writeFileSync(frpcPidFilePath(dataDir), String(pid), { mode: 384 });
+    import_node_fs23.default.writeFileSync(frpcPidFilePath(dataDir), String(pid), { mode: 384 });
   } catch {
   }
 }
 function clearFrpcPid(dataDir) {
   try {
-    import_node_fs22.default.unlinkSync(frpcPidFilePath(dataDir));
+    import_node_fs23.default.unlinkSync(frpcPidFilePath(dataDir));
   } catch {
   }
 }
@@ -39437,7 +40151,7 @@ function defaultIsPidAlive(pid) {
 }
 function defaultReadPidFile(file) {
   try {
-    return import_node_fs22.default.readFileSync(file, "utf8");
+    return import_node_fs23.default.readFileSync(file, "utf8");
   } catch {
     return null;
   }
@@ -39477,7 +40191,7 @@ async function killStaleFrpc(deps) {
   }
   if (victims.size === 0) {
     try {
-      import_node_fs22.default.unlinkSync(pidFile);
+      import_node_fs23.default.unlinkSync(pidFile);
     } catch {
     }
     return;
@@ -39488,14 +40202,14 @@ async function killStaleFrpc(deps) {
   }
   await sleep(deps.reapWaitMs ?? 300);
   try {
-    import_node_fs22.default.unlinkSync(pidFile);
+    import_node_fs23.default.unlinkSync(pidFile);
   } catch {
   }
 }
 async function defaultScanFrpcPidsByCmdline(tomlPath, logger) {
   if (process.platform === "win32") return [];
   return new Promise((resolve6) => {
-    const ps = (0, import_node_child_process4.spawn)("ps", ["-axo", "pid=,command="], { stdio: ["ignore", "pipe", "ignore"] });
+    const ps = (0, import_node_child_process8.spawn)("ps", ["-axo", "pid=,command="], { stdio: ["ignore", "pipe", "ignore"] });
     let buf = "";
     ps.stdout.on("data", (c) => {
       buf += c.toString();
@@ -39663,12 +40377,12 @@ var TunnelManager = class {
         localPort,
         logLevel: "info"
       });
-      await import_node_fs23.default.promises.writeFile(tomlPath, toml, { mode: 384 });
-      const proc = (this.deps.spawnImpl ?? import_node_child_process5.spawn)(frpcBin, ["-c", tomlPath], {
+      await import_node_fs24.default.promises.writeFile(tomlPath, toml, { mode: 384 });
+      const proc = (this.deps.spawnImpl ?? import_node_child_process9.spawn)(frpcBin, ["-c", tomlPath], {
         stdio: ["ignore", "pipe", "pipe"]
       });
       const logFilePath = import_node_path25.default.join(this.deps.dataDir, "frpc.log");
-      const logStream = import_node_fs23.default.createWriteStream(logFilePath, { flags: "a", mode: 384 });
+      const logStream = import_node_fs24.default.createWriteStream(logFilePath, { flags: "a", mode: 384 });
       logStream.on("error", () => {
       });
       const tee = (chunk) => {
@@ -39766,7 +40480,7 @@ function deriveStableDeviceKey(opts = {}) {
 }
 
 // src/auth-store.ts
-var import_node_fs24 = __toESM(require("fs"), 1);
+var import_node_fs25 = __toESM(require("fs"), 1);
 var import_node_path27 = __toESM(require("path"), 1);
 var import_node_crypto9 = __toESM(require("crypto"), 1);
 var AUTH_FILE_NAME = "auth.json";
@@ -39805,7 +40519,7 @@ function defaultGenerateOwnerPrincipalId() {
 }
 function readAuthFile(file) {
   try {
-    const raw = import_node_fs24.default.readFileSync(file, "utf8");
+    const raw = import_node_fs25.default.readFileSync(file, "utf8");
     const parsed = JSON.parse(raw);
     if (typeof parsed?.token !== "string" || parsed.token.length === 0) {
       return null;
@@ -39824,16 +40538,16 @@ function readAuthFile(file) {
   }
 }
 function writeAuthFile(file, content) {
-  import_node_fs24.default.mkdirSync(import_node_path27.default.dirname(file), { recursive: true });
-  import_node_fs24.default.writeFileSync(file, JSON.stringify(content, null, 2), { mode: 384 });
+  import_node_fs25.default.mkdirSync(import_node_path27.default.dirname(file), { recursive: true });
+  import_node_fs25.default.writeFileSync(file, JSON.stringify(content, null, 2), { mode: 384 });
   try {
-    import_node_fs24.default.chmodSync(file, 384);
+    import_node_fs25.default.chmodSync(file, 384);
   } catch {
   }
 }
 
 // src/owner-profile.ts
-var import_node_fs25 = __toESM(require("fs"), 1);
+var import_node_fs26 = __toESM(require("fs"), 1);
 var import_node_os13 = __toESM(require("os"), 1);
 var import_node_path28 = __toESM(require("path"), 1);
 var PROFILE_FILENAME = "profile.json";
@@ -39842,7 +40556,7 @@ function loadOwnerDisplayName(dataDir) {
   const profilePath = import_node_path28.default.join(dataDir, PROFILE_FILENAME);
   let raw;
   try {
-    raw = import_node_fs25.default.readFileSync(profilePath, "utf8");
+    raw = import_node_fs26.default.readFileSync(profilePath, "utf8");
   } catch {
     return fallback;
   }
@@ -39865,7 +40579,7 @@ function loadOwnerDisplayName(dataDir) {
 }
 
 // src/feishu-auth/owner-identity-store.ts
-var import_node_fs26 = __toESM(require("fs"), 1);
+var import_node_fs27 = __toESM(require("fs"), 1);
 var import_node_path29 = __toESM(require("path"), 1);
 var OWNER_IDENTITY_FILE_NAME = "owner-identity.json";
 var OwnerIdentityStore = class {
@@ -39876,7 +40590,7 @@ var OwnerIdentityStore = class {
   read() {
     let raw;
     try {
-      raw = import_node_fs26.default.readFileSync(this.file, "utf8");
+      raw = import_node_fs27.default.readFileSync(this.file, "utf8");
     } catch {
       return null;
     }
@@ -39903,16 +40617,16 @@ var OwnerIdentityStore = class {
     };
   }
   write(record) {
-    import_node_fs26.default.mkdirSync(import_node_path29.default.dirname(this.file), { recursive: true });
-    import_node_fs26.default.writeFileSync(this.file, JSON.stringify(record, null, 2), { mode: 384 });
+    import_node_fs27.default.mkdirSync(import_node_path29.default.dirname(this.file), { recursive: true });
+    import_node_fs27.default.writeFileSync(this.file, JSON.stringify(record, null, 2), { mode: 384 });
     try {
-      import_node_fs26.default.chmodSync(this.file, 384);
+      import_node_fs27.default.chmodSync(this.file, 384);
     } catch {
     }
   }
   clear() {
     try {
-      import_node_fs26.default.unlinkSync(this.file);
+      import_node_fs27.default.unlinkSync(this.file);
     } catch (err) {
       const code = err?.code;
       if (code !== "ENOENT") throw err;
@@ -40175,7 +40889,7 @@ function verifyConnectToken(args) {
 }
 
 // src/feishu-auth/server-key.ts
-var fs35 = __toESM(require("fs"), 1);
+var fs36 = __toESM(require("fs"), 1);
 var path38 = __toESM(require("path"), 1);
 var FILE_NAME2 = "server-signing-key.json";
 var ServerKeyStore = class {
@@ -40189,7 +40903,7 @@ var ServerKeyStore = class {
   /** 读缓存的公钥；无缓存 / 损坏 → null（调用方决定是否触发拉取） */
   read() {
     try {
-      const raw = fs35.readFileSync(this.filePath(), "utf8");
+      const raw = fs36.readFileSync(this.filePath(), "utf8");
       const parsed = JSON.parse(raw);
       if (typeof parsed.publicKeyPem === "string" && parsed.publicKeyPem.includes("PUBLIC KEY")) {
         return parsed.publicKeyPem;
@@ -40204,12 +40918,12 @@ var ServerKeyStore = class {
       publicKeyPem,
       fetchedAt: (/* @__PURE__ */ new Date()).toISOString()
     };
-    fs35.mkdirSync(this.dataDir, { recursive: true });
-    fs35.writeFileSync(this.filePath(), JSON.stringify(content, null, 2), { mode: 384 });
+    fs36.mkdirSync(this.dataDir, { recursive: true });
+    fs36.writeFileSync(this.filePath(), JSON.stringify(content, null, 2), { mode: 384 });
   }
   clear() {
     try {
-      fs35.unlinkSync(this.filePath());
+      fs36.unlinkSync(this.filePath());
     } catch {
     }
   }
@@ -40222,12 +40936,12 @@ init_protocol();
 init_protocol();
 
 // src/session/fork.ts
-var import_node_fs27 = __toESM(require("fs"), 1);
+var import_node_fs28 = __toESM(require("fs"), 1);
 var import_node_os14 = __toESM(require("os"), 1);
 var import_node_path30 = __toESM(require("path"), 1);
 init_claude_history();
 function readJsonlEntries(file) {
-  const raw = import_node_fs27.default.readFileSync(file, "utf8");
+  const raw = import_node_fs28.default.readFileSync(file, "utf8");
   const out = [];
   for (const line of raw.split("\n")) {
     const t = line.trim();
@@ -40243,7 +40957,7 @@ function forkSession(input) {
   const baseDir = input.baseDir ?? import_node_path30.default.join(import_node_os14.default.homedir(), ".claude");
   const projectDir = import_node_path30.default.join(baseDir, "projects", cwdToHashDir(input.cwd));
   const sourceFile = import_node_path30.default.join(projectDir, `${input.toolSessionId}.jsonl`);
-  if (!import_node_fs27.default.existsSync(sourceFile)) {
+  if (!import_node_fs28.default.existsSync(sourceFile)) {
     throw new Error(`fork: source transcript not found: ${sourceFile}`);
   }
   const entries = readJsonlEntries(sourceFile);
@@ -40274,8 +40988,8 @@ function forkSession(input) {
     forkedLines.push(JSON.stringify(forked));
   }
   const forkedFilePath = import_node_path30.default.join(projectDir, `${forkedToolSessionId}.jsonl`);
-  import_node_fs27.default.mkdirSync(projectDir, { recursive: true });
-  import_node_fs27.default.writeFileSync(forkedFilePath, forkedLines.join("\n") + "\n", { mode: 384 });
+  import_node_fs28.default.mkdirSync(projectDir, { recursive: true });
+  import_node_fs28.default.writeFileSync(forkedFilePath, forkedLines.join("\n") + "\n", { mode: 384 });
   return { forkedToolSessionId, forkedFilePath };
 }
 
@@ -40465,6 +41179,13 @@ function buildSessionHandlers(deps) {
     const sessionFile = file;
     manager.ensureSession(sessionFile);
     const adapter = getAdapter2(sessionFile.tool ?? "claude");
+    const caps = await adapter.capabilities();
+    if (caps.features.observe === false) {
+      throw new ClawdError(
+        ERROR_CODES.TOOL_NOT_SUPPORTED,
+        `tool ${sessionFile.tool ?? "claude"} does not support observe`
+      );
+    }
     observer.start({
       sessionId: args.sessionId,
       cwd: sessionFile.cwd,
@@ -40714,7 +41435,7 @@ function assertGuestPath(ctx, absPath, personaRoot, method, usersRoot) {
   }
 }
 function buildHistoryHandlers(deps) {
-  const { manager, history, store, personaRoot, usersRoot } = deps;
+  const { manager, history, getHistoryReader, store, personaRoot, usersRoot } = deps;
   const projects = async (_frame, _client, ctx) => {
     const list2 = await history.listProjects();
     if (ctx?.principal.kind === "guest" && personaRoot) {
@@ -40758,7 +41479,7 @@ function buildHistoryHandlers(deps) {
         response: { type: "history:read", messages: [], total: 0, offset: 0 }
       };
     }
-    const res = await history.read({
+    const res = await getHistoryReader(f.tool ?? "claude").read({
       cwd: f.cwd,
       toolSessionId: f.toolSessionId,
       limit: args.limit,
@@ -40837,7 +41558,7 @@ function assertGuestPath2(ctx, absPath, personaRoot, method, usersRoot) {
   }
 }
 function buildWorkspaceHandlers(deps) {
-  const { workspace, skills, agents, personaRoot, personaManager, usersRoot } = deps;
+  const { workspace, skills, agents, getSkillsForTool, personaRoot, personaManager, usersRoot } = deps;
   const list = async (frame, _client, ctx) => {
     const args = WorkspaceListArgs.parse(frame);
     const isGuest = ctx?.principal.kind === "guest";
@@ -40859,7 +41580,7 @@ function buildWorkspaceHandlers(deps) {
     const args = SkillsListArgs.parse(frame);
     const cwdAbs = path42.resolve(args.cwd);
     assertGuestPath2(ctx, cwdAbs, personaRoot, "skills:list", usersRoot);
-    const list2 = skills.list(args);
+    const list2 = await getSkillsForTool(args.tool ?? "claude", cwdAbs);
     if (ctx?.principal.kind === "guest" && personaRoot) {
       const personaId = personaIdFromPath(cwdAbs, personaRoot);
       const enabled = personaId ? buildEnabledPluginNames(personaManager, personaId) : /* @__PURE__ */ new Set();
@@ -40871,6 +41592,9 @@ function buildWorkspaceHandlers(deps) {
     const args = AgentsListArgs.parse(frame);
     const cwdAbs = path42.resolve(args.cwd);
     assertGuestPath2(ctx, cwdAbs, personaRoot, "agents:list", usersRoot);
+    if (args.tool === "codex") {
+      return { response: { type: "agents:list", agents: [] } };
+    }
     const list2 = agents.list(args);
     if (ctx?.principal.kind === "guest" && personaRoot) {
       const personaId = personaIdFromPath(cwdAbs, personaRoot);
@@ -40893,15 +41617,15 @@ init_protocol();
 init_protocol();
 
 // src/workspace/git.ts
-var import_node_child_process6 = require("child_process");
-var import_node_fs28 = __toESM(require("fs"), 1);
+var import_node_child_process10 = require("child_process");
+var import_node_fs29 = __toESM(require("fs"), 1);
 var import_node_path31 = __toESM(require("path"), 1);
 var import_node_util = require("util");
-var pexec = (0, import_node_util.promisify)(import_node_child_process6.execFile);
+var pexec = (0, import_node_util.promisify)(import_node_child_process10.execFile);
 function normalizePath(p2) {
   const resolved = import_node_path31.default.resolve(p2);
   try {
-    return import_node_fs28.default.realpathSync(resolved);
+    return import_node_fs29.default.realpathSync(resolved);
   } catch {
     return resolved;
   }
@@ -42091,22 +42815,22 @@ function pickExtId(frame) {
   }
   return extId;
 }
-function composeState(rec, running, crashed, getPort) {
-  if (rec.state === "invalid") return rec;
-  if (manifestMode(rec.manifest) === "hosted") {
+function composeState(rec3, running, crashed, getPort) {
+  if (rec3.state === "invalid") return rec3;
+  if (manifestMode(rec3.manifest) === "hosted") {
     return {
-      ...rec,
+      ...rec3,
       state: "running",
-      target: { kind: "hosted", url: rec.manifest.entry.url }
+      target: { kind: "hosted", url: rec3.manifest.entry.url }
     };
   }
-  if (running.has(rec.extId)) {
-    const port = getPort(rec.extId);
-    if (port == null) return rec;
-    return { ...rec, state: "running", target: { kind: "local", port } };
+  if (running.has(rec3.extId)) {
+    const port = getPort(rec3.extId);
+    if (port == null) return rec3;
+    return { ...rec3, state: "running", target: { kind: "local", port } };
   }
-  if (crashed.has(rec.extId)) return { ...rec, state: "crashed" };
-  return rec;
+  if (crashed.has(rec3.extId)) return { ...rec3, state: "crashed" };
+  return rec3;
 }
 function buildExtensionHandlers(deps) {
   const list = async (_frame, _client, ctx) => {
@@ -42323,7 +43047,7 @@ function buildExtensionHandlers(deps) {
 }
 
 // src/app-builder/kill-port.ts
-var import_node_child_process7 = require("child_process");
+var import_node_child_process11 = require("child_process");
 async function killPortOccupants(port, ownedPids, logger) {
   let pids;
   try {
@@ -42365,7 +43089,7 @@ async function killPortOccupants(port, ownedPids, logger) {
 }
 function listPidsOnPort(port) {
   return new Promise((resolve6, reject) => {
-    (0, import_node_child_process7.execFile)(
+    (0, import_node_child_process11.execFile)(
       "lsof",
       ["-ti", `:${port}`],
       { timeout: 3e3 },
@@ -42437,8 +43161,8 @@ var PublishJobRegistry = class {
 };
 
 // src/app-builder/publish-job-runner.ts
-var import_node_child_process8 = require("child_process");
-var import_node_fs29 = require("fs");
+var import_node_child_process12 = require("child_process");
+var import_node_fs30 = require("fs");
 var import_node_path38 = require("path");
 
 // src/app-builder/publish-stage-parser.ts
@@ -42466,7 +43190,7 @@ function tailStderrLines(buf, n) {
 // src/app-builder/publish-job-runner.ts
 async function startPublishJob(deps, args) {
   const { registry: registry2, projectDir } = deps;
-  const spawn9 = deps.spawnImpl ?? import_node_child_process8.spawn;
+  const spawn12 = deps.spawnImpl ?? import_node_child_process12.spawn;
   if (registry2.has(args.name)) {
     return { jobId: registry2.get(args.name).jobId, status: "already-publishing" };
   }
@@ -42474,11 +43198,11 @@ async function startPublishJob(deps, args) {
   const logPath = (0, import_node_path38.join)(projDir, ".publish.log");
   let logStream = null;
   try {
-    logStream = (0, import_node_fs29.createWriteStream)(logPath, { flags: "w" });
+    logStream = (0, import_node_fs30.createWriteStream)(logPath, { flags: "w" });
   } catch {
     logStream = null;
   }
-  const child = spawn9("bash", [args.scriptPath, projDir], {
+  const child = spawn12("bash", [args.scriptPath, projDir], {
     cwd: projDir,
     env: process.env,
     stdio: ["ignore", "pipe", "pipe"]
@@ -42732,7 +43456,7 @@ async function recoverInterruptedJobs(deps) {
 // src/handlers/app-builder.ts
 init_protocol();
 var import_node_path39 = require("path");
-var import_node_fs30 = require("fs");
+var import_node_fs31 = require("fs");
 var APP_BUILDER_PERSONAS = ["persona-app-builder"];
 var PUBLISH_SCRIPT_REL = "extension-kit/scripts/publish.sh";
 var DEV_SERVER_READY_TIMEOUT_MS = 3e4;
@@ -42814,7 +43538,7 @@ function buildAppBuilderHandlers(deps) {
   async function listAllUsersProjects() {
     if (!deps.usersRoot || !deps.getStore) return [];
     const getStore = deps.getStore;
-    const userIds = await import_node_fs30.promises.readdir(deps.usersRoot).catch(() => []);
+    const userIds = await import_node_fs31.promises.readdir(deps.usersRoot).catch(() => []);
     const perUser = await Promise.all(
       userIds.map((uid) => getStore(uid).list().catch(() => []))
     );
@@ -43354,8 +44078,8 @@ function buildMethodHandlers(deps) {
 }
 
 // src/app-builder/project-store.ts
-var import_node_fs31 = require("fs");
-var import_node_child_process9 = require("child_process");
+var import_node_fs32 = require("fs");
+var import_node_child_process13 = require("child_process");
 var import_node_path42 = require("path");
 init_protocol();
 var PROJECTS_DIR = "projects";
@@ -43383,7 +44107,7 @@ var ProjectStore = class {
   async list() {
     let entries;
     try {
-      entries = await import_node_fs31.promises.readdir(this.projectsRoot());
+      entries = await import_node_fs32.promises.readdir(this.projectsRoot());
     } catch (err) {
       if (err.code === "ENOENT") return [];
       throw err;
@@ -43391,7 +44115,7 @@ var ProjectStore = class {
     const out = [];
     for (const name of entries) {
       try {
-        const raw = await import_node_fs31.promises.readFile(this.metaPath(name), "utf8");
+        const raw = await import_node_fs32.promises.readFile(this.metaPath(name), "utf8");
         const json = JSON.parse(raw);
         let migrated = false;
         if (typeof json.devCommand !== "string" || json.devCommand.length === 0) {
@@ -43402,7 +44126,7 @@ var ProjectStore = class {
         if (parsed.success) {
           out.push(parsed.data);
           if (migrated) {
-            void import_node_fs31.promises.writeFile(this.metaPath(name), JSON.stringify(parsed.data, null, 2) + "\n", "utf8").catch(() => {
+            void import_node_fs32.promises.writeFile(this.metaPath(name), JSON.stringify(parsed.data, null, 2) + "\n", "utf8").catch(() => {
             });
           }
         }
@@ -43446,8 +44170,8 @@ var ProjectStore = class {
       throw new Error(`invalid name "${name}": ${validated.error.message}`);
     }
     const dir = this.projectDir(name);
-    await import_node_fs31.promises.mkdir(dir, { recursive: true });
-    await import_node_fs31.promises.writeFile(this.metaPath(name), JSON.stringify(meta, null, 2) + "\n", "utf8");
+    await import_node_fs32.promises.mkdir(dir, { recursive: true });
+    await import_node_fs32.promises.writeFile(this.metaPath(name), JSON.stringify(meta, null, 2) + "\n", "utf8");
     return meta;
   }
   /**
@@ -43462,7 +44186,7 @@ var ProjectStore = class {
     const scriptPath = (0, import_node_path42.join)(personaRoot, SCAFFOLD_SCRIPT_REL);
     const destDir = this.projectDir(name);
     return await new Promise((resolve6, reject) => {
-      const child = (0, import_node_child_process9.spawn)("bash", [scriptPath, name, template, destDir], {
+      const child = (0, import_node_child_process13.spawn)("bash", [scriptPath, name, template, destDir], {
         cwd: personaRoot,
         env: { ...process.env, PATH: process.env.PATH ?? "" },
         stdio: ["ignore", "pipe", "pipe"]
@@ -43492,7 +44216,7 @@ var ProjectStore = class {
   }
   async delete(name) {
     const dir = this.projectDir(name);
-    await import_node_fs31.promises.rm(dir, { recursive: true, force: true });
+    await import_node_fs32.promises.rm(dir, { recursive: true, force: true });
   }
   async updatePort(name, newPort) {
     if (newPort < PROJECT_PORT_MIN || newPort > PROJECT_PORT_MAX) {
@@ -43508,7 +44232,7 @@ var ProjectStore = class {
       throw new Error(`port ${newPort} already used / \u5DF2\u88AB project "${conflict.name}" \u5360\u7528`);
     }
     const updated = { ...target, port: newPort };
-    await import_node_fs31.promises.writeFile(this.metaPath(name), JSON.stringify(updated, null, 2) + "\n", "utf8");
+    await import_node_fs32.promises.writeFile(this.metaPath(name), JSON.stringify(updated, null, 2) + "\n", "utf8");
     return updated;
   }
   /**
@@ -43525,7 +44249,7 @@ var ProjectStore = class {
     if (!validated.success) {
       throw new Error(`invalid prodUrl "${url}": ${validated.error.message}`);
     }
-    await import_node_fs31.promises.writeFile(this.metaPath(name), JSON.stringify(validated.data, null, 2) + "\n", "utf8");
+    await import_node_fs32.promises.writeFile(this.metaPath(name), JSON.stringify(validated.data, null, 2) + "\n", "utf8");
     return validated.data;
   }
   /**
@@ -43546,7 +44270,7 @@ var ProjectStore = class {
     if (!validated.success) {
       throw new Error(`invalid publishJob: ${validated.error.message}`);
     }
-    await import_node_fs31.promises.writeFile(this.metaPath(name), JSON.stringify(validated.data, null, 2) + "\n", "utf8");
+    await import_node_fs32.promises.writeFile(this.metaPath(name), JSON.stringify(validated.data, null, 2) + "\n", "utf8");
     return validated.data;
   }
   /** 清掉 .clawd-project.json.publishJob 字段。其他字段保持原样。 */
@@ -43561,13 +44285,13 @@ var ProjectStore = class {
     if (!validated.success) {
       throw new Error(`failed to clear publishJob: ${validated.error.message}`);
     }
-    await import_node_fs31.promises.writeFile(this.metaPath(name), JSON.stringify(validated.data, null, 2) + "\n", "utf8");
+    await import_node_fs32.promises.writeFile(this.metaPath(name), JSON.stringify(validated.data, null, 2) + "\n", "utf8");
     return validated.data;
   }
 };
 
 // src/app-builder/dev-server-supervisor.ts
-var import_node_child_process10 = require("child_process");
+var import_node_child_process14 = require("child_process");
 var import_node_events2 = require("events");
 var DEFAULT_READY_PATTERN = /Local:\s+https?:\/\/|Nest application successfully started|server listening on/i;
 var DevServerSupervisor = class extends import_node_events2.EventEmitter {
@@ -43604,7 +44328,7 @@ var DevServerSupervisor = class extends import_node_events2.EventEmitter {
       tunnelHost: args.tunnelHost,
       devCommand: cmd
     });
-    const child = (0, import_node_child_process10.spawn)("sh", ["-c", cmd], {
+    const child = (0, import_node_child_process14.spawn)("sh", ["-c", cmd], {
       cwd: args.cwd,
       env,
       stdio: "pipe",
@@ -43996,7 +44720,7 @@ function computeGrantForFrame(method, frame) {
 }
 
 // src/extension/runtime.ts
-var import_node_child_process11 = require("child_process");
+var import_node_child_process15 = require("child_process");
 var import_node_path43 = __toESM(require("path"), 1);
 var import_promises10 = require("timers/promises");
 
@@ -44083,17 +44807,17 @@ var Runtime = class {
     const existing = this.handles.get(extId);
     if (existing) return { kind: "local", port: existing.port };
     const records = await loadAll(this.root);
-    const rec = records.find((r) => r.extId === extId);
-    if (!rec) throw new RuntimeError("NOT_FOUND", `extension ${extId} not installed`);
-    if (rec.state === "invalid")
-      throw new RuntimeError("INVALID_MANIFEST", rec.invalidReason);
-    if (manifestMode(rec.manifest) === "hosted") {
-      return { kind: "hosted", url: rec.manifest.entry.url };
+    const rec3 = records.find((r) => r.extId === extId);
+    if (!rec3) throw new RuntimeError("NOT_FOUND", `extension ${extId} not installed`);
+    if (rec3.state === "invalid")
+      throw new RuntimeError("INVALID_MANIFEST", rec3.invalidReason);
+    if (manifestMode(rec3.manifest) === "hosted") {
+      return { kind: "hosted", url: rec3.manifest.entry.url };
     }
     const port = await this.allocator.allocate().catch(() => {
       throw new RuntimeError("PORT_EXHAUSTED", "no free port in configured range");
     });
-    const startCommand = rec.manifest.runtime.startCommand;
+    const startCommand = rec3.manifest.runtime.startCommand;
     const cmd = startCommand.replace(
       /\$CLAWOS_EXT_PORT/g,
       String(port)
@@ -44104,7 +44828,7 @@ var Runtime = class {
       CLAWOS_EXT_PORT: String(port),
       CLAWOS_EXT_ID: extId
     };
-    const child = (0, import_node_child_process11.spawn)("sh", ["-c", cmd], {
+    const child = (0, import_node_child_process15.spawn)("sh", ["-c", cmd], {
       cwd: dir,
       env,
       stdio: ["ignore", "pipe", "pipe"],
@@ -44540,7 +45264,7 @@ async function startDaemon(config) {
         const absPath = import_node_path46.default.isAbsolute(input.relPath) ? input.relPath : import_node_path46.default.join(input.cwd, input.relPath);
         let size = 0;
         try {
-          size = import_node_fs32.default.statSync(absPath).size;
+          size = import_node_fs33.default.statSync(absPath).size;
         } catch (err) {
           logger.warn("attachment.onFileEdit stat failed", {
             sessionId: input.sessionId,
@@ -44610,6 +45334,7 @@ async function startDaemon(config) {
     onReady: (tsid) => manager.dispatchReadyDetected(tsid)
   }) : new ClaudeAdapter({ logger, historyReader: new ClaudeHistoryReader() });
   registerAdapter("claude", claudeAdapter);
+  registerAdapter("codex", new CodexAdapter({ logger, historyReader: new CodexHistoryReader() }));
   const personaRegistry = new PersonaRegistry(personaStore);
   const personaManager = new PersonaManager({
     store: personaStore,
@@ -44688,7 +45413,11 @@ async function startDaemon(config) {
     workspace,
     skills,
     agents,
+    // skills:list 按 tool 路由：codex → app-server skills/list；缺省 claude → SkillsScanner（同步包成 Promise）。
+    getSkillsForTool: (tool, cwd) => tool === "codex" ? listCodexSkills(cwd) : Promise.resolve(skills.list({ cwd })),
     history,
+    // history:read 按 session.tool 路由：codex → adapter.historyReader(CodexHistoryReader)；缺省 claude。
+    getHistoryReader: (tool) => getAdapter(tool).historyReader ?? history,
     observer,
     getAdapter,
     store,
@@ -45027,8 +45756,7 @@ async function startDaemon(config) {
     protocolVersion: PROTOCOL_VERSION,
     startedAt: (/* @__PURE__ */ new Date()).toISOString(),
     authMode,
-    authToken: resolvedAuthToken ?? void 0,
-    source: readDaemonSourceFromEnv()
+    authToken: resolvedAuthToken ?? void 0
   };
   stateMgr.write(stateSnapshot);
   process.stdout.write(`Ready: ${url}
@@ -45079,7 +45807,7 @@ ${bar}
 `);
       try {
         const connectPath = import_node_path46.default.join(config.dataDir, "connect.txt");
-        import_node_fs32.default.writeFileSync(connectPath, lines.join("\n") + "\n", { mode: 384 });
+        import_node_fs33.default.writeFileSync(connectPath, lines.join("\n") + "\n", { mode: 384 });
       } catch {
       }
     } catch (err) {
@@ -45152,7 +45880,7 @@ ${bar}
 function migrateDropPersonsDir(dataDir) {
   const dir = import_node_path46.default.join(dataDir, "persons");
   try {
-    import_node_fs32.default.rmSync(dir, { recursive: true, force: true });
+    import_node_fs33.default.rmSync(dir, { recursive: true, force: true });
   } catch {
   }
 }