atomix-cli 1.2.0 → 1.3.0

package/dist/tui.mjs

@@ -7941,7 +7941,7 @@ var require_react_reconciler_development = __commonJS({
         var HostPortal = 4;
         var HostComponent = 5;
         var HostText = 6;
-        var Fragment2 = 7;
+        var Fragment = 7;
         var Mode = 8;
         var ContextConsumer = 9;
         var ContextProvider = 10;
@@ -8081,7 +8081,7 @@ var require_react_reconciler_development = __commonJS({
               return "DehydratedFragment";
             case ForwardRef:
               return getWrappedName$1(type, type.render, "ForwardRef");
-            case Fragment2:
+            case Fragment:
               return "Fragment";
             case HostComponent:
               return type;
@@ -11215,7 +11215,7 @@ var require_react_reconciler_development = __commonJS({
             }
           }
           function updateFragment2(returnFiber, current2, fragment, lanes, key) {
-            if (current2 === null || current2.tag !== Fragment2) {
+            if (current2 === null || current2.tag !== Fragment) {
               var created = createFiberFromFragment(fragment, returnFiber.mode, lanes, key);
               created.return = returnFiber;
               return created;
@@ -11618,7 +11618,7 @@ var require_react_reconciler_development = __commonJS({
               if (child.key === key) {
                 var elementType = element.type;
                 if (elementType === REACT_FRAGMENT_TYPE) {
-                  if (child.tag === Fragment2) {
+                  if (child.tag === Fragment) {
                     deleteRemainingChildren(returnFiber, child.sibling);
                     var existing = useFiber(child, element.props.children);
                     existing.return = returnFiber;
@@ -17109,7 +17109,7 @@ var require_react_reconciler_development = __commonJS({
               var _resolvedProps2 = workInProgress2.elementType === type ? _unresolvedProps2 : resolveDefaultProps(type, _unresolvedProps2);
               return updateForwardRef(current2, workInProgress2, type, _resolvedProps2, renderLanes2);
             }
-            case Fragment2:
+            case Fragment:
               return updateFragment(current2, workInProgress2, renderLanes2);
             case Mode:
               return updateMode(current2, workInProgress2, renderLanes2);
@@ -17546,7 +17546,7 @@ var require_react_reconciler_development = __commonJS({
             case SimpleMemoComponent:
             case FunctionComponent:
             case ForwardRef:
-            case Fragment2:
+            case Fragment:
             case Mode:
             case Profiler:
             case ContextConsumer:
@@ -22314,7 +22314,7 @@ var require_react_reconciler_development = __commonJS({
           return fiber;
         }
         function createFiberFromFragment(elements, mode, lanes, key) {
-          var fiber = createFiber(Fragment2, elements, key, mode);
+          var fiber = createFiber(Fragment, elements, key, mode);
           fiber.lanes = lanes;
           return fiber;
         }
@@ -23358,7 +23358,7 @@ var require_permessage_deflate = __commonJS({
       acceptAsServer(offers) {
         const opts = this._options;
         const accepted = offers.find((params) => {
-          if (opts.serverNoContextTakeover === false && params.server_no_context_takeover || params.server_max_window_bits && (opts.serverMaxWindowBits === false || typeof opts.serverMaxWindowBits === "number" && opts.serverMaxWindowBits > params.server_max_window_bits) || typeof opts.clientMaxWindowBits === "number" && !params.client_max_window_bits) {
+          if (opts.serverNoContextTakeover === false && params.server_no_context_takeover || params.server_max_window_bits && (opts.serverMaxWindowBits === false || typeof opts.serverMaxWindowBits === "number" && opts.serverMaxWindowBits > params.server_max_window_bits) || typeof opts.clientMaxWindowBits === "number" && (typeof params.client_max_window_bits === "number" ? opts.clientMaxWindowBits > params.client_max_window_bits : !params.client_max_window_bits)) {
             return false;
           }
           return true;
@@ -23878,6 +23878,7 @@ var require_receiver = __commonJS({
         this._opcode = 0;
         this._totalPayloadLength = 0;
         this._messageLength = 0;
+        this._numFragments = 0;
         this._fragments = [];
         this._errored = false;
         this._loop = false;
@@ -24228,23 +24229,23 @@ var require_receiver = __commonJS({
           this.controlMessage(data, cb);
           return;
         }
+        if (this._maxFragments > 0 && ++this._numFragments > this._maxFragments) {
+          const error = this.createError(
+            RangeError,
+            "Too many message fragments",
+            false,
+            1008,
+            "WS_ERR_TOO_MANY_BUFFERED_PARTS"
+          );
+          cb(error);
+          return;
+        }
         if (this._compressed) {
           this._state = INFLATING;
           this.decompress(data, cb);
           return;
         }
         if (data.length) {
-          if (this._maxFragments > 0 && this._fragments.length >= this._maxFragments) {
-            const error = this.createError(
-              RangeError,
-              "Too many message fragments",
-              false,
-              1008,
-              "WS_ERR_TOO_MANY_BUFFERED_PARTS"
-            );
-            cb(error);
-            return;
-          }
           this._messageLength = this._totalPayloadLength;
           this._fragments.push(data);
         }
@@ -24274,17 +24275,6 @@ var require_receiver = __commonJS({
               cb(error);
               return;
             }
-            if (this._maxFragments > 0 && this._fragments.length >= this._maxFragments) {
-              const error = this.createError(
-                RangeError,
-                "Too many message fragments",
-                false,
-                1008,
-                "WS_ERR_TOO_MANY_BUFFERED_PARTS"
-              );
-              cb(error);
-              return;
-            }
             this._fragments.push(buf);
           }
           this.dataMessage(cb);
@@ -24307,6 +24297,7 @@ var require_receiver = __commonJS({
         this._totalPayloadLength = 0;
         this._messageLength = 0;
         this._fragmented = 0;
+        this._numFragments = 0;
         this._fragments = [];
         if (this._opcode === 2) {
           let data;
@@ -25807,8 +25798,8 @@ var require_websocket = __commonJS({
         autoPong: true,
         closeTimeout: CLOSE_TIMEOUT,
         protocolVersion: protocolVersions[1],
-        maxBufferedChunks: 1024 * 1024,
-        maxFragments: 128 * 1024,
+        maxBufferedChunks: 256 * 1024,
+        maxFragments: 16 * 1024,
         maxPayload: 100 * 1024 * 1024,
         skipUTF8Validation: false,
         perMessageDeflate: true,
@@ -26395,9 +26386,9 @@ var require_websocket_server = __commonJS({
        *     called
        * @param {Function} [options.handleProtocols] A hook to handle protocols
        * @param {String} [options.host] The hostname where to bind the server
-       * @param {Number} [options.maxBufferedChunks=1048576] The maximum number of
+       * @param {Number} [options.maxBufferedChunks=262144] The maximum number of
        *     buffered data chunks
-       * @param {Number} [options.maxFragments=131072] The maximum number of message
+       * @param {Number} [options.maxFragments=16384] The maximum number of message
        *     fragments
        * @param {Number} [options.maxPayload=104857600] The maximum allowed message
        *     size
@@ -26420,8 +26411,8 @@ var require_websocket_server = __commonJS({
         options2 = {
           allowSynchronousEvents: true,
           autoPong: true,
-          maxBufferedChunks: 1024 * 1024,
-          maxFragments: 128 * 1024,
+          maxBufferedChunks: 256 * 1024,
+          maxFragments: 16 * 1024,
           maxPayload: 100 * 1024 * 1024,
           skipUTF8Validation: false,
           perMessageDeflate: false,
@@ -27772,7 +27763,7 @@ var require_config = __commonJS({
     exports2.LOG_DIR_PATH = "logs";
     exports2.SERVICE_LOG_FILES_RETAIN_COUNT = 7;
     exports2.LLM_LOG_DIR_PATH = "llm_logs";
-    exports2.LLM_LOG_FILES_RETAIN_COUNT = 10;
+    exports2.LLM_LOG_FILES_RETAIN_COUNT = 50;
     exports2.LLM_LOG_CLEANUP_INTERVAL = 60 * 60 * 1e3;
     exports2.TRACKS_DIR_PATH = "tracks";
     exports2.TRACKS_FILES_RETAIN_COUNT = 30;
@@ -45120,9 +45111,11 @@ var require_logLLM = __commonJS({
       };
     })();
     Object.defineProperty(exports2, "__esModule", { value: true });
-    exports2.logEvent = exports2.logLLMResponse = exports2.logLLMRequest = void 0;
+    exports2.logEvent = exports2.cleanupLLMLogFiles = exports2.logLLMResponse = exports2.logLLMRequest = exports2.readActiveLLMLogSessionsAcrossProcesses = exports2.getActiveLLMLogSessions = exports2.acquireActiveLLMLogSession = exports2.REGISTER_TIMEOUT_MS = exports2.holdLLMLogLockForTest = exports2.withLLMLogLock = void 0;
     var fs14 = __importStar(__require("fs"));
     var path15 = __importStar(__require("path"));
+    var crypto_1 = __require("crypto");
+    var child_process_1 = __require("child_process");
     var time_1 = require_time();
     var config_1 = require_config();
     var savePath_1 = require_savePath();
@@ -45131,6 +45124,280 @@ var require_logLLM = __commonJS({
     var StateManager_1 = require_StateManager();
     var lastLLMCleanupTime = 0;
     var lastEventCleanupTime = 0;
+    var LOCK_DIR = ".lock";
+    var LOCK_POLL_MS = 15;
+    var getLockDir = () => path15.join((0, savePath_1.getLLMLogsDir)(), LOCK_DIR);
+    var isPidAlive = (pid) => {
+      if (!Number.isInteger(pid) || pid <= 0)
+        return false;
+      try {
+        process.kill(pid, 0);
+        return true;
+      } catch (err) {
+        return err.code !== "ESRCH";
+      }
+    };
+    var sleep = (ms) => new Promise((r) => setTimeout(r, ms));
+    var ticketPid = (name) => {
+      const match = /^(\d+)-[0-9a-f-]+\.ticket$/.exec(name);
+      return match ? Number(match[1]) : null;
+    };
+    var PID_REUSE_GRACE_MS = 2e3;
+    var PID_START_CACHE_MS = 1e4;
+    var pidStartCache = /* @__PURE__ */ new Map();
+    var pidStartTimeMs = (pid) => {
+      const cached = pidStartCache.get(pid);
+      if (cached && Date.now() - cached.at < PID_START_CACHE_MS)
+        return cached.startMs;
+      let startMs = null;
+      try {
+        if (process.platform === "linux") {
+          const stat = fs14.readFileSync(`/proc/${pid}/stat`, "utf8");
+          const fields = stat.slice(stat.lastIndexOf(")") + 2).split(" ");
+          const startTicks = Number(fields[19]);
+          const btime = Number(/^btime (\d+)$/m.exec(fs14.readFileSync("/proc/stat", "utf8"))?.[1]);
+          if (Number.isFinite(startTicks) && Number.isFinite(btime))
+            startMs = (btime + startTicks / 100) * 1e3;
+        } else if (process.platform !== "win32") {
+          const out = (0, child_process_1.execFileSync)("ps", ["-o", "lstart=", "-p", String(pid)], { encoding: "utf8", stdio: ["ignore", "pipe", "ignore"], timeout: 2e3 }).trim();
+          const t = Date.parse(out);
+          if (Number.isFinite(t))
+            startMs = t;
+        }
+      } catch {
+      }
+      pidStartCache.set(pid, { startMs, at: Date.now() });
+      return startMs;
+    };
+    var fileBirthMs = (file) => {
+      const st = fs14.statSync(file);
+      return st.birthtimeMs > 0 ? st.birthtimeMs : st.mtimeMs;
+    };
+    var isTicketOwnerDead = (pid, file) => {
+      if (!isPidAlive(pid))
+        return true;
+      if (pid === process.pid)
+        return false;
+      const startMs = pidStartTimeMs(pid);
+      if (startMs === null)
+        return false;
+      try {
+        return startMs - fileBirthMs(file) > PID_REUSE_GRACE_MS;
+      } catch {
+        return false;
+      }
+    };
+    var readTickets = (dir) => {
+      const tickets = [];
+      for (const name of fs14.readdirSync(dir)) {
+        const pid = ticketPid(name);
+        if (pid === null)
+          continue;
+        const file = path15.join(dir, name);
+        if (isTicketOwnerDead(pid, file)) {
+          fs14.rmSync(file, { force: true });
+          continue;
+        }
+        try {
+          const value = fs14.readFileSync(file, "utf8");
+          tickets.push({ name, number: /^[1-9]\d*$/.test(value) ? BigInt(value) : null });
+        } catch (err) {
+          if (err.code !== "ENOENT")
+            throw err;
+        }
+      }
+      return tickets;
+    };
+    var acquireLock = async (timeoutMs, signal) => {
+      if (signal?.aborted)
+        throw new Error("\u767B\u8BB0\u5DF2\u53D6\u6D88");
+      const dir = getLockDir();
+      fs14.mkdirSync(dir, { recursive: true });
+      const ticket = `${process.pid}-${(0, crypto_1.randomUUID)()}.ticket`;
+      const mine = path15.join(dir, ticket);
+      const staging = `${mine}.publishing`;
+      fs14.closeSync(fs14.openSync(mine, "wx"));
+      let acquired = false;
+      const release = () => {
+        fs14.rmSync(mine, { force: true });
+        fs14.rmSync(staging, { force: true });
+      };
+      const started = process.hrtime.bigint();
+      try {
+        const number = readTickets(dir).reduce((max2, t) => t.number !== null && t.number > max2 ? t.number : max2, 0n) + 1n;
+        fs14.writeFileSync(staging, String(number), { flag: "wx" });
+        fs14.renameSync(staging, mine);
+        for (; ; ) {
+          if (signal?.aborted)
+            throw new Error("\u767B\u8BB0\u5DF2\u53D6\u6D88");
+          const tickets = readTickets(dir);
+          if (!tickets.some((t) => t.name === ticket))
+            throw new Error("LLM \u65E5\u5FD7\u9501\u7968\u636E\u4E22\u5931");
+          const blocked = tickets.some((t) => t.name !== ticket && (t.number === null || t.number < number || t.number === number && t.name < ticket));
+          if (!blocked) {
+            acquired = true;
+            return { ticket, release };
+          }
+          if (Number(process.hrtime.bigint() - started) / 1e6 >= timeoutMs)
+            return null;
+          await sleep(LOCK_POLL_MS);
+        }
+      } finally {
+        if (!acquired)
+          release();
+      }
+    };
+    var withLLMLogLock = async (fn, timeoutMs = 5e3, signal) => {
+      const lock = await acquireLock(timeoutMs, signal);
+      if (!lock)
+        return null;
+      try {
+        if (signal?.aborted)
+          throw new Error("\u767B\u8BB0\u5DF2\u53D6\u6D88");
+        return await fn();
+      } finally {
+        lock.release();
+      }
+    };
+    exports2.withLLMLogLock = withLLMLogLock;
+    var holdLLMLogLockForTest = async (timeoutMs = 1e3) => {
+      const lock = await acquireLock(timeoutMs);
+      return lock ? { ticketPath: path15.join(getLockDir(), lock.ticket), release: lock.release } : null;
+    };
+    exports2.holdLLMLogLockForTest = holdLLMLogLockForTest;
+    var ACTIVE_MARK_DIR = ".active";
+    exports2.REGISTER_TIMEOUT_MS = 3e4;
+    var getActiveMarkDir = () => path15.join((0, savePath_1.getLLMLogsDir)(), ACTIVE_MARK_DIR);
+    var encodeSessionId = (sessionId) => encodeURIComponent(sessionId.replace(/[\uD800-\uDBFF](?![\uDC00-\uDFFF])|(?<![\uD800-\uDBFF])[\uDC00-\uDFFF]/g, "\uFFFD"));
+    var decodeSessionId = (encoded) => {
+      try {
+        return decodeURIComponent(encoded);
+      } catch {
+        return null;
+      }
+    };
+    var markFilePath = (sessionId) => path15.join(getActiveMarkDir(), `${encodeSessionId(sessionId)}.${process.pid}`);
+    var registrations = /* @__PURE__ */ new Map();
+    var removeMark = (sessionId) => {
+      try {
+        fs14.rmSync(markFilePath(sessionId), { force: true });
+      } catch {
+      }
+    };
+    var acquireActiveLLMLogSession = async (sessionId, opts = {}) => {
+      if (opts.signal?.aborted)
+        throw new Error("\u767B\u8BB0\u5DF2\u53D6\u6D88");
+      let reg = registrations.get(sessionId);
+      if (!reg) {
+        const created = { refs: 0, state: "registering", ready: Promise.resolve(), abort: new AbortController() };
+        created.ready = (async () => {
+          const done = await (0, exports2.withLLMLogLock)(() => {
+            if (created.refs === 0)
+              return "abandoned";
+            fs14.mkdirSync(getActiveMarkDir(), { recursive: true });
+            try {
+              fs14.writeFileSync(markFilePath(sessionId), String(process.pid), "utf8");
+            } catch (err) {
+              removeMark(sessionId);
+              throw err;
+            }
+            created.state = "active";
+            return "written";
+          }, opts.timeoutMs ?? exports2.REGISTER_TIMEOUT_MS, created.abort.signal);
+          if (done === null)
+            throw new Error(`LLM \u65E5\u5FD7\u6E05\u7406\u9501\u7B49\u5F85\u8D85\u65F6(${opts.timeoutMs ?? exports2.REGISTER_TIMEOUT_MS}ms),\u4F1A\u8BDD ${sessionId} \u672A\u80FD\u767B\u8BB0\u4E3A\u6D3B\u8DC3`);
+          if (done === "abandoned")
+            return;
+        })();
+        void created.ready.then(() => {
+          if (created.refs === 0 && registrations.get(sessionId) === created)
+            registrations.delete(sessionId);
+        }, () => {
+          if (registrations.get(sessionId) === created)
+            registrations.delete(sessionId);
+        });
+        registrations.set(sessionId, created);
+        reg = created;
+      }
+      const mine = reg;
+      mine.refs++;
+      let released = false;
+      const release = () => {
+        if (released)
+          return;
+        released = true;
+        mine.refs--;
+        if (mine.refs > 0)
+          return;
+        mine.abort.abort();
+        if (mine.state === "active")
+          removeMark(sessionId);
+        if (registrations.get(sessionId) === mine)
+          registrations.delete(sessionId);
+      };
+      if (opts.signal?.aborted) {
+        release();
+        throw new Error("\u767B\u8BB0\u5DF2\u53D6\u6D88");
+      }
+      let rejectAbort;
+      const aborted = new Promise((_, reject2) => {
+        rejectAbort = reject2;
+      });
+      const onAbort = () => {
+        release();
+        rejectAbort(new Error("\u767B\u8BB0\u5DF2\u53D6\u6D88"));
+      };
+      opts.signal?.addEventListener("abort", onAbort, { once: true });
+      try {
+        await Promise.race([mine.ready, aborted]);
+      } catch (err) {
+        release();
+        throw err;
+      } finally {
+        opts.signal?.removeEventListener("abort", onAbort);
+      }
+      if (released)
+        throw new Error("\u767B\u8BB0\u5DF2\u53D6\u6D88");
+      return { sessionId, release };
+    };
+    exports2.acquireActiveLLMLogSession = acquireActiveLLMLogSession;
+    var getActiveLLMLogSessions = () => [...registrations.entries()].filter(([, r]) => r.state === "active").map(([id]) => id);
+    exports2.getActiveLLMLogSessions = getActiveLLMLogSessions;
+    var readActiveLLMLogSessionsAcrossProcesses = () => {
+      const active = new Set((0, exports2.getActiveLLMLogSessions)());
+      const dir = getActiveMarkDir();
+      let names;
+      try {
+        names = fs14.readdirSync(dir);
+      } catch (err) {
+        if (err.code === "ENOENT")
+          return active;
+        throw err;
+      }
+      for (const name of names) {
+        const dot = name.lastIndexOf(".");
+        if (dot <= 0)
+          continue;
+        const sessionId = decodeSessionId(name.slice(0, dot));
+        const pid = Number(name.slice(dot + 1));
+        if (sessionId === null)
+          continue;
+        if (isPidAlive(pid)) {
+          active.add(sessionId);
+        } else {
+          try {
+            fs14.rmSync(path15.join(dir, name), { force: true });
+          } catch {
+          }
+        }
+      }
+      return active;
+    };
+    exports2.readActiveLLMLogSessionsAcrossProcesses = readActiveLLMLogSessionsAcrossProcesses;
+    var sessionIdOfLogFile = (name) => {
+      const m = /^\d{4}-\d{2}-\d{2}_(.+)\.log$/.exec(name);
+      return m ? m[1] : null;
+    };
     var getProjectName = () => {
       try {
         const coreConfig = (0, ConfManager_1.getConfManager)().getCoreConfig();
@@ -45165,7 +45432,7 @@ var require_logLLM = __commonJS({
         if (nowTimestamp - lastLLMCleanupTime > config_1.LLM_LOG_CLEANUP_INTERVAL) {
           lastLLMCleanupTime = nowTimestamp;
           setImmediate(() => {
-            cleanupLLMLogFiles();
+            void (0, exports2.cleanupLLMLogFiles)();
           });
         }
       } catch (err) {
@@ -45202,7 +45469,7 @@ var require_logLLM = __commonJS({
         if (nowTimestamp - lastLLMCleanupTime > config_1.LLM_LOG_CLEANUP_INTERVAL) {
           lastLLMCleanupTime = nowTimestamp;
           setImmediate(() => {
-            cleanupLLMLogFiles();
+            void (0, exports2.cleanupLLMLogFiles)();
           });
         }
       } catch (err) {
@@ -45320,25 +45587,35 @@ var require_logLLM = __commonJS({
       } catch (err) {
       }
     };
-    var cleanupLLMLogFiles = () => {
+    var cleanupLLMLogFiles = async () => {
       try {
         const llmLogsDir = (0, savePath_1.getLLMLogsDir)();
         if (!fs14.existsSync(llmLogsDir)) {
           return;
         }
-        const files = fs14.readdirSync(llmLogsDir).filter((file) => file.endsWith(".log")).map((file) => ({
-          name: file,
-          path: path15.join(llmLogsDir, file),
-          mtime: fs14.statSync(path15.join(llmLogsDir, file)).mtime
-        })).sort((a, b) => b.mtime.getTime() - a.mtime.getTime());
-        if (files.length > config_1.LLM_LOG_FILES_RETAIN_COUNT) {
-          const filesToArchive = files.slice(config_1.LLM_LOG_FILES_RETAIN_COUNT);
-          archiveLLMLogFiles(filesToArchive);
-        }
+        const done = await (0, exports2.withLLMLogLock)(() => cleanupLLMLogFilesLocked(llmLogsDir));
+        if (done === null)
+          (0, log_1.logError)("LLM \u65E5\u5FD7\u6E05\u7406\u9501\u7B49\u5F85\u8D85\u65F6,\u672C\u8F6E\u8DF3\u8FC7");
       } catch (err) {
         (0, log_1.logError)(`\u6E05\u7406LLM\u65E5\u5FD7\u6587\u4EF6\u51FA\u9519: ${err}`);
       }
     };
+    exports2.cleanupLLMLogFiles = cleanupLLMLogFiles;
+    var cleanupLLMLogFilesLocked = (llmLogsDir) => {
+      const active = (0, exports2.readActiveLLMLogSessionsAcrossProcesses)();
+      const files = fs14.readdirSync(llmLogsDir).filter((file) => file.endsWith(".log")).filter((file) => {
+        const sid = sessionIdOfLogFile(file);
+        return sid === null || !active.has(sid);
+      }).map((file) => ({
+        name: file,
+        path: path15.join(llmLogsDir, file),
+        mtime: fs14.statSync(path15.join(llmLogsDir, file)).mtime
+      })).sort((a, b) => b.mtime.getTime() - a.mtime.getTime());
+      if (files.length > config_1.LLM_LOG_FILES_RETAIN_COUNT) {
+        const filesToArchive = files.slice(config_1.LLM_LOG_FILES_RETAIN_COUNT);
+        archiveLLMLogFiles(filesToArchive);
+      }
+    };
     var getEventLogFilePath = () => {
       const dateStr = (0, time_1.getDayTimeString)();
       const eventDir = (0, savePath_1.getEventDir)();
@@ -46014,9 +46291,13 @@ var require_StateManager = __commonJS({
       }
       /**
        * 清空所有状态数据
+       * @param options.keepAgentStates 保留各代理的 processing/idle 状态记录（/clear 在处理输入的过程中调用：
+       *   主代理此刻是 processing，若连状态一起清掉，重建出来的记录默认 idle，随后的 updateState('idle')
+       *   因"状态未变"不再发 state:update，等 idle 的消费方（session 库 send、TUI 处理态）会挂住）
        */
-      clearAllState() {
-        this.statesMap.clear();
+      clearAllState(options2 = {}) {
+        if (!options2.keepAgentStates)
+          this.statesMap.clear();
         this.messageHistoryMap.clear();
         this.readFileTimestampsMap.clear();
         this.todosMap.clear();
@@ -50795,12 +51076,12 @@ var require_frontmatter = __commonJS({
     function parseFrontmatter(text) {
       const metadata = {};
       const length = text.length;
-      let lineStart = 0;
+      let lineStart2 = 0;
       for (let i = 0; i <= length; i++) {
         if (i === length || text[i] === "\n") {
-          if (i > lineStart) {
-            const lineEnd = i > 0 && text[i - 1] === "\r" ? i - 1 : i;
-            const line = text.slice(lineStart, lineEnd);
+          if (i > lineStart2) {
+            const lineEnd2 = i > 0 && text[i - 1] === "\r" ? i - 1 : i;
+            const line = text.slice(lineStart2, lineEnd2);
             if (line && line[0] !== "#") {
               const colonIndex = line.indexOf(":");
               if (colonIndex !== -1) {
@@ -50835,7 +51116,7 @@ var require_frontmatter = __commonJS({
               }
             }
           }
-          lineStart = i + 1;
+          lineStart2 = i + 1;
         }
       }
       return metadata;
@@ -90817,7 +91098,7 @@ var require_lib3 = __commonJS({
     } catch (e) {
     }
     var INTERNALS = /* @__PURE__ */ Symbol("Body internals");
-    var PassThrough2 = Stream2.PassThrough;
+    var PassThrough3 = Stream2.PassThrough;
     function Body(body) {
       var _this = this;
       var _ref = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : {}, _ref$size = _ref.size;
@@ -91069,8 +91350,8 @@ var require_lib3 = __commonJS({
         throw new Error("cannot clone body after it is used");
       }
       if (body instanceof Stream2 && typeof body.getBoundary !== "function") {
-        p1 = new PassThrough2();
-        p2 = new PassThrough2();
+        p1 = new PassThrough3();
+        p2 = new PassThrough3();
         body.pipe(p1);
         body.pipe(p2);
         instance[INTERNALS].body = p1;
@@ -132070,10 +132351,10 @@ ${value}`, dataLines++;
         for (; searchIndex < chunk2.length; ) {
           const crIndex = chunk2.indexOf("\r", searchIndex), lfIndex = chunk2.indexOf(`
 `, searchIndex);
-          let lineEnd = -1;
-          if (crIndex !== -1 && lfIndex !== -1 ? lineEnd = crIndex < lfIndex ? crIndex : lfIndex : crIndex !== -1 ? crIndex === chunk2.length - 1 ? lineEnd = -1 : lineEnd = crIndex : lfIndex !== -1 && (lineEnd = lfIndex), lineEnd === -1)
+          let lineEnd2 = -1;
+          if (crIndex !== -1 && lfIndex !== -1 ? lineEnd2 = crIndex < lfIndex ? crIndex : lfIndex : crIndex !== -1 ? crIndex === chunk2.length - 1 ? lineEnd2 = -1 : lineEnd2 = crIndex : lfIndex !== -1 && (lineEnd2 = lfIndex), lineEnd2 === -1)
             break;
-          parseLine(chunk2, searchIndex, lineEnd), searchIndex = lineEnd + 1, chunk2.charCodeAt(searchIndex - 1) === CR && chunk2.charCodeAt(searchIndex) === LF && searchIndex++;
+          parseLine(chunk2, searchIndex, lineEnd2), searchIndex = lineEnd2 + 1, chunk2.charCodeAt(searchIndex - 1) === CR && chunk2.charCodeAt(searchIndex) === LF && searchIndex++;
         }
         return chunk2.slice(searchIndex);
       }
@@ -134538,7 +134819,10 @@ var require_mcpShared = __commonJS({
     })();
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.mergeServerConfigs = mergeServerConfigs;
+    exports2.originalToolName = originalToolName;
     exports2.filterToolsByConfig = filterToolsByConfig;
+    exports2.isServerScopedOut = isServerScopedOut;
+    exports2.applyScopeToTools = applyScopeToTools;
     exports2.configHash = configHash;
     exports2.isValidServerConfig = isValidServerConfig;
     exports2.loadConfigFile = loadConfigFile;
@@ -134563,15 +134847,37 @@ var require_mcpShared = __commonJS({
       }
       return merged;
     }
-    function filterToolsByConfig(tools, useTools) {
+    function originalToolName(fullName, serverName) {
+      if (serverName) {
+        const prefix = `mcp__${serverName}__`;
+        if (fullName.startsWith(prefix))
+          return fullName.slice(prefix.length);
+      }
+      const parts = fullName.split("__");
+      return parts.length >= 3 ? parts.slice(2).join("__") : fullName;
+    }
+    function filterToolsByConfig(tools, useTools, serverName) {
       if (!useTools) {
         return tools;
       }
-      return tools.filter((tool) => {
-        const parts = tool.name.split("__");
-        const originalToolName = parts.length >= 3 ? parts.slice(2).join("__") : tool.name;
-        return useTools.includes(originalToolName);
-      });
+      return tools.filter((tool) => useTools.includes(originalToolName(tool.name, serverName)));
+    }
+    function isServerScopedOut(serverName, scope) {
+      if (!scope)
+        return false;
+      if (scope.servers !== null && !scope.servers.includes(serverName))
+        return true;
+      return scope.disabledServers?.includes(serverName) ?? false;
+    }
+    function applyScopeToTools(serverName, tools, scope) {
+      if (!scope)
+        return tools;
+      if (isServerScopedOut(serverName, scope))
+        return [];
+      const allow = scope.tools?.[serverName];
+      if (!allow)
+        return tools;
+      return filterToolsByConfig(tools, allow, serverName);
     }
     function configHash(config) {
       const identity2 = {
@@ -134736,6 +135042,7 @@ var require_MCPManager = __commonJS({
         this.clients = /* @__PURE__ */ new Map();
         this.connectingPromises = /* @__PURE__ */ new Map();
         this.serverInfoCache = null;
+        this.scope = null;
         this.globalConfigPath = globalConfigPath;
         this.projectConfigPath = projectConfigPath;
       }
@@ -134872,7 +135179,7 @@ var require_MCPManager = __commonJS({
         const mergedConfigs = this.getMergedConfigs();
         for (const [serverName, tools] of this.toolsCache.toolsByServer) {
           const config = mergedConfigs.get(serverName);
-          const filteredTools = this.filterToolsByConfig(tools, config?.useTools);
+          const filteredTools = this.filterToolsByConfig(tools, config?.useTools, serverName);
           toolStats[serverName] = filteredTools.length;
         }
         (0, log_1.logInfo)(`MCP \u5DE5\u5177\u7EDF\u8BA1 (\u8FC7\u6EE4\u540E): ${JSON.stringify(toolStats)}`);
@@ -134969,8 +135276,8 @@ var require_MCPManager = __commonJS({
       /**
        * 根据 useTools 配置过滤工具
        */
-      filterToolsByConfig(tools, useTools) {
-        return (0, mcpShared_1.filterToolsByConfig)(tools, useTools);
+      filterToolsByConfig(tools, useTools, serverName) {
+        return (0, mcpShared_1.filterToolsByConfig)(tools, useTools, serverName);
       }
       /**
        * 获取所有 MCP 工具（同步，返回缓存）
@@ -134983,11 +135290,19 @@ var require_MCPManager = __commonJS({
         const mergedConfigs = this.getMergedConfigs();
         for (const [serverName, tools] of this.toolsCache.toolsByServer) {
           const config = mergedConfigs.get(serverName);
-          const filteredTools = this.filterToolsByConfig(tools, config?.useTools);
-          result2.push(...filteredTools);
+          const filteredTools = this.filterToolsByConfig(tools, config?.useTools, serverName);
+          result2.push(...(0, mcpShared_1.applyScopeToTools)(serverName, filteredTools, this.scope));
         }
         return result2;
       }
+      /**
+       * 设置 / 清除(null)会话级 MCP 可见性 overlay(harness `mcp` 段)。
+       * 不写 mcp.json、不断连接;ServerInfo 缓存里带 scopedOut,故一并失效。
+       */
+      setScope(scope) {
+        this.scope = scope;
+        this.serverInfoCache = null;
+      }
       /**
        * 获取或创建客户端连接
        */
@@ -135067,7 +135382,8 @@ var require_MCPManager = __commonJS({
           status: client?.status ?? "disconnected",
           capabilities: client?.capabilities ?? void 0,
           error: void 0,
-          connectedAt: void 0
+          connectedAt: void 0,
+          scopedOut: config.enabled !== false && (0, mcpShared_1.isServerScopedOut)(name, this.scope)
         };
       }
       /**
@@ -135872,7 +136188,7 @@ var require_session = __commonJS({
       }
     }
     function generateSessionId() {
-      return crypto3.randomUUID().replace(/-/g, "").substring(0, 8);
+      return crypto3.randomUUID();
     }
     function initializeSessionId(historyPath) {
       if (historyPath) {
@@ -136235,10 +136551,10 @@ var require_runCommand = __commonJS({
     var compact_1 = require_compact();
     var errors_1 = require_errors2();
     var customCommands_1 = require_customCommands();
-    async function handleSystemCommand(input) {
+    async function handleSystemCommand(input, handlers) {
       switch (input) {
         case "/clear":
-          await handleClearCommand();
+          await handlers.clear();
           return true;
         case "/compact":
           await handleCompactCommand();
@@ -136279,17 +136595,6 @@ var require_runCommand = __commonJS({
         return { processedInput: input, handled: false };
       }
     }
-    async function handleClearCommand() {
-      (0, log_1.logInfo)("\u6267\u884C\u6E05\u7A7A\u547D\u4EE4...");
-      const eventBus = EventSystem_1.EventBus.getInstance();
-      const stateManager = (0, StateManager_1.getStateManager)();
-      stateManager.setMessageHistory([]);
-      stateManager.updateState("idle");
-      eventBus.emit("session:cleared", {
-        sessionId: stateManager.getSessionId()
-      });
-      stateManager.clearAllState();
-    }
     async function handleCompactCommand() {
       (0, log_1.logInfo)("\u6267\u884C\u538B\u7F29\u547D\u4EE4...");
       const eventBus = EventSystem_1.EventBus.getInstance();
@@ -136434,12 +136739,53 @@ var require_HookManager = __commonJS({
 var require_SemaEngine = __commonJS({
   "../atomix-core/dist/core/SemaEngine.js"(exports2) {
     "use strict";
+    var __createBinding = exports2 && exports2.__createBinding || (Object.create ? (function(o, m, k, k2) {
+      if (k2 === void 0) k2 = k;
+      var desc = Object.getOwnPropertyDescriptor(m, k);
+      if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+        desc = { enumerable: true, get: function() {
+          return m[k];
+        } };
+      }
+      Object.defineProperty(o, k2, desc);
+    }) : (function(o, m, k, k2) {
+      if (k2 === void 0) k2 = k;
+      o[k2] = m[k];
+    }));
+    var __setModuleDefault = exports2 && exports2.__setModuleDefault || (Object.create ? (function(o, v) {
+      Object.defineProperty(o, "default", { enumerable: true, value: v });
+    }) : function(o, v) {
+      o["default"] = v;
+    });
+    var __importStar = exports2 && exports2.__importStar || /* @__PURE__ */ (function() {
+      var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function(o2) {
+          var ar = [];
+          for (var k in o2) if (Object.prototype.hasOwnProperty.call(o2, k)) ar[ar.length] = k;
+          return ar;
+        };
+        return ownKeys(o);
+      };
+      return function(mod) {
+        if (mod && mod.__esModule) return mod;
+        var result2 = {};
+        if (mod != null) {
+          for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result2, mod, k[i]);
+        }
+        __setModuleDefault(result2, mod);
+        return result2;
+      };
+    })();
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.SemaEngine = void 0;
     var log_1 = require_log();
+    var logLLM_1 = require_logLLM();
+    var LLM_LOG_STRICT = process.env.ATOMIX_LLM_LOG_STRICT === "1";
     var session_1 = require_session();
     var tokens_1 = require_tokens();
     var history_1 = require_history();
+    var savePath_1 = require_savePath();
+    var fs14 = __importStar(__require("fs"));
     var topic_1 = require_topic();
     var fileReference_1 = require_fileReference();
     var message_1 = require_message2();
@@ -136466,6 +136812,9 @@ var require_SemaEngine = __commonJS({
     var SemaEngine = class {
       // eslint-disable-next-line @typescript-eslint/no-explicit-any
       constructor(instanceId, config, mcpManager, kernel) {
+        this.turnGeneration = 0;
+        this.llmLogHandle = null;
+        this.llmLogAbort = new AbortController();
         this.emit = (event, data) => {
           const store = this.getEngineStore();
           EngineContext_1.engineStorage.run(store, () => {
@@ -136603,6 +136952,7 @@ var require_SemaEngine = __commonJS({
        */
       processUserInput(input, originalInput) {
         (0, EngineContext_1.runWithEngine)(this.getEngineStore(), () => {
+          const turnGeneration = ++this.turnGeneration;
           const stateManager = (0, StateManager_1.getStateManager)();
           const mainAgentState = stateManager.forAgent(StateManager_1.MAIN_AGENT_ID);
           mainAgentState.updateState("processing");
@@ -136635,7 +136985,7 @@ var require_SemaEngine = __commonJS({
             tools,
             model: "main"
           };
-          return this.processQuery(textInput, originalInput, agentContext, blocks);
+          return this.processQuery(textInput, originalInput, agentContext, turnGeneration, blocks);
         }).catch((err) => (0, log_1.logInfo)(`[${this.instanceId}] processUserInput \u9876\u5C42\u9519\u8BEF: ${err}`));
       }
       /**
@@ -136643,7 +136993,7 @@ var require_SemaEngine = __commonJS({
        *
        * extraBlocks: blocks 路径下额外的非文本内容（如 image blocks），追加到当前 turn 的 user message。
        */
-      async processQuery(input, originalInput, agentContext, extraBlocks) {
+      async processQuery(input, originalInput, agentContext, turnGeneration, extraBlocks) {
         const turnStartedAt = Date.now();
         const stateManager = (0, StateManager_1.getStateManager)();
         const mainAgentState = stateManager.forAgent(StateManager_1.MAIN_AGENT_ID);
@@ -136679,7 +137029,7 @@ var require_SemaEngine = __commonJS({
         }
         try {
           (0, ConfManager_1.getConfManager)().saveUserInputToHistory(originalInput || input);
-          const isSystemCommand = await (0, runCommand_1.handleSystemCommand)(input);
+          const isSystemCommand = await (0, runCommand_1.handleSystemCommand)(input, { clear: () => this.clearSessionInternal(agentContext.abortController?.signal) });
           if (isSystemCommand) {
             return;
           }
@@ -136715,23 +137065,25 @@ var require_SemaEngine = __commonJS({
             (0, log_1.logDebug)("\u7528\u6237\u4E2D\u65AD\u64CD\u4F5C");
           }
         } finally {
-          stateManager.currentAbortController = null;
-          if (this.myHookManager?.hasHooksForEvent("Stop")) {
-            const stopHookInput = {
-              hook_event_name: "Stop",
-              session_id: stateManager.getSessionId() || "",
-              agent_id: StateManager_1.MAIN_AGENT_ID,
-              timestamp: (/* @__PURE__ */ new Date()).toISOString(),
-              cwd: this.initialConfig.workingDir || (0, cwd_1.getCwd)(),
-              turn_duration_ms: Date.now() - turnStartedAt
-            };
-            await (0, executeHooks_1.executeHooks)(this.myHookManager, "Stop", stopHookInput, {
-              env: this.initialConfig.hookEnv,
-              messages: mainAgentState.getMessageHistory()
-            });
-          }
-          if (stateManager.getCurrentState(StateManager_1.MAIN_AGENT_ID) !== "paused") {
-            mainAgentState.updateState("idle");
+          if (turnGeneration === this.turnGeneration) {
+            stateManager.currentAbortController = null;
+            if (this.myHookManager?.hasHooksForEvent("Stop")) {
+              const stopHookInput = {
+                hook_event_name: "Stop",
+                session_id: stateManager.getSessionId() || "",
+                agent_id: StateManager_1.MAIN_AGENT_ID,
+                timestamp: (/* @__PURE__ */ new Date()).toISOString(),
+                cwd: this.initialConfig.workingDir || (0, cwd_1.getCwd)(),
+                turn_duration_ms: Date.now() - turnStartedAt
+              };
+              await (0, executeHooks_1.executeHooks)(this.myHookManager, "Stop", stopHookInput, {
+                env: this.initialConfig.hookEnv,
+                messages: mainAgentState.getMessageHistory()
+              });
+            }
+            if (turnGeneration === this.turnGeneration && stateManager.getCurrentState(StateManager_1.MAIN_AGENT_ID) !== "paused") {
+              mainAgentState.updateState("idle");
+            }
           }
         }
       }
@@ -136762,6 +137114,7 @@ var require_SemaEngine = __commonJS({
        * 不更新状态，用于内部调用
        */
       abortCurrentRequest() {
+        ++this.turnGeneration;
         const abortController = this.myStateManager.currentAbortController;
         if (abortController && !abortController.signal.aborted) {
           (0, log_1.logInfo)("\u901A\u8FC7 AbortController \u53D1\u9001\u4E2D\u65AD\u4FE1\u53F7");
@@ -136835,6 +137188,10 @@ var require_SemaEngine = __commonJS({
           cfg.temperatureOverrides = partial2.temperatureOverrides ?? null;
         if ("thinking" in partial2)
           cfg.thinking = partial2.thinking === true;
+        if ("mcpScope" in partial2) {
+          cfg.mcpScope = partial2.mcpScope ?? null;
+          this.myMCPManager.setScope(cfg.mcpScope);
+        }
       }
       /**
        * 当前 session 的 coreConfig 只读快照（= initialConfig，含运行时 mutation 结果）。
@@ -136889,12 +137246,130 @@ var require_SemaEngine = __commonJS({
         }
       }
       // 初始化系统
+      /**
+       * /clear：清空上下文并换新 sessionId（events/types.ts SessionClearedData 注释有语义说明）。
+       * 三段式"准备 → 检查 → 同步提交"：
+       *   1. 准备：生成候选 id（完整 UUID），先做占用检查（当前 id / 项目历史文件 / 宿主回调 isSessionIdTaken），
+       *      再为候选 id 登记 LLM 日志句柄（唯一可能失败、可能 await 的步骤）。此时旧 id、旧消息、旧句柄一概不动。
+       *   2. 检查：await 回来后确认本轮未被中断、引擎未 dispose，并再查一次占用（等待期间宿主可能打开了同 id）；
+       *      冲突则释放候选句柄重新生成（有重试上限）。
+       *   3. 提交：换 id → 清消息 / todos / 状态 → 装新句柄 → 发 session:cleared，中间不再 await——宿主（serve）在
+       *      事件回调里同步 rekey，与最后一次检查处于同一同步段，其他 open 插不进来。随后释放旧句柄、进入 idle。
+       * 准备失败或被取消：释放候选句柄，旧会话原样保留。严格模式（ATOMIX_LLM_LOG_STRICT=1）下登记失败发
+       * session:error（session 库的 send 据此返回错误）；缺省模式沿用"告警后无日志保护继续"。
+       */
+      async clearSessionInternal(turnSignal) {
+        (0, log_1.logInfo)("\u6267\u884C\u6E05\u7A7A\u547D\u4EE4...");
+        const stateManager = (0, StateManager_1.getStateManager)();
+        const mainAgentState = stateManager.forAgent(StateManager_1.MAIN_AGENT_ID);
+        const previousSessionId = stateManager.getSessionId();
+        const workingDir = (0, ConfManager_1.getConfManager)().getCoreConfig()?.workingDir;
+        const cancelled = () => !!turnSignal?.aborted || this.llmLogAbort.signal.aborted;
+        const fail = (message) => {
+          (0, log_1.logWarn)(`\u6E05\u7A7A\u5931\u8D25,\u4FDD\u7559\u539F\u4F1A\u8BDD ${previousSessionId}:${message}`);
+          this.emit("session:error", { type: "clear_failed", error: { code: "CLEAR_FAILED", message } });
+          mainAgentState.updateState("idle");
+        };
+        if (cancelled())
+          return;
+        const MAX_TRIES = 8;
+        let newSessionId = null;
+        let newHandle = null;
+        for (let attempt2 = 1; attempt2 <= MAX_TRIES && newSessionId === null; attempt2++) {
+          const candidate = (0, session_1.initializeSessionId)();
+          if (this.isSessionIdTaken(candidate, previousSessionId, workingDir))
+            continue;
+          let handle;
+          try {
+            handle = await this.acquireLlmLogHandle(candidate);
+          } catch (err) {
+            if (cancelled())
+              return;
+            return fail(`LLM \u65E5\u5FD7\u6D3B\u8DC3\u767B\u8BB0\u5931\u8D25:${err instanceof Error ? err.message : String(err)}`);
+          }
+          if (cancelled()) {
+            handle?.release();
+            (0, log_1.logInfo)("\u6E05\u7A7A\u5728\u7B49\u5F85\u65E5\u5FD7\u767B\u8BB0\u671F\u95F4\u88AB\u53D6\u6D88,\u4FDD\u7559\u539F\u4F1A\u8BDD");
+            return;
+          }
+          if (this.isSessionIdTaken(candidate, previousSessionId, workingDir)) {
+            handle?.release();
+            (0, log_1.logWarn)(`\u5019\u9009 sessionId ${candidate} \u5728\u767B\u8BB0\u671F\u95F4\u88AB\u5360\u7528,\u91CD\u65B0\u751F\u6210(\u7B2C ${attempt2} \u6B21)`);
+            continue;
+          }
+          newSessionId = candidate;
+          newHandle = handle;
+        }
+        if (newSessionId === null)
+          return fail(`\u8FDE\u7EED ${MAX_TRIES} \u6B21\u751F\u6210\u7684 sessionId \u5747\u88AB\u5360\u7528`);
+        const oldHandle = this.llmLogHandle;
+        stateManager.setSessionId(newSessionId);
+        stateManager.clearAllState({ keepAgentStates: true });
+        mainAgentState.setMessageHistory([]);
+        mainAgentState.setTodos([]);
+        this.llmLogHandle = newHandle;
+        (0, log_1.logInfo)(`\u4E0A\u4E0B\u6587\u5DF2\u6E05\u7A7A\uFF0C\u65B0\u4F1A\u8BDD ${newSessionId}\uFF08\u539F\u4F1A\u8BDD ${previousSessionId}\uFF09`);
+        this.emit("session:cleared", {
+          sessionId: newSessionId,
+          previousSessionId,
+          usage: (0, tokens_1.getTokens)([])
+        });
+        oldHandle?.release();
+        mainAgentState.updateState("idle");
+      }
+      /** 候选 sessionId 是否已被占用:当前 id / 本项目已有历史文件 / 宿主回调(serve 进程内会话表等) */
+      isSessionIdTaken(candidate, currentSessionId, workingDir) {
+        if (candidate === currentSessionId)
+          return true;
+        try {
+          if (fs14.existsSync((0, savePath_1.getHistoryFilePath)(candidate, workingDir)))
+            return true;
+        } catch {
+        }
+        try {
+          return this.initialConfig.isSessionIdTaken?.(candidate) === true;
+        } catch (err) {
+          (0, log_1.logWarn)(`\u5BBF\u4E3B isSessionIdTaken \u56DE\u8C03\u629B\u9519,\u6309\u5DF2\u5360\u7528\u5904\u7406:${err instanceof Error ? err.message : String(err)}`);
+          return true;
+        }
+      }
+      /**
+       * 为 sessionId 登记 LLM 日志活跃句柄(不动 this.llmLogHandle,由调用方决定何时装上/释放旧的)。
+       * 登记为活跃会话:LLM 日志清理不动活跃会话的文件。resolve 即标记已在清理锁内落盘。engine 持句柄,换 id / dispose 只释放自己那一份。
+       * 拿不到锁(如某张票据的 pid 被复用且平台上拿不到进程启动时间来判死):不能无锁写标记假装受保护;
+       * 缺省告警后无保护继续(返回 null)——日志被归档的风险是原状,拒绝启动会话则是把清理的 fail-open 变成启动的 fail-closed,
+       * 影响不对称;ATOMIX_LLM_LOG_STRICT=1 时改为抛出。dispose 中的取消照常抛出。
+       */
+      async acquireLlmLogHandle(sessionId) {
+        let handle = null;
+        try {
+          handle = await (0, logLLM_1.acquireActiveLLMLogSession)(sessionId, { signal: this.llmLogAbort.signal });
+        } catch (err) {
+          if (this.llmLogAbort.signal.aborted || LLM_LOG_STRICT)
+            throw err;
+          (0, log_1.logWarn)(`LLM \u65E5\u5FD7\u6D3B\u8DC3\u767B\u8BB0\u5931\u8D25,\u672C\u4F1A\u8BDD\u65E5\u5FD7\u4E0D\u53D7\u6E05\u7406\u4FDD\u62A4(\u53EF\u80FD\u88AB\u5F52\u6863\u622A\u65AD):${err instanceof Error ? err.message : String(err)}`);
+        }
+        if (this.llmLogAbort.signal.aborted) {
+          handle?.release();
+          throw new Error("\u4F1A\u8BDD\u5DF2\u91CA\u653E");
+        }
+        return handle;
+      }
+      /** createSession 用:换绑到 sessionId(先登记新的,成功后释放旧的) */
+      async bindLlmLogSession(sessionId) {
+        if (this.llmLogHandle?.sessionId === sessionId)
+          return;
+        const handle = await this.acquireLlmLogHandle(sessionId);
+        this.llmLogHandle?.release();
+        this.llmLogHandle = handle;
+      }
       async initialize(sessionId) {
         const coreConfig = (0, ConfManager_1.getConfManager)().getCoreConfig();
         (0, log_1.setLogLevel)(coreConfig?.logLevel || "info");
         const finalSessionId = sessionId || (0, session_1.initializeSessionId)();
         const stateManager = (0, StateManager_1.getStateManager)();
         stateManager.setSessionId(finalSessionId);
+        await this.bindLlmLogSession(finalSessionId);
         try {
           const modelManager = (0, ModelManager_1.getModelManager)();
           const modelProfile = modelManager.getModel("main");
@@ -136923,6 +137398,9 @@ var require_SemaEngine = __commonJS({
       dispose() {
         (0, log_1.logInfo)("\u5F00\u59CB\u6E05\u7406 SemaEngine \u8D44\u6E90...");
         this.abortCurrentRequest();
+        this.llmLogAbort.abort();
+        this.llmLogHandle?.release();
+        this.llmLogHandle = null;
         this.myStateManager.clearAllState();
         this.myEventBus.removeAllListeners();
         (0, log_1.logInfo)("SemaEngine \u8D44\u6E90\u6E05\u7406\u5B8C\u6210");
@@ -137049,6 +137527,8 @@ var require_SemaSession = __commonJS({
         this.initialWorkingDir = workingDir;
         const agentDataDir = resolvedConfig.agentDataDir || workingDir;
         this.instanceMCPManager = this.acquireMCPManager(agentDataDir);
+        if (resolvedConfig.mcpScope !== void 0)
+          this.instanceMCPManager.setScope(resolvedConfig.mcpScope ?? null);
         this.engine = new SemaEngine_1.SemaEngine(instanceId, resolvedConfig, this.instanceMCPManager, kernel);
         if (resolvedConfig.skipMCPInit) {
           this.configPromise = (0, ConfManager_1.getConfManager)().registerProjectConfig(resolvedConfig);
@@ -137219,6 +137699,10 @@ var require_MCPManagerView = __commonJS({
     var mcpShared_1 = require_mcpShared();
     var log_1 = require_log();
     var MCPManagerView = class {
+      /** 设置 / 清除(null)本 session 的 MCP 可见性 overlay。 */
+      setScope(scope) {
+        this.scope = scope;
+      }
       constructor(mux, globalConfigPath, projectConfigPath) {
         this.mux = mux;
         this.globalConfigPath = globalConfigPath;
@@ -137226,6 +137710,7 @@ var require_MCPManagerView = __commonJS({
         this.globalConfigs = /* @__PURE__ */ new Map();
         this.projectConfigs = /* @__PURE__ */ new Map();
         this.heldHashes = /* @__PURE__ */ new Set();
+        this.scope = null;
       }
       // ==================== 生命周期 ====================
       /**
@@ -137269,7 +137754,7 @@ var require_MCPManagerView = __commonJS({
           if (!shared || shared.status !== "connected" || !shared.client)
             continue;
           const tools = shared.toolDefs.map((def) => (0, MCPToolAdapter_1.createMCPToolAdapter)(shared.client, serverName, def));
-          result2.push(...(0, mcpShared_1.filterToolsByConfig)(tools, config.useTools));
+          result2.push(...(0, mcpShared_1.applyScopeToTools)(serverName, (0, mcpShared_1.filterToolsByConfig)(tools, config.useTools, serverName), this.scope));
         }
         return result2;
       }
@@ -137291,7 +137776,8 @@ var require_MCPManagerView = __commonJS({
           status: shared?.status === "connected" ? "connected" : shared?.status === "connecting" ? "connecting" : "disconnected",
           capabilities: shared?.client?.capabilities ?? void 0,
           error: void 0,
-          connectedAt: void 0
+          connectedAt: void 0,
+          scopedOut: config.enabled !== false && (0, mcpShared_1.isServerScopedOut)(config.name, this.scope)
         };
       }
       // ==================== 配置写入（本 session 的 mcp.json）====================
@@ -152927,6 +153413,11 @@ function recordAgentUniverse(core, names) {
   const rt = runtimeOf(core);
   if (rt) rt.fullAgentNames = names.slice();
 }
+function isServerScopedOutBy(server, scope) {
+  if (!scope) return false;
+  if (scope.servers !== null && !scope.servers.includes(server)) return true;
+  return scope.disabledServers?.includes(server) ?? false;
+}
 function computeDisabledFrom(spec, allNames) {
   if (!spec) return /* @__PURE__ */ new Set();
   return spec.mode === "whitelist" ? new Set(allNames.filter((n) => !spec.enable.includes(n))) : new Set(spec.disable);
@@ -153101,6 +153592,37 @@ function loadHarnessDoc(name) {
   };
   const memory = parseToggle(raw.memory, "memory");
   const persona = parseToggle(raw.persona, "persona");
+  let mcp = null;
+  if (raw.mcp !== void 0 && raw.mcp !== null) {
+    if (typeof raw.mcp !== "object" || Array.isArray(raw.mcp)) {
+      toggleWarnings.push(`mcp \u6BB5\u53EA\u8BA4\u5BF9\u8C61 { mode, enable, disable, tools },\u5FFD\u7565\u975E\u6CD5\u503C ${JSON.stringify(raw.mcp)}`);
+    } else {
+      const m = raw.mcp;
+      const tools = {};
+      if (m.tools !== void 0 && m.tools !== null) {
+        if (typeof m.tools !== "object" || Array.isArray(m.tools)) toggleWarnings.push("mcp.tools \u53EA\u8BA4 { <server>: [\u5DE5\u5177\u540D...] },\u5DF2\u5FFD\u7565");
+        else for (const [server, v] of Object.entries(m.tools)) {
+          if (Array.isArray(v)) tools[server] = asStrArr(v);
+          else toggleWarnings.push(`mcp.tools.${server} \u53EA\u8BA4\u6570\u7EC4,\u5DF2\u5FFD\u7565`);
+        }
+      }
+      if (m.mode !== void 0 && m.mode !== null && m.mode !== "whitelist" && m.mode !== "blacklist") {
+        toggleWarnings.push(`mcp.mode \u53EA\u8BA4 whitelist / blacklist,\u6536\u5230 ${JSON.stringify(m.mode)},\u6309 blacklist \u5904\u7406`);
+      }
+      const strList = (key) => {
+        const v = m[key];
+        if (v === void 0 || v === null) return [];
+        if (!Array.isArray(v)) {
+          toggleWarnings.push(`mcp.${key} \u53EA\u8BA4\u6570\u7EC4,\u6536\u5230 ${JSON.stringify(v)},\u5DF2\u5FFD\u7565`);
+          return [];
+        }
+        const bad = v.filter((x) => typeof x !== "string");
+        if (bad.length) toggleWarnings.push(`mcp.${key} \u542B\u975E\u5B57\u7B26\u4E32\u9879 ${JSON.stringify(bad)},\u5DF2\u5FFD\u7565\u8FD9\u4E9B\u9879`);
+        return asStrArr(v);
+      };
+      mcp = { mode: asMode(m.mode), enable: strList("enable"), disable: strList("disable"), tools };
+    }
+  }
   const parseModel = (v) => {
     if (v === void 0 || v === null) return null;
     if (typeof v === "string") {
@@ -153177,6 +153699,7 @@ function loadHarnessDoc(name) {
     },
     skills: { mode: asMode(sk.mode), disable: asStrArr(sk.disable), enable: asStrArr(sk.enable) },
     agents: { mode: asMode(ag.mode), disable: asStrArr(ag.disable), enable: asStrArr(ag.enable) },
+    mcp,
     prompt: promptGroup.overrides,
     promptWarnings: promptGroup.warnings,
     memory,
@@ -153210,6 +153733,8 @@ function resolveBase(ctx) {
     thinking: ctx.baseline.thinking,
     skillsSpec: null,
     agentsSpec: null,
+    mcpScope: null,
+    mcpDeclared: null,
     skillsDisabled: /* @__PURE__ */ new Set(),
     agentsDisabled: /* @__PURE__ */ new Set()
   };
@@ -153290,9 +153815,33 @@ function resolveHarness(doc, ctx) {
       temperatureOverrides[slot] = t;
     }
   }
+  let mcpScope = null;
+  if (doc.mcp) {
+    const known = new Set(ctx.mcpServerNames);
+    const unknown = (names) => names.filter((n) => !known.has(n));
+    if (doc.mcp.mode === "whitelist") {
+      mcpScope = { servers: doc.mcp.enable.slice() };
+      const u = unknown(doc.mcp.enable);
+      if (u.length) warnings.push(`mcp.enable \u91CC\u7684 server \u4E0D\u5B58\u5728(\u672C\u9879\u76EE mcp.json \u672A\u914D\u7F6E\u6216\u5DF2\u7981\u7528):${u.join(", ")}`);
+    } else {
+      mcpScope = { servers: null, disabledServers: doc.mcp.disable.slice() };
+      const u = unknown(doc.mcp.disable);
+      if (u.length) warnings.push(`mcp.disable \u91CC\u7684 server \u4E0D\u5B58\u5728(\u672C\u9879\u76EE mcp.json \u672A\u914D\u7F6E\u6216\u5DF2\u7981\u7528):${u.join(", ")}`);
+    }
+    const toolEntries = Object.entries(doc.mcp.tools);
+    if (toolEntries.length) {
+      mcpScope.tools = Object.fromEntries(toolEntries.map(([k, v]) => [k, v.slice()]));
+      const u = unknown(toolEntries.map(([k]) => k));
+      if (u.length) warnings.push(`mcp.tools \u91CC\u7684 server \u4E0D\u5B58\u5728(\u672C\u9879\u76EE mcp.json \u672A\u914D\u7F6E\u6216\u5DF2\u7981\u7528):${u.join(", ")}`);
+      const shadowed = toolEntries.map(([k]) => k).filter((k) => isServerScopedOutBy(k, mcpScope));
+      if (shadowed.length) warnings.push(`mcp.tools \u5BF9\u5DF2\u88AB\u5C4F\u853D\u7684 server \u65E0\u6548:${shadowed.join(", ")}`);
+    }
+  }
   return {
     name: doc.name,
     dirName,
+    mcpScope,
+    mcpDeclared: doc.mcp,
     temperatureOverrides: Object.keys(temperatureOverrides).length ? temperatureOverrides : null,
     temperatureDeclared: doc.temperature,
     modelOverrides: Object.keys(modelOverrides).length ? modelOverrides : null,
@@ -153326,11 +153875,20 @@ function buildContext(core) {
     allToolNames: core.getToolInfos().map((t) => t.name),
     allSkillNames: rt.fullSkillNames ?? core.getSkillsInfo({ includeDisabled: true }).map((s) => s.name),
     allAgentNames: rt.fullAgentNames ?? core.getAgentsInfo().map((a) => a.name),
+    mcpServerNames: mcpServerNamesOf(core),
     modelNames: core.getModelNames(),
     baseModels: core.getModelPointers(),
     modelProfiles: core.getModelProfiles()
   };
 }
+function mcpServerNamesOf(core) {
+  const byScope = core.getMCPServerConfigs();
+  const merged = /* @__PURE__ */ new Map();
+  for (const scope of ["user", "project"]) {
+    for (const s of byScope.get(scope) ?? []) merged.set(s.config.name, s.config.enabled !== false);
+  }
+  return [...merged.entries()].filter(([, on]) => on).map(([n]) => n);
+}
 function applyAssembly(core, rt, r, opts = {}) {
   core.updateAssemblyConfig({
     useTools: r.useTools,
@@ -153346,6 +153904,8 @@ function applyAssembly(core, rt, r, opts = {}) {
     // null = 回 model.conf 指针(base 清场)
     temperatureOverrides: r.temperatureOverrides,
     // null = 回 profile / 协议默认(base 清场)
+    mcpScope: r.mcpScope,
+    // null = 回 mcp.json 基线(base / 未声明都清场,不残留上一个 harness 的屏蔽)
     ...!opts.preserveThinking && r.thinking !== void 0 ? { thinking: r.thinking } : {}
     // 声明 ?? 基线;只在 use/reset/启动 下发,不做热切换
   });
@@ -153486,6 +154046,7 @@ function summarize(r, ctx) {
   const agentsDisabled = computeDisabledFrom(r.agentsSpec, ctx.allAgentNames);
   lines.push(`skill  ${skillsDisabled.size ? `\u7981\u7528 ${[...skillsDisabled].join(", ")}` : "\u5168\u90E8\u53EF\u89C1"}`);
   lines.push(`agent  ${agentsDisabled.size ? `\u7981\u7528 ${[...agentsDisabled].join(", ")}` : "\u5168\u90E8\u53EF\u89C1"}`);
+  if (r.mcpDeclared) lines.push(`MCP    ${describeMcpScope(r.mcpScope, ctx.mcpServerNames)}`);
   lines.push(`\u89C4\u5219\u6BB5 ${r.customRules ? `${r.customRules.split("\n").length} \u884C` : "\u65E0"}`);
   const p = r.promptOverrides;
   const promptDesc = p ? [
@@ -153521,6 +154082,18 @@ function summarize(r, ctx) {
   if (r.warnings.length) lines.push(...r.warnings.map((w) => `\u26A0 ${w}`));
   return lines.join("\n  ");
 }
+function describeMcpScope(scope, allServers) {
+  if (!scope) return "\u5168\u90E8\u53EF\u89C1";
+  const blocked = allServers.filter((n) => isServerScopedOutBy(n, scope));
+  const visible = allServers.filter((n) => !isServerScopedOutBy(n, scope));
+  const parts = [];
+  if (scope.servers !== null) parts.push(`\u767D\u540D\u5355 ${scope.servers.length ? scope.servers.join(", ") : "(\u7A7A:\u4E00\u4E2A server \u90FD\u4E0D\u7ED9)"}`);
+  else if (scope.disabledServers?.length) parts.push(`\u5C4F\u853D ${scope.disabledServers.join(", ")}`);
+  parts.push(`\u53EF\u89C1 ${visible.length}/${allServers.length}${blocked.length ? `(\u5C4F\u853D:${blocked.join(", ")})` : ""}`);
+  const narrowed = Object.entries(scope.tools ?? {}).filter(([k]) => !isServerScopedOutBy(k, scope));
+  if (narrowed.length) parts.push(`\u6536\u7A84 ${narrowed.map(([k, v]) => `${k}\u2192[${v.join(", ")}]`).join(" ")}`);
+  return parts.join(";") + "(\u8FDE\u63A5\u4E0D\u91CA\u653E,\u5207\u8D70\u5373\u56DE mcp.json \u57FA\u7EBF)";
+}
 async function harnessCommand(core, args) {
   const [sub, ...rest2] = args;
   const arg = rest2.join(" ").trim() || void 0;
@@ -160716,7 +161289,8 @@ async function mcpCommand(core, args) {
       const name = s.config?.name ?? "?";
       const enabled = s.config?.enabled !== false;
       const inheritedTag = name.startsWith(INHERIT_PREFIX) ? "\uFF08\u7EE7\u627F\u81EA semaclaw\uFF09" : "";
-      lines.push(`${enabled ? "\u25CF" : "\u25CB"} ${name} [${scope}] ${s.status}${s.error ? ` \u2014 ${s.error}` : ""}${inheritedTag}`);
+      const scopedTag = s.scopedOut ? "\uFF08harness \u5C4F\u853D\uFF0C\u5DE5\u5177\u4E0D\u53EF\u89C1\uFF09" : "";
+      lines.push(`${enabled ? s.scopedOut ? "\u25CC" : "\u25CF" : "\u25CB"} ${name} [${scope}] ${s.status}${s.error ? ` \u2014 ${s.error}` : ""}${inheritedTag}${scopedTag}`);
     }
   }
   if (!lines.length) lines.push("\uFF08\u672A\u914D\u7F6E MCP \u670D\u52A1\u5668\uFF09");
@@ -161071,7 +161645,8 @@ function createSessionCore(opts) {
     // 交互模式下文件编辑必须过权限卡;无人值守靠 permissionMode(free-style 全放行,其余由自动应答器 fail-closed)
     skipFileEditPermission: false,
     multiSession: opts.multiSession ?? false,
-    systemPrompt: opts.systemPrompt ?? DEFAULT_SYSTEM_PROMPT
+    systemPrompt: opts.systemPrompt ?? DEFAULT_SYSTEM_PROMPT,
+    ...opts.isSessionIdTaken ? { isSessionIdTaken: opts.isSessionIdTaken } : {}
   });
   registerSessionDirs(core, dirs);
   const potential = buildPotentialContextFiles(opts.cwd, appConfig);
@@ -161084,7 +161659,7 @@ function createSessionCore(opts) {
     thinking: false
     // cli 构造 core 时 thinking 关;harness 未声明即回到这里
   };
-  return { [SESSION_HANDLE_BRAND]: true, core, cwd: opts.cwd, interactive, permissionMode, appConfig, contextFiles, baseline, notes };
+  return { [SESSION_HANDLE_BRAND]: true, core, cwd: opts.cwd, interactive, permissionMode, appConfig, contextFiles, baseline, notes, permissionPolicy: opts.permissionPolicy, questionPolicy: opts.questionPolicy, formPolicy: opts.formPolicy };
 }
 async function discardSessionCore(handle) {
   const h = internalHandle(handle);
@@ -161116,29 +161691,100 @@ async function startSession(handle, opts = {}) {
   });
   const mcpNotes = await applyMcpHotUpdates(core).catch(() => []);
   notes.push(...mcpNotes.map((n) => `${n}\uFF08\u9879\u76EE\u7EA7 override\uFF09`));
-  const responder = h.interactive ? null : attachHeadlessResponder(core);
+  const responder = h.interactive ? null : attachHeadlessResponder(core, { permission: h.permissionPolicy, question: h.questionPolicy, form: h.formPolicy });
   return new SessionImpl(h, ready, notes, responder);
 }
-function attachHeadlessResponder(core) {
+function isPlainRecord(v) {
+  return typeof v === "object" && v !== null && !Array.isArray(v);
+}
+function isQuestionAnswers(v) {
+  return isPlainRecord(v) && Object.values(v).every((x) => typeof x === "string");
+}
+function isFormAnswer(v) {
+  return isPlainRecord(v) && isPlainRecord(v.values) && typeof v.submitted === "boolean";
+}
+function attachHeadlessResponder(core, policies = {}) {
+  const policy = policies.permission;
   const blocked = [];
+  let gen = 0;
   const onPermission = (d) => {
-    blocked.push({ kind: "permission", name: d.toolName, title: d.title, agentId: d.agentId });
-    setImmediate(() => core.respondToToolPermission({ toolName: d.toolName, selected: "refuse", agentId: d.agentId }));
+    const g = gen;
+    const fresh = () => gen === g;
+    const respond = (selected) => {
+      setImmediate(() => {
+        if (fresh()) core.respondToToolPermission({ toolName: d.toolName, selected, agentId: d.agentId });
+      });
+    };
+    const deny = () => {
+      if (!fresh()) return;
+      blocked.push({ kind: "permission", name: d.toolName, title: d.title, agentId: d.agentId });
+      respond("refuse");
+    };
+    if (!policy) return deny();
+    let decided;
+    try {
+      decided = Promise.resolve(policy({ agentId: d.agentId, toolName: d.toolName, title: d.title, content: d.content, options: d.options }));
+    } catch {
+      decided = Promise.resolve("deny");
+    }
+    void decided.then(
+      (decision) => {
+        if (!fresh()) return;
+        if (decision === "allow") respond("agree");
+        else deny();
+      },
+      () => deny()
+    );
+  };
+  const decide = (fn, valid, fallback, g, apply2) => {
+    let decided;
+    try {
+      decided = fn ? Promise.resolve(fn()) : Promise.resolve(fallback);
+    } catch {
+      decided = Promise.resolve(fallback);
+    }
+    void decided.then(
+      (v) => apply2(valid(v) ? v : fallback, gen === g),
+      () => apply2(fallback, gen === g)
+    );
   };
   const onQuestion = (d) => {
-    blocked.push({ kind: "question", name: "AskUserQuestion", title: d.questions.map((q) => q.question).join(" / "), agentId: d.agentId });
-    setImmediate(() => core.respondToAskQuestion({ agentId: d.agentId, answers: {} }));
+    const g = gen;
+    const q = policies.question;
+    decide(q ? () => q({ agentId: d.agentId, questions: d.questions }) : void 0, isQuestionAnswers, {}, g, (answers, fresh) => {
+      if (!fresh) return;
+      const skipped = Object.keys(answers).length === 0;
+      if (skipped) blocked.push({ kind: "question", name: "AskUserQuestion", title: d.questions.map((x) => x.question).join(" / "), agentId: d.agentId });
+      setImmediate(() => {
+        if (gen === g) core.respondToAskQuestion({ agentId: d.agentId, answers });
+      });
+    });
   };
   const onForm = (d) => {
-    blocked.push({ kind: "form", name: "FormUI", title: d.title, agentId: d.agentId });
-    setImmediate(() => core.respondToForm({ agentId: d.agentId, values: {}, submitted: false }));
+    const g = gen;
+    const f = policies.form;
+    const fallback = { values: {}, submitted: false };
+    decide(f ? () => f({ agentId: d.agentId, title: d.title, surface: d.surface, submitLabel: d.submitLabel, fields: d.fields }) : void 0, isFormAnswer, fallback, g, (a, fresh) => {
+      if (!fresh) return;
+      if (!a.submitted) blocked.push({ kind: "form", name: "FormUI", title: d.title, agentId: d.agentId });
+      setImmediate(() => {
+        if (gen === g) core.respondToForm({ agentId: d.agentId, values: a.values, submitted: a.submitted });
+      });
+    });
   };
   core.on("tool:permission:request", onPermission);
   core.on("ask:question:request", onQuestion);
   core.on("form:request", onForm);
   return {
     blocked,
+    beginTurn() {
+      gen++;
+    },
+    endTurn() {
+      gen++;
+    },
     detach() {
+      gen++;
       core.off("tool:permission:request", onPermission);
       core.off("ask:question:request", onQuestion);
       core.off("form:request", onForm);
@@ -161198,6 +161844,7 @@ var SessionImpl = class {
     const core = this.core;
     const timeoutMs = opts.timeoutMs ?? DEFAULT_SEND_TIMEOUT_MS;
     const blockedStart = this.responder?.blocked.length ?? 0;
+    this.responder?.beginTurn();
     return new Promise((resolve9) => {
       const texts = [];
       let usage2;
@@ -161228,6 +161875,7 @@ var SessionImpl = class {
         done = true;
         clearTimeout(timer);
         this.abortCurrent = null;
+        this.responder?.endTurn();
         core.off("message:complete", onMessage);
         core.off("state:update", onState);
         core.off("session:error", onError);
@@ -161348,7 +161996,6 @@ var fancy = {
   refresh: "\u27F3",
   updown: "\u2191\u2193",
   permMode: "\u21E7\u21E5",
-  newline: "\u23CE",
   sBullet: "\u25CF",
   sToolDot: "\u23FA",
   sThink: "\u273B",
@@ -161382,7 +162029,6 @@ var ascii = {
   refresh: "~",
   updown: "\u4E0A\u4E0B\u952E",
   permMode: "[perm]",
-  newline: "\\n",
   sBullet: "\u25CF",
   sToolDot: "\u25CF",
   sThink: "\u203B",
@@ -161553,12 +162199,28 @@ function headByRows(text, maxRows, columns) {
   }
   return { text: lines.slice(0, i).join("\n"), hiddenLines: lines.length - i, truncated: true };
 }
+var isJoinAfter = (cp) => cp === 65039 || // VS16
+cp >= 127995 && cp <= 127999 || // 肤色修饰符
+cp >= 768 && cp <= 879 || // 组合附加符号
+cp >= 8400 && cp <= 8447;
+function clusterEnd(chars, i) {
+  let j = i + 1;
+  while (j < chars.length) {
+    const cp = chars[j].codePointAt(0);
+    if (cp === 8205 && j + 1 < chars.length) {
+      j += 2;
+      continue;
+    }
+    if (isJoinAfter(cp)) {
+      j++;
+      continue;
+    }
+    break;
+  }
+  return j;
+}
 function hardWrapByWidth(text, columns) {
   const cols = Math.max(1, columns);
-  const isJoinAfter = (cp) => cp === 65039 || // VS16
-  cp >= 127995 && cp <= 127999 || // 肤色修饰符
-  cp >= 768 && cp <= 879 || // 组合附加符号
-  cp >= 8400 && cp <= 8447;
   const out = [];
   for (const line of text.split("\n")) {
     if (!line.includes("	") && estimateWidth(line) <= cols) {
@@ -161594,19 +162256,7 @@ function hardWrapByWidth(text, columns) {
           i++;
           continue;
         }
-        let j = i + 1;
-        while (j < chars.length) {
-          const cp = chars[j].codePointAt(0);
-          if (cp === 8205 && j + 1 < chars.length) {
-            j += 2;
-            continue;
-          }
-          if (isJoinAfter(cp)) {
-            j++;
-            continue;
-          }
-          break;
-        }
+        const j = clusterEnd(chars, i);
         const cluster = chars.slice(i, j).join("");
         const cw = estimateWidth(cluster);
         if (w + cw > cols && w > 0) {
@@ -161628,30 +162278,6 @@ function clipToWidth(line, maxWidth) {
   if (estimateWidth(line) <= w) return line;
   return headOfLine(line, w - 1) + "\u2026";
 }
-function windowAroundCursor(chars, cursor, budget, newlineGlyph) {
-  const glyph = (ch) => ch === "\n" ? newlineGlyph : ch;
-  const half = Math.floor(budget / 2);
-  let w = 0;
-  let lo = cursor;
-  while (lo > 0) {
-    const cw = estimateWidth(glyph(chars[lo - 1]));
-    if (w + cw > half) break;
-    w += cw;
-    lo--;
-  }
-  const at2 = cursor < chars.length ? glyph(chars[cursor]) : "";
-  let rest2 = budget - w - estimateWidth(at2);
-  let hi = Math.min(cursor + 1, chars.length);
-  while (hi < chars.length) {
-    const cw = estimateWidth(glyph(chars[hi]));
-    if (rest2 - cw < 0) break;
-    rest2 -= cw;
-    hi++;
-  }
-  const before2 = (lo > 0 ? "\u2026" : "") + chars.slice(lo, cursor).map(glyph).join("");
-  const after2 = chars.slice(Math.min(cursor + 1, chars.length), hi).map(glyph).join("") + (hi < chars.length ? "\u2026" : "");
-  return { before: before2, at: at2, after: after2 };
-}
 
 // src/tui/bridge.ts
 var MAIN2 = "main";
@@ -161752,6 +162378,10 @@ var Bridge = class {
   setUsage(usage2) {
     this.set({ usage: usage2 });
   }
+  /** 会话切换（/resume 的 session:ready、/clear 的 session:cleared）后同步 UI 镜像：新 sessionId/usage，清掉上一会话的 todos 与流式残留 */
+  resetSession(d) {
+    this.set({ sessionId: d.sessionId, usage: d.usage, todos: [], streamText: "", streamThinkingChars: 0 });
+  }
   setThinking(enabled) {
     this.set({ thinkingEnabled: enabled });
     this.core.updateThinking(enabled);
@@ -161960,6 +162590,10 @@ var Bridge = class {
     core.on("session:interrupted", (d) => {
       if (d.agentId === MAIN2) this.notice("\u23F9 \u5DF2\u4E2D\u65AD", "warn");
     });
+    core.on("session:cleared", (d) => {
+      this.resetSession(d);
+      this.notice(`\u4E0A\u4E0B\u6587\u5DF2\u6E05\u7A7A\uFF0C\u65B0\u4F1A\u8BDD ${d.sessionId}${d.previousSessionId ? `\uFF08\u539F\u4F1A\u8BDD ${d.previousSessionId} \u53EF\u7528 /resume \u6062\u590D\uFF09` : ""}`, "success");
+    });
     core.on("session:error", (d) => {
       this.notice(`\u4F1A\u8BDD\u9519\u8BEF [${d.type}] ${d.error?.message ?? d.error?.code ?? ""}`, "error");
     });
@@ -162397,10 +163031,284 @@ function findAtToken(chars, cursor) {
   return { start, end, prefix: chars.slice(start + 1, cursor).join("") };
 }
 
+// src/tui/pasteText.ts
+var PASTE_COLLAPSE_CHARS = 200;
+var PLACEHOLDER_RE = /\[粘贴#\d+ [^[\]]*\]/g;
+var IMAGE_PLACEHOLDER_RE = /\[图片#\d+\]/g;
+var pastes = /* @__PURE__ */ new Map();
+var pasteSeq = 0;
+function sanitizePastedText(raw) {
+  return raw.replace(/\r\n?/g, "\n").replace(/\t/g, "  ").replace(/[\x00-\x08\x0b-\x1f\x7f]/g, "").replace(/\n+$/, "");
+}
+function collapsePaste(text) {
+  const chars = [...text];
+  if (chars.length <= PASTE_COLLAPSE_CHARS) return null;
+  const lines = text.split("\n").length;
+  const placeholder = `[\u7C98\u8D34#${++pasteSeq} ${lines > 1 ? `${lines}\u884C` : `${chars.length}\u5B57`}]`;
+  pastes.set(placeholder, text);
+  return placeholder;
+}
+function expandPastes(value) {
+  return value.replace(PLACEHOLDER_RE, (m) => {
+    const text = pastes.get(m);
+    if (text === void 0) return m;
+    pastes.delete(m);
+    return text;
+  });
+}
+function atomicSpans(value) {
+  const spans = [];
+  const collect = (re, accept) => {
+    for (const m of value.matchAll(re)) {
+      if (!accept(m[0])) continue;
+      const start = [...value.slice(0, m.index)].length;
+      spans.push({ start, end: start + [...m[0]].length });
+    }
+  };
+  collect(PLACEHOLDER_RE, (t) => pastes.has(t));
+  collect(IMAGE_PLACEHOLDER_RE, () => true);
+  return spans.sort((a, b) => a.start - b.start);
+}
+function spanEndingAt(spans, i) {
+  return spans.find((s) => s.end === i);
+}
+function spanStartingAt(spans, i) {
+  return spans.find((s) => s.start === i);
+}
+
+// src/tui/terminalInput.ts
+import { PassThrough as PassThrough2 } from "node:stream";
+import { emitKeypressEvents } from "node:readline";
+var BP_START = "\x1B[200~";
+var BP_END = "\x1B[201~";
+var SETTLE_MS = 30;
+var CHUNK_MIN = 256;
+function createTerminalInput(emit) {
+  let bracketed = null;
+  let fallback = "";
+  let prefix = "";
+  let timer;
+  const keys2 = new PassThrough2();
+  emitKeypressEvents(keys2);
+  const onKey = (input, key) => {
+    emit({
+      kind: "key",
+      input: key.ctrl ? key.name ?? "" : input ?? "",
+      key: {
+        upArrow: key.name === "up",
+        downArrow: key.name === "down",
+        leftArrow: key.name === "left",
+        rightArrow: key.name === "right",
+        pageUp: key.name === "pageup",
+        pageDown: key.name === "pagedown",
+        return: key.name === "return" || key.name === "enter",
+        escape: key.name === "escape",
+        tab: key.name === "tab",
+        backspace: key.name === "backspace",
+        delete: key.name === "delete",
+        ctrl: !!key.ctrl,
+        shift: !!key.shift,
+        meta: !!key.meta
+      }
+    });
+  };
+  keys2.on("keypress", onKey);
+  const flush = () => {
+    if (!fallback) return;
+    emit({ kind: "paste", text: fallback });
+    fallback = "";
+  };
+  const ordinary = (data, asKeys = false) => {
+    if (!data) return;
+    if (data === "\x1B") {
+      flush();
+      onKey("", { name: "escape", sequence: data });
+      return;
+    }
+    if (asKeys) {
+      flush();
+      keys2.write(data);
+      return;
+    }
+    const singleControl = data.length === 1 && /[\x00-\x1f\x7f]/.test(data);
+    if (!data.startsWith("\x1B") && !singleControl && (fallback || [...data].length >= CHUNK_MIN)) {
+      fallback += data;
+    } else {
+      flush();
+      if ([...data].length > 1 && !data.startsWith("\x1B")) emit({ kind: "paste", text: data });
+      else keys2.write(data);
+    }
+  };
+  const write = (chunk2) => {
+    clearTimeout(timer);
+    let data = prefix + chunk2;
+    let afterBracket = false;
+    prefix = "";
+    while (data) {
+      if (bracketed !== null) {
+        const searchFrom = Math.max(0, bracketed.length - BP_END.length + 1);
+        bracketed += data;
+        const end = bracketed.indexOf(BP_END, searchFrom);
+        if (end < 0) return;
+        emit({ kind: "paste", text: bracketed.slice(0, end) });
+        data = bracketed.slice(end + BP_END.length);
+        bracketed = null;
+        afterBracket = true;
+        continue;
+      }
+      const start = data.indexOf(BP_START);
+      if (start >= 0) {
+        ordinary(data.slice(0, start), afterBracket);
+        flush();
+        bracketed = "";
+        data = data.slice(start + BP_START.length);
+        continue;
+      }
+      for (let n = Math.min(data.length, BP_START.length - 1); n > 0; n--) {
+        if (data.endsWith(BP_START.slice(0, n))) {
+          prefix = data.slice(-n);
+          data = data.slice(0, -n);
+          break;
+        }
+      }
+      ordinary(data, afterBracket);
+      break;
+    }
+    if (prefix || fallback) {
+      timer = setTimeout(() => {
+        const pending = prefix;
+        prefix = "";
+        ordinary(pending);
+        flush();
+      }, SETTLE_MS);
+    }
+  };
+  return {
+    write,
+    dispose() {
+      clearTimeout(timer);
+      keys2.removeAllListeners("keypress");
+      keys2.destroy();
+    }
+  };
+}
+
+// src/tui/inputLayout.ts
+function layoutRows(chars, columns) {
+  const cols = Math.max(1, columns);
+  const rows = [];
+  let rowStart = 0;
+  let w = 0;
+  let i = 0;
+  while (i < chars.length) {
+    if (chars[i] === "\n") {
+      rows.push({ start: rowStart, end: i });
+      i++;
+      rowStart = i;
+      w = 0;
+      continue;
+    }
+    const j = clusterEnd(chars, i);
+    const cw = estimateWidth(chars.slice(i, j).join(""));
+    if (w + cw > cols && w > 0) {
+      rows.push({ start: rowStart, end: i });
+      rowStart = i;
+      w = 0;
+    }
+    w += cw;
+    i = j;
+  }
+  rows.push({ start: rowStart, end: chars.length });
+  return rows;
+}
+function rowOfCursor(rows, cursor) {
+  let r = 0;
+  for (let i = 0; i < rows.length; i++) {
+    if (rows[i].start <= cursor) r = i;
+    else break;
+  }
+  return r;
+}
+function columnOf(chars, row, cursor) {
+  return estimateWidth(chars.slice(row.start, Math.min(cursor, row.end)).join(""));
+}
+function indexAtColumn(chars, row, column) {
+  let w = 0;
+  let i = row.start;
+  while (i < row.end) {
+    const j = clusterEnd(chars, i);
+    const cw = estimateWidth(chars.slice(i, j).join(""));
+    if (w + cw > column) break;
+    w += cw;
+    i = j;
+  }
+  return i;
+}
+function moveVertical(chars, rows, cursor, delta) {
+  const r = rowOfCursor(rows, cursor);
+  const target = r + delta;
+  if (target < 0 || target >= rows.length) return null;
+  const row = rows[target];
+  const index = indexAtColumn(chars, row, columnOf(chars, rows[r], cursor));
+  if (index === row.end && rows[target + 1]?.start === row.end) {
+    let last2 = row.start;
+    for (let i = row.start; i < row.end; i = clusterEnd(chars, i)) last2 = i;
+    return last2;
+  }
+  return index;
+}
+function lineStart(chars, cursor) {
+  let i = cursor;
+  while (i > 0 && chars[i - 1] !== "\n") i--;
+  return i;
+}
+function lineEnd(chars, cursor) {
+  let i = cursor;
+  while (i < chars.length && chars[i] !== "\n") i++;
+  return i;
+}
+function scrollTop(total, cursorRow, visible, prevTop) {
+  const maxTop = Math.max(0, total - visible);
+  let top = Math.min(Math.max(0, prevTop), maxTop);
+  if (cursorRow < top) top = cursorRow;
+  else if (cursorRow >= top + visible) top = cursorRow - visible + 1;
+  return top;
+}
+function segmentRow(chars, row, spans, cursor) {
+  const segs = [];
+  const push = (text, kind) => {
+    const last2 = segs[segs.length - 1];
+    if (last2 && last2.kind === kind && kind !== "cursor") last2.text += text;
+    else segs.push({ text, kind });
+  };
+  let s = 0;
+  for (let i = row.start; i < row.end; i++) {
+    while (s < spans.length && spans[s].end <= i) s++;
+    const inSpan = s < spans.length && spans[s].start <= i && i < spans[s].end;
+    if (i === cursor) push(chars[i], "cursor");
+    else push(chars[i], inSpan ? "placeholder" : "text");
+  }
+  if (cursor === row.end) segs.push({ text: "", kind: "cursor" });
+  return segs;
+}
+
 // src/tui/components/LineInput.tsx
 var import_jsx_runtime3 = __toESM(require_jsx_runtime());
 var MENU_MAX = 8;
-var FORWARD_DELETE_SEQ = "\x1B[3~";
+var BP_ENABLE = "\x1B[?2004h";
+var BP_DISABLE = "\x1B[?2004l";
+function insertAt({ value, cursor }, text, pad2) {
+  const chars = [...value];
+  let insert = text;
+  if (pad2) {
+    const spaceBefore = cursor > 0 && chars[cursor - 1] !== " " ? " " : "";
+    const spaceAfter = chars[cursor] === " " || chars[cursor] === "\n" ? "" : " ";
+    insert = spaceBefore + text + spaceAfter;
+  }
+  const ins = [...insert];
+  chars.splice(cursor, 0, ...ins);
+  return { value: chars.join(""), cursor: cursor + ins.length };
+}
 function LineInput({ prompt = G.prompt, placeholder = "", history = [], color = theme.accent, onSubmit, onPaste, commands = [], completePaths }) {
   const [state, setState] = (0, import_react22.useState)({ value: "", cursor: 0 });
   const [histIdx, setHistIdx] = (0, import_react22.useState)(-1);
@@ -162414,6 +163322,7 @@ function LineInput({ prompt = G.prompt, placeholder = "", history = [], color =
   const sel = menu.length > 0 ? Math.min(selIdx ?? 0, menu.length - 1) : 0;
   const histValueRef = (0, import_react22.useRef)(null);
   const browsingHistory = histIdx >= 0 && state.value === histValueRef.current;
+  const draftRef = (0, import_react22.useRef)({ value: "", cursor: 0 });
   const arrowsToMenu = menuCapturesArrows(menu, isPathMenu && atToken ? "@" + atToken.prefix : state.value, browsingHistory);
   (0, import_react22.useEffect)(() => {
     setSelIdx(null);
@@ -162427,23 +163336,48 @@ function LineInput({ prompt = G.prompt, placeholder = "", history = [], color =
   }
   const pastingRef = (0, import_react22.useRef)(false);
   const [pasting, setPasting] = (0, import_react22.useState)(false);
-  const fwdDeleteRef = (0, import_react22.useRef)(false);
-  const { internal_eventEmitter } = use_stdin_default();
+  const inputQueue = (0, import_react22.useRef)([]);
+  const [inputVersion, wakeInput] = (0, import_react22.useState)(0);
+  function insertPaste(raw) {
+    const text = sanitizePastedText(raw);
+    if (!text) return;
+    const ph = collapsePaste(text);
+    setState((s) => ph ? insertAt(s, ph, true) : insertAt(s, text, false));
+  }
+  const { internal_eventEmitter, setRawMode } = use_stdin_default();
+  const { stdout } = use_stdout_default();
   (0, import_react22.useEffect)(() => {
-    const onRaw = (data) => {
-      fwdDeleteRef.current = data === FORWARD_DELETE_SEQ;
-      if (!fwdDeleteRef.current) return;
-      setState(({ value: value2, cursor: cursor2 }) => {
-        const chars2 = [...value2];
-        if (cursor2 >= chars2.length) return { value: value2, cursor: cursor2 };
-        chars2.splice(cursor2, 1);
-        return { value: chars2.join(""), cursor: cursor2 };
-      });
+    const reader = createTerminalInput((event) => {
+      inputQueue.current.push(event);
+      wakeInput((n) => n + 1);
+    });
+    setRawMode(true);
+    stdout?.write(BP_ENABLE);
+    internal_eventEmitter?.on("input", reader.write);
+    return () => {
+      internal_eventEmitter?.off("input", reader.write);
+      reader.dispose();
+      inputQueue.current = [];
+      stdout?.write(BP_DISABLE);
+      setRawMode(false);
     };
-    internal_eventEmitter?.on("input", onRaw);
-    return () => internal_eventEmitter?.off("input", onRaw);
-  }, [internal_eventEmitter]);
-  use_input_default((input, key) => {
+  }, [internal_eventEmitter, stdout, setRawMode]);
+  const { value, cursor } = state;
+  const chars = [...value];
+  const termColumns = stdout?.columns ?? 80;
+  const termRows = stdout?.rows ?? 24;
+  const promptWidth = estimateWidth(prompt);
+  const columns = Math.max(10, termColumns - 5 - promptWidth);
+  const inputRows = Math.max(2, Math.min(6, termRows - 16));
+  const rows = layoutRows(chars, columns);
+  const curRow = rowOfCursor(rows, cursor);
+  const clipped = rows.length > inputRows;
+  const visible = clipped ? inputRows - 1 : inputRows;
+  const topRef = (0, import_react22.useRef)(0);
+  topRef.current = scrollTop(rows.length, curRow, visible, topRef.current);
+  const top = topRef.current;
+  const spans = atomicSpans(value);
+  function handleKey(input, key) {
     if (key.return) {
       if (pastingRef.current) return;
       if (isPathMenu && selIdx !== null && menu.length > 0) {
@@ -162454,8 +163388,9 @@ function LineInput({ prompt = G.prompt, placeholder = "", history = [], color =
       setState({ value: "", cursor: 0 });
       setHistIdx(-1);
       histValueRef.current = null;
+      draftRef.current = { value: "", cursor: 0 };
       setSelIdx(null);
-      onSubmit(v);
+      onSubmit(expandPastes(v));
       return;
     }
     if (key.tab) {
@@ -162468,22 +163403,34 @@ function LineInput({ prompt = G.prompt, placeholder = "", history = [], color =
       }
       return;
     }
-    if (key.backspace || key.delete) {
-      if (fwdDeleteRef.current) return;
+    if (key.delete) {
+      setState(({ value: value2, cursor: cursor2 }) => {
+        const chars2 = [...value2];
+        const span = spanStartingAt(atomicSpans(value2), cursor2);
+        chars2.splice(cursor2, span ? span.end - span.start : 1);
+        return { value: chars2.join(""), cursor: cursor2 };
+      });
+      return;
+    }
+    if (key.backspace) {
       setState(({ value: value2, cursor: cursor2 }) => {
         if (cursor2 === 0) return { value: value2, cursor: cursor2 };
         const chars2 = [...value2];
-        chars2.splice(cursor2 - 1, 1);
-        return { value: chars2.join(""), cursor: cursor2 - 1 };
+        const span = spanEndingAt(atomicSpans(value2), cursor2);
+        const n = span ? span.end - span.start : 1;
+        chars2.splice(cursor2 - n, n);
+        return { value: chars2.join(""), cursor: cursor2 - n };
       });
       return;
     }
     if (key.leftArrow) {
-      setState(({ value: value2, cursor: cursor2 }) => ({ value: value2, cursor: Math.max(0, cursor2 - 1) }));
+      const span = spanEndingAt(spans, cursor);
+      setState(({ value: value2, cursor: cursor2 }) => ({ value: value2, cursor: span ? span.start : Math.max(0, cursor2 - 1) }));
       return;
     }
     if (key.rightArrow) {
-      setState(({ value: value2, cursor: cursor2 }) => ({ value: value2, cursor: Math.min([...value2].length, cursor2 + 1) }));
+      const span = spanStartingAt(spans, cursor);
+      setState(({ value: value2, cursor: cursor2 }) => ({ value: value2, cursor: span ? span.end : Math.min([...value2].length, cursor2 + 1) }));
       return;
     }
     if (key.upArrow) {
@@ -162491,8 +163438,15 @@ function LineInput({ prompt = G.prompt, placeholder = "", history = [], color =
         setSelIdx((sel - 1 + menu.length) % menu.length);
         return;
       }
+      const moved = moveVertical(chars, rows, cursor, -1);
+      if (moved !== null) {
+        setState({ value, cursor: moved });
+        return;
+      }
       if (history.length === 0) return;
-      const next = Math.min(histIdx + 1, history.length - 1);
+      const base = browsingHistory ? histIdx : -1;
+      if (base === -1) draftRef.current = state;
+      const next = Math.min(base + 1, history.length - 1);
       const v = history[next] ?? "";
       setHistIdx(next);
       histValueRef.current = v;
@@ -162504,10 +163458,16 @@ function LineInput({ prompt = G.prompt, placeholder = "", history = [], color =
         setSelIdx((sel + 1) % menu.length);
         return;
       }
+      const moved = moveVertical(chars, rows, cursor, 1);
+      if (moved !== null) {
+        setState({ value, cursor: moved });
+        return;
+      }
+      if (!browsingHistory) return;
       if (histIdx <= 0) {
         setHistIdx(-1);
         histValueRef.current = null;
-        setState({ value: "", cursor: 0 });
+        setState(draftRef.current);
         return;
       }
       const next = histIdx - 1;
@@ -162518,11 +163478,11 @@ function LineInput({ prompt = G.prompt, placeholder = "", history = [], color =
       return;
     }
     if (key.ctrl && input === "a") {
-      setState(({ value: value2 }) => ({ value: value2, cursor: 0 }));
+      setState(({ value: value2, cursor: cursor2 }) => ({ value: value2, cursor: lineStart([...value2], cursor2) }));
       return;
     }
     if (key.ctrl && input === "e") {
-      setState(({ value: value2 }) => ({ value: value2, cursor: [...value2].length }));
+      setState(({ value: value2, cursor: cursor2 }) => ({ value: value2, cursor: lineEnd([...value2], cursor2) }));
       return;
     }
     if (key.ctrl && input === "v" && onPaste) {
@@ -162530,20 +163490,9 @@ function LineInput({ prompt = G.prompt, placeholder = "", history = [], color =
       pastingRef.current = true;
       setPasting(true);
       void onPaste().then((r) => {
-        if (r) {
-          setState(({ value: value2, cursor: cursor2 }) => {
-            const chars2 = [...value2];
-            let insert = r.insert;
-            if (r.pad) {
-              const spaceBefore = cursor2 > 0 && chars2[cursor2 - 1] !== " " ? " " : "";
-              const spaceAfter = chars2[cursor2] === " " ? "" : " ";
-              insert = spaceBefore + r.insert + spaceAfter;
-            }
-            const ins = [...insert];
-            chars2.splice(cursor2, 0, ...ins);
-            return { value: chars2.join(""), cursor: cursor2 + ins.length };
-          });
-        }
+        if (!r) return;
+        if (r.pad) setState((s) => insertAt(s, r.insert, true));
+        else insertPaste(r.insert);
       }).catch(() => {
       }).finally(() => {
         pastingRef.current = false;
@@ -162555,39 +163504,40 @@ function LineInput({ prompt = G.prompt, placeholder = "", history = [], color =
       return;
     }
     if (input) {
-      setState(({ value: value2, cursor: cursor2 }) => {
-        const chars2 = [...value2];
-        const ins = [...input];
-        chars2.splice(cursor2, 0, ...ins);
-        return { value: chars2.join(""), cursor: cursor2 + ins.length };
-      });
+      setState((s) => insertAt(s, input, false));
     }
-  });
-  const { value, cursor } = state;
-  const chars = [...value];
-  const { stdout } = use_stdout_default();
-  const termColumns = stdout?.columns ?? 80;
-  const termRows = stdout?.rows ?? 24;
-  const inputRows = Math.max(2, Math.min(4, termRows - 12));
-  const budget = Math.max(40, termColumns - 8) * inputRows;
-  const { before: before2, at: at2, after: after2 } = windowAroundCursor(chars, cursor, budget, G.newline);
+  }
+  (0, import_react22.useEffect)(() => {
+    const event = inputQueue.current.shift();
+    if (!event) return;
+    if (event.kind === "paste") insertPaste(event.text);
+    else handleKey(event.input, event.key);
+    if (inputQueue.current.length) wakeInput((n) => n + 1);
+  }, [inputVersion]);
+  const pastingHint = pasting ? /* @__PURE__ */ (0, import_jsx_runtime3.jsxs)(Text, { dimColor: true, children: [
+    " ",
+    G.refresh,
+    " \u7C98\u8D34\u4E2D\u2026"
+  ] }) : null;
+  const indent = " ".repeat(promptWidth);
   return /* @__PURE__ */ (0, import_jsx_runtime3.jsxs)(Box_default, { flexDirection: "column", children: [
-    /* @__PURE__ */ (0, import_jsx_runtime3.jsxs)(Text, { children: [
+    value ? rows.slice(top, top + visible).map((row, i) => {
+      const r = top + i;
+      const segs = segmentRow(chars, row, spans, r === curRow ? cursor : null);
+      return /* @__PURE__ */ (0, import_jsx_runtime3.jsxs)(Text, { wrap: "truncate-end", children: [
+        /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(Text, { color, children: r === 0 ? prompt : indent }),
+        segs.map(
+          (s, j) => s.kind === "cursor" ? s.text ? /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(Text, { inverse: true, children: s.text }, j) : /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(Text, { color, children: G.cursor }, j) : /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(Text, { color: s.kind === "placeholder" ? color : void 0, children: s.text }, j)
+        ),
+        r === curRow ? pastingHint : null
+      ] }, r);
+    }) : /* @__PURE__ */ (0, import_jsx_runtime3.jsxs)(Text, { children: [
       /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(Text, { color, children: prompt }),
-      value ? /* @__PURE__ */ (0, import_jsx_runtime3.jsxs)(import_jsx_runtime3.Fragment, { children: [
-        /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(Text, { children: before2 }),
-        at2 ? /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(Text, { inverse: true, children: at2 }) : /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(Text, { color, children: G.cursor }),
-        /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(Text, { children: after2 })
-      ] }) : /* @__PURE__ */ (0, import_jsx_runtime3.jsxs)(import_jsx_runtime3.Fragment, { children: [
-        /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(Text, { color, children: G.cursor }),
-        /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(Text, { dimColor: true, children: placeholder })
-      ] }),
-      pasting ? /* @__PURE__ */ (0, import_jsx_runtime3.jsxs)(Text, { dimColor: true, children: [
-        " ",
-        G.refresh,
-        " \u7C98\u8D34\u4E2D\u2026"
-      ] }) : null
+      /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(Text, { color, children: G.cursor }),
+      /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(Text, { dimColor: true, children: placeholder }),
+      pastingHint
     ] }),
+    clipped ? /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(Text, { dimColor: true, children: `  \u2026\u5171 ${rows.length} \u884C\uFF0C\u663E\u793A\u7B2C ${top + 1}-${top + visible} \u884C\uFF08${G.updown} \u79FB\u52A8\u5149\u6807\uFF09` }) : null,
     menu.map((c, i) => /* @__PURE__ */ (0, import_jsx_runtime3.jsxs)(Text, { color: i === sel ? color : void 0, dimColor: i !== sel, children: [
       i === sel ? G.menuPointer : "  ",
       c
@@ -162645,8 +163595,8 @@ function SelectList({ options: options2, multi = false, color = theme.accent, on
     }
   });
   const { stdout } = use_stdout_default();
-  const maxVisible = Math.max(3, Math.min(options2.length, (stdout?.rows ?? 24) - 8));
-  const winStart = Math.min(Math.max(0, index - maxVisible + 1), options2.length - maxVisible);
+  const maxVisible = Math.max(1, Math.min(options2.length, Math.max(3, (stdout?.rows ?? 24) - 8)));
+  const winStart = Math.max(0, Math.min(index - maxVisible + 1, options2.length - maxVisible));
   const visible = options2.slice(winStart, winStart + maxVisible);
   return /* @__PURE__ */ (0, import_jsx_runtime4.jsxs)(Box_default, { flexDirection: "column", children: [
     winStart > 0 ? /* @__PURE__ */ (0, import_jsx_runtime4.jsx)(Text, { dimColor: true, children: `  \u2026 \u4E0A\u65B9\u8FD8\u6709 ${winStart} \u9879` }) : null,
@@ -162872,7 +163822,7 @@ import { promisify as promisify2 } from "util";
 var execFileP2 = promisify2(execFile2);
 var IMAGE_EXT_RE = /\.(png|jpe?g|gif|webp)$/i;
 var pastedImages = /* @__PURE__ */ new Map();
-var pasteSeq = 0;
+var pasteSeq2 = 0;
 var housekeepingDone = false;
 function ensureHousekeeping(dir) {
   if (housekeepingDone) return;
@@ -162944,11 +163894,11 @@ async function readClipboardText() {
   } catch {
     return null;
   }
-  const text = raw.replace(/\r\n?/g, "\n").replace(/\t/g, "  ").replace(/[\x00-\x08\x0b-\x1f\x7f]/g, "").replace(/\n+$/, "");
+  const text = sanitizePastedText(raw);
   return text || null;
 }
 async function capturePastedImage() {
-  const seq = ++pasteSeq;
+  const seq = ++pasteSeq2;
   const file = await readClipboardImage(seq);
   if (!file) return null;
   const placeholder = `[\u56FE\u7247#${seq}]`;
@@ -163159,6 +164109,29 @@ async function runShellCommand(cmd, opts) {
   return finalize(killed ? "killed" : "exited");
 }
 
+// src/sessionSwitch.ts
+init_skills();
+init_agents();
+async function switchSession(core, sessionId) {
+  let ready;
+  const onReady = (d) => {
+    ready = d;
+  };
+  core.once("session:ready", onReady);
+  try {
+    await core.createSession(sessionId);
+  } finally {
+    core.off("session:ready", onReady);
+  }
+  if (!ready) throw new Error("createSession \u5DF2\u8FD4\u56DE\u4F46\u672A\u6536\u5230 session:ready");
+  const notes = [];
+  applyDisabledSkills(core);
+  await applyDisabledAgents(core).catch((e) => {
+    notes.push(`subagent \u542F\u505C\u540D\u5355\u5E94\u7528\u5931\u8D25\uFF08harness agent \u53D6\u820D\u53EF\u80FD\u672A\u751F\u6548\uFF09\uFF1A${e instanceof Error ? e.message : String(e)}`);
+  });
+  return { ready, notes };
+}
+
 // src/tui/App.tsx
 var import_jsx_runtime6 = __toESM(require_jsx_runtime());
 function ShellRunningLine({ cmd }) {
@@ -163179,7 +164152,7 @@ function ShellRunningLine({ cmd }) {
 }
 var HELP = [
   "/help \u672C\u5E2E\u52A9 \xB7 /model \u6A21\u578B\u914D\u7F6E \xB7 /skills skill \u542F\u505C \xB7 /agents \u4EBA\u8BBE\u542F\u505C \xB7 /mcp MCP \u5217\u8868 \xB7 /marketplace \u63D2\u4EF6\u5E02\u573A \xB7 /memory \u8BB0\u5FC6/\u4EBA\u8BBE\u6587\u4EF6 \xB7 /resume \u5207\u6362\u5386\u53F2\u4F1A\u8BDD \xB7 /status \u72B6\u6001 \xB7 /tools \u5DE5\u5177\u5217\u8868",
-  "/theme [\u540D\u79F0] \u4E3B\u9898\u5207\u6362 \xB7 /glyphs [auto|fancy|ascii] \u5B57\u5F62\u98CE\u683C\uFF08cmd \u9ED8\u8BA4\u964D\u7EA7 ASCII \u9632\u9519\u4F4D\uFF09 \xB7 /thinking [on|off] \u601D\u8003\u5F00\u5173 \xB7 /clear /compact \u4E0A\u4E0B\u6587 \xB7 /exit \u9000\u51FA",
+  "/theme [\u540D\u79F0] \u4E3B\u9898\u5207\u6362 \xB7 /glyphs [auto|fancy|ascii] \u5B57\u5F62\u98CE\u683C\uFF08cmd \u9ED8\u8BA4\u964D\u7EA7 ASCII \u9632\u9519\u4F4D\uFF09 \xB7 /thinking [on|off] \u601D\u8003\u5F00\u5173 \xB7 /clear \u6E05\u7A7A\u4E0A\u4E0B\u6587\uFF08\u5F00\u65B0\u4F1A\u8BDD\uFF0C\u65E7\u4F1A\u8BDD\u53EF /resume\uFF09\xB7 /compact \u538B\u7F29\u4E0A\u4E0B\u6587 \xB7 /exit \u9000\u51FA",
   "/permissions [step-by-step|action-check|free-style] \u6743\u9650\u6A21\u5F0F\uFF08Shift+Tab \u5FAA\u73AF\u5207\u6362\uFF1Baction check \u53EA\u8BFB\u64CD\u4F5C\u514D\u786E\u8BA4\uFF0Cfree style \u5168\u90E8\u514D\u786E\u8BA4\uFF09",
   "\u8F93\u5165 / \u663E\u793A\u547D\u4EE4\u83DC\u5355\uFF1ATab \u8865\u5168 \xB7 \u2191\u2193 \u9009\u62E9 \xB7 \u552F\u4E00\u524D\u7F00\u53EF\u76F4\u63A5\u6267\u884C\uFF08\u5982 /st \u2192 /status\uFF09",
   "@\u6587\u4EF6\u8DEF\u5F84 \u5F15\u7528\u6587\u4EF6\uFF08\u8F93\u5165 @ \u5F39\u51FA\u8DEF\u5F84\u8865\u5168\uFF0CTab/\u2191\u2193 \u9009\u62E9\uFF1B\u56FE\u7247\u6269\u5C55\u540D\u81EA\u52A8\u8F6C\u591A\u6A21\u6001\uFF09 \xB7 Ctrl+V \u7C98\u8D34\u526A\u8D34\u677F\u56FE\u7247\u6216\u6587\u672C\uFF08\u56FE\u7247\u652F\u6301 macOS/Windows\uFF09 \xB7 Esc \u4E2D\u65AD\u5F53\u524D\u8F6E \xB7 \u2191\u2193 \u8F93\u5165\u5386\u53F2",
@@ -163320,17 +164293,9 @@ function App2({ bridge, cwd: cwd2, initialHistory, appConfig }) {
         ]);
         if (!picked) return;
         try {
-          await new Promise((resolve9, reject2) => {
-            bridge.core.once("session:ready", (d) => {
-              bridge.setSessionId(d.sessionId);
-              bridge.setUsage(d.usage);
-              resolve9();
-            });
-            bridge.core.createSession(picked).catch(reject2);
-          });
-          applyDisabledSkills(bridge.core);
-          await applyDisabledAgents(bridge.core).catch(() => {
-          });
+          const { ready, notes } = await switchSession(bridge.core, picked);
+          bridge.resetSession(ready);
+          for (const n of notes) bridge.notice(n, "warn");
           bridge.seedReplay(loadReplay(cwd2, picked));
           bridge.notice(`\u5DF2\u5207\u6362\u5230\u4F1A\u8BDD ${picked}`, "success");
         } catch (e) {
@@ -163544,7 +164509,7 @@ function App2({ bridge, cwd: cwd2, initialHistory, appConfig }) {
         /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(Text, { color: theme[permMeta.tone], children: `  ${G.permMode} ${permMeta.label}` }),
         /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(Text, { dimColor: true, children: `${G.sep}Shift+Tab switch` })
       ] }),
-      showHint ? /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(Text, { dimColor: true, children: `  Enter \u53D1\u9001${G.sep}${G.updown} \u5386\u53F2${G.sep}/help \u547D\u4EE4\uFF08/ \u53EF Tab \u8865\u5168\uFF09${G.sep}Ctrl+C \u9000\u51FA` }) : null
+      showHint ? /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(Text, { dimColor: true, children: `  Enter \u53D1\u9001${G.sep}${G.updown} \u884C/\u5386\u53F2${G.sep}/help \u547D\u4EE4\uFF08/ \u53EF Tab \u8865\u5168\uFF09${G.sep}Ctrl+C \u9000\u51FA` }) : null
     ] }) : null
   ] });
 }
@@ -163617,7 +164582,7 @@ async function startTui(cwd2, options2 = {}) {
     });
   };
   const GESTURE_GAP_MS = 300;
-  const SETTLE_MS = 150;
+  const SETTLE_MS2 = 150;
   let lastResizeAt = 0;
   let resizeTimer = null;
   const onResize = () => {
@@ -163625,7 +164590,7 @@ async function startTui(cwd2, options2 = {}) {
     if (now2 - lastResizeAt > GESTURE_GAP_MS) scrollOutViewport();
     lastResizeAt = now2;
     if (resizeTimer) clearTimeout(resizeTimer);
-    resizeTimer = setTimeout(() => refreshTail(true), SETTLE_MS);
+    resizeTimer = setTimeout(() => refreshTail(true), SETTLE_MS2);
   };
   process.stdout.on("resize", onResize);
   const guard = createScrollbackGuard(process.stdout, { onBurstEnd: () => refreshTail(false) });
@@ -163640,6 +164605,7 @@ async function startTui(cwd2, options2 = {}) {
     process.stdout.off("resize", onResize);
     if (resizeTimer) clearTimeout(resizeTimer);
     guard.flush();
+    process.stdout.write(`${ESC4}[?2004l`);
     await core.dispose().catch(() => {
     });
   }