magpie-agent-console 0.1.0 → 1.0.0

package/daemon/dist/main.js

@@ -71,17 +71,22 @@ var init_log = __esm({
 
 // daemon/src/util/paths.ts
 import { realpathSync, existsSync as existsSync3 } from "node:fs";
-import { resolve as resolve2, sep } from "node:path";
-function normPath(p) {
-  let r = resolve2(p);
+import { posix, sep, win32 } from "node:path";
+function normPath(p, platform = process.platform) {
+  let r = (platform === "win32" ? win32 : posix).resolve(p);
   try {
-    r = realpathSync(r);
+    r = realpathSync.native(r);
   } catch {
+    try {
+      r = realpathSync(r);
+    } catch {
+    }
   }
-  if (process.platform === "win32") {
-    r = r.replace(/\//g, "\\").toLowerCase();
+  if (platform === "win32") {
+    r = r.replace(/\//g, "\\").replace(/^\\\\\?\\(?!UNC\\)/i, "").replace(/^\\\\\?\\UNC\\/i, "\\\\").toLowerCase();
   } else {
     r = r.replace(/\\/g, "/");
+    if (platform === "darwin") r = r.normalize("NFC").toLowerCase();
   }
   while (r.length > 3 && (r.endsWith("/") || r.endsWith("\\"))) r = r.slice(0, -1);
   return r;
@@ -662,21 +667,21 @@ var init_mock = __esm({
         }
       }
       respond(requestId, answer) {
-        const resolve4 = this.pendingReq.get(requestId);
-        if (resolve4) {
+        const resolve2 = this.pendingReq.get(requestId);
+        if (resolve2) {
           this.pendingReq.delete(requestId);
-          resolve4(answer);
+          resolve2(answer);
         }
       }
       waitFor(requestId) {
-        return new Promise((resolve4) => {
-          this.pendingReq.set(requestId, resolve4);
+        return new Promise((resolve2) => {
+          this.pendingReq.set(requestId, resolve2);
         });
       }
       async interrupt() {
         this.interruptFlag = true;
-        for (const [id, resolve4] of this.pendingReq) {
-          resolve4({ cancelled: true });
+        for (const [id, resolve2] of this.pendingReq) {
+          resolve2({ cancelled: true });
           this.pendingReq.delete(id);
         }
         await sleep(120);
@@ -704,11 +709,11 @@ var init_mock = __esm({
       }
       async close() {
         this.closed = true;
-        for (const [, resolve4] of this.pendingReq) resolve4({ cancelled: true });
+        for (const [, resolve2] of this.pendingReq) resolve2({ cancelled: true });
         this.pendingReq.clear();
         this.q.close();
       }
-      // resumeId 时首条回复加（已续接）前缀
+      // With resumeId the first reply gets a "（已续接）" prefix
       resumePrefix() {
         if (this.resumed && this.turnNum === 1) return "\uFF08\u5DF2\u7EED\u63A5\uFF09";
         return "";
@@ -718,70 +723,192 @@ var init_mock = __esm({
   }
 });
 
+// lib/pathscan.mjs
+import { accessSync, constants, statSync as statSync2 } from "node:fs";
+import { homedir as homedir2 } from "node:os";
+import path from "node:path";
+function defaultExists(file, platform) {
+  try {
+    if (!statSync2(file).isFile()) return false;
+    if (platform !== "win32") accessSync(file, constants.X_OK);
+    return true;
+  } catch {
+    return false;
+  }
+}
+function envGet(env, name) {
+  if (env[name] !== void 0) return env[name];
+  const lower = name.toLowerCase();
+  for (const key of Object.keys(env)) if (key.toLowerCase() === lower) return env[key];
+  return void 0;
+}
+function extraBinDirs({ platform = process.platform, env = process.env, home = homedir2() } = {}) {
+  const p = platform === "win32" ? path.win32 : path.posix;
+  const dirs = [];
+  if (platform === "win32") {
+    const appData = envGet(env, "APPDATA");
+    const localAppData = envGet(env, "LOCALAPPDATA");
+    const programFiles = envGet(env, "ProgramFiles") || "C:\\Program Files";
+    const nvmSymlink = envGet(env, "NVM_SYMLINK");
+    if (home) dirs.push(p.join(home, ".local", "bin"));
+    if (appData) dirs.push(p.join(appData, "npm"));
+    if (nvmSymlink) dirs.push(nvmSymlink);
+    dirs.push(p.join(programFiles, "nodejs"));
+    if (localAppData) dirs.push(p.join(localAppData, "Programs", "nodejs"));
+    if (home) {
+      dirs.push(p.join(home, ".volta", "bin"));
+      dirs.push(p.join(home, ".bun", "bin"));
+    }
+    return dirs;
+  }
+  if (home) {
+    dirs.push(p.join(home, ".local", "bin"));
+    dirs.push(p.join(home, ".npm-global", "bin"));
+    dirs.push(p.join(home, ".volta", "bin"));
+    dirs.push(p.join(home, ".bun", "bin"));
+    dirs.push(p.join(home, ".claude", "local"));
+  }
+  if (platform === "darwin") dirs.push("/opt/homebrew/bin");
+  dirs.push("/usr/local/bin", "/usr/bin", "/bin");
+  return dirs;
+}
+function searchDirs({ platform = process.platform, env = process.env, home = homedir2(), extra = true } = {}) {
+  const sep4 = platform === "win32" ? ";" : ":";
+  const raw = String(envGet(env, "PATH") ?? "").split(sep4).map((d) => d.trim().replace(/^"(.*)"$/, "$1")).filter(Boolean);
+  const all = extra ? [...raw, ...extraBinDirs({ platform, env, home })] : raw;
+  const seen = /* @__PURE__ */ new Set();
+  const out = [];
+  for (const d of all) {
+    const key = platform === "win32" ? d.toLowerCase().replace(/[\\/]+$/, "") : d.replace(/\/+$/, "");
+    if (seen.has(key)) continue;
+    seen.add(key);
+    out.push(d);
+  }
+  return out;
+}
+function windowsExts(env) {
+  const list = String(envGet(env, "PATHEXT") || ".COM;.EXE;.BAT;.CMD").split(";").map((e) => e.trim().toLowerCase()).filter((e) => e.startsWith("."));
+  if (!list.includes(".ps1")) list.push(".ps1");
+  return list;
+}
+function findOnPath(name, { platform = process.platform, env = process.env, home = homedir2(), extra = true, exists } = {}) {
+  if (!name) return [];
+  const p = platform === "win32" ? path.win32 : path.posix;
+  const check = exists ?? ((file) => defaultExists(file, platform));
+  if (name.includes("/") || platform === "win32" && name.includes("\\")) {
+    return check(name) ? [name] : [];
+  }
+  let names = [name];
+  if (platform === "win32") {
+    const exts = windowsExts(env);
+    const ext = p.extname(name).toLowerCase();
+    names = ext && exts.includes(ext) ? [name] : exts.map((e) => name + e);
+  }
+  const hits = [];
+  for (const dir of searchDirs({ platform, env, home, extra })) {
+    for (const n of names) {
+      const file = p.join(dir, n);
+      if (check(file) && !hits.includes(file)) hits.push(file);
+    }
+  }
+  return hits;
+}
+function findNode(opts = {}) {
+  return findOnPath("node", opts).find((file) => isNodeExecutable(file)) ?? null;
+}
+function isNodeExecutable(file) {
+  return /^node(\.exe)?$/i.test(String(file || "").split(/[\\/]/).pop() ?? "");
+}
+var init_pathscan = __esm({
+  "lib/pathscan.mjs"() {
+  }
+});
+
 // daemon/src/util/bin.ts
-import { spawn } from "node:child_process";
+import { execFileSync, spawn } from "node:child_process";
 import { readFile as readFile3 } from "node:fs/promises";
 import { existsSync as existsSync4 } from "node:fs";
-import { dirname as dirname3, isAbsolute, join as join6, resolve as resolve3 } from "node:path";
+import path2 from "node:path";
 function which(name) {
-  return new Promise((resolvePromise) => {
-    const cmd = IS_WIN ? "where.exe" : "which";
-    let out = "";
-    let done = false;
-    const finish = (v) => {
-      if (!done) {
-        done = true;
-        resolvePromise(v);
-      }
-    };
+  return findOnPath(name);
+}
+function escapeCmdCommand(cmd) {
+  return cmd.replace(CMD_META, "^$1");
+}
+function escapeCmdArgument(arg, doubleEscape) {
+  let a = String(arg);
+  a = a.replace(/(\\*)"/g, '$1$1\\"');
+  a = a.replace(/(\\*)$/, "$1$1");
+  a = `"${a}"`;
+  a = a.replace(CMD_META, "^$1");
+  if (doubleEscape) a = a.replace(CMD_META, "^$1");
+  return a;
+}
+function argvFor(r, args) {
+  if (r.via === "cmd-shim" && r.shim) {
+    const line = [escapeCmdCommand(r.shim), ...args.map((a) => escapeCmdArgument(a, true))].join(" ");
+    return { cmd: r.cmd, args: ["/d", "/s", "/c", `"${line}"`], windowsVerbatimArguments: true };
+  }
+  return { cmd: r.cmd, args: [...r.prefixArgs, ...args] };
+}
+function reapOnExit() {
+  for (const pid of liveTrees) {
     try {
-      const p = spawn(cmd, [name], { windowsHide: true });
-      const t = setTimeout(() => {
-        try {
-          p.kill();
-        } catch {
-        }
-        finish([]);
-      }, 4e3);
-      p.stdout.on("data", (c) => out += c.toString());
-      p.on("error", () => {
-        clearTimeout(t);
-        finish([]);
-      });
-      p.on("close", (code) => {
-        clearTimeout(t);
-        const lines = out.split(/\r?\n/).map((s) => s.trim()).filter(Boolean);
-        finish(code === 0 ? lines : []);
-      });
+      if (IS_WIN) execFileSync("taskkill", ["/pid", String(pid), "/T", "/F"], { stdio: "ignore", windowsHide: true, timeout: 3e3 });
+      else process.kill(-pid, "SIGKILL");
     } catch {
-      finish([]);
     }
+  }
+  liveTrees.clear();
+}
+function trackTree(child) {
+  if (child.pid == null) return;
+  const pid = child.pid;
+  liveTrees.add(pid);
+  child.once("exit", () => liveTrees.delete(pid));
+  if (!exitHookInstalled) {
+    exitHookInstalled = true;
+    process.once("exit", reapOnExit);
+  }
+}
+function spawnBin(r, args, opts = {}) {
+  const a = argvFor(r, args);
+  const { group, ...rest } = opts;
+  const child = spawn(a.cmd, a.args, {
+    windowsHide: true,
+    ...rest,
+    ...a.windowsVerbatimArguments ? { windowsVerbatimArguments: true } : {},
+    ...group && !IS_WIN ? { detached: true } : {}
   });
+  if (group) trackTree(child);
+  return child;
 }
-function shimTarget(cmdText, cmdDir) {
+function shimTarget(cmdText, cmdDir, deps = {}) {
+  const exists = deps.exists ?? existsSync4;
+  const P = deps.win ?? IS_WIN ? path2.win32 : path2;
   const cands = [];
   const re = /"([^"]+?\.(?:js|mjs|cjs|exe|cmd|bat))"/gi;
   let m;
   while (m = re.exec(cmdText)) cands.push(m[1]);
   const re2 = /(?:%~?dp0%?)?[A-Za-z]:?[\\/\w.@-]*?\.(?:js|mjs|cjs|exe)\b/gi;
   while (m = re2.exec(cmdText)) cands.push(m[0]);
+  const found = [];
   for (const raw of cands) {
     let p = raw.replace(/%~?dp0%?/gi, "");
     p = p.replace(/%[A-Z_]+%/gi, "");
     p = p.trim().replace(/^[\\/]+/, "");
     if (!p || /%\w+%/.test(p) || !/\.(js|mjs|cjs|exe)$/i.test(p)) continue;
-    if (!isAbsolute(p)) {
+    if (!P.isAbsolute(p)) {
       if (!cmdDir) continue;
-      p = join6(cmdDir, p);
+      p = P.join(cmdDir, p);
     }
-    if (existsSync4(p)) return resolve3(p);
+    if (exists(p)) found.push(P.resolve(p));
   }
-  return null;
+  return found.find((f) => /\.(js|mjs|cjs)$/i.test(f)) ?? found.find((f) => /\.exe$/i.test(f) && !isNodeExecutable(P.basename(f))) ?? null;
 }
-async function findNode() {
-  const hits = await which("node");
-  for (const h of hits) if (/node\.exe$/i.test(h) || /node$/.test(h)) return h;
-  return hits[0] || process.execPath;
+function findNode2() {
+  if (isNodeExecutable(process.execPath)) return process.execPath;
+  return findNode() ?? "node";
 }
 async function resolveBin(name) {
   const hit = cache.get(name);
@@ -803,39 +930,47 @@ function clearBinCache(name) {
   if (name) cache.delete(name);
   else cache.clear();
 }
-async function resolveBinUncached(name) {
-  const hits = await which(name);
+function resolveBinUncached(name) {
+  return resolveBinWith(name);
+}
+async function resolveBinWith(name, deps = {}) {
+  const platform = deps.platform ?? process.platform;
+  const win = platform === "win32";
+  const P = win ? path2.win32 : path2.posix;
+  const exists = deps.exists ?? existsSync4;
+  const hits = (deps.find ?? which)(name);
   if (!hits.length) return { ok: false, reason: `PATH \u91CC\u627E\u4E0D\u5230 ${name}` };
-  const exe = hits.find((h) => /\.exe$/i.test(h));
-  if (exe && existsSync4(exe)) {
-    return { ok: true, cmd: exe, prefixArgs: [], display: exe, via: "exe" };
+  const first = hits[0];
+  if (!win) return { ok: true, cmd: first, prefixArgs: [], display: first, via: "path" };
+  const ext = P.extname(first).toLowerCase();
+  if (ext === ".exe" || ext === ".com") return { ok: true, cmd: first, prefixArgs: [], display: first, via: "exe" };
+  if (ext === ".ps1") {
+    return {
+      ok: true,
+      cmd: "powershell.exe",
+      prefixArgs: ["-NoProfile", "-NonInteractive", "-ExecutionPolicy", "Bypass", "-File", first],
+      display: first,
+      via: "ps1"
+    };
   }
-  if (IS_WIN) {
-    const shim = hits.find((h) => /\.(cmd|bat)$/i.test(h));
-    if (shim && existsSync4(shim)) {
-      const dir = dirname3(shim);
-      if (name.toLowerCase() === "npx") {
-        const node = join6(dir, "node.exe");
-        const cli = join6(dir, "node_modules", "npm", "bin", "npx-cli.js");
-        if (existsSync4(node) && existsSync4(cli))
-          return { ok: true, cmd: node, prefixArgs: [cli], display: `${node} ${cli}`, via: "npx-shim" };
-      }
-      const text = await readFile3(shim, "utf8").catch(() => "");
-      const target = shimTarget(text, dir);
-      if (target && /\.(js|mjs|cjs)$/i.test(target)) {
-        const node = await findNode();
-        return { ok: true, cmd: node, prefixArgs: [target], display: `${node} ${target}`, via: "shim-js" };
-      }
-      if (target && /\.exe$/i.test(target)) {
-        return { ok: true, cmd: target, prefixArgs: [], display: target, via: "shim-exe" };
-      }
-      const comspec = process.env.ComSpec || "cmd.exe";
-      return { ok: true, cmd: comspec, prefixArgs: ["/d", "/s", "/c", shim], display: shim, via: "cmd-shim" };
-    }
+  const dir = P.dirname(first);
+  if (name.toLowerCase() === "npx") {
+    const node = P.join(dir, "node.exe");
+    const cli = P.join(dir, "node_modules", "npm", "bin", "npx-cli.js");
+    if (exists(node) && exists(cli))
+      return { ok: true, cmd: node, prefixArgs: [cli], display: `${node} ${cli}`, via: "npx-shim" };
   }
-  const first = hits[0];
-  if (existsSync4(first)) return { ok: true, cmd: first, prefixArgs: [], display: first, via: "path" };
-  return { ok: false, reason: `\u627E\u4E0D\u5230\u53EF\u6267\u884C\u7684 ${name}` };
+  const text = await (deps.readText ?? ((f) => readFile3(f, "utf8")))(first).catch(() => "");
+  const target = shimTarget(text, dir, { exists, win: true });
+  if (target && /\.(js|mjs|cjs)$/i.test(target)) {
+    const node = (deps.node ?? findNode2)();
+    return { ok: true, cmd: node, prefixArgs: [target], display: `${node} ${target}`, via: "shim-js" };
+  }
+  if (target && /\.exe$/i.test(target)) {
+    return { ok: true, cmd: target, prefixArgs: [], display: target, via: "shim-exe" };
+  }
+  const comspec = deps.comspec ?? (process.env.ComSpec || "cmd.exe");
+  return { ok: true, cmd: comspec, prefixArgs: [], display: first, via: "cmd-shim", shim: first };
 }
 function killTree(child, { graceMs = 3e3 } = {}) {
   if (!child || child.pid == null) return Promise.resolve();
@@ -870,6 +1005,10 @@ function killTree(child, { graceMs = 3e3 } = {}) {
       } catch {
       }
     }
+    if (child.exitCode !== null || child.signalCode !== null) {
+      finish();
+      return;
+    }
     const t = setTimeout(() => {
       try {
         process.kill(-pid, "SIGKILL");
@@ -888,12 +1027,16 @@ function killTree(child, { graceMs = 3e3 } = {}) {
     });
   });
 }
-var IS_WIN, cache, CACHE_MS;
+var IS_WIN, cache, CACHE_MS, CMD_META, liveTrees, exitHookInstalled;
 var init_bin = __esm({
   "daemon/src/util/bin.ts"() {
+    init_pathscan();
     IS_WIN = process.platform === "win32";
     cache = /* @__PURE__ */ new Map();
     CACHE_MS = 60 * 1e3;
+    CMD_META = /([()\][%!^"`<>&|;, *?])/g;
+    liveTrees = /* @__PURE__ */ new Set();
+    exitHookInstalled = false;
   }
 });
 
@@ -1092,7 +1235,7 @@ function mapSdkMessage(m, st, cwd) {
     out.push({
       type: "turn_ended",
       turnId: "",
-      // session 补当前 turnId
+      // The session fills in the current turnId
       status: interrupted ? "interrupted" : isError ? "failed" : "completed",
       durationMs: typeof r.duration_ms === "number" ? r.duration_ms : void 0,
       error: isError && !interrupted ? str(r.result) ?? subtype : void 0,
@@ -1255,6 +1398,14 @@ var init_attachmentRefs = __esm({
 // daemon/src/providers/claude/session.ts
 import { query } from "@anthropic-ai/claude-agent-sdk";
 import { readFile as readFile4 } from "node:fs/promises";
+function claudeExecutable(o) {
+  if (!o.binCmd) return null;
+  if (o.binVia === "cmd-shim" || o.binVia === "ps1") return null;
+  const last = o.binPrefixArgs[o.binPrefixArgs.length - 1];
+  if (last && /\.(c|m)?js$/i.test(last)) return { path: last, node: true };
+  if (o.binPrefixArgs.length) return null;
+  return { path: o.binCmd, node: false };
+}
 var EFFORTS, rid2, ClaudeSession;
 var init_session = __esm({
   "daemon/src/providers/claude/session.ts"() {
@@ -1289,7 +1440,7 @@ var init_session = __esm({
       closed = false;
       stderrTail = "";
       pumpDone = null;
-      // 首次 send 前才真正起 query（检测失败要尽快报错）
+      // The query is only started before the first send (a failed detection should be reported quickly)
       ensureQuery() {
         if (this.query && !this.needsRestart) return this.query;
         this.abort = new AbortController();
@@ -1308,13 +1459,10 @@ var init_session = __esm({
             this.stderrTail = (this.stderrTail + d).slice(-4096);
           }
         };
-        if (this.o.binCmd) {
-          if (this.o.binPrefixArgs.length) {
-            options.pathToClaudeCodeExecutable = this.o.binPrefixArgs[this.o.binPrefixArgs.length - 1];
-            options.executable = "node";
-          } else {
-            options.pathToClaudeCodeExecutable = this.o.binCmd;
-          }
+        const exe = claudeExecutable(this.o);
+        if (exe) {
+          options.pathToClaudeCodeExecutable = exe.path;
+          if (exe.node) options.executable = "node";
         }
         if (this.o.effort && EFFORTS.includes(this.o.effort)) {
           options.effort = this.o.effort;
@@ -1406,7 +1554,7 @@ var init_session = __esm({
         })();
         return this.restarting;
       }
-      // ---- 授权（§7.2.4）----
+      // ---- permissions (§7.2.4) ----
       canUseTool(toolName, input, opts) {
         const requestId = "perm_" + rid2();
         const { signal } = opts;
@@ -1433,12 +1581,12 @@ var init_session = __esm({
             { id: "deny", label: "\u62D2\u7EDD", kind: "reject_once" }
           ]
         });
-        return new Promise((resolve4) => {
-          this.pending.set(requestId, { kind: "permission", resolve: (a) => resolve4(this.toPermissionResult(a, input)) });
+        return new Promise((resolve2) => {
+          this.pending.set(requestId, { kind: "permission", resolve: (a) => resolve2(this.toPermissionResult(a, input)) });
           signal.addEventListener("abort", () => {
             if (this.pending.delete(requestId)) {
               this.emit({ type: "permission_resolved", requestId, cancelled: true });
-              resolve4({ behavior: "deny", message: "\u5DF2\u53D6\u6D88", interrupt: true });
+              resolve2({ behavior: "deny", message: "\u5DF2\u53D6\u6D88", interrupt: true });
             }
           }, { once: true });
         });
@@ -1465,12 +1613,12 @@ var init_session = __esm({
             { id: "reject", label: "\u62D2\u7EDD", kind: "reject_once" }
           ]
         });
-        const answer = await new Promise((resolve4) => {
-          this.pending.set(requestId, { kind: "permission", resolve: (a) => resolve4(a) });
+        const answer = await new Promise((resolve2) => {
+          this.pending.set(requestId, { kind: "permission", resolve: (a) => resolve2(a) });
           signal.addEventListener("abort", () => {
             if (this.pending.delete(requestId)) {
               this.emit({ type: "permission_resolved", requestId, cancelled: true });
-              resolve4({ cancelled: true });
+              resolve2({ cancelled: true });
             }
           }, { once: true });
         });
@@ -1488,12 +1636,12 @@ var init_session = __esm({
       }
       async handleQuestion(requestId, input, signal) {
         this.emit({ type: "question", requestId, questions: input.questions });
-        const answer = await new Promise((resolve4) => {
-          this.pending.set(requestId, { kind: "question", resolve: (a) => resolve4(a) });
+        const answer = await new Promise((resolve2) => {
+          this.pending.set(requestId, { kind: "question", resolve: (a) => resolve2(a) });
           signal.addEventListener("abort", () => {
             if (this.pending.delete(requestId)) {
               this.emit({ type: "permission_resolved", requestId, cancelled: true });
-              resolve4({ cancelled: true });
+              resolve2({ cancelled: true });
             }
           }, { once: true });
         });
@@ -1608,8 +1756,8 @@ var init_models = __esm({
 // daemon/src/history/import.ts
 import { readdir, readFile as readFile5, stat as stat3 } from "node:fs/promises";
 import { existsSync as existsSync6 } from "node:fs";
-import { join as join7 } from "node:path";
-import { homedir as homedir2 } from "node:os";
+import { join as join6 } from "node:path";
+import { homedir as homedir3 } from "node:os";
 function parseLine(line) {
   let r;
   try {
@@ -1629,8 +1777,8 @@ function parseLine(line) {
   }
   return { cwd, userText };
 }
-async function* linesOf(path) {
-  const text = await readFile5(path, "utf8").catch(() => "");
+async function* linesOf(path3) {
+  const text = await readFile5(path3, "utf8").catch(() => "");
   for (const line of text.split("\n")) {
     if (line.trim()) yield line;
   }
@@ -1639,14 +1787,14 @@ async function listClaudeHistory(cwd) {
   const out = [];
   const dirs = await readdir(CLAUDE_ROOT).catch(() => []);
   for (const d of dirs) {
-    const dirPath = join7(CLAUDE_ROOT, d);
+    const dirPath = join6(CLAUDE_ROOT, d);
     const files = (await readdir(dirPath).catch(() => [])).filter((f) => f.endsWith(".jsonl"));
     for (const f of files) {
-      const path = join7(dirPath, f);
+      const path3 = join6(dirPath, f);
       let match = false;
       let title = "";
       let count = 0;
-      for await (const line of linesOf(path)) {
+      for await (const line of linesOf(path3)) {
         const p = parseLine(line);
         if (!p) continue;
         if (!match) {
@@ -1658,7 +1806,7 @@ async function listClaudeHistory(cwd) {
         if (p.userText) count++;
       }
       if (!match) continue;
-      const s = await stat3(path).catch(() => null);
+      const s = await stat3(path3).catch(() => null);
       out.push({
         sessionId: f.replace(/\.jsonl$/, ""),
         title: title || "\uFF08\u65E0\u6807\u9898\uFF09",
@@ -1673,11 +1821,11 @@ async function listClaudeHistory(cwd) {
 async function readClaudeHistory(sessionId, cwd) {
   const dirs = await readdir(CLAUDE_ROOT).catch(() => []);
   for (const d of dirs) {
-    const path = join7(CLAUDE_ROOT, d, `${sessionId}.jsonl`);
-    if (!existsSync6(path)) continue;
+    const path3 = join6(CLAUDE_ROOT, d, `${sessionId}.jsonl`);
+    if (!existsSync6(path3)) continue;
     const msgs = [];
     let matched = false;
-    for await (const line of linesOf(path)) {
+    for await (const line of linesOf(path3)) {
       const p = parseLine(line);
       if (!matched) {
         if (p?.cwd && samePath(p.cwd, cwd)) matched = true;
@@ -1699,27 +1847,26 @@ var CLAUDE_ROOT, rec2, str2;
 var init_import = __esm({
   "daemon/src/history/import.ts"() {
     init_paths();
-    CLAUDE_ROOT = join7(homedir2(), ".claude", "projects");
+    CLAUDE_ROOT = join6(homedir3(), ".claude", "projects");
     rec2 = (v) => v && typeof v === "object" ? v : {};
     str2 = (v) => typeof v === "string" ? v : void 0;
   }
 });
 
 // daemon/src/providers/claude/provider.ts
-import { spawn as spawn2 } from "node:child_process";
-function runVersion(cmd, args, timeoutMs = 5e3) {
+function runVersion(r, args, timeoutMs = 5e3) {
   return new Promise((resolvePromise, reject) => {
     let out = "";
-    const p = spawn2(cmd, args, { windowsHide: true, env: { ...process.env, NO_COLOR: "1", FORCE_COLOR: "0" } });
+    const p = spawnBin(r, args, { stdio: ["ignore", "pipe", "pipe"], env: { ...process.env, NO_COLOR: "1", FORCE_COLOR: "0" } });
     const t = setTimeout(() => {
       try {
-        p.kill();
+        void killTree(p, { graceMs: 500 });
       } catch {
       }
       reject(new Error("timeout"));
     }, timeoutMs);
-    p.stdout.on("data", (c) => out += c.toString());
-    p.stderr.on("data", (c) => out += c.toString());
+    p.stdout?.on("data", (c) => out += c.toString());
+    p.stderr?.on("data", (c) => out += c.toString());
     p.on("error", reject);
     p.on("close", (code) => {
       clearTimeout(t);
@@ -1737,7 +1884,7 @@ function createClaudeProvider() {
       const bin = await resolveBin("claude");
       if (!bin.ok) return { available: false, reason: bin.reason, installHint: INSTALL_HINT };
       try {
-        const version = await runVersion(bin.cmd, [...bin.prefixArgs, "--version"]);
+        const version = await runVersion(bin, ["--version"]);
         return { available: true, bin: bin.display, version: version.trim().split("\n")[0] || "" };
       } catch {
         return { available: true, bin: bin.display, version: "" };
@@ -1757,10 +1904,11 @@ function createClaudeProvider() {
         effort: o.effort,
         resumeId: o.resumeId,
         binCmd: bin.cmd,
-        binPrefixArgs: bin.prefixArgs
+        binPrefixArgs: bin.prefixArgs,
+        binVia: bin.via
       });
     },
-    // §7.6：~/.claude/projects 下按 cwd 匹配的 jsonl 会话
+    // §7.6: jsonl sessions under ~/.claude/projects matched by cwd
     async listHistory(cwd) {
       const items = await listClaudeHistory(cwd);
       return items.map((i) => ({ provider: "claude", ...i, imported: false }));
@@ -1798,7 +1946,7 @@ var init_provider = __esm({
       resume: true,
       interrupt: true,
       steer: false,
-      // Claude 不支持真正插话 — manager 会排队（§7.2.2）
+      // Claude doesn't support real steering — the manager queues instead (§7.2.2)
       images: true,
       plan: true,
       questions: true,
@@ -1811,8 +1959,8 @@ var init_provider = __esm({
 
 // daemon/src/history/codex.ts
 import { readdir as readdir2, readFile as readFile6, stat as stat4 } from "node:fs/promises";
-import { join as join8 } from "node:path";
-import { homedir as homedir3 } from "node:os";
+import { join as join7 } from "node:path";
+import { homedir as homedir4 } from "node:os";
 function textOf(content, kind) {
   if (!Array.isArray(content)) return "";
   return content.filter((p) => p.type === kind || p.type === "input_text" || p.type === "output_text").map((p) => str3(p.text) ?? "").join("\n").trim();
@@ -1820,7 +1968,7 @@ function textOf(content, kind) {
 async function* walk(dir, depth = 0) {
   if (depth > 6) return;
   for (const name of await readdir2(dir).catch(() => [])) {
-    const p = join8(dir, name);
+    const p = join7(dir, name);
     const s = await stat4(p).catch(() => null);
     if (!s) continue;
     if (s.isDirectory()) yield* walk(p, depth + 1);
@@ -1829,11 +1977,11 @@ async function* walk(dir, depth = 0) {
 }
 async function listCodexHistory(cwd) {
   const out = [];
-  for await (const path of walk(CODEX_ROOT)) {
-    const m = /rollout-.*-([0-9a-f-]{36})\.jsonl$/i.exec(path);
+  for await (const path3 of walk(CODEX_ROOT)) {
+    const m = /rollout-.*-([0-9a-f-]{36})\.jsonl$/i.exec(path3);
     const sessionId = m?.[1];
     if (!sessionId) continue;
-    const text = await readFile6(path, "utf8").catch(() => "");
+    const text = await readFile6(path3, "utf8").catch(() => "");
     let match = false;
     let title = "";
     let count = 0;
@@ -1864,7 +2012,7 @@ async function listCodexHistory(cwd) {
       }
     }
     if (!match) continue;
-    const s = await stat4(path).catch(() => null);
+    const s = await stat4(path3).catch(() => null);
     out.push({ sessionId, title: title || "\uFF08\u65E0\u6807\u9898\uFF09", updatedAt: s ? Math.round(s.mtimeMs) : 0, messageCount: count });
   }
   out.sort((a, b) => b.updatedAt - a.updatedAt);
@@ -1952,7 +2100,7 @@ var CODEX_ROOT, rec3, str3, WRAPPERS;
 var init_codex = __esm({
   "daemon/src/history/codex.ts"() {
     init_paths();
-    CODEX_ROOT = join8(homedir3(), ".codex", "sessions");
+    CODEX_ROOT = join7(homedir4(), ".codex", "sessions");
     rec3 = (v) => v && typeof v === "object" ? v : {};
     str3 = (v) => typeof v === "string" ? v : void 0;
     WRAPPERS = /^\s*<(environment_context|user_instructions|skills_instructions|permissions instructions)>/i;
@@ -1960,11 +2108,12 @@ var init_codex = __esm({
 });
 
 // daemon/src/providers/codex/rpc.ts
-import { spawn as spawn3 } from "node:child_process";
+import { spawn as spawn2 } from "node:child_process";
 var CodexRpcError, CodexProcessExitedError, CodexRpc;
 var init_rpc = __esm({
   "daemon/src/providers/codex/rpc.ts"() {
     init_log();
+    init_bin();
     CodexRpcError = class extends Error {
       code;
       constructor(message, code) {
@@ -1986,13 +2135,17 @@ var init_rpc = __esm({
       onServerRequest;
       onNotification;
       onExit;
-      constructor(cmd, args, opts = {}) {
-        this.proc = spawn3(cmd, args, {
+      constructor(argv, opts = {}) {
+        this.proc = spawn2(argv.cmd, argv.args, {
           cwd: opts.cwd,
           env: opts.env ?? process.env,
           stdio: ["pipe", "pipe", "pipe"],
-          windowsHide: true
+          windowsHide: true,
+          ...argv.windowsVerbatimArguments ? { windowsVerbatimArguments: true } : {},
+          // Non-Windows: its own process group, so after a close() timeout killTree also ends the commands codex started
+          ...process.platform !== "win32" ? { detached: true } : {}
         });
+        trackTree(this.proc);
         this.proc.stdout.setEncoding("utf8");
         this.proc.stdout.on("data", (chunk) => this.onData(chunk));
         this.proc.stderr.setEncoding("utf8");
@@ -2107,10 +2260,7 @@ var init_rpc = __esm({
         }
         await new Promise((resolvePromise) => {
           const t = setTimeout(() => {
-            try {
-              this.proc.kill();
-            } catch {
-            }
+            void killTree(this.proc, { graceMs: 1500 });
             resolvePromise();
           }, 3e3);
           this.proc.on("close", () => {
@@ -2345,8 +2495,8 @@ var init_map2 = __esm({
 
 // daemon/src/providers/codex/commands.ts
 import { readdir as readdir3, readFile as readFile7, stat as stat5 } from "node:fs/promises";
-import { homedir as homedir4 } from "node:os";
-import { basename, join as join9 } from "node:path";
+import { homedir as homedir5 } from "node:os";
+import { basename, join as join8 } from "node:path";
 function parseFrontMatter(raw) {
   if (!raw.startsWith("---\n")) return { meta: {}, body: raw };
   const end = raw.indexOf("\n---\n", 4);
@@ -2376,11 +2526,11 @@ async function readPromptFiles(dir) {
   }
   for (const f of names) {
     if (!f.endsWith(".md")) continue;
-    const path = join9(dir, f);
+    const path3 = join8(dir, f);
     try {
-      const st = await stat5(path);
+      const st = await stat5(path3);
       if (!st.isFile()) continue;
-      const raw = await readFile7(path, "utf8");
+      const raw = await readFile7(path3, "utf8");
       const { meta, body } = parseFrontMatter(raw);
       const name = basename(f, ".md");
       out.push({
@@ -2404,7 +2554,7 @@ async function readSkillDirs(root) {
     return out;
   }
   for (const d of dirs) {
-    const skillPath = join9(root, d, "SKILL.md");
+    const skillPath = join8(root, d, "SKILL.md");
     try {
       const st = await stat5(skillPath);
       if (!st.isFile()) continue;
@@ -2424,12 +2574,12 @@ async function readSkillDirs(root) {
   return out;
 }
 async function loadCodexSlashEntries(cwd, opts) {
-  const home = homedir4();
+  const home = homedir5();
   const parts = await Promise.all([
-    opts?.skipHome ? Promise.resolve([]) : readPromptFiles(join9(home, ".codex", "prompts")),
-    readPromptFiles(join9(cwd, ".codex", "prompts")),
-    opts?.skipHome ? Promise.resolve([]) : readSkillDirs(join9(home, ".codex", "skills")),
-    readSkillDirs(join9(cwd, ".codex", "skills"))
+    opts?.skipHome ? Promise.resolve([]) : readPromptFiles(join8(home, ".codex", "prompts")),
+    readPromptFiles(join8(cwd, ".codex", "prompts")),
+    opts?.skipHome ? Promise.resolve([]) : readSkillDirs(join8(home, ".codex", "skills")),
+    readSkillDirs(join8(cwd, ".codex", "skills"))
   ]);
   const byName = /* @__PURE__ */ new Map();
   for (const list of parts) {
@@ -2462,6 +2612,7 @@ var init_session2 = __esm({
     init_attachmentRefs();
     init_queue();
     init_rpc();
+    init_bin();
     init_map2();
     init_commands();
     init_log();
@@ -2489,7 +2640,7 @@ var init_session2 = __esm({
       started = null;
       interruptWanted = false;
       ourTurnId = null;
-      // 当前轮在 timeline 里的 turnId（send 时生成）
+      // The current turn's turnId in the timeline (generated on send)
       staleCodexTurns = /* @__PURE__ */ new Set();
       codexSlash = null;
       emit(ev) {
@@ -2506,8 +2657,10 @@ var init_session2 = __esm({
         if (this.started) return this.started;
         const attempt = (async () => {
           const rpc = new CodexRpc(
-            this.o.binCmd,
-            [...this.o.binPrefixArgs, "app-server"],
+            argvFor(
+              { ok: true, cmd: this.o.binCmd, prefixArgs: this.o.binPrefixArgs, display: this.o.binCmd, via: this.o.binVia ?? "path", shim: this.o.binShim },
+              ["app-server"]
+            ),
             { cwd: this.o.cwd }
           );
           this.rpc = rpc;
@@ -2651,7 +2804,7 @@ var init_session2 = __esm({
       threadId() {
         return this.sessionThreadId ?? void 0;
       }
-      // ---- 服务端请求（§7.3.5 审批）----
+      // ---- server requests (§7.3.5 approvals) ----
       async onServerRequest(method, params) {
         switch (method) {
           case "item/commandExecution/requestApproval": {
@@ -2713,8 +2866,8 @@ var init_session2 = __esm({
         }
       }
       waitFor(requestId) {
-        return new Promise((resolve4) => {
-          this.pending.set(requestId, { kind: "permission", resolve: resolve4 });
+        return new Promise((resolve2) => {
+          this.pending.set(requestId, { kind: "permission", resolve: resolve2 });
         });
       }
       respond(requestId, answer) {
@@ -2754,20 +2907,19 @@ var init_session2 = __esm({
 });
 
 // daemon/src/providers/codex/provider.ts
-import { spawn as spawn4 } from "node:child_process";
-function runVersion2(cmd, args, timeoutMs = 5e3) {
+function runVersion2(r, args, timeoutMs = 5e3) {
   return new Promise((resolvePromise, reject) => {
     let out = "";
-    const p = spawn4(cmd, args, { windowsHide: true });
+    const p = spawnBin(r, args, { stdio: ["ignore", "pipe", "pipe"] });
     const t = setTimeout(() => {
       try {
-        p.kill();
+        void killTree(p, { graceMs: 500 });
       } catch {
       }
       reject(new Error("timeout"));
     }, timeoutMs);
-    p.stdout.on("data", (c) => out += c.toString());
-    p.stderr.on("data", (c) => out += c.toString());
+    p.stdout?.on("data", (c) => out += c.toString());
+    p.stderr?.on("data", (c) => out += c.toString());
     p.on("error", reject);
     p.on("close", (code) => {
       clearTimeout(t);
@@ -2784,8 +2936,8 @@ function normalizeEfforts(raw) {
   }
   return out;
 }
-async function fetchModels(cmd, prefixArgs, cwd) {
-  const rpc = new CodexRpc(cmd, [...prefixArgs, "app-server"], { cwd });
+async function fetchModels(r, cwd) {
+  const rpc = new CodexRpc(argvFor(r, ["app-server"]), { cwd });
   try {
     await rpc.request("initialize", {
       clientInfo: { name: "agent-console", title: "Agent Console", version: "0" },
@@ -2822,7 +2974,7 @@ function createCodexProvider(version) {
         return { available: false, reason: bin.reason, installHint: INSTALL_HINT2 };
       }
       try {
-        const v = await runVersion2(bin.cmd, [...bin.prefixArgs, "--version"]);
+        const v = await runVersion2(bin, ["--version"]);
         return { available: true, bin: bin.display, version: v.trim().split("\n")[0] || "" };
       } catch (e) {
         return { available: true, bin: bin.display, version: "", reason: String(e) };
@@ -2833,7 +2985,7 @@ function createCodexProvider(version) {
       const bin = await resolveBin("codex");
       if (!bin.ok) return [{ id: "", name: "\u9ED8\u8BA4" }];
       try {
-        const models2 = await fetchModels(bin.cmd, bin.prefixArgs, process.cwd());
+        const models2 = await fetchModels(bin, process.cwd());
         modelCache = { at: Date.now(), models: models2 };
         return models2;
       } catch (e) {
@@ -2853,10 +3005,12 @@ function createCodexProvider(version) {
         resumeId: o.resumeId,
         binCmd: bin.cmd,
         binPrefixArgs: bin.prefixArgs,
+        binVia: bin.via,
+        binShim: bin.shim,
         version
       });
     },
-    // §7.6：~/.codex/sessions/**/rollout-*.jsonl 按 cwd 匹配
+    // §7.6: ~/.codex/sessions/**/rollout-*.jsonl matched by cwd
     async listHistory(cwd) {
       const items = await listCodexHistory(cwd);
       return items.map((i) => ({ provider: "codex", ...i, imported: false }));
@@ -2883,9 +3037,9 @@ var init_provider2 = __esm({
       plan: true,
       questions: true,
       cost: false,
-      // tokenUsage 有，cost 无
+      // tokenUsage yes, cost no
       effort: [],
-      // effort 值随模型而定 — detect 后由 model/list 填充
+      // effort values depend on the model — filled from model/list after detect
       modes: ["plan", "default", "acceptEdits", "bypassPermissions"]
     };
     modelCache = null;
@@ -2917,16 +3071,15 @@ var init_catalog = __esm({
 });
 
 // daemon/src/providers/acp/spawn.ts
-import { spawn as spawn5 } from "node:child_process";
 import { Readable, Writable } from "node:stream";
 import { resolve as resolvePath } from "node:path";
 import * as acp from "@agentclientprotocol/sdk";
 function spawnResolved(r, args, o = {}) {
-  return spawn5(r.cmd, [...r.prefixArgs, ...args], {
+  return spawnBin(r, args, {
     cwd: o.cwd,
     stdio: ["pipe", "pipe", "pipe"],
-    windowsHide: true,
-    env: { ...process.env, NO_COLOR: "1", FORCE_COLOR: "0" }
+    env: { ...process.env, NO_COLOR: "1", FORCE_COLOR: "0" },
+    group: true
   });
 }
 function acpStreamFromChild(child) {
@@ -3148,7 +3301,7 @@ var init_session3 = __esm({
       activeTurnId = null;
       configOptions = null;
       wakePump = null;
-      // 第一批命令到达（或确认没有）前 listCommands 等它，参考 Paseo 的 waitForInitialCommands
+      // listCommands waits for the first batch of commands (or confirmation there are none), following Paseo's waitForInitialCommands
       commandsReady;
       settleCommands;
       async boot() {
@@ -3184,7 +3337,7 @@ var init_session3 = __esm({
           this.ctx = this.conn.agent;
           await this.ctx.request(methods2.agent.initialize, {
             protocolVersion: PROTOCOL_VERSION,
-            // Cursor：声明支持参数化模型选择器（同 Paseo），它才会把档位 / Fast 作为单独配置项交出来
+            // Cursor: declare support for the parameterized model picker (as Paseo does); only then does it expose levels / Fast as separate config options
             clientCapabilities: this.o.flavor === "cursor" ? { _meta: { parameterizedModelPicker: true } } : {},
             clientInfo: { name: "Agent Console", version: this.o.appVersion }
           });
@@ -3232,7 +3385,7 @@ var init_session3 = __esm({
         if (this.initErr) throw this.initErr;
         if (!this.active) throw new Error("ACP \u4F1A\u8BDD\u672A\u5C31\u7EEA");
       }
-      /** 当前生效的配置项：每次 set_config_option 的返回会带回最新一份（换模型后档位选项会变），没有就用 session/new 的 */
+      /** The config options currently in effect: each set_config_option response returns the latest set (levels change after switching models); otherwise use session/new's */
       currentConfig() {
         return this.configOptions ?? this.active?.newSessionResponse.configOptions ?? [];
       }
@@ -3245,14 +3398,14 @@ var init_session3 = __esm({
         }
         if (this.o.flavor === "cursor") this.modelConfigId = "model";
       }
-      // 档位选项属于「当前模型」：每次刷新都重算（换到没有档位的模型时清空）
+      // Level options belong to the current model: recompute on every refresh (cleared when switching to a model without levels)
       syncThoughtConfigId() {
         this.thoughtConfigId = null;
         const opts = this.currentConfig().filter((o) => o.type === "select");
         const hit = opts.find((o) => o.category === "thought_level") ?? opts.find((o) => /thought|thinking|effort|reasoning/i.test(o.id ?? ""));
         if (hit) this.thoughtConfigId = hit.id;
       }
-      /** set_config_option，并用返回的最新配置项刷新本地状态 */
+      /** set_config_option, then refresh local state from the latest config options it returns */
       async setOption(configId, value) {
         if (!this.ctx || !this.active) return false;
         try {
@@ -3278,7 +3431,7 @@ var init_session3 = __esm({
         if (values.length && !values.includes(effort)) return;
         await this.setOption(this.thoughtConfigId, effort);
       }
-      /** Agent 报的模式选项：优先 configOptions 里 category=mode 的 select，否则 ACP modes.availableModes */
+      /** Mode choices the Agent reports: prefer a category=mode select in configOptions, otherwise ACP modes.availableModes */
       modeChoices() {
         const opt = this.currentConfig().find(
           (o) => o.type === "select" && (o.category === "mode" || o.id === "mode")
@@ -3333,8 +3486,8 @@ var init_session3 = __esm({
         }
       }
       /**
-       * 换模型 → 用返回的新配置项刷新档位选项 → 再下发档位（同 Paseo）。
-       * Cursor 以 parameterizedModelPicker 方式连接：模型只发基名（grok-4.6），档位 / Fast 是单独的配置项。
+       * Switch model → refresh level options from the new config options it returns → then apply the level (as Paseo does).
+       * Cursor connects with parameterizedModelPicker: only the base model name is sent (grok-4.6); level / Fast are separate config options.
        */
       async applySessionModel(model) {
         if (!this.ctx || !this.active) return;
@@ -3368,7 +3521,7 @@ var init_session3 = __esm({
           }
         }
       }
-      /** Cursor 专用：Fast / Auto-review（会话已开时也可改） */
+      /** Cursor only: Fast / Auto-review (can be changed while the session is open) */
       async updateCursorOpts(fast, autoReview) {
         this.cursorFast = fast;
         void autoReview;
@@ -3377,8 +3530,8 @@ var init_session3 = __esm({
         await this.applyCursorAutoReviewConfig(false);
       }
       waitPerm(requestId) {
-        return new Promise((resolve4) => {
-          this.permPending.set(requestId, resolve4);
+        return new Promise((resolve2) => {
+          this.permPending.set(requestId, resolve2);
         });
       }
       respond(requestId, answer) {
@@ -3416,7 +3569,7 @@ var init_session3 = __esm({
         }
         void this.runTurn(text);
       }
-      // 发出这一轮的 prompt；读更新由常驻的 pumpUpdates() 负责（参考 Paseo：会话级统一处理 session/update）
+      // Send this turn's prompt; reading updates is the job of the persistent pumpUpdates() (following Paseo: session/update is handled at session level)
       async runTurn(text) {
         this.activeTurnId = this.turnId;
         this.wakePump?.();
@@ -3430,9 +3583,9 @@ var init_session3 = __esm({
         this.running = false;
       }
       /**
-       * 会话整个生命周期内持续读 session/update。
-       * 原来只在一轮对话里读：Agent 在 session/new 之后、第一条消息之前推的 available_commands_update 就没人收，
-       * 斜杠菜单一直是空的。现在命令更新随时缓存；对话内容只在有进行中的轮次时转成时间线事件。
+       * Read session/update for the whole lifetime of the session.
+       * It used to read only during a turn: the available_commands_update an Agent pushes after session/new and before the first message went unread,
+       * so the slash menu stayed empty. Now command updates are cached at any time; conversation content becomes timeline events only while a turn is in progress.
        */
       async pumpUpdates() {
         const session = this.active;
@@ -3521,20 +3674,19 @@ var init_session3 = __esm({
 });
 
 // daemon/src/providers/acp/provider.ts
-import { spawn as spawn6 } from "node:child_process";
 function runVersion3(r, args, timeoutMs = 8e3) {
   return new Promise((resolvePromise, reject) => {
     let out = "";
-    const p = spawn6(r.cmd, [...r.prefixArgs, ...args], { windowsHide: true, env: { ...process.env, NO_COLOR: "1" } });
+    const p = spawnBin(r, args, { stdio: ["ignore", "pipe", "pipe"], env: { ...process.env, NO_COLOR: "1" } });
     const t = setTimeout(() => {
       try {
-        p.kill();
+        void killTree(p, { graceMs: 500 });
       } catch {
       }
       reject(new Error("timeout"));
     }, timeoutMs);
-    p.stdout.on("data", (c) => out += c.toString());
-    p.stderr.on("data", (c) => out += c.toString());
+    p.stdout?.on("data", (c) => out += c.toString());
+    p.stderr?.on("data", (c) => out += c.toString());
     p.on("error", reject);
     p.on("close", (code) => {
       clearTimeout(t);
@@ -3603,6 +3755,7 @@ function createAcpProvider(cfg2) {
 var acpCapabilities, cursorAcpCapabilities;
 var init_provider3 = __esm({
   "daemon/src/providers/acp/provider.ts"() {
+    init_bin();
     init_bin();
     init_session3();
     acpCapabilities = {
@@ -3802,7 +3955,7 @@ function acpConfigForEntry(entry, appVersion) {
         acpArgs: ["acp"],
         flavor: "cursor",
         capabilities: cursorAcpCapabilities,
-        // 每个模型自己的思考档位来自 cursor/list_available_models（同 Paseo）
+        // Each model's own thinking levels come from cursor/list_available_models (as Paseo does)
         fetchModels: cursorProbeModels(["acp"])
       };
     case "devin":
@@ -3932,22 +4085,77 @@ var init_pickFolderWin = __esm({
   }
 });
 
+// daemon/src/util/pickFolder.ts
+import { execFile as execFile2 } from "node:child_process";
+import { existsSync as existsSync7, statSync as statSync3 } from "node:fs";
+function appleScriptString(s) {
+  return '"' + s.replace(/\\/g, "\\\\").replace(/"/g, '\\"') + '"';
+}
+function isDir(p) {
+  try {
+    return !!p && existsSync7(p) && statSync3(p).isDirectory();
+  } catch {
+    return false;
+  }
+}
+function pickFolderCommand(platform, initial, find = (n) => findOnPath(n)[0] ?? null, env = process.env) {
+  const init = isDir(initial) ? initial : void 0;
+  if (platform === "darwin") {
+    const prompt = appleScriptString("\u9009\u62E9\u9879\u76EE\u6587\u4EF6\u5939 / Choose a project folder");
+    const loc = init ? ` default location (POSIX file ${appleScriptString(init)})` : "";
+    return { cmd: "/usr/bin/osascript", args: ["-e", `POSIX path of (choose folder with prompt ${prompt}${loc})`] };
+  }
+  if (platform === "linux" || platform === "freebsd" || platform === "openbsd") {
+    if (!env.DISPLAY && !env.WAYLAND_DISPLAY) return null;
+    const zenity = find("zenity");
+    if (zenity) {
+      const args = ["--file-selection", "--directory", "--title=\u9009\u62E9\u9879\u76EE\u6587\u4EF6\u5939 / Choose a project folder"];
+      if (init) args.push(`--filename=${init.endsWith("/") ? init : init + "/"}`);
+      return { cmd: zenity, args };
+    }
+    const kdialog = find("kdialog");
+    if (kdialog) return { cmd: kdialog, args: ["--getexistingdirectory", init ?? env.HOME ?? "/"] };
+  }
+  return null;
+}
+function pickFolder(initial) {
+  if (process.platform === "win32") return pickFolderWindows(initial);
+  const c = pickFolderCommand(process.platform, initial);
+  if (!c) return Promise.resolve({ available: false, path: null });
+  return new Promise((resolvePromise) => {
+    execFile2(c.cmd, c.args, { timeout: TIMEOUT, encoding: "utf8" }, (e, stdout) => {
+      if (e) return resolvePromise({ available: true, path: null });
+      let p = String(stdout ?? "").replace(/\r?\n$/, "").trim();
+      if (p.length > 1) p = p.replace(/\/+$/, "");
+      resolvePromise({ available: true, path: p || null });
+    }).on("error", () => resolvePromise({ available: false, path: null }));
+  });
+}
+var TIMEOUT;
+var init_pickFolder = __esm({
+  "daemon/src/util/pickFolder.ts"() {
+    init_pathscan();
+    init_pickFolderWin();
+    TIMEOUT = 10 * 60 * 1e3;
+  }
+});
+
 // daemon/src/providers/magpieGateway.ts
 import { readFile as readFile9 } from "node:fs/promises";
-import { homedir as homedir5 } from "node:os";
-import { join as join10 } from "node:path";
-async function readJson(path) {
+import { homedir as homedir6 } from "node:os";
+import { join as join9 } from "node:path";
+async function readJson(path3) {
   try {
-    return JSON.parse(await readFile9(path, "utf8"));
+    return JSON.parse(await readFile9(path3, "utf8"));
   } catch {
     return null;
   }
 }
 async function readApplied() {
-  return await readJson(join10(homedir5(), ".config", "magpie", "applied.json")) ?? {};
+  return await readJson(join9(homedir6(), ".config", "magpie", "applied.json")) ?? {};
 }
 async function readClaudeEnv() {
-  const s = await readJson(join10(homedir5(), ".claude", "settings.json"));
+  const s = await readJson(join9(homedir6(), ".claude", "settings.json"));
   return s?.env ?? {};
 }
 async function gatewayBase() {
@@ -4116,11 +4324,11 @@ var init_infoCache = __esm({
 
 // daemon/src/ws/methods.ts
 import { z } from "zod";
-import { existsSync as existsSync7, statSync as statSync2 } from "node:fs";
+import { existsSync as existsSync8, statSync as statSync4 } from "node:fs";
 import { mkdir as mkdir2, writeFile as writeFile3 } from "node:fs/promises";
-import { homedir as homedir6 } from "node:os";
-import { dirname as dirname4, join as join11 } from "node:path";
-import { execFile as execFile2 } from "node:child_process";
+import { homedir as homedir7 } from "node:os";
+import { dirname as dirname3, join as join10, win32 as win32Path } from "node:path";
+import { execFile as execFile3 } from "node:child_process";
 function wrap(schema, fn) {
   return (params, ctx) => {
     const r = schema.safeParse(params ?? {});
@@ -4235,20 +4443,23 @@ function registerMethods(gw, svc) {
   gw.method("projects.open", wrap(z.object({ id: z.string() }), async (p) => {
     const proj = await svc.projects.get(p.id);
     if (!proj) throw new ApiError("not_found", "\u9879\u76EE\u4E0D\u5B58\u5728");
+    if (!existsSync8(proj.path)) throw new ApiError("bad_path", "\u76EE\u5F55\u4E0D\u5B58\u5728\u6216\u4E0D\u662F\u6587\u4EF6\u5939");
     const cmd = process.platform === "win32" ? "explorer.exe" : process.platform === "darwin" ? "open" : "xdg-open";
-    execFile2(cmd, [proj.path], { windowsHide: true }, () => {
+    const target = process.platform === "win32" ? win32Path.normalize(proj.path) : proj.path;
+    execFile3(cmd, [target], { windowsHide: true }, () => {
+    }).on("error", () => {
     });
     return { ok: true };
   }));
   gw.method("fs.check", wrap(z.object({ path: z.string().min(1) }), (p) => {
     let exists = false;
-    let isDir = false;
+    let isDir2 = false;
     try {
-      exists = existsSync7(p.path);
-      isDir = exists && statSync2(p.path).isDirectory();
+      exists = existsSync8(p.path);
+      isDir2 = exists && statSync4(p.path).isDirectory();
     } catch {
     }
-    return { exists, isDir };
+    return { exists, isDir: isDir2 };
   }));
   gw.method("fs.recentDirs", wrap(zEmpty, async () => {
     const s = await svc.settings.get();
@@ -4256,7 +4467,7 @@ function registerMethods(gw, svc) {
   }));
   gw.method("fs.pickFolder", wrap(
     z.object({ initial: z.string().optional() }).passthrough().optional(),
-    (p) => pickFolderWindows(p?.initial)
+    (p) => pickFolder(p?.initial)
   ));
   gw.method("threads.list", wrap(zEmpty, () => svc.threads.list()));
   gw.method("threads.create", wrap(
@@ -4273,7 +4484,7 @@ function registerMethods(gw, svc) {
     async (p) => {
       const proj = await svc.projects.get(p.projectId);
       if (!proj) throw new ApiError("not_found", "\u9879\u76EE\u4E0D\u5B58\u5728");
-      if (!existsSync7(proj.path)) throw new ApiError("bad_path", "\u9879\u76EE\u76EE\u5F55\u5DF2\u4E0D\u5B58\u5728");
+      if (!existsSync8(proj.path)) throw new ApiError("bad_path", "\u9879\u76EE\u76EE\u5F55\u5DF2\u4E0D\u5B58\u5728");
       if (!p.providerSessionId && !isProviderEnabled(await svc.settings.get(), p.provider)) {
         throw new ApiError("bad_params", "\u8BE5 Agent \u5DF2\u5728\u8BBE\u7F6E\u4E2D\u7981\u7528");
       }
@@ -4335,7 +4546,7 @@ function registerMethods(gw, svc) {
   const projectPath = async (projectId) => {
     const proj = await svc.projects.get(projectId);
     if (!proj) throw new ApiError("not_found", "\u9879\u76EE\u4E0D\u5B58\u5728");
-    if (!existsSync7(proj.path)) throw new ApiError("bad_path", "\u9879\u76EE\u76EE\u5F55\u5DF2\u4E0D\u5B58\u5728");
+    if (!existsSync8(proj.path)) throw new ApiError("bad_path", "\u9879\u76EE\u76EE\u5F55\u5DF2\u4E0D\u5B58\u5728");
     return proj.path;
   };
   gw.method("git.status", wrap(
@@ -4416,8 +4627,8 @@ function registerMethods(gw, svc) {
   gw.method("terminal.create", wrap(
     z.object({ projectId: z.string(), cols: z.number().int().min(20).max(500).default(80), rows: z.number().int().min(5).max(200).default(24) }),
     async (p) => {
-      const path = await projectPath(p.projectId);
-      const r = await svc.terminals.create(p.projectId, path, p.cols, p.rows);
+      const path3 = await projectPath(p.projectId);
+      const r = await svc.terminals.create(p.projectId, path3, p.cols, p.rows);
       if ("error" in r) throw new ApiError("bad_params", r.error);
       return r;
     }
@@ -4554,12 +4765,12 @@ ${e.text}
     const markdown = L.join("\n");
     const safe = meta.title.replace(/[\\/:*?"<>|\s]+/g, "_").slice(0, 60) || "thread";
     const filename = `${safe}.md`;
-    const dir = join11(homedir6(), "Downloads");
+    const dir = join10(homedir7(), "Downloads");
     await mkdir2(dir, { recursive: true });
-    let dest = join11(dir, filename);
-    if (existsSync7(dest)) {
+    let dest = join10(dir, filename);
+    if (existsSync8(dest)) {
       const stamp2 = (/* @__PURE__ */ new Date()).toISOString().replace(/[:.]/g, "-").slice(0, 19);
-      dest = join11(dir, `${safe}-${stamp2}.md`);
+      dest = join10(dir, `${safe}-${stamp2}.md`);
     }
     await writeFile3(dest, markdown, "utf8");
     revealInFileManager(dest);
@@ -4568,16 +4779,19 @@ ${e.text}
 }
 function revealInFileManager(filePath) {
   if (process.platform === "win32") {
-    execFile2("explorer.exe", ["/select," + filePath], { windowsHide: true }, () => {
+    execFile3("explorer.exe", ["/select," + win32Path.normalize(filePath)], { windowsHide: true }, () => {
+    }).on("error", () => {
     });
     return;
   }
   if (process.platform === "darwin") {
-    execFile2("open", ["-R", filePath], () => {
+    execFile3("open", ["-R", filePath], () => {
+    }).on("error", () => {
     });
     return;
   }
-  execFile2("xdg-open", [dirname4(filePath)], () => {
+  execFile3("xdg-open", [dirname3(filePath)], () => {
+  }).on("error", () => {
   });
 }
 var threadModeSchema, ApiError;
@@ -4586,7 +4800,7 @@ var init_methods = __esm({
     init_registry();
     init_catalog();
     init_enabled();
-    init_pickFolderWin();
+    init_pickFolder();
     init_bin();
     init_infoCache();
     threadModeSchema = z.enum(["plan", "default", "acceptEdits", "bypassPermissions", "ask"]);
@@ -4602,10 +4816,10 @@ var init_methods = __esm({
 
 // daemon/src/util/atomic.ts
 import { writeFile as writeFile4, rename, mkdir as mkdir3 } from "node:fs/promises";
-import { dirname as dirname5 } from "node:path";
+import { dirname as dirname4 } from "node:path";
 async function writeJsonAtomic(file, obj) {
   try {
-    await mkdir3(dirname5(file), { recursive: true });
+    await mkdir3(dirname4(file), { recursive: true });
     const tmp = `${file}.tmp-${process.pid}-${Math.random().toString(36).slice(2, 8)}`;
     await writeFile4(tmp, JSON.stringify(obj, null, 2), "utf8");
     await rename(tmp, file);
@@ -4622,7 +4836,7 @@ var init_atomic = __esm({
 
 // daemon/src/util/jsonl.ts
 import { appendFile, readFile as readFile12, mkdir as mkdir4, rename as rename2, writeFile as writeFile5 } from "node:fs/promises";
-import { dirname as dirname6 } from "node:path";
+import { dirname as dirname5 } from "node:path";
 async function readJsonl(file) {
   let text = "";
   try {
@@ -4645,7 +4859,7 @@ function appendJsonl(file, obj) {
   const prev = writers.get(file) ?? Promise.resolve();
   const next = prev.then(async () => {
     try {
-      await mkdir4(dirname6(file), { recursive: true });
+      await mkdir4(dirname5(file), { recursive: true });
       await appendFile(file, JSON.stringify(obj) + "\n", "utf8");
     } catch (e) {
       if (e instanceof ApiError) throw e;
@@ -4672,8 +4886,8 @@ var legacy_exports = {};
 __export(legacy_exports, {
   migrateLegacy: () => migrateLegacy
 });
-import { cp, mkdir as mkdir7, readdir as readdir6, readFile as readFile16 } from "node:fs/promises";
-import { existsSync as existsSync11 } from "node:fs";
+import { cp as cp2, mkdir as mkdir7, readdir as readdir6, readFile as readFile16 } from "node:fs/promises";
+import { existsSync as existsSync12 } from "node:fs";
 import { join as join17 } from "node:path";
 function stamp() {
   const d = /* @__PURE__ */ new Date();
@@ -4685,17 +4899,17 @@ async function migrateLegacy(dataDir, stores) {
   if (settings.v1Migrated) return { migrated: 0, skipped: true };
   const oldDir = join17(dataDir, "sessions");
   const oldSettingsPath = join17(dataDir, "settings.json");
-  if (!existsSync11(oldDir) && !existsSync11(oldSettingsPath)) {
+  if (!existsSync12(oldDir) && !existsSync12(oldSettingsPath)) {
     await stores.settings.set({ v1Migrated: true });
     return { migrated: 0, skipped: true };
   }
   const backup = join17(dataDir, "trash", `legacy-${stamp()}`);
   await mkdir7(backup, { recursive: true });
-  if (existsSync11(oldDir)) await cp(oldDir, join17(backup, "sessions"), { recursive: true }).catch(() => {
+  if (existsSync12(oldDir)) await cp2(oldDir, join17(backup, "sessions"), { recursive: true }).catch(() => {
   });
-  if (existsSync11(oldSettingsPath)) await cp(oldSettingsPath, join17(backup, "settings.json")).catch(() => {
+  if (existsSync12(oldSettingsPath)) await cp2(oldSettingsPath, join17(backup, "settings.json")).catch(() => {
   });
-  const oldSettings = existsSync11(oldSettingsPath) ? JSON.parse(await readFile16(oldSettingsPath, "utf8").catch(() => "{}")) : {};
+  const oldSettings = existsSync12(oldSettingsPath) ? JSON.parse(await readFile16(oldSettingsPath, "utf8").catch(() => "{}")) : {};
   const projectIdByPath = /* @__PURE__ */ new Map();
   const lc = (p) => p.replace(/\\/g, "/").toLowerCase().replace(/\/+$/, "");
   for (const p of oldSettings.projects ?? []) {
@@ -4709,7 +4923,7 @@ async function migrateLegacy(dataDir, stores) {
   }
   let sessionIds = [];
   try {
-    sessionIds = (await readdir6(oldDir)).filter((d) => validId(d) && existsSync11(join17(oldDir, d, "meta.json")));
+    sessionIds = (await readdir6(oldDir)).filter((d) => validId(d) && existsSync12(join17(oldDir, d, "meta.json")));
   } catch {
   }
   const metas = [];
@@ -4729,7 +4943,7 @@ async function migrateLegacy(dataDir, stores) {
     extraDirs.push(m.cwd);
   }
   for (const d of extraDirs) {
-    if (!existsSync11(d)) continue;
+    if (!existsSync12(d)) continue;
     try {
       const name = d.replace(/\\/g, "/").split("/").filter(Boolean).pop() ?? d;
       const proj = await stores.projects.create(d, name);
@@ -4786,7 +5000,7 @@ async function migrateLegacy(dataDir, stores) {
         seq: 0
       };
       const tdir = join17(threadsDir, meta.id);
-      if (existsSync11(tdir)) meta.id = `t_${m.id}_v1`.slice(0, 80);
+      if (existsSync12(tdir)) meta.id = `t_${m.id}_v1`.slice(0, 80);
       await mkdir7(join17(threadsDir, meta.id), { recursive: true });
       const oldEvts = (await readFile16(join17(oldDir, m.id, "events.jsonl"), "utf8").catch(() => "")).split("\n").filter((l) => l.trim()).map((l) => {
         try {
@@ -4845,7 +5059,7 @@ async function migrateLegacy(dataDir, stores) {
           case "permission.request":
           case "permission.resolved":
             break;
-          // 旧授权卡过期，不重建
+          // Old permission cards are stale; don't recreate them
           case "notice":
             push({ type: "notice", level: e.level ?? "info", message: String(e.message ?? "") });
             break;
@@ -4933,7 +5147,7 @@ var init_warm = __esm({
 });
 
 // daemon/src/main.ts
-import { mkdirSync as mkdirSync2, rmSync as rmSync2 } from "node:fs";
+import { mkdirSync as mkdirSync2, rmSync as rmSync2, chmodSync as chmodSync2 } from "node:fs";
 import { join as join18, dirname as dirname7 } from "node:path";
 import { fileURLToPath as fileURLToPath3 } from "node:url";
 
@@ -4955,9 +5169,9 @@ function resolveDaemonMainJs() {
   const here = dirname(self);
   const candidates = [
     join(here, "..", "..", "dist", "main.js"),
-    // src/util → daemon/dist/main.js（vitest/tsc）
+    // src/util → daemon/dist/main.js (vitest/tsc)
     join(here, "main.js"),
-    // 已在 dist 目录
+    // Already in the dist directory
     join(here, "..", "main.js")
   ];
   for (const p of candidates) {
@@ -4989,6 +5203,7 @@ function parseConfig(argv) {
   let port = null;
   let data = null;
   let token = null;
+  let parentPid;
   for (let i = 0; i < argv.length; i++) {
     const a = argv[i];
     if (a === "--port" && argv[i + 1]) port = Number(argv[++i]);
@@ -4997,10 +5212,12 @@ function parseConfig(argv) {
     else if (a.startsWith("--data=")) data = a.slice(7);
     else if (a === "--token" && argv[i + 1]) token = argv[++i];
     else if (a.startsWith("--token=")) token = a.slice(8);
+    else if (a === "--parent-pid" && argv[i + 1]) parentPid = Number(argv[++i]);
+    else if (a.startsWith("--parent-pid=")) parentPid = Number(a.slice(13));
   }
-  if (port == null || !Number.isInteger(port) || port < 1 || port > 65535) {
+  if (port == null || !Number.isInteger(port) || port < 0 || port > 65535) {
     const envPort = Number(process.env.AGENT_CONSOLE_PORT || "");
-    port = Number.isInteger(envPort) && envPort >= 1 && envPort <= 65535 ? envPort : 3488;
+    port = Number.isInteger(envPort) && envPort >= 0 && envPort <= 65535 ? envPort : 3488;
   }
   const xdg = data ?? process.env.XDG_CONFIG_HOME ?? join2(homedir(), ".config");
   const dataDir = resolve(join2(xdg, "magpie", "agent-console"));
@@ -5011,7 +5228,8 @@ function parseConfig(argv) {
     token: token ?? process.env.AGENT_CONSOLE_TOKEN ?? randomBytes(16).toString("hex"),
     version: pkgVersion(),
     idleExitMinutes: Number.isFinite(idleEnv) && idleEnv > 0 ? idleEnv : 60,
-    buildStamp: daemonBuildStamp()
+    buildStamp: daemonBuildStamp(),
+    parentPid: Number.isInteger(parentPid) ? parentPid : void 0
   };
 }
 
@@ -5032,11 +5250,12 @@ function checkHost(host, port) {
   if (h === `127.0.0.1:${port}` || h === `localhost:${port}`) return { ok: true };
   return { ok: false, code: 421, message: "Host \u4E0D\u5BF9" };
 }
-function checkOrigin(origin, port) {
-  if (origin === void 0 || origin === "null" || origin === "") return { ok: true };
+function classifyOrigin(origin, port) {
+  if (origin === void 0 || origin === "") return "none";
+  if (origin === "null") return "opaque";
   const o = origin.toLowerCase();
-  if (o === `http://127.0.0.1:${port}` || o === `http://localhost:${port}`) return { ok: true };
-  return { ok: false, code: 403, message: "\u6765\u6E90\u4E0D\u5141\u8BB8" };
+  if (o === `http://127.0.0.1:${port}` || o === `http://localhost:${port}`) return "self";
+  return "foreign";
 }
 function tokenEqual(a, b) {
   const ha = createHash("sha256").update(a).digest();
@@ -5062,6 +5281,13 @@ var MIME = {
 };
 var MAX_UPLOAD = 50 * 1024 * 1024;
 var MAX_MSG = 200 * 1024;
+function safeDecode(s) {
+  try {
+    return decodeURIComponent(s);
+  } catch {
+    return null;
+  }
+}
 function send(res, code, body, headers = {}) {
   res.writeHead(code, headers);
   res.end(body);
@@ -5069,14 +5295,11 @@ function send(res, code, body, headers = {}) {
 function sendJson(res, code, obj, headers = {}) {
   send(res, code, JSON.stringify(obj), { "content-type": "application/json; charset=utf-8", "cache-control": "no-store", ...headers });
 }
-function preflightHeaders(origin) {
-  return {
-    "access-control-allow-origin": origin && origin !== "null" ? origin : "null",
-    "access-control-allow-headers": "x-agent-console, content-type",
-    "access-control-allow-methods": "GET, POST, OPTIONS",
-    "access-control-max-age": "600"
-  };
-}
+var STATIC_HEADERS = {
+  "cache-control": "no-store",
+  "x-content-type-options": "nosniff",
+  "referrer-policy": "no-referrer"
+};
 function createHttpServer(cfg2, appDir, attachments, hooks = {}) {
   const server = createServer(async (req, res) => {
     try {
@@ -5093,46 +5316,57 @@ function createHttpServer(cfg2, appDir, attachments, hooks = {}) {
       sendJson(res, hostCheck.code, { ok: false, e: { code: "bad_host", message: hostCheck.message } });
       return;
     }
-    const originCheck = checkOrigin(req.headers.origin, cfg2.port);
-    if (!originCheck.ok) {
-      sendJson(res, originCheck.code, { ok: false, e: { code: "bad_origin", message: originCheck.message } });
+    const origin = classifyOrigin(req.headers.origin, cfg2.port);
+    if (origin === "foreign") {
+      sendJson(res, 403, { ok: false, e: { code: "bad_origin", message: "\u6765\u6E90\u4E0D\u5141\u8BB8" } });
       return;
     }
     const url = new URL(req.url ?? "/", `http://127.0.0.1:${cfg2.port}`);
     const pathname = url.pathname;
-    if (req.headers.origin) {
-      res.setHeader("access-control-allow-origin", preflightHeaders(req.headers.origin)["access-control-allow-origin"]);
-      res.setHeader("vary", "origin");
-    }
+    const isApi = pathname.startsWith("/api/");
+    const isAttachment = pathname.startsWith("/attachments/");
     if (req.method === "OPTIONS") {
-      send(res, 204, "", preflightHeaders(req.headers.origin));
-      return;
-    }
-    if (pathname.startsWith("/api/")) {
-      const tok = req.headers["x-agent-console"];
-      if (typeof tok !== "string" || !tokenEqual(tok, cfg2.token)) {
-        sendJson(res, 403, { ok: false, e: { code: "bad_token", message: "\u4EE4\u724C\u65E0\u6548" } });
+      if (pathname !== "/api/upload" || origin === "none") {
+        sendJson(res, 403, { ok: false, e: { code: "bad_preflight", message: "\u9884\u68C0\u4E0D\u5141\u8BB8" } });
         return;
       }
-      await routeApi(req, res, pathname, url);
+      send(res, 204, "", {
+        "access-control-allow-origin": origin === "opaque" ? "null" : `http://127.0.0.1:${cfg2.port}`,
+        "access-control-allow-headers": "x-agent-console, content-type",
+        "access-control-allow-methods": "GET, POST, OPTIONS",
+        "access-control-max-age": "600",
+        vary: "origin"
+      });
       return;
     }
-    if (pathname.startsWith("/attachments/")) {
-      const tok = req.headers["x-agent-console"];
-      const tokQ = url.searchParams.get("t");
-      const okTok = typeof tok === "string" && tokenEqual(tok, cfg2.token) || tokQ && tokenEqual(tokQ, cfg2.token);
-      if (!okTok) {
+    if (isApi || isAttachment) {
+      const headerToken = req.headers["x-agent-console"];
+      const queryToken = isAttachment ? url.searchParams.get("t") : null;
+      const validToken = typeof headerToken === "string" && tokenEqual(headerToken, cfg2.token) || typeof queryToken === "string" && tokenEqual(queryToken, cfg2.token);
+      if (!validToken) {
         sendJson(res, 403, { ok: false, e: { code: "bad_token", message: "\u4EE4\u724C\u65E0\u6548" } });
         return;
       }
-      const id = decodeURIComponent(pathname.slice("/attachments/".length));
-      const a = await attachments.get(id);
+      if (origin === "opaque") {
+        res.setHeader("access-control-allow-origin", "null");
+        res.setHeader("vary", "origin");
+      }
+      if (isApi) {
+        await routeApi(req, res, pathname, url);
+        return;
+      }
+      const id = safeDecode(pathname.slice("/attachments/".length));
+      const a = id === null ? null : await attachments.get(id);
       if (!a) {
         sendJson(res, 404, { ok: false, e: { code: "not_found", message: "\u9644\u4EF6\u4E0D\u5B58\u5728" } });
         return;
       }
-      const data2 = await attachments.read(id);
-      send(res, 200, data2 ?? Buffer.alloc(0), { "content-type": a.mime, "cache-control": "no-store" });
+      const data2 = await attachments.read(a.id);
+      send(res, 200, data2 ?? Buffer.alloc(0), { ...STATIC_HEADERS, "content-type": a.mime });
+      return;
+    }
+    if (origin === "opaque") {
+      sendJson(res, 403, { ok: false, e: { code: "bad_origin", message: "\u6765\u6E90\u4E0D\u5141\u8BB8" } });
       return;
     }
     if (req.method !== "GET" && req.method !== "HEAD") {
@@ -5140,17 +5374,20 @@ function createHttpServer(cfg2, appDir, attachments, hooks = {}) {
       return;
     }
     if (pathname === "/" || pathname === "/index.html") {
-      const htmlPath = join4(appDir, "index.html");
       try {
-        let html = await readFile(htmlPath, "utf8");
-        html = html.replace("__TOKEN__", cfg2.token);
-        send(res, 200, html, { "content-type": "text/html; charset=utf-8", "cache-control": "no-store" });
+        const html = await readFile(join4(appDir, "index.html"), "utf8");
+        send(res, 200, html, { ...STATIC_HEADERS, "content-type": "text/html; charset=utf-8" });
       } catch {
-        send(res, 503, "app \u8FD8\u6CA1\u6784\u5EFA\uFF08\u7F3A app/index.html\uFF09", { "content-type": "text/plain; charset=utf-8" });
+        send(res, 503, "app \u8FD8\u6CA1\u6784\u5EFA\uFF08\u7F3A app/index.html\uFF09", { ...STATIC_HEADERS, "content-type": "text/plain; charset=utf-8" });
       }
       return;
     }
-    const rel = normalize(decodeURIComponent(pathname)).replace(/^([\\/])+/, "");
+    const decoded = safeDecode(pathname);
+    if (decoded === null) {
+      sendJson(res, 400, { ok: false, e: { code: "bad_path", message: "\u8DEF\u5F84\u4E0D\u5408\u6CD5" } });
+      return;
+    }
+    const rel = normalize(decoded).replace(/^([\\/])+/, "");
     const full = normalize(join4(appDir, rel));
     if (!full.startsWith(normalize(appDir)) || rel.includes("..")) {
       sendJson(res, 403, { ok: false, e: { code: "bad_path", message: "\u8DEF\u5F84\u4E0D\u5141\u8BB8" } });
@@ -5161,7 +5398,7 @@ function createHttpServer(cfg2, appDir, attachments, hooks = {}) {
       return;
     }
     const data = await readFile(full);
-    send(res, 200, data, { "content-type": MIME[extname(full).toLowerCase()] ?? "application/octet-stream", "cache-control": "no-store" });
+    send(res, 200, data, { ...STATIC_HEADERS, "content-type": MIME[extname(full).toLowerCase()] ?? "application/octet-stream" });
   }
   async function routeApi(req, res, pathname, url) {
     if (pathname === "/api/ping" && req.method === "GET") {
@@ -5174,12 +5411,20 @@ function createHttpServer(cfg2, appDir, attachments, hooks = {}) {
         sendJson(res, 400, { ok: false, e: { code: "bad_type", message: "\u4E0D\u652F\u6301\u7684\u6587\u4EF6\u7C7B\u578B" } });
         return;
       }
+      const declared = Number(req.headers["content-length"] ?? 0);
+      if (declared > MAX_UPLOAD) {
+        res.setHeader("connection", "close");
+        sendJson(res, 413, { ok: false, e: { code: "too_large", message: "\u6587\u4EF6\u592A\u5927\uFF08\u4E0A\u9650 50MB\uFF09" } });
+        req.resume();
+        return;
+      }
       const chunks = [];
       let size = 0;
       for await (const c of req) {
         const b = c;
         size += b.length;
         if (size > MAX_UPLOAD) {
+          res.setHeader("connection", "close");
           sendJson(res, 413, { ok: false, e: { code: "too_large", message: "\u6587\u4EF6\u592A\u5927\uFF08\u4E0A\u9650 50MB\uFF09" } });
           return;
         }
@@ -5211,11 +5456,14 @@ var MIME2 = {
   ".gif": "image/gif",
   ".webp": "image/webp"
 };
+var TEXT_MIME = "text/plain; charset=utf-8";
 var AttachmentStore = class {
   constructor(dir) {
     this.dir = dir;
   }
   dir;
+  // id → file name: avoids a readdir of the whole directory on every lookup (slow with many attachments)
+  files = /* @__PURE__ */ new Map();
   safeExt(name) {
     const ext = extname2(name).toLowerCase();
     if (IMG_EXT.has(ext) || TEXT_EXT.has(ext)) return ext;
@@ -5232,25 +5480,37 @@ var AttachmentStore = class {
     await mkdir(this.dir, { recursive: true });
     const file = join5(this.dir, id + ext);
     await writeFile(file, data);
-    const mime = MIME2[ext] ?? "text/plain";
+    this.files.set(id, id + ext);
+    const mime = MIME2[ext] ?? TEXT_MIME;
     return { id, name: name || "\u672A\u547D\u540D" + ext, mime, size: data.length, path: file };
   }
   async get(id) {
     if (!validId(id)) return null;
+    const known = this.files.get(id);
+    if (known) {
+      const hit = await this.describe(id, known);
+      if (hit) return hit;
+      this.files.delete(id);
+    }
     const { readdir: readdir7 } = await import("node:fs/promises");
     try {
       for (const f of await readdir7(this.dir)) {
         if (f.startsWith(id + ".")) {
-          const p = join5(this.dir, f);
-          const s = await stat2(p);
-          const ext = extname2(f).toLowerCase();
-          return { id, name: f.slice(id.length + 1) || f, mime: MIME2[ext] ?? "text/plain", size: s.size, path: p };
+          this.files.set(id, f);
+          return await this.describe(id, f);
         }
       }
     } catch {
     }
     return null;
   }
+  async describe(id, f) {
+    const p = join5(this.dir, f);
+    const s = await stat2(p).catch(() => null);
+    if (!s?.isFile()) return null;
+    const ext = extname2(f).toLowerCase();
+    return { id, name: f.slice(id.length + 1) || f, mime: MIME2[ext] ?? TEXT_MIME, size: s.size, path: p };
+  }
   async read(id) {
     const a = await this.get(id);
     if (!a) return null;
@@ -5261,7 +5521,7 @@ var AttachmentStore = class {
 // daemon/src/store/settings.ts
 init_atomic();
 import { readFile as readFile10 } from "node:fs/promises";
-import { join as join12 } from "node:path";
+import { join as join11 } from "node:path";
 var DEFAULT_SETTINGS = {
   defaultProvider: "claude",
   defaultMode: "default",
@@ -5285,7 +5545,7 @@ var SettingsStore = class {
   cache = null;
   writing = Promise.resolve();
   constructor(dataDir) {
-    this.file = join12(dataDir, "settings.json");
+    this.file = join11(dataDir, "settings.json");
   }
   async get() {
     if (this.cache) return this.cache;
@@ -5313,8 +5573,8 @@ init_atomic();
 init_paths();
 init_methods();
 import { readFile as readFile11 } from "node:fs/promises";
-import { existsSync as existsSync8, statSync as statSync3 } from "node:fs";
-import { join as join13 } from "node:path";
+import { existsSync as existsSync9, statSync as statSync5 } from "node:fs";
+import { join as join12 } from "node:path";
 import { randomBytes as randomBytes3 } from "node:crypto";
 function newId() {
   return "p_" + Date.now().toString(36) + randomBytes3(3).toString("hex");
@@ -5324,7 +5584,7 @@ var ProjectsStore = class {
   cache = null;
   writing = Promise.resolve();
   constructor(dataDir) {
-    this.file = join13(dataDir, "projects.json");
+    this.file = join12(dataDir, "projects.json");
   }
   async list() {
     if (this.cache) return this.cache;
@@ -5346,19 +5606,19 @@ var ProjectsStore = class {
     this.writing = this.writing.then(() => writeJsonAtomic(this.file, snap));
     await this.writing;
   }
-  async create(path, name) {
-    if (!path || typeof path !== "string") throw new ApiError("bad_params", "\u8DEF\u5F84\u4E0D\u80FD\u4E3A\u7A7A");
-    if (!existsSync8(path) || !statSync3(path).isDirectory()) {
+  async create(path3, name) {
+    if (!path3 || typeof path3 !== "string") throw new ApiError("bad_params", "\u8DEF\u5F84\u4E0D\u80FD\u4E3A\u7A7A");
+    if (!existsSync9(path3) || !statSync5(path3).isDirectory()) {
       throw new ApiError("bad_path", "\u76EE\u5F55\u4E0D\u5B58\u5728\u6216\u4E0D\u662F\u6587\u4EF6\u5939");
     }
-    const np = normPath(path);
+    const np = normPath(path3);
     const list = await this.list();
     const dup = list.find((p) => normPath(p.path) === np);
     if (dup) return dup;
     const proj = {
       id: newId(),
-      name: name?.trim() || path.replace(/[\\/]+$/, "").split(/[\\/]/).pop() || path,
-      path,
+      name: name?.trim() || path3.replace(/[\\/]+$/, "").split(/[\\/]/).pop() || path3,
+      path: path3,
       createdAt: Date.now()
     };
     list.push(proj);
@@ -5389,7 +5649,7 @@ init_paths();
 init_methods();
 init_i18n();
 import { mkdir as mkdir5, rename as rename3, readdir as readdir4, readFile as readFile13 } from "node:fs/promises";
-import { join as join14 } from "node:path";
+import { join as join13 } from "node:path";
 import { randomBytes as randomBytes4 } from "node:crypto";
 function newId2() {
   return "t_" + Date.now().toString(36) + randomBytes4(3).toString("hex");
@@ -5399,7 +5659,7 @@ var ThreadsStore = class {
   trashDir;
   metas = /* @__PURE__ */ new Map();
   loaded = false;
-  // meta 写串行化：并发 patch/appendEvent 互相覆盖（manager 里 setStatus/patch/provider_session_id 会并发跑）
+  // Serialize meta writes: concurrent patch/appendEvent would overwrite each other (setStatus/patch/provider_session_id run concurrently in the manager)
   writeQ = Promise.resolve();
   serial(fn) {
     const p = this.writeQ.then(fn, fn);
@@ -5408,17 +5668,17 @@ var ThreadsStore = class {
     return p;
   }
   constructor(dataDir) {
-    this.dir = join14(dataDir, "threads");
-    this.trashDir = join14(dataDir, "trash", "threads");
+    this.dir = join13(dataDir, "threads");
+    this.trashDir = join13(dataDir, "trash", "threads");
   }
   tdir(id) {
-    return join14(this.dir, id);
+    return join13(this.dir, id);
   }
   metaPath(id) {
-    return join14(this.tdir(id), "meta.json");
+    return join13(this.tdir(id), "meta.json");
   }
   timelinePath(id) {
-    return join14(this.tdir(id), "timeline.jsonl");
+    return join13(this.tdir(id), "timeline.jsonl");
   }
   async loadAll() {
     if (this.loaded) return;
@@ -5490,8 +5750,8 @@ var ThreadsStore = class {
       return next;
     });
   }
-  // 事件追加：在串行区内取 meta.seq+1 作为 seq，落盘 jsonl + 更新 meta。
-  // 传入的 seq 被忽略（保证单调递增）；ts/threadId 缺省时自动补。
+  // Append an event: inside the serialized section take meta.seq+1 as seq, write the jsonl and update meta.
+  // A passed-in seq is ignored (keeps it strictly increasing); ts/threadId are filled in when missing.
   async appendEvent(id, ev) {
     return this.serial(async () => {
       const meta = await this.get(id);
@@ -5522,7 +5782,7 @@ var ThreadsStore = class {
     await mkdir5(this.trashDir, { recursive: true });
     for (let attempt = 0; ; attempt++) {
       try {
-        await rename3(this.tdir(id), join14(this.trashDir, `${id}-${stamp2}`));
+        await rename3(this.tdir(id), join13(this.trashDir, `${id}-${stamp2}`));
         break;
       } catch (e) {
         const code = e?.code;
@@ -5566,7 +5826,7 @@ var Conn = class {
     } catch {
     }
   }
-  // 看 socket 里真正还没发出去的字节（客户端卡住才会涨），而不是累计发送量
+  // Look at bytes really still unsent in the socket (only grows when the client is stuck), not the cumulative amount sent
   overflow(next) {
     return this.ws.bufferedAmount + next > 8 * 1024 * 1024;
   }
@@ -5607,8 +5867,7 @@ var Gateway = class {
       socket.destroy();
       return;
     }
-    const originCheck = checkOrigin(req.headers.origin, this.cfg.port);
-    if (!originCheck.ok) {
+    if (classifyOrigin(req.headers.origin, this.cfg.port) === "foreign") {
       socket.write("HTTP/1.1 403 Forbidden\r\n\r\n");
       socket.destroy();
       return;
@@ -5700,7 +5959,7 @@ var Gateway = class {
       });
     }
   }
-  // 终端二进制帧：[op:1][terminalIndex:2 BE][payload]
+  // Terminal binary frame: [op:1][terminalIndex:2 BE][payload]
   onBinary(conn, buf) {
     if (buf.length < 3) return;
     const op = buf.readUInt8(0);
@@ -5756,7 +6015,7 @@ var Coalescer = class {
     this.windowMs = windowMs;
     this.onEmit = onEmit;
   }
-  // 推入一个 delta；首个立即发，窗口内合并后 trailing 发
+  // Push a delta; the first goes out immediately, the rest are merged within the window and sent trailing
   push(itemId, text) {
     const acc = this.acc.get(itemId);
     if (!acc) {
@@ -5766,7 +6025,7 @@ var Coalescer = class {
     }
     acc.text += text;
   }
-  // 完整事件到达前必须 flush，保证顺序（delta 在完整事件之前）
+  // Must flush before the complete event arrives to keep ordering (deltas before the complete event)
   flush(itemId) {
     const acc = this.acc.get(itemId);
     if (!acc) return;
@@ -5777,7 +6036,7 @@ var Coalescer = class {
     if (acc.text.length > 0) this.onEmit(itemId, acc.text);
     this.acc.delete(itemId);
   }
-  // itemId 的完整事件到达前调用：flush 未发完的 delta
+  // Call before an itemId's complete event arrives: flush the deltas not yet sent
   flushItem(itemId) {
     this.flush(itemId);
   }
@@ -5810,14 +6069,14 @@ var AgentManager = class {
   runtimes = /* @__PURE__ */ new Map();
   recycleTimer = null;
   slashCache = /* @__PURE__ */ new Map();
-  /** 前端 thread.send 的 attachment.path 实际是上传 id，需解析到 dataDir/attachments 下的文件 */
+  /** attachment.path in the frontend's thread.send is really an upload id; resolve it to the file under dataDir/attachments */
   resolveAttachments(refs) {
     return resolveAttachmentRefs(this.attachments, refs);
   }
   attachmentLabels(refs) {
     return refs.map((a) => ({ id: a.path, name: (a.name ?? "").trim() || a.path, mime: a.mime }));
   }
-  // 启动时调用：恢复 running/initializing 的对话为 closed（§5.7.6）
+  // Called at startup: running/initializing conversations are recovered as closed (§5.7.6)
   async recoverOnStart() {
     for (const meta of await this.threads.list()) {
       if (meta.status === "running" || meta.status === "initializing") {
@@ -5854,13 +6113,16 @@ var AgentManager = class {
     this.recycleTimer = setInterval(() => void this.recycleIdle(), 6e4);
     this.recycleTimer.unref?.();
   }
+  /** Close every session; the returned Promise resolves once each close finishes (or fails). Callers add their own timeout. */
   shutdown() {
     if (this.recycleTimer) clearInterval(this.recycleTimer);
-    for (const rt of this.runtimes.values()) void rt.session?.close().catch(() => {
-    });
+    const all = [...this.runtimes.values()].map((rt) => rt.session?.close().catch(() => {
+    }));
     this.runtimes.clear();
+    return Promise.all(all).then(() => {
+    });
   }
-  // 空闲退出判定（§5.2.7）：任一 runtime 非 idle 即忙
+  // Idle-exit check (§5.2.7): busy if any runtime is not idle
   anyBusy() {
     for (const rt of this.runtimes.values()) {
       if (rt.status === "running" || rt.status === "initializing") return true;
@@ -5913,7 +6175,7 @@ var AgentManager = class {
   flushDeltas(rt, itemId) {
     for (const t of DELTA_TYPES) rt.coalescer.flushItem(deltaKey(t, itemId));
   }
-  // ---- 发送 ----
+  // ---- send ----
   async send(threadId, input, behavior = "queue") {
     const meta = await this.mustThread(threadId);
     if (meta.archived) {
@@ -6006,7 +6268,7 @@ var AgentManager = class {
       throw e;
     }
   }
-  // ---- 事件泵 ----
+  // ---- event pump ----
   async pumpEvents(threadId, session) {
     const rt = this.rt(threadId);
     let ended = false;
@@ -6126,7 +6388,7 @@ var AgentManager = class {
   alive(_s) {
     return true;
   }
-  // ---- respond（授权/提问回应） ----
+  // ---- respond (permission/question answers) ----
   async respond(threadId, requestId, answer) {
     const rt = this.rt(threadId);
     const pending = rt.pending.get(requestId);
@@ -6231,7 +6493,7 @@ var AgentManager = class {
     }
     this.gw.publish("sidebar", { type: "thread.upsert", thread: next });
   }
-  /** 仅尚无用户消息、且未在跑时可换 Agent */
+  /** The Agent can be switched only before any user message and while not running */
   async setProvider(threadId, providerId) {
     await this.mustThread(threadId);
     const meta = await this.threads.get(threadId);
@@ -6276,7 +6538,7 @@ var AgentManager = class {
     }
     await this.setStatus(threadId, "closed");
   }
-  /** 斜杠命令：默认不建会话；load:true 时才为需会话的 Provider 建会话拉列表 */
+  /** Slash commands: no session by default; only with load:true do we create a session for providers that need one to list them */
   async listCommands(threadId, opts) {
     let meta;
     try {
@@ -6363,7 +6625,7 @@ var AgentManager = class {
     if (!proj) throw new ApiError("not_found", "\u9879\u76EE\u4E0D\u5B58\u5728");
     let model = meta.model;
     if (meta.provider === "dsh" && model) {
-      const available = await provider.listModels().catch(() => []);
+      const available = await cachedModels(provider).catch(() => []);
       if (available.length && !available.some((m) => m.id === model)) {
         model = available.find((m) => /magpie/i.test(m.id))?.id ?? available.find((m) => m.isDefault)?.id ?? null;
         await this.threads.patch(threadId, { model });
@@ -6393,7 +6655,7 @@ var AgentManager = class {
     this.runtimes.delete(threadId);
     await this.threads.delete(threadId);
   }
-  // ---- 内部 ----
+  // ---- internals ----
   async mustThread(threadId) {
     const meta = await this.threads.get(threadId);
     if (!meta) throw new ApiError("not_found", "\u5BF9\u8BDD\u4E0D\u5B58\u5728");
@@ -6424,14 +6686,14 @@ var AgentManager = class {
     this.gw.publish("sidebar", { type: "thread.upsert", thread: meta });
     this.gw.publish(`thread:${threadId}`, { type: "status", status });
   }
-  // 追加事件：seq 由 store 串行区分配，落盘，推送 thread:<id>
+  // Append an event: seq is assigned in the store's serialized section, persisted, then pushed to thread:<id>
   async appendRaw(threadId, ev) {
     const full = await this.threads.appendEvent(threadId, { ...ev, ts: Date.now() });
     this.gw.publish(`thread:${threadId}`, { type: "event", event: full });
   }
-  // 推送但不落盘（coalescer delta 用；usage 已经由上面累加）。
-  // 不落盘的事件不占 seq 序号：seq=-1 让前端只按持久化 seq 去重，
-  // 否则 delta 把客户端的 maxSeq 顶上去，会把随后的持久化事件误丢。
+  // Push without persisting (for coalescer deltas; usage is already accumulated above).
+  // Unpersisted events take no seq: seq=-1 so the frontend dedupes only by persisted seq,
+  // otherwise deltas would push the client's maxSeq up and the following persisted events would be dropped by mistake.
   async pushEvent(threadId, ev) {
     const full = { ...ev, seq: -1, ts: Date.now(), threadId };
     this.gw.publish(`thread:${threadId}`, { type: "event", event: full });
@@ -6449,29 +6711,41 @@ var AgentManager = class {
 };
 
 // daemon/src/git/service.ts
-import { execFile as execFile3 } from "node:child_process";
-import { existsSync as existsSync9 } from "node:fs";
-import { mkdir as mkdir6, readFile as readFile14, rename as rename4, stat as stat7 } from "node:fs/promises";
-import { join as join15, normalize as normalize2, sep as sep2 } from "node:path";
-var TIMEOUT = 15e3;
+import { execFile as execFile4 } from "node:child_process";
+import { existsSync as existsSync10 } from "node:fs";
+import { cp, mkdir as mkdir6, readFile as readFile14, rename as rename4, rm, stat as stat7 } from "node:fs/promises";
+import { join as join14, normalize as normalize2, sep as sep2 } from "node:path";
+var TIMEOUT2 = 15e3;
 var DIFF_LIMIT = 1024 * 1024;
 function runGit(cwd, args) {
   return new Promise((res) => {
-    execFile3("git", args, { cwd, timeout: TIMEOUT, maxBuffer: 8 * 1024 * 1024, windowsHide: true }, (e, stdout, stderr) => {
+    execFile4("git", ["-c", "core.quotepath=false", ...args], { cwd, timeout: TIMEOUT2, maxBuffer: 8 * 1024 * 1024, windowsHide: true }, (e, stdout, stderr) => {
       const code = e && typeof e.code === "number" ? e.code : e ? 1 : 0;
-      res({ code, out: String(stdout ?? ""), err: String(stderr ?? (e?.message ?? "")) });
+      const missing = e?.code === "ENOENT";
+      res({ code, out: String(stdout ?? ""), err: missing ? "\u627E\u4E0D\u5230 git\uFF08\u8BF7\u5148\u5B89\u88C5 git \u5E76\u52A0\u5165 PATH\uFF09" : String(stderr || (e?.message ?? "")) });
     });
   });
 }
 function insidePath(projectPath, p) {
   const rel = normalize2(p).replace(/\\/g, "/");
-  const abs = normalize2(join15(projectPath, rel));
+  const abs = normalize2(join14(projectPath, rel));
   const proj = normalize2(projectPath);
   if (abs !== proj && !abs.startsWith(proj + sep2)) return null;
   return rel.replace(/\\/g, "/");
 }
+async function moveAcrossDevices(from, to, ops = {}) {
+  const ren = ops.rename ?? rename4;
+  try {
+    await ren(from, to);
+  } catch (e) {
+    const code = e?.code;
+    if (code !== "EXDEV") throw e;
+    await (ops.cp ?? cp)(from, to, { recursive: true, errorOnExist: true, force: false, preserveTimestamps: true });
+    await (ops.rm ?? rm)(from, { recursive: true, force: true });
+  }
+}
 var GitService = class {
-  // projectPath 由调用方从 projectId 解析（service 不认识 store）
+  // projectPath is resolved from projectId by the caller (the service doesn't know about the store)
   async status(projectPath) {
     const inside = await runGit(projectPath, ["rev-parse", "--is-inside-work-tree"]);
     if (inside.code !== 0 || inside.out.trim() !== "true") return { isRepo: false };
@@ -6485,7 +6759,7 @@ var GitService = class {
       if (!rec5 || rec5.length < 4) continue;
       const index = rec5[0];
       const worktree = rec5[1];
-      let path = rec5.slice(3);
+      let path3 = rec5.slice(3);
       let kind = "modified";
       if (index === "?" && worktree === "?") kind = "untracked";
       else if (index === "R" || worktree === "R") {
@@ -6493,18 +6767,18 @@ var GitService = class {
         i++;
       } else if (index === "A" || worktree === "A") kind = "added";
       else if (index === "D" || worktree === "D") kind = "deleted";
-      files.push({ path, index, worktree, kind });
+      files.push({ path: path3, index, worktree, kind });
     }
     return { isRepo: true, branch: br.out.trim() || void 0, files };
   }
-  // 统一 diff 文本；{tooLarge:true} 当 diff > 1MB
+  // Unified diff text; {tooLarge:true} when the diff is > 1MB
   async diff(projectPath, p) {
     const rel = insidePath(projectPath, p);
     if (!rel) return { error: "\u8DEF\u5F84\u4E0D\u5141\u8BB8" };
     const ls = await runGit(projectPath, ["ls-files", "--error-unmatch", "--", rel]);
     if (ls.code !== 0) {
-      const full = join15(projectPath, rel);
-      if (!existsSync9(full)) return { error: "\u6587\u4EF6\u4E0D\u5B58\u5728" };
+      const full = join14(projectPath, rel);
+      if (!existsSync10(full)) return { error: "\u6587\u4EF6\u4E0D\u5B58\u5728" };
       const s = await stat7(full);
       if (!s.isFile()) return { error: "\u4E0D\u662F\u6587\u4EF6" };
       if (s.size > DIFF_LIMIT) return { tooLarge: true };
@@ -6525,10 +6799,11 @@ ${lines}` };
     if (d.out.length > DIFF_LIMIT) return { tooLarge: true };
     return { diff: d.out };
   }
-  // 已跟踪 → git restore；未跟踪 → 移到 trash/discarded/<ts>/<relpath>
+  // Tracked → git restore; untracked → move to trash/discarded/<ts>/<relpath>
   async discard(projectPath, p, dataDir) {
     const rel = insidePath(projectPath, p);
     if (!rel) return { ok: false, error: "\u8DEF\u5F84\u4E0D\u5141\u8BB8" };
+    if (rel === "." || rel === "" || rel === "./") return { ok: false, error: "\u8DEF\u5F84\u4E0D\u5141\u8BB8" };
     const ls = await runGit(projectPath, ["ls-files", "--error-unmatch", "--", rel]);
     if (ls.code === 0) {
       let r = await runGit(projectPath, ["restore", "--staged", "--worktree", "--", rel]);
@@ -6536,13 +6811,13 @@ ${lines}` };
       if (r.code !== 0) return { ok: false, error: r.err.trim() || "\u653E\u5F03\u5931\u8D25" };
       return { ok: true };
     }
-    const full = join15(projectPath, rel);
-    if (!existsSync9(full)) return { ok: false, error: "\u6587\u4EF6\u4E0D\u5B58\u5728" };
+    const full = join14(projectPath, rel);
+    if (!existsSync10(full)) return { ok: false, error: "\u6587\u4EF6\u4E0D\u5B58\u5728" };
     const stamp2 = (/* @__PURE__ */ new Date()).toISOString().replace(/[:.]/g, "-").slice(0, 19);
-    const dest = join15(dataDir, "trash", "discarded", stamp2, rel);
-    await mkdir6(join15(dest, ".."), { recursive: true });
+    const dest = join14(dataDir, "trash", "discarded", stamp2, rel);
+    await mkdir6(join14(dest, ".."), { recursive: true });
     try {
-      await rename4(full, dest);
+      await moveAcrossDevices(full, dest);
     } catch (e) {
       return { ok: false, error: "\u79FB\u52A8\u5931\u8D25\uFF1A" + String(e?.message ?? e) };
     }
@@ -6552,9 +6827,21 @@ ${lines}` };
 
 // daemon/src/files/service.ts
 import { readdir as readdir5, readFile as readFile15, stat as stat8 } from "node:fs/promises";
-import { existsSync as existsSync10 } from "node:fs";
-import { join as join16, normalize as normalize3, sep as sep3, extname as extname3 } from "node:path";
+import { join as join15, normalize as normalize3, sep as sep3, extname as extname3 } from "node:path";
 import ignore from "ignore";
+function decodeText(buf) {
+  try {
+    const text = new TextDecoder("utf-8", { fatal: true, ignoreBOM: false }).decode(buf);
+    return { text, encoding: "utf8" };
+  } catch {
+  }
+  try {
+    const text = new TextDecoder("gbk", { fatal: true }).decode(buf);
+    return { text, encoding: "gbk" };
+  } catch {
+  }
+  return { text: new TextDecoder("utf-8").decode(buf), encoding: "utf8" };
+}
 var MAX_READ = 1024 * 1024;
 var MAX_PER_LEVEL = 2e3;
 var ALWAYS_IGNORE = /* @__PURE__ */ new Set([".git", "node_modules"]);
@@ -6603,49 +6890,59 @@ var LANG = {
 };
 function insidePath2(projectPath, p) {
   const rel = normalize3(p || ".").replace(/\\/g, "/");
-  const abs = normalize3(join16(projectPath, rel));
+  const abs = normalize3(join15(projectPath, rel));
   const proj = normalize3(projectPath);
   if (abs !== proj && !abs.startsWith(proj + sep3)) return null;
   return rel;
 }
 var FileService = class {
-  // 缓存每个项目的 ignore 实例（.gitignore 变更由下一次 daemon 重启拾取；代价可接受）
+  // Cache an ignore instance per project (.gitignore changes are picked up on the next daemon restart; acceptable cost)
+  // Invalidate by .gitignore mtime: an edited .gitignore takes effect the next time a directory is expanded
   igCache = /* @__PURE__ */ new Map();
   async igFor(projectPath) {
-    if (this.igCache.has(projectPath)) return this.igCache.get(projectPath);
-    const gi = join16(projectPath, ".gitignore");
+    const gi = join15(projectPath, ".gitignore");
+    const st = await stat8(gi).catch(() => null);
+    const mtime = st?.isFile() ? st.mtimeMs : -1;
+    const hit = this.igCache.get(projectPath);
+    if (hit && hit.mtime === mtime) return hit.ig;
     let ig = null;
-    if (existsSync10(gi)) {
+    if (mtime >= 0) {
       try {
         ig = ignore().add(await readFile15(gi, "utf8"));
       } catch {
         ig = null;
       }
     }
-    this.igCache.set(projectPath, ig);
+    this.igCache.set(projectPath, { mtime, ig });
     return ig;
   }
   async tree(projectPath, dir) {
     const rel = insidePath2(projectPath, dir);
     if (rel === null) return { error: "\u8DEF\u5F84\u4E0D\u5141\u8BB8" };
-    const abs = join16(projectPath, rel);
+    const abs = join15(projectPath, rel);
     const s = await stat8(abs).catch(() => null);
     if (!s?.isDirectory()) return { error: "\u76EE\u5F55\u4E0D\u5B58\u5728" };
     const ig = await this.igFor(projectPath);
-    const names = await readdir5(abs).catch(() => null);
-    if (!names) return { error: "\u65E0\u6CD5\u8BFB\u53D6\u76EE\u5F55" };
+    const dirents = await readdir5(abs, { withFileTypes: true }).catch(() => null);
+    if (!dirents) return { error: "\u65E0\u6CD5\u8BFB\u53D6\u76EE\u5F55" };
     const out = [];
-    for (const name of names) {
+    for (const d of dirents) {
       if (out.length >= MAX_PER_LEVEL) break;
+      const name = d.name;
       if (ALWAYS_IGNORE.has(name)) continue;
       const childRel = rel === "." ? name : `${rel}/${name}`;
-      const st = await stat8(join16(projectPath, childRel)).catch(() => null);
-      if (!st) continue;
-      const isDir = st.isDirectory();
+      let isDir2 = d.isDirectory();
+      if (d.isSymbolicLink()) {
+        const st = await stat8(join15(projectPath, childRel)).catch(() => null);
+        if (!st) continue;
+        isDir2 = st.isDirectory();
+      } else if (!d.isFile() && !isDir2) {
+        continue;
+      }
       if (ig) {
-        if (ig.ignores(isDir ? childRel + "/" : childRel)) continue;
+        if (ig.ignores(isDir2 ? childRel + "/" : childRel)) continue;
       }
-      out.push({ name, path: childRel, isDir });
+      out.push({ name, path: childRel, isDir: isDir2 });
     }
     out.sort((a, b) => a.isDir === b.isDir ? a.name.localeCompare(b.name, "zh-CN") : a.isDir ? -1 : 1);
     return { entries: out };
@@ -6653,7 +6950,7 @@ var FileService = class {
   async read(projectPath, p) {
     const rel = insidePath2(projectPath, p);
     if (rel === null) return { error: "\u8DEF\u5F84\u4E0D\u5141\u8BB8" };
-    const abs = join16(projectPath, rel);
+    const abs = join15(projectPath, rel);
     const s = await stat8(abs).catch(() => null);
     if (!s) return { error: "\u6587\u4EF6\u4E0D\u5B58\u5728" };
     if (!s.isFile()) return { error: "\u4E0D\u662F\u6587\u4EF6" };
@@ -6662,28 +6959,76 @@ var FileService = class {
     if (!buf) return { error: "\u65E0\u6CD5\u8BFB\u53D6" };
     const head = buf.subarray(0, 8192);
     if (head.includes(0)) return { binary: true };
-    return { text: buf.toString("utf8"), language: LANG[extname3(rel).toLowerCase()] ?? "plaintext" };
+    const { text, encoding } = decodeText(buf);
+    return { text, encoding, language: LANG[extname3(rel).toLowerCase()] ?? "plaintext" };
   }
 };
 
 // daemon/src/terminal/service.ts
+init_pathscan();
 init_log();
-import { spawn as spawn7, execFileSync } from "node:child_process";
+import { spawn as spawn3, execFileSync as execFileSync2 } from "node:child_process";
+import { accessSync as accessSync2, chmodSync, constants as fsc, existsSync as existsSync11, statSync as statSync6 } from "node:fs";
+import { createRequire as moduleRequire } from "node:module";
+import { release } from "node:os";
+import { dirname as dirname6, join as join16 } from "node:path";
+import { StringDecoder } from "node:string_decoder";
 var MAX_TERMS_PER_PROJECT = 8;
 var BUF_MAX = 2 * 1024 * 1024;
 var SNAP_LINES = 5e3;
-function pickShell() {
-  if (process.platform === "win32") {
-    for (const s of ["pwsh.exe", "powershell.exe"]) {
-      try {
-        execFileSync("where.exe", [s], { stdio: "ignore", windowsHide: true });
-        return s;
-      } catch {
+function isExecFile(file) {
+  try {
+    accessSync2(file, fsc.X_OK);
+    return statSync6(file).isFile();
+  } catch {
+    return false;
+  }
+}
+function pickShell(o = {}) {
+  const platform = o.platform ?? process.platform;
+  const env = o.env ?? process.env;
+  const find = o.find ?? ((n) => findOnPath(n, { platform, env })[0] ?? null);
+  const isExec = o.isExec ?? isExecFile;
+  if (platform === "win32") {
+    for (const s of ["pwsh", "powershell"]) {
+      const hit = find(s);
+      if (hit) return hit;
+    }
+    const sysRoot = env.SystemRoot || env.SYSTEMROOT || env.windir || "C:\\Windows";
+    const ps = `${sysRoot}\\System32\\WindowsPowerShell\\v1.0\\powershell.exe`;
+    if (isExec(ps)) return ps;
+    return env.ComSpec || env.COMSPEC || "cmd.exe";
+  }
+  if (env.SHELL && env.SHELL.startsWith("/") && isExec(env.SHELL)) return env.SHELL;
+  const order = platform === "darwin" ? ["/bin/zsh", "/bin/bash", "/bin/sh"] : ["/bin/bash", "/usr/bin/bash", "/bin/zsh", "/bin/sh"];
+  for (const s of order) if (isExec(s)) return s;
+  return "/bin/sh";
+}
+function simpleShellArgs(shell, platform = process.platform) {
+  if (platform === "win32") {
+    if (/(^|[\\/])cmd(\.exe)?$/i.test(shell)) return ["/Q"];
+    return ["-NoLogo"];
+  }
+  return ["-i"];
+}
+function fixSpawnHelper() {
+  if (process.platform !== "darwin") return;
+  try {
+    const req = moduleRequire(import.meta.url);
+    const root = dirname6(req.resolve("node-pty/package.json"));
+    for (const sub of [`prebuilds/darwin-${process.arch}`, "build/Release"]) {
+      const f = join16(root, sub, "spawn-helper");
+      if (existsSync11(f) && !isExecFile(f)) {
+        chmodSync(f, 493);
+        log("info", "\u5DF2\u4FEE\u590D node-pty spawn-helper \u7684\u53EF\u6267\u884C\u4F4D", { file: f });
       }
     }
-    return "powershell.exe";
+  } catch {
   }
-  return process.env.SHELL || "/bin/bash";
+}
+function conptyInfo() {
+  const build = Number(release().split(".")[2]);
+  return { backend: "conpty", buildNumber: Number.isFinite(build) ? build : 0 };
 }
 var nextIndex = 1;
 var rid5 = () => "t_" + Math.random().toString(36).slice(2, 10);
@@ -6699,6 +7044,7 @@ var TerminalService = class {
   async loadPty() {
     if (this.ptyLib !== void 0) return this.ptyLib;
     try {
+      fixSpawnHelper();
       this.ptyLib = await import("node-pty");
     } catch (e) {
       log("warn", "node-pty \u52A0\u8F7D\u5931\u8D25\uFF0C\u7EC8\u7AEF\u9000\u5316\u65E0 PTY \u65B9\u6848", { err: String(e) });
@@ -6749,11 +7095,19 @@ var TerminalService = class {
     }
     if (!term.pty) {
       term.simple = true;
-      const args = process.platform === "win32" ? ["-NoLogo"] : ["-i"];
-      const proc = spawn7(shell, args, { cwd, stdio: "pipe", windowsHide: true, env: process.env });
+      const args = simpleShellArgs(shell);
+      const proc = spawn3(shell, args, {
+        cwd,
+        stdio: "pipe",
+        windowsHide: true,
+        env: process.env,
+        detached: process.platform !== "win32"
+      });
       term.proc = proc;
-      proc.stdout.on("data", (d) => this.onData(term, d.toString("utf8")));
-      proc.stderr.on("data", (d) => this.onData(term, d.toString("utf8")));
+      const outDec = new StringDecoder("utf8");
+      const errDec = new StringDecoder("utf8");
+      proc.stdout.on("data", (d) => this.onData(term, outDec.write(d)));
+      proc.stderr.on("data", (d) => this.onData(term, errDec.write(d)));
       proc.on("exit", () => this.onExit(term));
       proc.on("error", () => this.onExit(term));
     }
@@ -6766,7 +7120,8 @@ var TerminalService = class {
     if (!t) return { error: "\u7EC8\u7AEF\u4E0D\u5B58\u5728" };
     const lines = t.buf.split("\n");
     const snapshot = lines.length > SNAP_LINES ? lines.slice(-SNAP_LINES).join("\n") : t.buf;
-    return { index: t.index, snapshot, simple: t.simple };
+    const windowsPty = process.platform === "win32" && t.pty ? conptyInfo() : void 0;
+    return { index: t.index, snapshot, simple: t.simple, ...windowsPty ? { windowsPty } : {} };
   }
   indexOf(id) {
     return this.terms.get(id)?.index ?? null;
@@ -6786,21 +7141,41 @@ var TerminalService = class {
   killAll() {
     for (const t of this.terms.values()) this.killTerm(t, true);
   }
-  // ---- 内部 ----
-  // 只杀 shell 会把它启动的 npm run dev 之类留成孤儿 → Windows 用 taskkill /T 杀整棵树
-  killTree(pid, sync) {
-    if (process.platform !== "win32" || !pid) return;
+  // ---- internals ----
+  // Killing only the shell would orphan the npm run dev etc. it started → on Windows taskkill /T kills the whole tree
+  killTree(pid, sync, group) {
+    if (!pid) return;
+    if (process.platform !== "win32") {
+      if (group) {
+        try {
+          process.kill(-pid, "SIGTERM");
+        } catch {
+        }
+        const t = setTimeout(() => {
+          try {
+            process.kill(-pid, "SIGKILL");
+          } catch {
+          }
+        }, 1500);
+        t.unref?.();
+      }
+      return;
+    }
     const args = ["/pid", String(pid), "/T", "/F"];
     try {
-      if (sync) execFileSync("taskkill", args, { windowsHide: true, stdio: "ignore", timeout: 5e3 });
-      else spawn7("taskkill", args, { windowsHide: true, stdio: "ignore" }).on("error", () => {
+      if (sync) execFileSync2("taskkill", args, { windowsHide: true, stdio: "ignore", timeout: 5e3 });
+      else spawn3("taskkill", args, { windowsHide: true, stdio: "ignore" }).on("error", () => {
       });
     } catch {
     }
   }
   killTerm(t, sync = false) {
     t.alive = false;
-    this.killTree(t.pty?.pid ?? t.proc?.pid, sync);
+    this.killTree(t.pty?.pid ?? t.proc?.pid, sync, !t.pty && !!t.proc);
+    if (t.timer) {
+      clearTimeout(t.timer);
+      t.timer = null;
+    }
     try {
       t.pty?.kill();
     } catch {
@@ -6813,6 +7188,16 @@ var TerminalService = class {
     this.byIndex.delete(t.index);
   }
   onExit(t) {
+    if (t.timer) {
+      clearTimeout(t.timer);
+      t.timer = null;
+      if (t.pend) {
+        this.gw.publishTerminal(t.index, Buffer.from(t.pend, "utf8"));
+        t.pend = "";
+      }
+    }
+    if (t.exited) return;
+    t.exited = true;
     t.alive = false;
     this.terms.delete(t.id);
     this.byIndex.delete(t.index);
@@ -6832,7 +7217,7 @@ var TerminalService = class {
       }, 16);
     }
   }
-  // 输入帧：op 2=输入，3=尺寸
+  // Input frames: op 2=input, 3=resize
   onInput(conn, index, op, payload) {
     const t = this.byIndex.get(index);
     if (!t || !t.alive) return;
@@ -6851,7 +7236,41 @@ var TerminalService = class {
   }
 };
 
+// daemon/src/util/proc.ts
+init_pathscan();
+import { delimiter } from "node:path";
+function pidAlive(pid, kill = (p, s) => process.kill(p, s)) {
+  if (!Number.isInteger(pid) || pid <= 0) return false;
+  try {
+    kill(pid, 0);
+    return true;
+  } catch (e) {
+    return e?.code === "EPERM";
+  }
+}
+function augmentPath(env, nodeDir, platform = process.platform, home) {
+  const win = platform === "win32";
+  const sep4 = win ? ";" : platform === process.platform ? delimiter : ":";
+  const key = Object.keys(env).find((k) => k.toUpperCase() === "PATH") ?? "PATH";
+  const cur = (env[key] ?? "").split(sep4).filter(Boolean);
+  const norm = (d) => win ? d.replace(/[\\/]+$/, "").toLowerCase() : d.replace(/\/+$/, "");
+  const seen = new Set(cur.map(norm));
+  const out = [...cur];
+  for (const d of [nodeDir, ...extraBinDirs({ platform, env, home })]) {
+    if (!d || seen.has(norm(d))) continue;
+    seen.add(norm(d));
+    out.push(d);
+  }
+  return out.join(sep4);
+}
+
 // daemon/src/main.ts
+var nodeMajor = Number(/^v?(\d+)/.exec(process.versions.node ?? "")?.[1] ?? 0);
+if (nodeMajor < 20) {
+  console.error(`[agent-console] \u9700\u8981 Node.js 20 \u6216\u66F4\u9AD8\u7248\u672C\uFF0C\u5F53\u524D ${process.version}\uFF08${process.execPath}\uFF09`);
+  process.exit(3);
+}
+process.env.PATH = augmentPath(process.env, dirname7(process.execPath));
 var cfg = parseConfig(process.argv.slice(2));
 process.on("uncaughtException", (e) => {
   log("error", "uncaughtException", { err: String(e?.stack ?? e) });
@@ -6917,6 +7336,9 @@ async function main() {
     log("error", `\u7AEF\u53E3 ${cfg.port} \u65E0\u6CD5\u76D1\u542C`, { err: String(e) });
     process.exit(2);
   });
+  const bound = server.address();
+  if (bound && typeof bound === "object") cfg.port = bound.port;
+  process.stdout.write(JSON.stringify({ agentConsoleReady: true, port: cfg.port, pid: process.pid }) + "\n");
   void (async () => {
     const { warmProviderCache: warmProviderCache2 } = await Promise.resolve().then(() => (init_warm(), warm_exports));
     await warmProviderCache2(await settings.get());
@@ -6930,7 +7352,9 @@ async function main() {
     buildStamp: cfg.buildStamp,
     startedAt: Date.now()
   });
+  chmodSync2(daemonJsonPath, 384);
   log("info", `daemon \u5DF2\u542F\u52A8 \u7AEF\u53E3 ${cfg.port} \u6570\u636E\u76EE\u5F55 ${cfg.dataDir} \u7248\u672C ${cfg.version} pid ${process.pid}`);
+  if (!cfg.parentPid) console.log(`[agent-console] \u6253\u5F00 http://127.0.0.1:${cfg.port}/#t=${cfg.token}`);
   let idleSince = Date.now();
   setInterval(() => {
     const busy = gateway.connectionCount > 0 || manager.anyBusy() || terminals.count > 0;
@@ -6946,17 +7370,32 @@ async function main() {
     shuttingDown = true;
     log("info", "daemon \u5173\u95ED\u4E2D");
     terminals.killAll();
-    manager.shutdown();
     gateway.closeAll();
     try {
       rmSync2(daemonJsonPath, { force: true });
     } catch {
     }
-    server.close(() => process.exit(code));
-    setTimeout(() => process.exit(code), 3e3).unref();
+    const sessionsClosed = Promise.race([manager.shutdown(), new Promise((r) => setTimeout(r, 2500))]);
+    void sessionsClosed.then(() => server.close(() => process.exit(code)));
+    setTimeout(() => process.exit(code), 4e3).unref();
   }
   process.on("SIGINT", () => shutdown(0));
   process.on("SIGTERM", () => shutdown(0));
+  if (cfg.parentPid) {
+    const parentPid = cfg.parentPid;
+    const parentWatch = setInterval(() => {
+      if (!pidAlive(parentPid)) {
+        clearInterval(parentWatch);
+        log("info", `\u7236\u8FDB\u7A0B ${parentPid} \u5DF2\u9000\u51FA\uFF0Cdaemon \u8DDF\u968F\u9000\u51FA`);
+        shutdown(0);
+      }
+    }, 2e3);
+    parentWatch.unref();
+    process.stdin.on("end", () => shutdown(0));
+    process.stdin.on("close", () => shutdown(0));
+    process.stdin.on("error", () => shutdown(0));
+    process.stdin.resume();
+  }
 }
 main().catch((e) => {
   console.error("[agent-console] \u542F\u52A8\u5931\u8D25", e);