atomix-cli 1.0.0 → 1.1.0

package/dist/tui.mjs

@@ -27277,6 +27277,20 @@ var require_stack_utils = __commonJS({
   }
 });
 
+// src/paths.ts
+import * as os3 from "os";
+import * as path from "path";
+function getAtomixRoot() {
+  const custom = process.env.ATOMIX_ROOT;
+  if (custom) return path.resolve(custom);
+  return path.join(os3.homedir(), ".atomix");
+}
+var init_paths = __esm({
+  "src/paths.ts"() {
+    "use strict";
+  }
+});
+
 // ../atomix-core/dist/util/adapter.js
 var require_adapter = __commonJS({
   "../atomix-core/dist/util/adapter.js"(exports2) {
@@ -34969,7 +34983,7 @@ var require_combineLatest = __commonJS({
         maybeSchedule(scheduler, function() {
           var length = observables.length;
           var values2 = new Array(length);
-          var active2 = length;
+          var active = length;
           var remainingFirstValues = length;
           var _loop_1 = function(i2) {
             maybeSchedule(scheduler, function() {
@@ -34985,7 +34999,7 @@ var require_combineLatest = __commonJS({
                   subscriber.next(valueTransform(values2.slice()));
                 }
               }, function() {
-                if (!--active2) {
+                if (!--active) {
                   subscriber.complete();
                 }
               }));
@@ -35019,20 +35033,20 @@ var require_mergeInternals = __commonJS({
     var OperatorSubscriber_1 = require_OperatorSubscriber();
     function mergeInternals(source, subscriber, project, concurrent, onBeforeNext, expand, innerSubScheduler, additionalFinalizer) {
       var buffer = [];
-      var active2 = 0;
+      var active = 0;
       var index = 0;
       var isComplete = false;
       var checkComplete = function() {
-        if (isComplete && !buffer.length && !active2) {
+        if (isComplete && !buffer.length && !active) {
           subscriber.complete();
         }
       };
       var outerNext = function(value) {
-        return active2 < concurrent ? doInnerSub(value) : buffer.push(value);
+        return active < concurrent ? doInnerSub(value) : buffer.push(value);
       };
       var doInnerSub = function(value) {
         expand && subscriber.next(value);
-        active2++;
+        active++;
         var innerComplete = false;
         innerFrom_1.innerFrom(project(value, index++)).subscribe(OperatorSubscriber_1.createOperatorSubscriber(subscriber, function(innerValue) {
           onBeforeNext === null || onBeforeNext === void 0 ? void 0 : onBeforeNext(innerValue);
@@ -35046,7 +35060,7 @@ var require_mergeInternals = __commonJS({
         }, void 0, function() {
           if (innerComplete) {
             try {
-              active2--;
+              active--;
               var _loop_1 = function() {
                 var bufferedValue = buffer.shift();
                 if (innerSubScheduler) {
@@ -35057,7 +35071,7 @@ var require_mergeInternals = __commonJS({
                   doInnerSub(bufferedValue);
                 }
               };
-              while (buffer.length && active2 < concurrent) {
+              while (buffer.length && active < concurrent) {
                 _loop_1();
               }
               checkComplete();
@@ -42241,7 +42255,7 @@ var require_shell = __commonJS({
     var os9 = __importStar(__require("os"));
     var crypto3 = __importStar(__require("crypto"));
     var log_1 = require_log();
-    var TEMPFILE_PREFIX = os9.tmpdir() + `sema-`;
+    var TEMPFILE_PREFIX = (0, path_1.join)(os9.tmpdir(), "sema-");
     var DEFAULT_TIMEOUT = 30 * 60 * 1e3;
     var SIGTERM_CODE = 143;
     var FILE_SUFFIXES = {
@@ -51127,9 +51141,9 @@ var require_agentsManager = __commonJS({
         }
         const userNext = /* @__PURE__ */ new Map();
         await this.loadAgentsFromDir(userNext, this.userAgentsDir, "user");
-        const projectDir2 = opts?.projectAgentsDir !== void 0 ? path15.resolve(opts.projectAgentsDir) : this.resolveProjectAgentsDir();
+        const projectDir = opts?.projectAgentsDir !== void 0 ? path15.resolve(opts.projectAgentsDir) : this.resolveProjectAgentsDir();
         const projectNext = /* @__PURE__ */ new Map();
-        await this.loadAgentsFromDir(projectNext, projectDir2, "project");
+        await this.loadAgentsFromDir(projectNext, projectDir, "project");
         for (const name of userNext.keys()) {
           if (managedNext.has(name) || builtinNext.has(name))
             (0, log_1.logWarn)(`Agent [${name}] \u88AB user \u7EA7\u914D\u7F6E\u8986\u76D6`);
@@ -51142,11 +51156,11 @@ var require_agentsManager = __commonJS({
         this.builtinLayer = builtinNext;
         this.managedLayers.set(key, managedNext);
         this.userLayer = userNext;
-        this.projectLayers.set(projectDir2, projectNext);
+        this.projectLayers.set(projectDir, projectNext);
         this.lastInitKey = key;
-        this.lastInitProjectKey = projectDir2;
+        this.lastInitProjectKey = projectDir;
         this.invalidateCache();
-        const agentNames = Array.from(this.mergedFor(key, projectDir2).keys()).join(", ");
+        const agentNames = Array.from(this.mergedFor(key, projectDir).keys()).join(", ");
         (0, log_1.logInfo)(`\u52A0\u8F7D Agents \u914D\u7F6E: ${agentNames}`);
       }
       /** 按 managed 键 + project 键合并四层（带缓存）；spread 顺序即覆盖顺序 */
@@ -51385,20 +51399,20 @@ var require_agentsManager = __commonJS({
         if (this.currentMerged(view).has(agentConf.name)) {
           (0, log_1.logWarn)(`Agent [${agentConf.name}] \u88AB\u8986\u76D6`);
         }
-        const projectDir2 = view?.projectAgentsDir !== void 0 ? path15.resolve(view.projectAgentsDir) : this.resolveProjectAgentsDir();
+        const projectDir = view?.projectAgentsDir !== void 0 ? path15.resolve(view.projectAgentsDir) : this.resolveProjectAgentsDir();
         if (agentConf.locate === "user") {
           this.userLayer.set(agentConf.name, { ...agentConf });
         } else {
-          let layer = this.projectLayers.get(projectDir2);
+          let layer = this.projectLayers.get(projectDir);
           if (!layer) {
             layer = /* @__PURE__ */ new Map();
-            this.projectLayers.set(projectDir2, layer);
+            this.projectLayers.set(projectDir, layer);
           }
           layer.set(agentConf.name, { ...agentConf });
         }
         this.invalidateCache();
         (0, log_1.logInfo)(`\u6DFB\u52A0 Agent \u914D\u7F6E: ${agentConf.name}`);
-        const saved = await this.saveAgentToFile(agentConf, projectDir2);
+        const saved = await this.saveAgentToFile(agentConf, projectDir);
         if (!saved) {
           (0, log_1.logWarn)(`Agent \u914D\u7F6E\u5DF2\u6DFB\u52A0\u5230\u5185\u5B58\uFF0C\u4F46\u4FDD\u5B58\u5230\u6587\u4EF6\u5931\u8D25: ${agentConf.name}`);
         }
@@ -51870,9 +51884,15 @@ var require_Bash = __commonJS({
         "--eof",
         "-a",
         "--arg-file"
-      ])
-    };
-    var STATEMENT_KEYWORDS = /* @__PURE__ */ new Set([
+      ]),
+      // zsh precommand modifier（macOS 默认 $SHELL 是 zsh，PersistentShell 直接用它）：
+      // `repeat N cmd`、`noglob cmd`、`nocorrect cmd`、`- cmd`（argv[0] 加 `-`）都会执行后面的命令
+      repeat: W([], [], 1),
+      noglob: W([], []),
+      nocorrect: W([], []),
+      "-": W([], [])
+    };
+    var CMD_KEYWORDS = /* @__PURE__ */ new Set([
       "!",
       "{",
       "}",
@@ -51885,13 +51905,9 @@ var require_Bash = __commonJS({
       "until",
       "do",
       "done",
-      "case",
       "esac",
-      "in",
-      "for",
-      "select",
-      "function",
-      "coproc"
+      "always",
+      "end"
     ]);
     var REDIRECT_OPS = /* @__PURE__ */ new Set([">", ">>", "<", ">&", "<&", "<<<", ">|"]);
     var LIST_SEPARATORS = /* @__PURE__ */ new Set(["&&", "||", ";", ";;", "|", "|&", "&"]);
@@ -51901,6 +51917,8 @@ var require_Bash = __commonJS({
     var isClobberPipe = (entries, k) => isOp(entries[k], "|") && isOp(entries[k - 1], ">");
     function analyzeCommandSegments(command) {
       const out = [];
+      let state = "cmd";
+      let caseDepth = 0;
       for (const line of command.split(/\r\n|\n|\r/)) {
         if (!line.trim())
           continue;
@@ -51911,32 +51929,226 @@ var require_Bash = __commonJS({
           out.push({ error: `command could not be parsed: ${line}` });
           continue;
         }
-        const segments = [];
+        if (state !== "patterns")
+          state = "cmd";
+        let pending = null;
+        let parenList = false;
+        let patternWord = false;
         let cur = [];
-        for (let k = 0; k < entries.length; k++) {
+        let failed = false;
+        const flush = () => {
+          if (cur.length) {
+            const r = unwrapEntries(cur, line);
+            if (r !== null)
+              out.push(r);
+          }
+          cur = [];
+        };
+        const fail = (msg) => {
+          out.push({ error: msg });
+          failed = true;
+        };
+        for (let k = 0; k < entries.length && !failed; k++) {
           const e = entries[k];
-          let boundary;
-          if (typeof e === "string")
-            boundary = STATEMENT_KEYWORDS.has(e);
-          else if ("op" in e)
-            boundary = e.op === "(" || e.op === ")" || LIST_SEPARATORS.has(e.op) && !isAmpRedirect(entries, k) && !isClobberPipe(entries, k);
-          else
-            boundary = false;
-          if (boundary) {
-            if (cur.length)
-              segments.push(cur);
-            cur = [];
+          if (typeof e === "object" && "comment" in e)
+            break;
+          const kw = typeof e === "string" ? e : null;
+          const isWord = kw !== null || isOp(e, "glob");
+          if (isWord) {
+            switch (state) {
+              case "cmd":
+                if (kw !== null && CMD_KEYWORDS.has(kw)) {
+                  flush();
+                  if (kw === "esac")
+                    caseDepth = Math.max(0, caseDepth - 1);
+                  continue;
+                }
+                if (kw === "for" || kw === "select" || kw === "foreach") {
+                  flush();
+                  pending = "for";
+                  state = "name";
+                  continue;
+                }
+                if (kw === "case") {
+                  flush();
+                  pending = "case";
+                  state = "name";
+                  continue;
+                }
+                if (kw === "function") {
+                  flush();
+                  pending = "function";
+                  state = "name";
+                  continue;
+                }
+                if (kw === "coproc") {
+                  flush();
+                  if (typeof entries[k + 1] === "string" && (entries[k + 2] === "{" || isOp(entries[k + 2], "(")))
+                    k++;
+                  continue;
+                }
+                if (kw === "[[") {
+                  flush();
+                  state = "cond";
+                  continue;
+                }
+                cur.push(e);
+                if (kw !== null && (ENV_ASSIGN_RE.test(kw) || kw.startsWith("-") || /^\d+$/.test(kw) && isRedirectOp(entries[k + 1])))
+                  continue;
+                if (kw !== null && WRAPPERS[kw]) {
+                  const words2 = [kw];
+                  for (let j = k + 1; j < entries.length; j++) {
+                    const w = entries[j];
+                    if (typeof w === "string")
+                      words2.push(w);
+                    else if (isOp(w, "glob"))
+                      words2.push(w.pattern);
+                    else
+                      break;
+                  }
+                  const r = consumeWrapper(words2, 0);
+                  if ("error" in r) {
+                    fail(r.error);
+                    continue;
+                  }
+                  const n = Math.min(r.next, words2.length);
+                  for (let m = 1; m < n; m++)
+                    cur.push(entries[k + m]);
+                  k += n - 1;
+                  if (r.query)
+                    state = "args";
+                  continue;
+                }
+                state = "args";
+                continue;
+              case "args":
+                if (kw === "}") {
+                  flush();
+                  state = "cmd";
+                  continue;
+                }
+                cur.push(e);
+                continue;
+              case "name":
+                state = pending === "function" ? "cmd" : "afterName";
+                continue;
+              case "afterName":
+                if (kw === "in") {
+                  if (pending === "case") {
+                    caseDepth++;
+                    state = "patterns";
+                    patternWord = false;
+                  } else
+                    state = "wordList";
+                  continue;
+                }
+                if (kw === "do" && pending === "for") {
+                  state = "cmd";
+                  continue;
+                }
+                state = "cmd";
+                k--;
+                continue;
+              case "wordList":
+                continue;
+              // 字面量列表，不是命令
+              case "patterns":
+                if (kw === "esac") {
+                  caseDepth = Math.max(0, caseDepth - 1);
+                  state = "cmd";
+                  continue;
+                }
+                if (patternWord) {
+                  fail(`case pattern cannot be analyzed statically in: ${line}`);
+                  continue;
+                }
+                patternWord = true;
+                continue;
+              case "cond":
+                if (kw === "]]")
+                  state = "cmd";
+                continue;
+            }
+          }
+          const op = e.op;
+          if (state === "cond") {
+            if (LIST_SEPARATORS.has(op) && op !== "&&" && op !== "||")
+              state = "cmd";
+            continue;
+          }
+          if ((state === "name" || state === "afterName") && !(state === "afterName" && op === "(")) {
+            state = "cmd";
+            k--;
+            continue;
+          }
+          if (REDIRECT_OPS.has(op) || isAmpRedirect(entries, k)) {
+            const skip = state === "wordList" || state === "patterns";
+            const take2 = (idx) => {
+              if (!skip)
+                cur.push(entries[idx]);
+            };
+            take2(k);
+            if (op === "&")
+              take2(++k);
+            while (k + 1 < entries.length && (isRedirectOp(entries[k + 1]) || isClobberPipe(entries, k + 1)))
+              take2(++k);
+            if (k + 1 < entries.length && typeof entries[k + 1] === "string")
+              take2(++k);
+            continue;
+          }
+          if (op === "(") {
+            if (state === "afterName") {
+              state = "wordList";
+              parenList = true;
+              continue;
+            }
+            if (state === "patterns") {
+              patternWord = false;
+              continue;
+            }
+            flush();
+            state = "cmd";
             continue;
           }
+          if (op === ")") {
+            if (state === "wordList" && parenList) {
+              parenList = false;
+              state = "cmd";
+              continue;
+            }
+            if (state === "patterns") {
+              state = "cmd";
+              continue;
+            }
+            flush();
+            state = "cmd";
+            continue;
+          }
+          if (op === "|" && state === "patterns") {
+            patternWord = false;
+            continue;
+          }
+          if (LIST_SEPARATORS.has(op) && !isClobberPipe(entries, k)) {
+            flush();
+            if (op === ";;" && caseDepth > 0) {
+              state = "patterns";
+              patternWord = false;
+            } else
+              state = "cmd";
+            parenList = false;
+            continue;
+          }
+          if (state === "wordList" || state === "patterns")
+            continue;
           cur.push(e);
         }
-        if (cur.length)
-          segments.push(cur);
-        for (const seg of segments) {
-          const r = unwrapEntries(seg, line);
-          if (r !== null)
-            out.push(r);
+        if (failed)
+          continue;
+        if (state === "cond") {
+          fail(`unterminated [[ in: ${line}`);
+          continue;
         }
+        flush();
       }
       return out;
     }
@@ -51977,53 +52189,62 @@ var require_Bash = __commonJS({
           i++;
           continue;
         }
-        const spec = WRAPPERS[t];
-        if (!spec)
+        if (!WRAPPERS[t])
           break;
-        if (t === "command") {
-          const rest2 = tokens.slice(i + 1);
-          const optEnd = rest2.findIndex((x) => !x.startsWith("-") || x === "--");
-          const opts = optEnd < 0 ? rest2 : rest2.slice(0, optEnd);
-          if (opts.some((o) => /^-[pvV]*[vV][pvV]*$/.test(o)))
-            return { baseCmd: "command", args: rest2 };
-        }
-        i++;
-        while (i < tokens.length && tokens[i].startsWith("-")) {
-          const opt = tokens[i];
-          if (opt === "--") {
-            i++;
-            break;
-          }
-          const eq2 = opt.startsWith("--") ? opt.indexOf("=") : -1;
-          const name = eq2 > 0 ? opt.slice(0, eq2) : opt;
-          if (eq2 > 0 && (spec.flags.has(name) || spec.valueFlags.has(name))) {
-            i++;
-            continue;
-          }
-          if (spec.flags.has(opt)) {
-            i++;
-            continue;
-          }
-          if (spec.valueFlags.has(opt)) {
-            i += 2;
-            continue;
-          }
-          if (/^-[A-Za-z]/.test(opt) && opt.length > 2 && spec.valueFlags.has(opt.slice(0, 2))) {
-            i++;
-            continue;
-          }
-          if (t === "nice" && /^-\d+$/.test(opt)) {
-            i++;
-            continue;
-          }
-          return { error: `option '${opt}' of wrapper '${t}' cannot be analyzed statically` };
-        }
-        i += spec.positional ?? 0;
+        const r = consumeWrapper(tokens, i);
+        if ("error" in r)
+          return r;
+        if (r.query)
+          return { baseCmd: "command", args: tokens.slice(i + 1) };
+        i = r.next;
       }
       if (i >= tokens.length)
         return { baseCmd: tokens[tokens.length - 1], args: [] };
       return { baseCmd: tokens[i], args: tokens.slice(i + 1) };
     }
+    function consumeWrapper(tokens, i) {
+      const t = tokens[i];
+      const spec = WRAPPERS[t];
+      if (t === "command") {
+        const rest2 = tokens.slice(i + 1);
+        const optEnd = rest2.findIndex((x) => !x.startsWith("-") || x === "--");
+        const opts = optEnd < 0 ? rest2 : rest2.slice(0, optEnd);
+        if (opts.some((o) => /^-[pvV]*[vV][pvV]*$/.test(o)))
+          return { next: tokens.length, query: true };
+      }
+      i++;
+      while (i < tokens.length && tokens[i].startsWith("-")) {
+        const opt = tokens[i];
+        if (opt === "--") {
+          i++;
+          break;
+        }
+        const eq2 = opt.startsWith("--") ? opt.indexOf("=") : -1;
+        const name = eq2 > 0 ? opt.slice(0, eq2) : opt;
+        if (eq2 > 0 && (spec.flags.has(name) || spec.valueFlags.has(name))) {
+          i++;
+          continue;
+        }
+        if (spec.flags.has(opt)) {
+          i++;
+          continue;
+        }
+        if (spec.valueFlags.has(opt)) {
+          i += 2;
+          continue;
+        }
+        if (/^-[A-Za-z]/.test(opt) && opt.length > 2 && spec.valueFlags.has(opt.slice(0, 2))) {
+          i++;
+          continue;
+        }
+        if (t === "nice" && /^-\d+$/.test(opt)) {
+          i++;
+          continue;
+        }
+        return { error: `option '${opt}' of wrapper '${t}' cannot be analyzed statically` };
+      }
+      return { next: i + (spec.positional ?? 0) };
+    }
     function resolveCdTarget(args) {
       const positional = [];
       let optionsDone = false;
@@ -64769,7 +64990,7 @@ var init_iteratee = __esm({
 });
 
 // ../atomix-core/node_modules/lodash-es/join.js
-function join(array, separator) {
+function join2(array, separator) {
   return array == null ? "" : nativeJoin.call(array, separator);
 }
 var arrayProto2, nativeJoin, join_default;
@@ -64777,7 +64998,7 @@ var init_join = __esm({
   "../atomix-core/node_modules/lodash-es/join.js"() {
     arrayProto2 = Array.prototype;
     nativeJoin = arrayProto2.join;
-    join_default = join;
+    join_default = join2;
   }
 });
 
@@ -74274,15 +74495,30 @@ var require_skillRegistry = __commonJS({
   "../atomix-core/dist/services/skill/skillRegistry.js"(exports2) {
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
+    exports2.skillRegistryKey = skillRegistryKey;
     exports2.initializeSkillRegistry = initializeSkillRegistry;
     exports2.getSkillRegistry = getSkillRegistry;
     exports2.findSkill = findSkill;
     exports2.getSkillsInfo = getSkillsInfo;
     exports2.getSkillsSummary = getSkillsSummary;
+    exports2.invalidateSkillCache = invalidateSkillCache;
     exports2.clearSkillRegistry = clearSkillRegistry;
     var skillLoader_1 = require_skillLoader();
     var log_1 = require_log();
-    var globalRegistry = null;
+    var EngineContext_1 = require_EngineContext();
+    var registries = /* @__PURE__ */ new Map();
+    var lastKey = null;
+    function skillRegistryKey(workingDir, extraDirs) {
+      return workingDir + "\0" + (extraDirs ?? []).map((e) => `${e.locate}:${e.dir}`).join("\0");
+    }
+    function viewFromContext() {
+      const store = (0, EngineContext_1.getEngineStore)();
+      const cfg = store?.coreConfig;
+      if (!store || !cfg)
+        return null;
+      const workingDir = cfg.agentDataDir || cfg.workingDir || store.agentDataDir || store.workingDir || process.cwd();
+      return { workingDir, extraDirs: cfg.skillsExtraDirs, disabledNames: cfg.skillsDisabledNames };
+    }
     function initializeSkillRegistry(workingDir, extraDirs) {
       const registry = /* @__PURE__ */ new Map();
       const skills = (0, skillLoader_1.loadAllSkills)(workingDir, extraDirs);
@@ -74294,21 +74530,44 @@ var require_skillRegistry = __commonJS({
         }
         registry.set(name, skill);
       }
-      globalRegistry = registry;
+      const key = skillRegistryKey(workingDir, extraDirs);
+      registries.set(key, registry);
+      lastKey = key;
       return registry;
     }
-    function getSkillRegistry() {
-      if (!globalRegistry) {
+    function resolve9(view) {
+      const v = view ?? viewFromContext();
+      if (v) {
+        const key = skillRegistryKey(v.workingDir, v.extraDirs);
+        let registry = registries.get(key);
+        if (!registry) {
+          registry = initializeSkillRegistry(v.workingDir, v.extraDirs);
+        }
+        return { registry, disabled: new Set(v.disabledNames ?? []) };
+      }
+      if (!lastKey) {
         throw new Error("Skill registry not initialized. Call initializeSkillRegistry() first.");
       }
-      return globalRegistry;
-    }
-    function findSkill(name) {
-      const registry = getSkillRegistry();
+      return { registry: registries.get(lastKey), disabled: /* @__PURE__ */ new Set() };
+    }
+    function getSkillRegistry(view) {
+      const { registry, disabled } = resolve9(view);
+      if (disabled.size === 0)
+        return registry;
+      const filtered = /* @__PURE__ */ new Map();
+      for (const [name, skill] of registry)
+        if (!disabled.has(name))
+          filtered.set(name, skill);
+      return filtered;
+    }
+    function findSkill(name, view) {
+      const { registry, disabled } = resolve9(view);
+      if (disabled.has(name))
+        return void 0;
       return registry.get(name);
     }
-    function getSkillsInfo() {
-      const registry = getSkillRegistry();
+    function getSkillsInfo(view, opts) {
+      const registry = opts?.includeDisabled ? resolve9(view).registry : getSkillRegistry(view);
       const skillsInfo = [];
       for (const [name, skill] of registry.entries()) {
         skillsInfo.push({
@@ -74320,8 +74579,8 @@ var require_skillRegistry = __commonJS({
       }
       return skillsInfo;
     }
-    function getSkillsSummary() {
-      const registry = getSkillRegistry();
+    function getSkillsSummary(view) {
+      const registry = getSkillRegistry(view);
       if (registry.size === 0) {
         return "";
       }
@@ -74335,10 +74594,14 @@ var require_skillRegistry = __commonJS({
       lines.push("When a task requires specific domain knowledge or workflow, use the Skill tool to activate the relevant skill.");
       return lines.join("\n");
     }
-    function clearSkillRegistry() {
-      globalRegistry = null;
+    function invalidateSkillCache() {
       skillLoader_1.loadAllSkills.cache.clear?.();
     }
+    function clearSkillRegistry() {
+      registries.clear();
+      lastKey = null;
+      invalidateSkillCache();
+    }
   }
 });
 
@@ -135411,7 +135674,7 @@ var require_session = __commonJS({
     exports2.parseSessionIdFromHistoryPath = parseSessionIdFromHistoryPath;
     exports2.generateSessionId = generateSessionId;
     exports2.initializeSessionId = initializeSessionId;
-    exports2.validateSessionId = validateSessionId;
+    exports2.validateSessionId = validateSessionId2;
     exports2.generateHistoryPath = generateHistoryPath;
     var crypto3 = __importStar(__require("crypto"));
     var path15 = __importStar(__require("path"));
@@ -135446,7 +135709,7 @@ var require_session = __commonJS({
       }
       return generateSessionId();
     }
-    function validateSessionId(sessionId) {
+    function validateSessionId2(sessionId) {
       const shortIdRegex = /^[0-9a-f]{8}$/i;
       return shortIdRegex.test(sessionId);
     }
@@ -136429,7 +136692,7 @@ var require_SemaEngine = __commonJS({
        */
       async initializePlugins(workingDir, extraDirs) {
         try {
-          (0, skillRegistry_1.clearSkillRegistry)();
+          (0, skillRegistry_1.invalidateSkillCache)();
           (0, skillRegistry_1.initializeSkillRegistry)(workingDir || process.cwd(), extraDirs);
           (0, log_1.logDebug)("Skill registry initialized successfully");
         } catch (error) {
@@ -136609,6 +136872,11 @@ var require_SemaSession = __commonJS({
         this.engine = new SemaEngine_1.SemaEngine(instanceId, resolvedConfig, this.instanceMCPManager, kernel);
         if (resolvedConfig.skipMCPInit) {
           this.configPromise = (0, ConfManager_1.getConfManager)().registerProjectConfig(resolvedConfig);
+        } else if (resolvedConfig.multiSession) {
+          (0, log_1.setLogLevel)(resolvedConfig.logLevel || "info");
+          this.configPromise = (0, ConfManager_1.getConfManager)().registerProjectConfig(resolvedConfig).then(async () => {
+            await this.instanceMCPManager.init();
+          });
         } else {
           this.configPromise = (0, ConfManager_1.getConfManager)().setCoreConfig(resolvedConfig);
           this.configPromise = this.configPromise.then(async () => {
@@ -136675,26 +136943,34 @@ var require_SemaSession = __commonJS({
         return this.engine.coreConfig;
       }
       // ==================== Skill 热重载（session 触发）====================
+      /** 本 session 的 skill 视图（同 agentsView：显式上下文，ALS 外可读）。 */
+      skillsView() {
+        const config = this.engine["initialConfig"];
+        return {
+          workingDir: config.agentDataDir || config.workingDir || (0, cwd_1.getCwd)(),
+          extraDirs: config.skillsExtraDirs,
+          disabledNames: config.skillsDisabledNames ?? []
+        };
+      }
       /**
        * 热重载 Skill 注册表（不重建 session/历史）。
        *
-       * ⚠ Stage A wrinkle：方法依赖本 session 的 workingDir / skillsExtraDirs，但内部
-       * clearSkillRegistry + initializeSkillRegistry mutate 的是【全局】registry，会影响所有
-       * session。这是 D6「project 层 vs 全局 registry」矛盾的具象，Stage A 保持现状行为
-       * （全局重扫），Stage D 做 global/project 分层 + mtime 缓存时彻底解决。
+       * 注册表按供给键（workingDir + skillsExtraDirs）隔离，只重建本 session 键；屏蔽名单写入
+       * initialConfig.skillsDisabledNames 由读取端过滤（session-api-v1 §3.1，语义同 reloadAgents）。
        *
-       * @param disabledNames 需要从注册表中移除的 skill 名称集合。
+       * @param disabledNames 按名屏蔽的 skill 集合；undefined = 只重扫，屏蔽名单不变。
        */
       reloadSkills(disabledNames) {
         const config = this.engine["initialConfig"];
-        const workingDir = config.agentDataDir || config.workingDir || (0, cwd_1.getCwd)();
-        (0, skillRegistry_1.clearSkillRegistry)();
-        const registry = (0, skillRegistry_1.initializeSkillRegistry)(workingDir, config.skillsExtraDirs);
-        if (disabledNames?.size) {
-          for (const name of disabledNames) {
-            registry.delete(name);
-          }
-        }
+        if (disabledNames !== void 0)
+          config.skillsDisabledNames = [...disabledNames];
+        const view = this.skillsView();
+        (0, skillRegistry_1.invalidateSkillCache)();
+        (0, skillRegistry_1.initializeSkillRegistry)(view.workingDir, view.extraDirs);
+      }
+      /** 本 session 视角的 skills 列表；includeDisabled 取供给全集（harness whitelist 求补用）。 */
+      getSkillsInfo(opts) {
+        return (0, skillRegistry_1.getSkillsInfo)(this.skillsView(), opts);
       }
       // ==================== Agents（session 视角，显式上下文）====================
       /**
@@ -137287,7 +137563,7 @@ var require_AtomixCore = __commonJS({
         this.getMCPServerConfigs = () => this.session.getMCPServerConfigs();
         this.connectMCPServer = (name) => this.session.connectMCPServer(name);
         this.updateMCPUseTools = (name, toolNames) => this.session.updateMCPUseTools(name, toolNames);
-        this.getSkillsInfo = () => this.kernel.skills.getInfo();
+        this.getSkillsInfo = (opts) => this.session.getSkillsInfo(opts);
         this.getAgentsInfo = () => this.session.getAgentsInfo();
         this.addAgentConf = (agentConf) => this.session.addAgentConf(agentConf);
         this.getCustomCommands = () => this.session.getCustomCommands();
@@ -144002,20 +144278,6 @@ var require_dist4 = __commonJS({
   }
 });
 
-// src/paths.ts
-import * as os3 from "os";
-import * as path from "path";
-function getAtomixRoot() {
-  const custom = process.env.ATOMIX_ROOT;
-  if (custom) return path.resolve(custom);
-  return path.join(os3.homedir(), ".atomix");
-}
-var init_paths = __esm({
-  "src/paths.ts"() {
-    "use strict";
-  }
-});
-
 // src/theme.ts
 function getThemeName() {
   return activeThemeName;
@@ -151485,8 +151747,8 @@ function enableAgent(name) {
 async function applyDisabledAgents(core) {
   await core.reloadAgents(/* @__PURE__ */ new Set());
   const allNames = core.getAgentsInfo().map((a) => a.name);
-  recordAgentUniverse(allNames);
-  const disabled = /* @__PURE__ */ new Set([...readDisabledAgents(), ...harnessDisabledAgents(allNames)]);
+  recordAgentUniverse(core, allNames);
+  const disabled = /* @__PURE__ */ new Set([...readDisabledAgents(), ...harnessDisabledAgents(core, allNames)]);
   await core.reloadAgents(disabled);
 }
 async function agentsCommand(core, args) {
@@ -151535,6 +151797,14 @@ var init_agents = __esm({
 // src/harness.ts
 import * as fs3 from "fs";
 import * as path3 from "path";
+function runtimeOf(core) {
+  return runtimes.get(core) ?? null;
+}
+function requireRuntime(core) {
+  const rt = runtimeOf(core);
+  if (!rt) throw new Error("harness \u672A\u521D\u59CB\u5316(initHarness \u672A\u8C03\u7528)");
+  return rt;
+}
 function overrideOf(activeValue, baseValue) {
   if (baseValue === void 0 || activeValue === void 0) return null;
   const baseOn = baseValue !== null;
@@ -151547,33 +151817,40 @@ function personaOverrideOf(activeValue, baseValue) {
   if (activeValue && baseValue && activeValue !== baseValue) return "swap";
   return null;
 }
-function harnessMemoryOverride() {
-  return overrideOf(activeMemoryFiles, baseline.memoryFiles);
+function harnessMemoryOverride(core) {
+  const rt = runtimeOf(core);
+  return rt ? overrideOf(rt.activeMemoryFiles, rt.baseline.memoryFiles) : null;
 }
-function harnessPersonaOverride() {
-  return personaOverrideOf(activePersonaFile, baseline.personaFile);
+function harnessPersonaOverride(core) {
+  const rt = runtimeOf(core);
+  return rt ? personaOverrideOf(rt.activePersonaFile, rt.baseline.personaFile) : null;
 }
-function getActivePersonaFile() {
-  return activePersonaFile;
+function getActivePersonaFile(core) {
+  return runtimeOf(core)?.activePersonaFile;
 }
-function getActiveHarnessName() {
-  return active?.name ?? BASE_HARNESS;
+function getActiveHarnessName(core) {
+  return runtimeOf(core)?.active?.name ?? BASE_HARNESS;
 }
-function recordSkillUniverse(names) {
-  fullSkillNames = names.slice();
+function isHarnessOverridden(core) {
+  return runtimeOf(core)?.overridden ?? false;
 }
-function recordAgentUniverse(names) {
-  fullAgentNames = names.slice();
+function recordSkillUniverse(core, names) {
+  const rt = runtimeOf(core);
+  if (rt) rt.fullSkillNames = names.slice();
+}
+function recordAgentUniverse(core, names) {
+  const rt = runtimeOf(core);
+  if (rt) rt.fullAgentNames = names.slice();
 }
 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);
 }
-function harnessDisabledSkills(allNames) {
-  return computeDisabledFrom(active?.skillsSpec ?? null, allNames);
+function harnessDisabledSkills(core, allNames) {
+  return computeDisabledFrom(runtimeOf(core)?.active?.skillsSpec ?? null, allNames);
 }
-function harnessDisabledAgents(allNames) {
-  return computeDisabledFrom(active?.agentsSpec ?? null, allNames);
+function harnessDisabledAgents(core, allNames) {
+  return computeDisabledFrom(runtimeOf(core)?.active?.agentsSpec ?? null, allNames);
 }
 function libraryDir() {
   return path3.join(getAtomixRoot(), "harness");
@@ -151841,17 +152118,19 @@ function resolveHarness(doc, ctx) {
   };
 }
 function buildContext(core) {
+  const rt = requireRuntime(core);
   return {
-    baseline,
+    baseline: rt.baseline,
     // 工具:getToolInfos 恒返回内置全集(禁用项带 status),可直读;
-    // skill/agent:注册表是已过滤视图,优先用 applyDisabled* 回写的全集缓存,
-    // 缓存为空只在启动初始化时(此刻注册表尚未过滤,直读即全集)
+    // skill:core 按 session 读取时过滤,includeDisabled 直接取供给全集;
+    // agent:注册表是已过滤视图,优先用 applyDisabledAgents 回写的全集缓存,
+    // 缓存为空只在启动初始化时(此刻尚未过滤,直读即全集)
     allToolNames: core.getToolInfos().map((t) => t.name),
-    allSkillNames: fullSkillNames ?? core.getSkillsInfo().map((s) => s.name),
-    allAgentNames: fullAgentNames ?? core.getAgentsInfo().map((a) => a.name)
+    allSkillNames: rt.fullSkillNames ?? core.getSkillsInfo({ includeDisabled: true }).map((s) => s.name),
+    allAgentNames: rt.fullAgentNames ?? core.getAgentsInfo().map((a) => a.name)
   };
 }
-function applyAssembly(core, r) {
+function applyAssembly(core, rt, r) {
   core.updateAssemblyConfig({
     useTools: r.useTools,
     deferBuiltinTools: r.deferBuiltinTools,
@@ -151863,44 +152142,54 @@ function applyAssembly(core, r) {
     ...r.memoryFiles !== void 0 ? { memoryFiles: r.memoryFiles } : {},
     ...r.personaFile !== void 0 ? { personaFile: r.personaFile } : {}
   });
-  activeMemoryFiles = r.memoryFiles;
-  activePersonaFile = r.personaFile;
-  active = r.name === BASE_HARNESS ? null : r;
-}
-function initHarness(core, cwd2, base) {
-  baseline = {
-    useTools: base.useTools ? [...base.useTools] : null,
-    deferBuiltinTools: base.deferBuiltinTools?.slice(),
-    memoryFiles: base.memoryFiles,
-    personaFile: base.personaFile,
-    potentialMemoryFiles: base.potentialMemoryFiles
+  rt.activeMemoryFiles = r.memoryFiles;
+  rt.activePersonaFile = r.personaFile;
+  rt.active = r.name === BASE_HARNESS ? null : r;
+}
+function initHarness(core, cwd2, base, opts = {}) {
+  const rt = {
+    baseline: {
+      useTools: base.useTools ? [...base.useTools] : null,
+      deferBuiltinTools: base.deferBuiltinTools?.slice(),
+      memoryFiles: base.memoryFiles,
+      personaFile: base.personaFile,
+      potentialMemoryFiles: base.potentialMemoryFiles
+    },
+    activeMemoryFiles: base.memoryFiles,
+    activePersonaFile: base.personaFile,
+    projectDir: cwd2,
+    active: null,
+    overridden: opts.harness !== void 0,
+    fullSkillNames: null,
+    fullAgentNames: null
   };
-  activeMemoryFiles = base.memoryFiles;
-  activePersonaFile = base.personaFile;
-  projectDir = cwd2;
-  const name = readState(cwd2);
+  runtimes.set(core, rt);
+  const name = opts.harness ?? readState(cwd2);
+  const source = rt.overridden ? "\u4F1A\u8BDD\u7EA7\u6307\u5B9A" : "\u6765\u81EA .atomix/harness-state.json";
   if (name === BASE_HARNESS) return null;
   try {
     const doc = loadHarnessDoc(name);
     const r = resolveHarness(doc, buildContext(core));
-    applyAssembly(core, r);
-    return r.warnings.length ? `harness "${r.name}"(\u6765\u81EA .atomix/harness-state.json)\u5DF2\u52A0\u8F7D:
+    applyAssembly(core, rt, r);
+    return r.warnings.length ? `harness "${r.name}"(${source})\u5DF2\u52A0\u8F7D:
   \u26A0 ${r.warnings.join("\n  \u26A0 ")}` : null;
   } catch (e) {
-    return `harness "${name}"(\u6765\u81EA .atomix/harness-state.json)\u52A0\u8F7D\u5931\u8D25,\u5DF2\u56DE\u843D base:${e instanceof Error ? e.message : e}`;
+    if (rt.overridden) throw new Error(`harness "${name}" \u52A0\u8F7D\u5931\u8D25:${e instanceof Error ? e.message : e}`);
+    return `harness "${name}"(${source})\u52A0\u8F7D\u5931\u8D25,\u5DF2\u56DE\u843D base:${e instanceof Error ? e.message : e}`;
   }
 }
 async function switchTo(core, name) {
-  if (!projectDir) throw new Error("harness \u672A\u521D\u59CB\u5316(initHarness \u672A\u8C03\u7528)");
+  const rt = requireRuntime(core);
   const ctx = buildContext(core);
   const r = name === BASE_HARNESS ? resolveBase(ctx) : resolveHarness(loadHarnessDoc(name), ctx);
   const wasOn = (v) => v !== null && v !== void 0;
-  const memWasOn = wasOn(activeMemoryFiles);
-  const personaWas = activePersonaFile;
-  applyAssembly(core, r);
-  const memNowOn = wasOn(activeMemoryFiles);
-  const personaNow = activePersonaFile;
-  writeState(projectDir, name);
+  const memWasOn = wasOn(rt.activeMemoryFiles);
+  const personaWas = rt.activePersonaFile;
+  applyAssembly(core, rt, r);
+  const memNowOn = wasOn(rt.activeMemoryFiles);
+  const personaNow = rt.activePersonaFile;
+  writeState(rt.projectDir, name);
+  rt.overridden = false;
   const { applyDisabledSkills: applyDisabledSkills2 } = await Promise.resolve().then(() => (init_skills(), skills_exports));
   const { applyDisabledAgents: applyDisabledAgents2 } = await Promise.resolve().then(() => (init_agents(), agents_exports));
   applyDisabledSkills2(core);
@@ -151955,13 +152244,15 @@ async function harnessCommand(core, args) {
   switch (sub) {
     case void 0:
     case "list": {
-      const cur = getActiveHarnessName();
+      const cur = getActiveHarnessName(core);
+      const rt = runtimeOf(core);
       const lines = names.map((n) => `${n === cur ? "\u25CF" : "\u25CB"} ${n}${n === BASE_HARNESS ? "(\u9ED8\u8BA4\u88C5\u914D)" : ""}`);
-      if (sub === void 0 && active) {
+      if (sub === void 0 && rt?.active) {
         const ctx = buildContext(core);
-        lines.unshift(`\u5F53\u524D:${cur}(\u9879\u76EE\u7EA7,${path3.join(".atomix", "harness-state.json")})`, "  " + summarize(active, ctx), "");
+        const where = rt.overridden ? "\u4F1A\u8BDD\u7EA7\u6307\u5B9A,\u672A\u5199\u5165\u9879\u76EE\u6001" : `\u9879\u76EE\u7EA7,${path3.join(".atomix", "harness-state.json")}`;
+        lines.unshift(`\u5F53\u524D:${cur}(${where})`, "  " + summarize(rt.active, ctx), "");
       } else if (sub === void 0) {
-        lines.unshift(`\u5F53\u524D:base(\u9ED8\u8BA4\u88C5\u914D,\u672A\u9009\u62E9 harness)`, "");
+        lines.unshift(rt?.overridden ? "\u5F53\u524D:base(\u4F1A\u8BDD\u7EA7\u6307\u5B9A\u9ED8\u8BA4\u88C5\u914D)" : "\u5F53\u524D:base(\u9ED8\u8BA4\u88C5\u914D,\u672A\u9009\u62E9 harness)", "");
       }
       lines.push("", "\u7528\u6CD5:/harness list | use <\u540D\u79F0> | show <\u540D\u79F0> | diff <\u540D\u79F0> | reset");
       lines.push(`\u5E93\u76EE\u5F55:${libraryDir()}(\u6BCF\u4E2A harness \u4E00\u4E2A\u5B50\u76EE\u5F55,\u542B harness.yaml + rules.md)`);
@@ -151985,7 +152276,7 @@ async function harnessCommand(core, args) {
       try {
         const ctx = buildContext(core);
         const r = resolveHarness(loadHarnessDoc(arg), ctx);
-        return `${r.name}${arg === getActiveHarnessName() ? "(\u5F53\u524D)" : ""}
+        return `${r.name}${arg === getActiveHarnessName(core) ? "(\u5F53\u524D)" : ""}
   ${summarize(r, ctx)}`;
       } catch (e) {
         return `\u8BFB\u53D6\u5931\u8D25:${e instanceof Error ? e.message : e}`;
@@ -151995,7 +152286,7 @@ async function harnessCommand(core, args) {
       return `\u672A\u77E5\u5B50\u547D\u4EE4:${sub}(\u53EF\u7528:list / use / show / diff / reset)`;
   }
 }
-var import_yaml, import_atomix_core2, BASE_HARNESS, baseline, activeMemoryFiles, activePersonaFile, projectDir, active, fullSkillNames, fullAgentNames;
+var import_yaml, import_atomix_core2, BASE_HARNESS, runtimes;
 var init_harness = __esm({
   "src/harness.ts"() {
     "use strict";
@@ -152003,11 +152294,7 @@ var init_harness = __esm({
     import_atomix_core2 = __toESM(require_dist4());
     init_paths();
     BASE_HARNESS = "base";
-    baseline = { useTools: null };
-    projectDir = null;
-    active = null;
-    fullSkillNames = null;
-    fullAgentNames = null;
+    runtimes = /* @__PURE__ */ new WeakMap();
   }
 });
 
@@ -152017,14 +152304,14 @@ import * as path4 from "path";
 function getMemoryPaths(cwd2) {
   const root2 = realpathOrSelf(getAtomixRoot());
   const slug = (0, import_atomix_core3.projectPathToDirName)(cwd2);
-  const projectDir2 = path4.join(root2, "projects", slug);
+  const projectDir = path4.join(root2, "projects", slug);
   return {
     root: root2,
     slug,
     soul: path4.join(root2, "SOUL.md"),
     globalMemory: path4.join(root2, "MEMORY.md"),
-    projectDir: projectDir2,
-    projectMemory: path4.join(projectDir2, "MEMORY.md")
+    projectDir,
+    projectMemory: path4.join(projectDir, "MEMORY.md")
   };
 }
 function realpathOrSelf(p) {
@@ -152190,19 +152477,28 @@ function getMarketplace() {
   if (!_instance) _instance = new Marketplace();
   return _instance;
 }
+function registerSessionDirs(core, dirs) {
+  sessionRegistry.set(core, dirs);
+}
+function unregisterSessionDirs(core) {
+  sessionRegistry.delete(core);
+}
+function listSessionDirs() {
+  return [...sessionRegistry.entries()];
+}
 function buildAgentsExtraDirs() {
-  activeAgentsDirs = getMarketplace().getSubagentDirs();
-  return activeAgentsDirs;
+  return getMarketplace().getSubagentDirs();
 }
 function refreshAgentsExtraDirs() {
-  if (activeAgentsDirs) activeAgentsDirs.splice(0, activeAgentsDirs.length, ...getMarketplace().getSubagentDirs());
+  const fresh = getMarketplace().getSubagentDirs();
+  for (const [, d] of sessionRegistry) d.agents.splice(0, d.agents.length, ...fresh);
 }
 function buildCommandsExtraDirs() {
-  activeCommandDirs = getMarketplace().getCommandDirs();
-  return activeCommandDirs;
+  return getMarketplace().getCommandDirs();
 }
 function refreshCommandsExtraDirs() {
-  if (activeCommandDirs) activeCommandDirs.splice(0, activeCommandDirs.length, ...getMarketplace().getCommandDirs());
+  const fresh = getMarketplace().getCommandDirs();
+  for (const [, d] of sessionRegistry) d.commands.splice(0, d.commands.length, ...fresh);
 }
 function syncMarketplaceMcp() {
   const mcpPath = path6.join(getAtomixRoot(), "mcp.json");
@@ -152316,7 +152612,7 @@ function countPluginContents(dir) {
     hasHooks: fs6.existsSync(path6.join(dir, "hooks", "hooks.json"))
   };
 }
-var execFileP, MKT_PREFIX, activeProjectDir, Marketplace, _instance, activeAgentsDirs, activeCommandDirs;
+var execFileP, MKT_PREFIX, activeProjectDir, Marketplace, _instance, sessionRegistry;
 var init_marketplace = __esm({
   "src/marketplace.ts"() {
     "use strict";
@@ -152608,8 +152904,7 @@ var init_marketplace = __esm({
       }
     };
     _instance = null;
-    activeAgentsDirs = null;
-    activeCommandDirs = null;
+    sessionRegistry = /* @__PURE__ */ new Map();
   }
 });
 
@@ -152676,17 +152971,17 @@ function computeSkillsExtraDirs() {
   return dirs;
 }
 function buildSkillsExtraDirs() {
-  activeExtraDirs = computeSkillsExtraDirs();
-  return activeExtraDirs;
+  return computeSkillsExtraDirs();
 }
 function refreshSkillsExtraDirs() {
-  if (activeExtraDirs) activeExtraDirs.splice(0, activeExtraDirs.length, ...computeSkillsExtraDirs());
+  const fresh = computeSkillsExtraDirs();
+  for (const [, d] of listSessionDirs()) d.skills.splice(0, d.skills.length, ...fresh);
 }
 function applyDisabledSkills(core) {
   core.reloadSkills();
-  const allNames = core.getSkillsInfo().map((s) => s.name);
-  recordSkillUniverse(allNames);
-  const disabled = /* @__PURE__ */ new Set([...readDisabledSkills(), ...harnessDisabledSkills(allNames)]);
+  const allNames = core.getSkillsInfo({ includeDisabled: true }).map((s) => s.name);
+  recordSkillUniverse(core, allNames);
+  const disabled = /* @__PURE__ */ new Set([...readDisabledSkills(), ...harnessDisabledSkills(core, allNames)]);
   core.reloadSkills(disabled);
 }
 function sourceLabel(s) {
@@ -152755,7 +153050,7 @@ async function skillsCommand(core, args) {
       return `\u672A\u77E5\u5B50\u547D\u4EE4\uFF1A${sub}\uFF08\u7528\u6CD5\uFF1A/skills list | enable <\u540D\u79F0> | disable <\u540D\u79F0> | import-disabled\uFF09`;
   }
 }
-var activeExtraDirs, LOCATE_LABEL;
+var LOCATE_LABEL;
 var init_skills = __esm({
   "src/skills.ts"() {
     "use strict";
@@ -152763,7 +153058,6 @@ var init_skills = __esm({
     init_harness();
     init_appConfig();
     init_marketplace();
-    activeExtraDirs = null;
     LOCATE_LABEL = {
       user: "user",
       project: "project",
@@ -159339,26 +159633,6 @@ var import_react20 = __toESM(require_react(), 1);
 // node_modules/ink/build/hooks/use-focus-manager.js
 var import_react21 = __toESM(require_react(), 1);
 
-// src/tui/index.tsx
-var import_atomix_core8 = __toESM(require_dist4());
-
-// src/tools.ts
-var ATOMIX_TOOLS = [
-  "Bash",
-  "Glob",
-  "Grep",
-  "Read",
-  "Write",
-  "Edit",
-  "TodoWrite",
-  "Skill",
-  "AgentTeam",
-  "NotebookEdit",
-  "AskUser",
-  "ToolSearch"
-];
-var ATOMIX_DEFER_TOOLS = ["NotebookEdit"];
-
 // src/tui/index.tsx
 init_paths();
 
@@ -159745,7 +160019,30 @@ async function modelCommand(core, args, ask) {
   }
 }
 
-// src/tui/index.tsx
+// src/session.ts
+var import_atomix_core5 = __toESM(require_dist4());
+
+// src/sessionTypes.ts
+var SESSION_HANDLE_BRAND = /* @__PURE__ */ Symbol.for("atomix-cli.sessionHandle");
+
+// src/tools.ts
+var ATOMIX_TOOLS = [
+  "Bash",
+  "Glob",
+  "Grep",
+  "Read",
+  "Write",
+  "Edit",
+  "TodoWrite",
+  "Skill",
+  "AgentTeam",
+  "NotebookEdit",
+  "AskUser",
+  "ToolSearch"
+];
+var ATOMIX_DEFER_TOOLS = ["NotebookEdit"];
+
+// src/session.ts
 init_skills();
 init_agents();
 init_harness();
@@ -159820,7 +160117,7 @@ async function mcpCommand(core, args) {
   return lines.join("\n  ");
 }
 
-// src/tui/index.tsx
+// src/session.ts
 init_marketplace();
 
 // src/marketplaceCommand.ts
@@ -159878,6 +160175,19 @@ async function applyMcpHotUpdates(core) {
   }
   return notes;
 }
+async function refreshRegisteredSessions(invoker) {
+  refreshSkillsExtraDirs();
+  refreshAgentsExtraDirs();
+  refreshCommandsExtraDirs();
+  const cores = new Set(listSessionDirs().map(([c]) => c));
+  if (invoker) cores.add(invoker);
+  for (const c of cores) {
+    applyDisabledSkills(c);
+    await applyDisabledAgents(c).catch(() => {
+    });
+    c.reloadCustomCommands();
+  }
+}
 async function applyChanges(core, opts) {
   const notes = [];
   const { synced, removed } = syncMarketplaceMcp();
@@ -159885,13 +160195,7 @@ async function applyChanges(core, opts) {
     if (synced.length || removed.length) notes.push(`MCP \u5168\u5C40\u540C\u6B65\uFF1A+${synced.length} \u2212${removed.length}\uFF08\u4E0B\u6B21\u542F\u52A8\u8FDE\u63A5\uFF09`);
     return notes;
   }
-  refreshSkillsExtraDirs();
-  applyDisabledSkills(core);
-  refreshAgentsExtraDirs();
-  await applyDisabledAgents(core).catch(() => {
-  });
-  refreshCommandsExtraDirs();
-  core.reloadCustomCommands();
+  await refreshRegisteredSessions(core);
   notes.push(...await applyMcpHotUpdates(core));
   const hooksNow = getMarketplace().getHookEntries().map((h) => h.file).sort();
   const hooksBefore = [...opts?.hooksBefore ?? hooksNow].sort();
@@ -160104,8 +160408,246 @@ function loadHooks(cwd2) {
   };
 }
 
+// src/session.ts
+init_appConfig();
+function internalHandle(handle) {
+  if (!handle || handle[SESSION_HANDLE_BRAND] !== true) {
+    throw new Error("\u975E\u6CD5\u4F1A\u8BDD\u53E5\u67C4:\u5FC5\u987B\u6765\u81EA createSessionCore()");
+  }
+  return handle;
+}
+var MAIN = "main";
+var DEFAULT_SYSTEM_PROMPT = "You are Atomix, a CLI coding agent bound to the current working directory.";
+var DEFAULT_SEND_TIMEOUT_MS = 10 * 60 * 1e3;
+var SESSION_ID_PATTERN = /^[A-Za-z0-9._-]{1,128}$/;
+function validateSessionId(id) {
+  if (!SESSION_ID_PATTERN.test(id) || id === "." || id === "..") {
+    throw new Error(`\u975E\u6CD5 session id:${JSON.stringify(id)}(\u53EA\u5141\u8BB8 1\u2013128 \u4E2A\u5B57\u6BCD\u3001\u6570\u5B57\u3001\u70B9\u3001\u4E0B\u5212\u7EBF\u3001\u8FDE\u5B57\u7B26)`);
+  }
+}
+var preparedCwd = null;
+function prepareProcess(cwd2) {
+  if (preparedCwd === null) {
+    initMarketplaceProject(cwd2);
+    syncInheritedMcp();
+    syncMarketplaceMcp();
+    preparedCwd = cwd2;
+    return null;
+  }
+  if (preparedCwd !== cwd2) {
+    return `marketplace \u9879\u76EE\u7EA7 override \u4ECD\u7ED1\u5B9A\u9996\u4E2A\u4F1A\u8BDD\u76EE\u5F55 ${preparedCwd}(\u672C\u8FDB\u7A0B\u5185\u591A\u4F1A\u8BDD\u5171\u7528\u4E00\u4E2A\u9879\u76EE\u57DF)`;
+  }
+  return null;
+}
+function createSessionCore(opts) {
+  const interactive = opts.interactive ?? false;
+  const permissionMode = opts.permissionMode ?? (interactive ? import_atomix_core5.DEFAULT_PERMISSION_MODE : "free-style");
+  const notes = [];
+  const prepNote = prepareProcess(opts.cwd);
+  if (prepNote) notes.push(prepNote);
+  const appConfig = readConfig();
+  const contextFiles = buildContextFilesConfig(opts.cwd, appConfig);
+  const hookCfg = opts.hooks ?? interactive ? loadHooks(opts.cwd) : {};
+  const dirs = { skills: buildSkillsExtraDirs(), agents: buildAgentsExtraDirs(), commands: buildCommandsExtraDirs() };
+  const core = new import_atomix_core5.AtomixCore({
+    workingDir: opts.cwd,
+    logLevel: opts.logLevel ?? atomixLogLevel(),
+    stream: opts.stream ?? interactive,
+    useTools: ATOMIX_TOOLS,
+    deferBuiltinTools: ATOMIX_DEFER_TOOLS,
+    skillsExtraDirs: dirs.skills,
+    agentsExtraDirs: dirs.agents,
+    commandsExtraDirs: dirs.commands,
+    ...hookCfg,
+    ...contextFiles,
+    permissionMode,
+    // 交互模式下文件编辑必须过权限卡;无人值守靠 permissionMode(free-style 全放行,其余由自动应答器 fail-closed)
+    skipFileEditPermission: false,
+    multiSession: opts.multiSession ?? false,
+    systemPrompt: opts.systemPrompt ?? DEFAULT_SYSTEM_PROMPT
+  });
+  registerSessionDirs(core, dirs);
+  const potential = buildPotentialContextFiles(opts.cwd, appConfig);
+  const baseline = {
+    useTools: ATOMIX_TOOLS,
+    deferBuiltinTools: ATOMIX_DEFER_TOOLS,
+    memoryFiles: contextFiles.memoryFiles,
+    personaFile: contextFiles.personaFile,
+    potentialMemoryFiles: potential.memoryFiles
+  };
+  return { [SESSION_HANDLE_BRAND]: true, core, cwd: opts.cwd, interactive, permissionMode, appConfig, contextFiles, baseline, notes };
+}
+async function discardSessionCore(handle) {
+  const h = internalHandle(handle);
+  unregisterSessionDirs(h.core);
+  await h.core.dispose().catch(() => {
+  });
+}
+async function startSession(handle, opts = {}) {
+  const h = internalHandle(handle);
+  const { core, cwd: cwd2 } = h;
+  if (opts.sessionId !== void 0) validateSessionId(opts.sessionId);
+  const notes = [...h.notes];
+  const warn = initHarness(core, cwd2, h.baseline, opts.harness !== void 0 ? { harness: opts.harness } : {});
+  if (warn) notes.push(warn);
+  let ready;
+  const onReady = (d) => {
+    ready = d;
+  };
+  core.once("session:ready", onReady);
+  try {
+    await core.createSession(opts.sessionId);
+  } finally {
+    core.off("session:ready", onReady);
+  }
+  if (!ready) throw new Error("createSession \u5DF2\u8FD4\u56DE\u4F46\u672A\u6536\u5230 session:ready");
+  applyDisabledSkills(core);
+  await applyDisabledAgents(core).catch((e) => {
+    notes.push(`subagent \u542F\u505C\u540D\u5355\u5E94\u7528\u5931\u8D25(harness agent \u53D6\u820D\u53EF\u80FD\u672A\u751F\u6548):${e instanceof Error ? e.message : String(e)}`);
+  });
+  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);
+  return new SessionImpl(h, ready, notes, responder);
+}
+function attachHeadlessResponder(core) {
+  const blocked = [];
+  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 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 onForm = (d) => {
+    blocked.push({ kind: "form", name: "FormUI", title: d.title, agentId: d.agentId });
+    setImmediate(() => core.respondToForm({ agentId: d.agentId, values: {}, submitted: false }));
+  };
+  core.on("tool:permission:request", onPermission);
+  core.on("ask:question:request", onQuestion);
+  core.on("form:request", onForm);
+  return {
+    blocked,
+    detach() {
+      core.off("tool:permission:request", onPermission);
+      core.off("ask:question:request", onQuestion);
+      core.off("form:request", onForm);
+    }
+  };
+}
+var DISPOSED_ERROR = "session \u5DF2\u91CA\u653E";
+var SessionImpl = class {
+  constructor(handle, ready, notes, responder) {
+    this.responder = responder;
+    this.core = handle.core;
+    this.cwd = handle.cwd;
+    this.permissionMode = handle.permissionMode;
+    this.ready = ready;
+    this.notes = notes;
+  }
+  responder;
+  core;
+  cwd;
+  permissionMode;
+  ready;
+  notes;
+  queue = Promise.resolve();
+  disposed = false;
+  /** 进行中一轮的强制收尾(dispose 用):以给定错误结束 send 并中断 core */
+  abortCurrent = null;
+  get sessionId() {
+    return this.core.getCurrentSessionId() ?? this.ready.sessionId;
+  }
+  get harness() {
+    return getActiveHarnessName(this.core);
+  }
+  on(event, listener) {
+    this.core.on(event, listener);
+  }
+  off(event, listener) {
+    this.core.off(event, listener);
+  }
+  send(input, opts = {}) {
+    if (this.disposed) return Promise.reject(new Error(DISPOSED_ERROR));
+    const run = this.queue.then(() => this.sendNow(input, opts));
+    this.queue = run.catch(() => void 0);
+    return run;
+  }
+  sendNow(input, opts) {
+    if (this.disposed) return Promise.reject(new Error(DISPOSED_ERROR));
+    const core = this.core;
+    const timeoutMs = opts.timeoutMs ?? DEFAULT_SEND_TIMEOUT_MS;
+    const blockedStart = this.responder?.blocked.length ?? 0;
+    return new Promise((resolve9) => {
+      const texts = [];
+      let usage2;
+      let sawProcessing = false;
+      let done = false;
+      const onMessage = (d) => {
+        if (d.agentId === MAIN && d.content.trim()) texts.push(d.content);
+      };
+      const onState = (d) => {
+        if (d.state === "processing") sawProcessing = true;
+        else if (d.state === "idle" && sawProcessing) finish();
+      };
+      const onError = (d) => {
+        finish({ type: d.type, message: d.error?.message ?? d.error?.code ?? "" });
+      };
+      const onUsage = (d) => {
+        if (d.agentId === void 0 || d.agentId === MAIN) usage2 = d.usage;
+      };
+      const interruptWith = (error) => {
+        if (done) return;
+        finish(error);
+        core.interruptSession();
+      };
+      const onAbort = () => interruptWith({ type: "aborted", message: "\u8C03\u7528\u65B9\u4E2D\u6B62" });
+      const timer = setTimeout(() => interruptWith({ type: "timeout", message: `\u8D85\u65F6\uFF08${timeoutMs / 1e3}s\uFF09` }), timeoutMs);
+      const finish = (error) => {
+        if (done) return;
+        done = true;
+        clearTimeout(timer);
+        this.abortCurrent = null;
+        core.off("message:complete", onMessage);
+        core.off("state:update", onState);
+        core.off("session:error", onError);
+        core.off("conversation:usage", onUsage);
+        opts.signal?.removeEventListener("abort", onAbort);
+        resolve9({
+          text: texts[texts.length - 1] ?? "",
+          texts,
+          blocked: this.responder ? this.responder.blocked.slice(blockedStart) : [],
+          usage: usage2,
+          ...error ? { error } : {}
+        });
+      };
+      this.abortCurrent = interruptWith;
+      core.on("message:complete", onMessage);
+      core.on("state:update", onState);
+      core.on("session:error", onError);
+      core.on("conversation:usage", onUsage);
+      if (opts.signal) {
+        if (opts.signal.aborted) return onAbort();
+        opts.signal.addEventListener("abort", onAbort, { once: true });
+      }
+      core.processUserInput(input);
+    });
+  }
+  async dispose() {
+    if (this.disposed) return;
+    this.disposed = true;
+    this.abortCurrent?.({ type: "disposed", message: DISPOSED_ERROR });
+    await this.queue.catch(() => void 0);
+    this.responder?.detach();
+    unregisterSessionDirs(this.core);
+    await this.core.dispose().catch(() => {
+    });
+  }
+};
+
 // src/resume.ts
-var import_atomix_core5 = __toESM(require_dist4());
+var import_atomix_core6 = __toESM(require_dist4());
 import * as fs10 from "fs";
 import * as path10 from "path";
 function extractText(content) {
@@ -160124,7 +160666,7 @@ function readMessages(file) {
   }
 }
 function listSessions(cwd2) {
-  const dir = (0, import_atomix_core5.getProjectHistoryDir)(cwd2);
+  const dir = (0, import_atomix_core6.getProjectHistoryDir)(cwd2);
   if (!fs10.existsSync(dir)) return [];
   const entries = [];
   for (const f of fs10.readdirSync(dir)) {
@@ -160264,15 +160806,15 @@ function setGlyphMode(mode) {
 }
 
 // src/permissionMode.ts
-var import_atomix_core6 = __toESM(require_dist4());
+var import_atomix_core7 = __toESM(require_dist4());
 var META = {
   "step-by-step": { label: "step by step", hint: "\u6BCF\u4E2A\u654F\u611F\u64CD\u4F5C\u9010\u9879\u786E\u8BA4", tone: "muted" },
   "action-check": { label: "action check", hint: "\u53EA\u8BFB\u64CD\u4F5C\u514D\u786E\u8BA4\uFF0C\u5176\u4F59\u9010\u9879\u786E\u8BA4", tone: "accent" },
   "free-style": { label: "free style", hint: "\u5168\u90E8\u514D\u786E\u8BA4\uFF08\u5B89\u5168\u6821\u9A8C\u4ECD\u751F\u6548\uFF09", tone: "warning" }
 };
-var PERMISSION_MODE_ORDER = import_atomix_core6.PERMISSION_MODES;
+var PERMISSION_MODE_ORDER = import_atomix_core7.PERMISSION_MODES;
 function permissionModeMeta(mode) {
-  return META[mode] ?? META[import_atomix_core6.DEFAULT_PERMISSION_MODE];
+  return META[mode] ?? META[import_atomix_core7.DEFAULT_PERMISSION_MODE];
 }
 function nextPermissionMode(mode) {
   const i = PERMISSION_MODE_ORDER.indexOf(mode);
@@ -160490,7 +161032,7 @@ function windowAroundCursor(chars, cursor, budget, newlineGlyph) {
 }
 
 // src/tui/bridge.ts
-var MAIN = "main";
+var MAIN2 = "main";
 function estimateItemRows(item, columns) {
   const text = item.kind === "thinking" ? "" : item.kind === "tool" ? `${item.title} ${item.summary ?? ""}` : item.kind === "shell" ? `${item.cmd}
 ${item.body}
@@ -160533,7 +161075,7 @@ var Bridge = class {
     interactions: [],
     sessionId: "",
     thinkingEnabled: false,
-    permissionMode: import_atomix_core6.DEFAULT_PERMISSION_MODE,
+    permissionMode: import_atomix_core7.DEFAULT_PERMISSION_MODE,
     modelName: "",
     redrawNonce: 0,
     staticEpoch: 0,
@@ -160710,7 +161252,7 @@ var Bridge = class {
       this.set({ streamText: content ?? "" });
     });
     core.on("message:complete", (d) => {
-      if (d.agentId !== MAIN) return;
+      if (d.agentId !== MAIN2) return;
       const items = [...this.state.items];
       if (d.reasoning) items.push({ kind: "thinking", chars: d.reasoning.length });
       if (d.content.trim()) items.push({ kind: "assistant", text: d.content });
@@ -160759,7 +161301,7 @@ var Bridge = class {
     core.on("todos:update", (todos) => {
       this.set({ todos: todos ?? [] });
     });
-    const isMainEvent = (agentId) => !agentId || agentId === MAIN;
+    const isMainEvent = (agentId) => !agentId || agentId === MAIN2;
     core.on("conversation:usage", (d) => {
       if (isMainEvent(d.agentId)) this.set({ usage: d.usage });
     });
@@ -160790,7 +161332,7 @@ var Bridge = class {
       });
     });
     core.on("session:interrupted", (d) => {
-      if (d.agentId === MAIN) this.notice("\u23F9 \u5DF2\u4E2D\u65AD", "warn");
+      if (d.agentId === MAIN2) this.notice("\u23F9 \u5DF2\u4E2D\u65AD", "warn");
     });
     core.on("session:error", (d) => {
       this.notice(`\u4F1A\u8BDD\u9519\u8BEF [${d.type}] ${d.error?.message ?? d.error?.code ?? ""}`, "error");
@@ -161484,9 +162026,9 @@ function SelectList({ options: options2, multi = false, color = theme.accent, on
     winStart > 0 ? /* @__PURE__ */ (0, import_jsx_runtime4.jsx)(Text, { dimColor: true, children: `  \u2026 \u4E0A\u65B9\u8FD8\u6709 ${winStart} \u9879` }) : null,
     visible.map((o, vi) => {
       const i = winStart + vi;
-      const active2 = i === index;
-      const mark = multi ? checked.has(i) ? G.radioOn : G.radioOff : active2 ? G.pointer : " ";
-      return /* @__PURE__ */ (0, import_jsx_runtime4.jsxs)(Text, { color: active2 ? color : void 0, dimColor: !active2, children: [
+      const active = i === index;
+      const mark = multi ? checked.has(i) ? G.radioOn : G.radioOff : active ? G.pointer : " ";
+      return /* @__PURE__ */ (0, import_jsx_runtime4.jsxs)(Text, { color: active ? color : void 0, dimColor: !active, children: [
         `  ${mark} ${i + 1}. ${o.label}`,
         o.hint ? `  ${o.hint}` : ""
       ] }, i);
@@ -161695,7 +162237,7 @@ function PromptCard({
 }
 
 // src/tui/images.ts
-var import_atomix_core7 = __toESM(require_dist4());
+var import_atomix_core8 = __toESM(require_dist4());
 import { execFile as execFile2 } from "child_process";
 import * as fs13 from "fs";
 import * as os8 from "os";
@@ -161812,7 +162354,7 @@ async function buildUserInput(text, cwd2) {
   if (sources.length === 0) return { input: text, display: text };
   const blocks = [
     { type: "text", text: rewritten },
-    ...await Promise.all(sources.map((src) => (0, import_atomix_core7.loadImageAsBlock)(src)))
+    ...await Promise.all(sources.map((src) => (0, import_atomix_core8.loadImageAsBlock)(src)))
   ];
   for (const placeholder of usedPlaceholders) {
     const file = pastedImages.get(placeholder);
@@ -162042,7 +162584,7 @@ function App2({ bridge, cwd: cwd2, initialHistory, appConfig }) {
   }, [bridge]);
   const submittingRef = (0, import_react25.useRef)(false);
   const [submitting, setSubmitting] = (0, import_react25.useState)(false);
-  const active2 = s.interactions[0];
+  const active = s.interactions[0];
   const shellKillRef = (0, import_react25.useRef)(null);
   const [shellCmd, setShellCmd] = (0, import_react25.useState)(null);
   use_input_default((input, key) => {
@@ -162181,7 +162723,7 @@ function App2({ bridge, cwd: cwd2, initialHistory, appConfig }) {
         bridge.notice(await harnessCommand(bridge.core, rest2));
         return;
       case "/memory":
-        bridge.notice(await memoryCommand(cwd2, appConfig, rest2, { harnessMemory: harnessMemoryOverride(), harnessPersona: harnessPersonaOverride(), personaPath: getActivePersonaFile() }));
+        bridge.notice(await memoryCommand(cwd2, appConfig, rest2, { harnessMemory: harnessMemoryOverride(bridge.core), harnessPersona: harnessPersonaOverride(bridge.core), personaPath: getActivePersonaFile(bridge.core) }));
         return;
       case "/mcp":
         bridge.notice(await mcpCommand(bridge.core, rest2));
@@ -162196,8 +162738,8 @@ function App2({ bridge, cwd: cwd2, initialHistory, appConfig }) {
           [
             `session  ${s.sessionId}`,
             `cwd      ${cwd2}`,
-            `harness  ${getActiveHarnessName()}`,
-            `memory   ${memoryStatusLine(appConfig, { harnessMemory: harnessMemoryOverride(), harnessPersona: harnessPersonaOverride() })}`,
+            `harness  ${getActiveHarnessName(bridge.core)}${isHarnessOverridden(bridge.core) ? "\uFF08\u4F1A\u8BDD\u7EA7\u6307\u5B9A\uFF09" : ""}`,
+            `memory   ${memoryStatusLine(appConfig, { harnessMemory: harnessMemoryOverride(bridge.core), harnessPersona: harnessPersonaOverride(bridge.core) })}`,
             `model    main=${md?.taskConfig.main ?? "-"}  quick=${md?.taskConfig.quick ?? "-"}`,
             `context  ${s.usage ? `${s.usage.useTokens} / ${s.usage.maxTokens} tokens` : "-"}`,
             `thinking ${s.thinkingEnabled ? "on" : "off"}`,
@@ -162324,11 +162866,11 @@ function App2({ bridge, cwd: cwd2, initialHistory, appConfig }) {
         /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(Box_default, { flexDirection: "column", width: previewWidth, children: /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(Text, { children: streamPreview.text }) })
       ] })
     ] }) : null,
-    active2?.kind === "permission" ? /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(PermissionCard, { data: active2.data, respond: active2.respond }) : null,
-    active2?.kind === "question" ? /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(QuestionCard, { data: active2.data, respond: active2.respond }) : null,
-    active2?.kind === "form" ? /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(FormCard, { data: active2.data, respond: active2.respond }) : null,
-    active2?.kind === "prompt" ? /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(PromptCard, { question: active2.question, respond: active2.respond, cancel: active2.cancel }) : null,
-    active2?.kind === "select" ? /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(SelectCard, { question: active2.question, options: active2.options, respond: active2.respond }) : null,
+    active?.kind === "permission" ? /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(PermissionCard, { data: active.data, respond: active.respond }) : null,
+    active?.kind === "question" ? /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(QuestionCard, { data: active.data, respond: active.respond }) : null,
+    active?.kind === "form" ? /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(FormCard, { data: active.data, respond: active.respond }) : null,
+    active?.kind === "prompt" ? /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(PromptCard, { question: active.question, respond: active.respond, cancel: active.cancel }) : null,
+    active?.kind === "select" ? /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(SelectCard, { question: active.question, options: active.options, respond: active.respond }) : null,
     showTodos ? /* @__PURE__ */ (0, import_jsx_runtime6.jsxs)(Box_default, { flexDirection: "column", marginTop: 1, children: [
       s.todos.slice(0, 6).map((t, i) => {
         const mark = t.status === "completed" ? G.todoDone : t.status === "in_progress" ? G.todoDoing : G.todoPending;
@@ -162349,9 +162891,9 @@ function App2({ bridge, cwd: cwd2, initialHistory, appConfig }) {
       }
     ),
     redrawPulse ? /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(Text, { children: " " }) : null,
-    s.processing && !active2 ? /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(ProcessingLine, {}) : null,
-    shellCmd && !active2 ? /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(ShellRunningLine, { cmd: shellCmd }) : null,
-    !s.processing && !active2 && !submitting ? /* @__PURE__ */ (0, import_jsx_runtime6.jsxs)(Box_default, { flexDirection: "column", children: [
+    s.processing && !active ? /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(ProcessingLine, {}) : null,
+    shellCmd && !active ? /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(ShellRunningLine, { cmd: shellCmd }) : null,
+    !s.processing && !active && !submitting ? /* @__PURE__ */ (0, import_jsx_runtime6.jsxs)(Box_default, { flexDirection: "column", children: [
       /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(Box_default, { borderStyle: G.border, borderColor: theme.muted, paddingX: 1, children: /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(Box_default, { flexGrow: 1, children: /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(
         LineInput,
         {
@@ -162375,32 +162917,15 @@ function App2({ bridge, cwd: cwd2, initialHistory, appConfig }) {
 // src/tui/index.tsx
 var import_jsx_runtime7 = __toESM(require_jsx_runtime());
 var VERSION2 = "0.1.0";
-async function startTui(cwd2, resumeSessionId) {
+async function startTui(cwd2, options2 = {}) {
+  const { resumeSessionId } = options2;
   applyConfiguredTheme();
   if (!process.env.ATOMIX_GLYPHS) {
     const mode = configuredGlyphMode();
     if (mode) setGlyphMode(mode);
   }
-  initMarketplaceProject(cwd2);
-  syncInheritedMcp();
-  syncMarketplaceMcp();
-  const hookCfg = loadHooks(cwd2);
-  const appConfig = readConfig();
-  const contextFiles = buildContextFilesConfig(cwd2, appConfig);
-  const core = new import_atomix_core8.AtomixCore({
-    workingDir: cwd2,
-    logLevel: atomixLogLevel(),
-    stream: true,
-    useTools: ATOMIX_TOOLS,
-    deferBuiltinTools: ATOMIX_DEFER_TOOLS,
-    skillsExtraDirs: buildSkillsExtraDirs(),
-    agentsExtraDirs: buildAgentsExtraDirs(),
-    commandsExtraDirs: buildCommandsExtraDirs(),
-    ...hookCfg,
-    ...contextFiles,
-    skipFileEditPermission: false,
-    systemPrompt: "You are Atomix, a CLI coding agent bound to the current working directory."
-  });
+  const handle = createSessionCore({ cwd: cwd2, interactive: true, permissionMode: options2.permissionMode });
+  const { core, appConfig } = handle;
   {
     const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
     const { ask, dispose } = makeCancellableAsk(rl);
@@ -162413,8 +162938,7 @@ async function startTui(cwd2, resumeSessionId) {
     }
     if (!ok) {
       console.log(gray("\u672A\u5B8C\u6210\u6A21\u578B\u914D\u7F6E\uFF0C\u9000\u51FA\u3002"));
-      await core.dispose().catch(() => {
-      });
+      await discardSessionCore(handle);
       process.exit(1);
     }
   }
@@ -162432,37 +162956,16 @@ async function startTui(cwd2, resumeSessionId) {
       accent("\u2570\u2500 ") + muted("/help \u67E5\u770B\u547D\u4EE4")
     ].join("\n")
   );
-  let initialHistory = [];
-  await new Promise((resolve9, reject2) => {
-    core.once("session:ready", (d) => {
-      bridge.setSessionId(d.sessionId);
-      bridge.setUsage(d.usage);
-      initialHistory = [...d.projectInputHistory ?? []];
-      resolve9();
-    });
-    core.createSession(resumeSessionId).catch(reject2);
-  }).catch(async (e) => {
+  const session = await startSession(handle, { sessionId: resumeSessionId, harness: options2.harness }).catch(async (e) => {
     console.error(`\u4F1A\u8BDD\u521D\u59CB\u5316\u5931\u8D25\uFF1A${e instanceof Error ? e.message : String(e)}`);
-    await core.dispose().catch(() => {
-    });
+    await discardSessionCore(handle);
     process.exit(1);
   });
-  {
-    const potential = buildPotentialContextFiles(cwd2, appConfig);
-    const warn = initHarness(core, cwd2, {
-      useTools: ATOMIX_TOOLS,
-      deferBuiltinTools: ATOMIX_DEFER_TOOLS,
-      memoryFiles: contextFiles.memoryFiles,
-      personaFile: contextFiles.personaFile,
-      potentialMemoryFiles: potential.memoryFiles
-    });
-    if (warn) console.error(warn);
-  }
-  applyDisabledSkills(core);
-  await applyDisabledAgents(core).catch(() => {
-  });
-  const mcpNotes = await applyMcpHotUpdates(core).catch(() => []);
-  for (const n of mcpNotes) bridge.notice(`${n}\uFF08\u9879\u76EE\u7EA7 override\uFF09`);
+  bridge.setPermissionMode(handle.permissionMode, { silent: true });
+  bridge.setSessionId(session.ready.sessionId);
+  bridge.setUsage(session.ready.usage);
+  const initialHistory = [...session.ready.projectInputHistory ?? []];
+  for (const n of session.notes) bridge.notice(n, n.startsWith("harness") ? "warn" : "info");
   if (resumeSessionId) {
     bridge.seedReplay(loadReplay(cwd2, resumeSessionId));
   }