deskbuddy 0.2.0-beta.0 → 0.2.0-beta.2

package/dist/cli.js

@@ -1,15 +1,20 @@
 #!/usr/bin/env node
 
 // src/commands/daemon.ts
-import { writeFileSync as writeFileSync11, rmSync as rmSync4 } from "fs";
+import { writeFileSync as writeFileSync13, rmSync as rmSync7 } from "fs";
 
 // src/core/config.ts
 import { randomUUID } from "crypto";
 import { existsSync, mkdirSync, readFileSync, renameSync, writeFileSync } from "fs";
 import { homedir, hostname } from "os";
 import { join } from "path";
-function defaultRemoteCwd(home = homedir()) {
-  return join(home, "Desktop");
+function defaultRemoteCwd(home = homedir(), platform = process.platform, exists = existsSync) {
+  const desktop = join(home, "Desktop");
+  if (platform === "win32" && !exists(desktop)) {
+    const od = join(home, "OneDrive", "Desktop");
+    if (exists(od)) return od;
+  }
+  return desktop;
 }
 var PROD_API_BASE = "https://api.shifengintelli.com";
 var TEST_API_BASE = "https://test-api.shifengintelli.com";
@@ -83,7 +88,8 @@ function loadConfig() {
       boundApiBase: parsed.boundApiBase,
       remoteCwd: parsed.remoteCwd,
       // 不认识的值一律回落默认，不能让一个手滑写错的配置变成"全放行"或"全拦"
-      approvalPolicy: parsed.approvalPolicy === "all" ? "all" : parsed.approvalPolicy === "commands" ? "commands" : void 0
+      approvalPolicy: parsed.approvalPolicy === "all" ? "all" : parsed.approvalPolicy === "commands" ? "commands" : void 0,
+      codexAppServer: typeof parsed.codexAppServer === "string" ? parsed.codexAppServer : void 0
     };
   } catch {
     return fallback;
@@ -105,12 +111,124 @@ function ensureClientId() {
 }
 
 // src/daemon/autostart.ts
-import { execFile } from "child_process";
-import { existsSync as existsSync2, mkdirSync as mkdirSync2, rmSync, writeFileSync as writeFileSync2 } from "fs";
+import { execFile, spawn } from "child_process";
+import { existsSync as existsSync2, mkdirSync as mkdirSync2, readFileSync as readFileSync2, rmSync, writeFileSync as writeFileSync2 } from "fs";
 import { homedir as homedir2 } from "os";
 import { fileURLToPath } from "url";
 import { basename, dirname, join as join2 } from "path";
 import { promisify } from "util";
+
+// src/core/winproc.ts
+import { execFileSync } from "child_process";
+function winSplitArgs(cmdline) {
+  const out = [];
+  let cur = "";
+  let inQ = false;
+  let has = false;
+  const s = cmdline || "";
+  for (let i = 0; i < s.length; i++) {
+    const c = s[i];
+    if (c === "\\") {
+      let n = 0;
+      while (s[i + n] === "\\") n++;
+      if (s[i + n] === '"') {
+        cur += "\\".repeat(Math.floor(n / 2));
+        if (n % 2 === 1) cur += '"';
+        else inQ = !inQ;
+        i += n;
+        has = true;
+      } else {
+        cur += "\\".repeat(n);
+        i += n - 1;
+        has = true;
+      }
+    } else if (c === '"') {
+      inQ = !inQ;
+      has = true;
+    } else if (!inQ && (c === " " || c === "	")) {
+      if (has) out.push(cur);
+      cur = "";
+      has = false;
+    } else {
+      cur += c;
+      has = true;
+    }
+  }
+  if (has) out.push(cur);
+  return out;
+}
+var SCRIPT_HOSTS = /* @__PURE__ */ new Set(["node", "bun", "deno"]);
+function stripExe(name) {
+  return name.replace(/\.exe$/i, "");
+}
+function lastTwo(p) {
+  return p.split(/[\\/]+/).filter(Boolean).slice(-2).join("/");
+}
+function hostedScript(argv) {
+  for (const a of argv.slice(1)) if (!a.startsWith("-")) return a;
+  return "";
+}
+function winEffectiveName(name, cmdline) {
+  if (!SCRIPT_HOSTS.has(stripExe(name).toLowerCase())) return name;
+  const script = hostedScript(winSplitArgs(cmdline));
+  return script ? lastTwo(script) : name;
+}
+function winNormalizedArgs(name, cmdline) {
+  let argv = winSplitArgs(cmdline);
+  if (argv.length === 0) return "";
+  if (SCRIPT_HOSTS.has(stripExe(name).toLowerCase())) {
+    const script = hostedScript(argv);
+    if (script) argv = argv.slice(argv.indexOf(script));
+  }
+  return argv.map((a) => a.replace(/\s+/g, "_").replace(/\\/g, "/")).join(" ");
+}
+var WIN_PS_SCRIPT = "[Console]::OutputEncoding=[Text.Encoding]::UTF8;Get-CimInstance Win32_Process | Select-Object ProcessId,ParentProcessId,Name,CommandLine | ConvertTo-Json -Compress";
+function parseWinProcJson(json) {
+  let d;
+  try {
+    d = JSON.parse(json.replace(/^\uFEFF/, ""));
+  } catch {
+    return [];
+  }
+  const list = Array.isArray(d) ? d : d ? [d] : [];
+  const out = [];
+  for (const r of list) {
+    const pid = Number(r?.ProcessId);
+    if (!Number.isInteger(pid) || pid <= 0) continue;
+    const rawName = typeof r.Name === "string" ? r.Name : "";
+    const cmdline = typeof r.CommandLine === "string" ? r.CommandLine.replace(/[\r\n]+/g, " ") : "";
+    out.push({
+      pid,
+      ppid: Number(r.ParentProcessId) || 0,
+      name: winEffectiveName(rawName, cmdline),
+      args: winNormalizedArgs(rawName, cmdline),
+      cmdline
+    });
+  }
+  return out;
+}
+var CACHE_MS = 1500;
+var FAIL_CACHE_MS = 1e4;
+var cache = null;
+function winProcs(now = Date.now()) {
+  if (cache && now - cache.at < (cache.procs ? CACHE_MS : FAIL_CACHE_MS)) return cache.procs;
+  try {
+    const out = execFileSync("powershell.exe", ["-NoProfile", "-NonInteractive", "-Command", WIN_PS_SCRIPT], {
+      encoding: "utf8",
+      stdio: ["ignore", "pipe", "ignore"],
+      maxBuffer: 32 * 1024 * 1024,
+      windowsHide: true,
+      timeout: 15e3
+    });
+    const procs = parseWinProcJson(out);
+    cache = { at: now, procs: procs.length > 0 ? procs : null };
+  } catch {
+    cache = { at: now, procs: null };
+  }
+  return cache.procs;
+}
+
+// src/daemon/autostart.ts
 var run = promisify(execFile);
 var LAUNCH_LABEL = "com.deskbuddy.daemon";
 var SYSTEMD_UNIT = "deskbuddy.service";
@@ -157,6 +275,49 @@ RestartSec=10
 WantedBy=default.target
 `;
 }
+function winStartupVbsPath(appData = process.env.APPDATA ?? join2(homedir2(), "AppData", "Roaming")) {
+  return join2(appData, "Microsoft", "Windows", "Start Menu", "Programs", "Startup", "DeskBuddyDaemon.vbs");
+}
+function vbsQuote(s) {
+  return '"' + s.replace(/"/g, '""') + '"';
+}
+function winStartupVbs(t) {
+  const cmd = `"${t.execPath}" "${t.cliPath}" daemon`;
+  return [
+    "' DeskBuddy \u5B88\u62A4\u8FDB\u7A0B\u5F00\u673A\u81EA\u542F\u3002deskbuddy disable / logout \u4F1A\u5220\u6389\u5B83",
+    `CreateObject("WScript.Shell").Run ${vbsQuote(cmd)}, 0, False`,
+    ""
+  ].join("\r\n");
+}
+function isOurDaemonCmdline(cmdline) {
+  const argv = winSplitArgs(cmdline);
+  const i = argv.findIndex((a) => /(?:^|[\\/])deskbuddy[\\/]dist[\\/]cli\.js$/i.test(a));
+  return i >= 1 && argv[i + 1] === "daemon";
+}
+async function stopPidFileDaemon() {
+  let pid = 0;
+  try {
+    pid = Number(readFileSync2(pidFilePath(), "utf8").trim());
+  } catch {
+    return;
+  }
+  if (!Number.isInteger(pid) || pid <= 0 || pid === process.pid) return;
+  const p = winProcs()?.find((x) => x.pid === pid);
+  if (!p || !isOurDaemonCmdline(p.cmdline)) return;
+  try {
+    process.kill(pid);
+  } catch {
+    return;
+  }
+  for (let i = 0; i < 30; i++) {
+    try {
+      process.kill(pid, 0);
+    } catch {
+      return;
+    }
+    await new Promise((r) => setTimeout(r, 100));
+  }
+}
 function launchAgentPath(home = homedir2()) {
   return join2(home, "Library", "LaunchAgents", `${LAUNCH_LABEL}.plist`);
 }
@@ -167,6 +328,8 @@ function write(path, content) {
   mkdirSync2(dirname(path), { recursive: true });
   writeFileSync2(path, content, "utf8");
 }
+var BOOTSTRAP_RETRIES = 10;
+var BOOTSTRAP_RETRY_MS = 500;
 async function installAutostart(t, platform = process.platform) {
   try {
     if (platform === "darwin") {
@@ -174,29 +337,33 @@ async function installAutostart(t, platform = process.platform) {
       write(p, launchAgentPlist(t));
       await run("launchctl", ["bootout", `gui/${process.getuid?.() ?? 501}/${LAUNCH_LABEL}`]).catch(() => {
       });
-      await run("launchctl", ["bootstrap", `gui/${process.getuid?.() ?? 501}`, p]);
+      for (let i = 0; ; i++) {
+        try {
+          await run("launchctl", ["bootstrap", `gui/${process.getuid?.() ?? 501}`, p]);
+          break;
+        } catch (e) {
+          if (i >= BOOTSTRAP_RETRIES) throw e;
+          await new Promise((r) => setTimeout(r, BOOTSTRAP_RETRY_MS));
+        }
+      }
       return { ok: true, message: "\u5DF2\u8BBE\u7F6E\u5F00\u673A\u81EA\u542F\uFF08launchd\uFF09" };
     }
     if (platform === "linux") {
       write(systemdUnitPath(), systemdUnit(t));
       await run("systemctl", ["--user", "daemon-reload"]);
       await run("systemctl", ["--user", "enable", "--now", SYSTEMD_UNIT]);
+      await run("systemctl", ["--user", "restart", SYSTEMD_UNIT]);
       return { ok: true, message: "\u5DF2\u8BBE\u7F6E\u5F00\u673A\u81EA\u542F\uFF08systemd --user\uFF09" };
     }
     if (platform === "win32") {
-      await run("schtasks", [
-        "/create",
-        "/f",
-        "/sc",
-        "onlogon",
-        "/rl",
-        "LIMITED",
-        "/tn",
-        SCHTASK_NAME,
-        "/tr",
-        `"${t.execPath}" "${t.cliPath}" daemon`
-      ]);
-      return { ok: true, message: "\u5DF2\u8BBE\u7F6E\u5F00\u673A\u81EA\u542F\uFF08\u8BA1\u5212\u4EFB\u52A1\uFF09" };
+      const p = winStartupVbsPath();
+      mkdirSync2(dirname(p), { recursive: true });
+      writeFileSync2(p, "\uFEFF" + winStartupVbs(t), "utf16le");
+      await run("schtasks", ["/delete", "/f", "/tn", SCHTASK_NAME], { windowsHide: true }).catch(() => {
+      });
+      await stopPidFileDaemon();
+      spawn("wscript.exe", [p], { detached: true, stdio: "ignore", windowsHide: true }).unref();
+      return { ok: true, message: "\u5DF2\u8BBE\u7F6E\u5F00\u673A\u81EA\u542F\uFF08\u300C\u542F\u52A8\u300D\u6587\u4EF6\u5939\uFF09" };
     }
     return { ok: false, message: `\u6682\u4E0D\u652F\u6301\u5728 ${platform} \u4E0A\u8BBE\u7F6E\u5F00\u673A\u81EA\u542F\uFF0C\u8BF7\u81EA\u884C\u5E38\u9A7B\u8FD0\u884C deskbuddy daemon` };
   } catch (e) {
@@ -222,8 +389,11 @@ async function uninstallAutostart(platform = process.platform) {
       return { ok: true, message: "\u5DF2\u53D6\u6D88\u5F00\u673A\u81EA\u542F" };
     }
     if (platform === "win32") {
-      await run("schtasks", ["/delete", "/f", "/tn", SCHTASK_NAME]).catch(() => {
+      await run("schtasks", ["/delete", "/f", "/tn", SCHTASK_NAME], { windowsHide: true }).catch(() => {
       });
+      const p = winStartupVbsPath();
+      if (existsSync2(p)) rmSync(p, { force: true });
+      await stopPidFileDaemon();
       return { ok: true, message: "\u5DF2\u53D6\u6D88\u5F00\u673A\u81EA\u542F" };
     }
     return { ok: true, message: "" };
@@ -242,14 +412,16 @@ import { basename as basename6 } from "path";
 import WebSocket2 from "ws";
 
 // src/adapters/ocPlugin.ts
-import { existsSync as existsSync3, mkdirSync as mkdirSync3, readFileSync as readFileSync2, renameSync as renameSync2, unlinkSync, writeFileSync as writeFileSync3 } from "fs";
+import { existsSync as existsSync3, mkdirSync as mkdirSync3, readFileSync as readFileSync3, renameSync as renameSync2, unlinkSync, writeFileSync as writeFileSync3 } from "fs";
 import { dirname as dirname2, join as join3 } from "path";
+import { pathToFileURL } from "url";
 var OC_MARKER = "// deskbuddy:opencode-plugin";
-function ocPluginSource(pluginModule, nodePath) {
+function ocPluginSource(pluginModule, nodePath, platform = process.platform) {
+  const spec = platform === "win32" ? pathToFileURL(pluginModule).href : pluginModule;
   return [
     OC_MARKER,
     "// \u7531 deskbuddy enable opencode \u751F\u6210\uFF0Cdeskbuddy disable opencode \u4F1A\u5220\u6389\u5B83\u3002",
-    `import { make } from ${JSON.stringify(pluginModule)}`,
+    `import { make } from ${JSON.stringify(spec)}`,
     `export const DeskBuddy = make({ node: ${JSON.stringify(nodePath)} })`,
     ""
   ].join("\n");
@@ -258,7 +430,7 @@ function ocPluginModule(hookPath) {
   return join3(dirname2(hookPath), "opencode.mjs");
 }
 function installOcPlugin(pluginPath, hookPath, nodePath) {
-  if (existsSync3(pluginPath) && !readFileSync2(pluginPath, "utf8").includes(OC_MARKER)) {
+  if (existsSync3(pluginPath) && !readFileSync3(pluginPath, "utf8").includes(OC_MARKER)) {
     throw new Error(`${pluginPath} \u5DF2\u5B58\u5728\u4E14\u4E0D\u662F DeskBuddy \u751F\u6210\u7684\uFF0C\u8BF7\u5148\u632A\u8D70\u518D\u91CD\u8BD5`);
   }
   mkdirSync3(dirname2(pluginPath), { recursive: true });
@@ -268,13 +440,13 @@ function installOcPlugin(pluginPath, hookPath, nodePath) {
 }
 function uninstallOcPlugin(pluginPath) {
   try {
-    if (readFileSync2(pluginPath, "utf8").includes(OC_MARKER)) unlinkSync(pluginPath);
+    if (readFileSync3(pluginPath, "utf8").includes(OC_MARKER)) unlinkSync(pluginPath);
   } catch {
   }
 }
 function isOcPluginInstalled(pluginPath) {
   try {
-    return readFileSync2(pluginPath, "utf8").includes(OC_MARKER);
+    return readFileSync3(pluginPath, "utf8").includes(OC_MARKER);
   } catch {
     return false;
   }
@@ -282,14 +454,16 @@ function isOcPluginInstalled(pluginPath) {
 var OC_NOTICE = "   \u5DF2\u5F00\u7740\u7684 opencode \u7A97\u53E3\u91CD\u5F00\u540E\u751F\u6548";
 
 // src/core/state.ts
-import { existsSync as existsSync4, mkdirSync as mkdirSync4, readdirSync, readFileSync as readFileSync3, renameSync as renameSync3, rmSync as rmSync2, writeFileSync as writeFileSync4 } from "fs";
+import { existsSync as existsSync4, mkdirSync as mkdirSync4, readdirSync, readFileSync as readFileSync4, renameSync as renameSync3, rmSync as rmSync2, writeFileSync as writeFileSync4 } from "fs";
 import { join as join4 } from "path";
 
 // src/core/process.ts
-import { execFileSync } from "child_process";
+import { execFileSync as execFileSync2 } from "child_process";
+var WIN = process.platform === "win32";
 function processName(pid) {
+  if (WIN) return winProcs()?.find((p) => p.pid === pid)?.name ?? null;
   try {
-    const out = execFileSync("ps", ["-p", String(pid), "-o", "comm="], {
+    const out = execFileSync2("ps", ["-p", String(pid), "-o", "comm="], {
       encoding: "utf8",
       stdio: ["ignore", "pipe", "ignore"]
     });
@@ -307,6 +481,12 @@ function isAlive(pid, expectName) {
     return false;
   }
   if (!expectName) return true;
+  if (WIN) {
+    const procs = winProcs();
+    if (!procs) return true;
+    const p = procs.find((x) => x.pid === pid);
+    return !!p && p.name.toLowerCase().includes(expectName.toLowerCase());
+  }
   const name = processName(pid);
   return name != null && name.toLowerCase().includes(expectName.toLowerCase());
 }
@@ -321,7 +501,7 @@ function statePath(sessionId) {
 }
 function readState(sessionId) {
   try {
-    return JSON.parse(readFileSync3(statePath(sessionId), "utf8"));
+    return JSON.parse(readFileSync4(statePath(sessionId), "utf8"));
   } catch {
     return null;
   }
@@ -339,7 +519,7 @@ function readAliveStates(tool) {
     if (!file.endsWith(".json")) continue;
     let s;
     try {
-      s = JSON.parse(readFileSync3(join4(stateDir(), file), "utf8"));
+      s = JSON.parse(readFileSync4(join4(stateDir(), file), "utf8"));
     } catch {
       rmSync2(join4(stateDir(), file), { force: true });
       continue;
@@ -372,7 +552,7 @@ var ALIAS_TTL_MS = 7 * 24 * 60 * 60 * 1e3;
 function resolveAlias(sessionId, now = Date.now()) {
   let map = {};
   try {
-    map = JSON.parse(readFileSync3(join4(deskbuddyHome(), "alias.json"), "utf8")) || {};
+    map = JSON.parse(readFileSync4(join4(deskbuddyHome(), "alias.json"), "utf8")) || {};
   } catch {
     return sessionId;
   }
@@ -386,13 +566,13 @@ function resolveAlias(sessionId, now = Date.now()) {
 }
 
 // src/core/api.ts
-import { execFileSync as execFileSync2 } from "child_process";
+import { execFileSync as execFileSync3 } from "child_process";
 import { createHash, randomBytes, randomUUID as randomUUID2 } from "crypto";
-import { readFileSync as readFileSync5 } from "fs";
+import { readFileSync as readFileSync6 } from "fs";
 import { release } from "os";
 
 // src/core/hookFile.ts
-import { copyFileSync, existsSync as existsSync5, mkdirSync as mkdirSync5, readFileSync as readFileSync4, renameSync as renameSync4, writeFileSync as writeFileSync5 } from "fs";
+import { copyFileSync, existsSync as existsSync5, mkdirSync as mkdirSync5, readFileSync as readFileSync5, renameSync as renameSync4, writeFileSync as writeFileSync5 } from "fs";
 import { createRequire } from "module";
 import { dirname as dirname3, join as join5 } from "path";
 import { fileURLToPath as fileURLToPath2 } from "url";
@@ -427,7 +607,7 @@ function hookVersionPath(target = installedHookPath()) {
 }
 function installedHookVersion(target = installedHookPath()) {
   try {
-    return readFileSync4(hookVersionPath(target), "utf8").trim() || null;
+    return readFileSync5(hookVersionPath(target), "utf8").trim() || null;
   } catch {
     return null;
   }
@@ -471,6 +651,8 @@ var SERVICES = {
   confirmAuth: "com.shifeng.api.service.api.v2.deskbuddy.deskbuddyconfirmauthapi"
 };
 var DIRS_SERVICE = "com.shifeng.api.service.api.v2.deskbuddy.deskbuddyclientdirsreportapi";
+var INSTALL_REDEEM_SERVICE = "com.shifeng.api.service.api.v2.deskbuddy.deskbuddyinstallredeemapi";
+var CMD_RESULT_SERVICE = "com.shifeng.api.service.api.v2.deskbuddy.deskbuddycommandresultapi";
 var APPROVAL_SERVICES = {
   create: "com.shifeng.api.service.api.v2.deskbuddy.deskbuddyapprovalcreateapi",
   cancel: "com.shifeng.api.service.api.v2.deskbuddy.deskbuddyapprovalcancelapi",
@@ -537,12 +719,12 @@ function humanOs(platform = process.platform) {
   return known[platform] ?? platform;
 }
 var defaultOsVersionDeps = {
-  runSwVers: () => execFileSync2("sw_vers", ["-productVersion"], {
+  runSwVers: () => execFileSync3("sw_vers", ["-productVersion"], {
     encoding: "utf8",
     stdio: ["ignore", "pipe", "ignore"],
     timeout: 2e3
   }),
-  readOsRelease: () => readFileSync5("/etc/os-release", "utf8"),
+  readOsRelease: () => readFileSync6("/etc/os-release", "utf8"),
   kernelRelease: () => release()
 };
 function productOsVersion(platform = process.platform, deps = defaultOsVersionDeps) {
@@ -608,7 +790,10 @@ var api = {
   approvalCreate: (payload) => call(APPROVAL_SERVICES.create, payload),
   approvalCancel: (approvalId, reason) => call(APPROVAL_SERVICES.cancel, { approvalId, reason }),
   approvalSync: (approvalIds) => call(APPROVAL_SERVICES.sync, { approvalIds }),
-  dirsReport: (payload) => call(DIRS_SERVICE, payload)
+  dirsReport: (payload) => call(DIRS_SERVICE, payload),
+  installRedeem: (installCode, clientId, hostName) => call(INSTALL_REDEEM_SERVICE, { installCode, clientId, hostName, ...machineInfo() }),
+  // 2 秒超时、失败不重试（spec §4.1）：回报丢了只是设备少一句提示，任务状态仍由会话快照负责
+  commandResult: (payload) => call(CMD_RESULT_SERVICE, payload, 2e3)
 };
 
 // src/core/report.ts
@@ -623,7 +808,8 @@ async function postReport(payload) {
 import { basename as basename2 } from "path";
 var KEEPALIVE_MS = 2 * 60 * 1e3;
 var MAX_SESSIONS = 20;
-function buildSnapshot(states, tool, cfg, nowMs) {
+var CAPS = ["cmd_result", "window_inject"];
+function buildSnapshot(states, tool, cfg, nowMs, remote) {
   const sessions = states.filter((s) => s.tool === tool).sort((a, b) => b.updatedAt - a.updatedAt).slice(0, MAX_SESSIONS).map((s) => ({
     sessionId: s.sessionId,
     title: s.title,
@@ -632,14 +818,15 @@ function buildSnapshot(states, tool, cfg, nowMs) {
     state: s.state,
     startedAt: s.startedAt,
     updatedAt: s.updatedAt,
-    interactive: s.interactive === true
+    interactive: s.interactive === true,
+    remoteWindow: remote ? remote.has(s.sessionId) : s.remoteWindow === true
   }));
-  return { clientId: cfg.clientId, hostName: cfg.hostName, tool, snapshotAt: nowMs, sessions };
+  return { clientId: cfg.clientId, hostName: cfg.hostName, tool, snapshotAt: nowMs, sessions, caps: [...CAPS] };
 }
 
 // src/core/dirs.ts
 import { createHmac, randomBytes as randomBytes2 } from "crypto";
-import { chmodSync, existsSync as existsSync6, mkdirSync as mkdirSync6, readFileSync as readFileSync6, writeFileSync as writeFileSync6 } from "fs";
+import { chmodSync, existsSync as existsSync6, mkdirSync as mkdirSync6, readFileSync as readFileSync7, writeFileSync as writeFileSync6 } from "fs";
 import { basename as basename3, join as join6 } from "path";
 var DIRS_REPORT_MAX = 10;
 function dirsPath() {
@@ -648,7 +835,7 @@ function dirsPath() {
 function dirSecret() {
   const file = join6(deskbuddyHome(), "dir-secret");
   try {
-    const s2 = readFileSync6(file, "utf8").trim();
+    const s2 = readFileSync7(file, "utf8").trim();
     if (s2) return s2;
   } catch {
   }
@@ -666,7 +853,7 @@ function dirRef(path) {
 }
 function readMap() {
   try {
-    const m = JSON.parse(readFileSync6(dirsPath(), "utf8"));
+    const m = JSON.parse(readFileSync7(dirsPath(), "utf8"));
     const out = {};
     for (const [k, v] of Object.entries(m ?? {})) if (typeof v === "number") out[k] = v;
     return out;
@@ -762,7 +949,7 @@ function isExpired(cmd, now = Date.now()) {
 }
 
 // src/daemon/executor.ts
-import { execFile as execFile2 } from "child_process";
+import { execFile as execFile2, execFileSync as execFileSync4 } from "child_process";
 import { homedir as homedir4 } from "os";
 import { join as join8 } from "path";
 
@@ -776,6 +963,19 @@ function waitModeFor(tool) {
 function shQuote(s) {
   return `'${s.replace(/'/g, `'\\''`)}'`;
 }
+function fwdSlash(p) {
+  return p.replace(/\\/g, "/");
+}
+function winBare(p) {
+  const f = fwdSlash(p);
+  return /^[A-Za-z0-9_.:/~+@\-\u0080-\uFFFF]+$/.test(f) ? f : null;
+}
+function winCmdPath(p) {
+  return winBare(p) ?? `"${fwdSlash(p)}"`;
+}
+function winPsPath(p) {
+  return winBare(p) ?? `'${fwdSlash(p).replace(/'/g, "''")}'`;
+}
 function defaultGateScript() {
   const candidates = [
     fileURLToPath3(new URL("./gate.cjs", import.meta.url)),
@@ -783,17 +983,17 @@ function defaultGateScript() {
   ];
   return candidates.find((p) => existsSync7(p)) ?? candidates[0];
 }
-function gateCommand(t) {
+function gateCommand(t, platform = process.platform) {
+  if (platform === "win32") return winGateCommand(t);
   return `${shQuote(t.nodePath)} ${shQuote(t.gateScript)} --run ${t.runId} || exit 2`;
 }
-function ccSettingsJson(t) {
-  return JSON.stringify({
-    hooks: {
-      PreToolUse: [
-        { matcher: "*", hooks: [{ type: "command", command: gateCommand(t), timeout: GATE_HOOK_TIMEOUT_S }] }
-      ]
-    }
-  });
+function winGateCommand(t) {
+  return `node ${winPsPath(t.gateScript)} --run ${t.runId}; if (-not $? -or $LASTEXITCODE -ne 0) { exit 2 }`;
+}
+function ccSettingsJson(t, platform = process.platform) {
+  const entry = { type: "command", command: gateCommand(t, platform), timeout: GATE_HOOK_TIMEOUT_S };
+  if (platform === "win32") entry.shell = "powershell";
+  return JSON.stringify({ hooks: { PreToolUse: [{ matcher: "*", hooks: [entry] }] } });
 }
 function codexGateArgs(t) {
   const hook = `hooks.PreToolUse=[{matcher="*",hooks=[{type="command",command=${JSON.stringify(gateCommand(t))},timeout=${GATE_HOOK_TIMEOUT_S}}]}]`;
@@ -809,7 +1009,7 @@ function codexGateArgs(t) {
 }
 
 // src/daemon/locate.ts
-import { accessSync, constants, existsSync as existsSync8, statSync } from "fs";
+import { accessSync, constants, existsSync as existsSync8, readFileSync as readFileSync8, statSync } from "fs";
 import { homedir as homedir3 } from "os";
 import { delimiter, dirname as dirname4, join as join7 } from "path";
 var defaultLocateDeps = () => ({
@@ -825,9 +1025,33 @@ var defaultLocateDeps = () => ({
       return false;
     }
   },
-  exists: (p) => existsSync8(p)
+  exists: (p) => existsSync8(p),
+  platform: process.platform,
+  appData: process.env.APPDATA ?? "",
+  localAppData: process.env.LOCALAPPDATA ?? "",
+  readText: (p) => {
+    try {
+      return readFileSync8(p, "utf8");
+    } catch {
+      return null;
+    }
+  },
+  // 🔴 daemon 自己也不能找到垫片：远程任务要的是真程序（窗口接管 spec 2026-09-30 §3.1）
+  skipDirs: [join7(deskbuddyHome(), "bin")]
 });
-function extraBinDirs(home, nodePath = "") {
+var isWin = (d) => (d.platform ?? process.platform) === "win32";
+var WIN_EXTS = [".exe", ".cmd", ".bat"];
+function extraBinDirs(home, nodePath = "", win) {
+  if (win) {
+    return [
+      join7(home, ".local", "bin"),
+      ...win.appData ? [join7(win.appData, "npm")] : [],
+      join7(home, ".bun", "bin"),
+      ...win.localAppData ? [join7(win.localAppData, "Volta", "bin")] : [],
+      join7(home, "scoop", "shims"),
+      ...nodePath ? [dirname4(nodePath)] : []
+    ];
+  }
   return [
     join7(home, ".local", "bin"),
     join7(home, ".claude", "local"),
@@ -840,19 +1064,110 @@ function extraBinDirs(home, nodePath = "") {
   ];
 }
 function whichIn(name, d) {
-  const dirs = [...d.path.split(delimiter).filter(Boolean), ...extraBinDirs(d.home, d.nodePath)];
-  for (const dir of dirs) {
-    const p = join7(dir, name);
-    if (d.isExecutable(p)) return p;
+  return whichAllIn(name, d)[0] ?? null;
+}
+function whichAllIn(name, d) {
+  const exts = isWin(d) ? WIN_EXTS : [""];
+  const out = [];
+  for (const dir of binDirs(d)) {
+    for (const ext of exts) {
+      const p = join7(dir, name + ext);
+      if (d.isExecutable(p)) out.push(p);
+    }
   }
+  return out;
+}
+function binDirs(d) {
+  const win = isWin(d);
+  const sep2 = win ? ";" : delimiter;
+  const all = [
+    ...d.path.split(sep2).filter(Boolean),
+    ...extraBinDirs(d.home, d.nodePath, win ? { appData: d.appData, localAppData: d.localAppData } : void 0)
+  ];
+  if (!d.skipDirs || d.skipDirs.length === 0) return all;
+  const key = (p) => {
+    const t = p.replace(/[\\/]+$/, "");
+    return win ? t.replace(/\//g, "\\").toLowerCase() : t;
+  };
+  const skip = new Set(d.skipDirs.map(key));
+  return all.filter((p) => !skip.has(key(p)));
+}
+function parseNpmCmdShim(shimPath, text) {
+  const m = text.match(/"%~?dp0%?\\?([^"%]+)"\s+%\*/i);
+  if (!m) return null;
+  return join7(dirname4(shimPath), m[1].replace(/^\\/, ""));
+}
+function resolveWinLaunch(file, d) {
+  const lower = file.toLowerCase();
+  if (lower.endsWith(".exe") || lower.endsWith(".com")) return { file, prefixArgs: [] };
+  if (lower.endsWith(".cmd") || lower.endsWith(".bat")) {
+    const text = d.readText?.(file);
+    const target = text ? parseNpmCmdShim(file, text) : null;
+    if (!target || !d.exists(target)) return null;
+    if (/\.(?:cmd|bat)$/i.test(target)) return null;
+    return resolveWinLaunch(target, d);
+  }
+  if (/\.(?:c|m)?js$/.test(lower)) return { file: d.nodePath, prefixArgs: [file] };
+  const head = d.readText?.(file)?.slice(0, 200) ?? "";
+  if (/^#!.*\bnode\b/.test(head)) return { file: d.nodePath, prefixArgs: [file] };
   return null;
 }
 function appDirs(home) {
   return ["/Applications", join7(home, "Applications")];
 }
+function winAppDirs(d, product) {
+  return [
+    ...d.localAppData ? [join7(d.localAppData, "Programs", product)] : [],
+    join7("C:\\Program Files", product)
+  ];
+}
+var WORKBUDDY_CLI_IN_WIN_APP = "resources/app.asar.unpacked/cli/bin/codebuddy";
+var QODER_CN_WORKER_IN_WIN_APP = "resources/app.asar.unpacked/node_modules/@qoder-ai/qoder-cn-agent-sdk/dist/_worker/qoder-worker-runtime.obf.mjs";
+function locateWin(tool, d) {
+  const plain = (name) => {
+    for (const f of whichAllIn(name, d)) {
+      const r = resolveWinLaunch(f, d);
+      if (r) return r;
+    }
+    return null;
+  };
+  switch (tool) {
+    case "claude_code":
+      return plain("claude");
+    case "codex":
+      return plain("codex");
+    case "workbuddy": {
+      for (const dir of winAppDirs(d, "WorkBuddy")) {
+        for (const ext of [".exe", ".cmd", ""]) {
+          const p = join7(dir, WORKBUDDY_CLI_IN_WIN_APP + ext);
+          if (d.exists(p)) {
+            const r = resolveWinLaunch(p, d);
+            if (r) return r;
+          }
+        }
+      }
+      return plain("codebuddy");
+    }
+    case "qoder": {
+      for (const dir of winAppDirs(d, "Qoder CN")) {
+        const p = join7(dir, QODER_CN_WORKER_IN_WIN_APP);
+        if (d.exists(p)) return { file: d.nodePath, prefixArgs: [p] };
+      }
+      return plain("qodercli");
+    }
+    case "opencode": {
+      const p = join7(d.home, ".opencode", "bin", "opencode.exe");
+      if (d.exists(p)) return { file: p, prefixArgs: [] };
+      return plain("opencode");
+    }
+    default:
+      return null;
+  }
+}
 var WORKBUDDY_CLI_IN_APP = "WorkBuddy.app/Contents/Resources/app.asar.unpacked/cli/bin/codebuddy";
 var QODER_CN_WORKER_IN_APP = "Qoder CN.app/Contents/Resources/app.asar.unpacked/node_modules/@qoder-ai/qoder-cn-agent-sdk/dist/_worker/qoder-worker-runtime.obf.mjs";
 function locate(tool, d = defaultLocateDeps()) {
+  if (isWin(d)) return locateWin(tool, d);
   const plain = (name) => {
     const f = whichIn(name, d);
     return f ? { file: f, prefixArgs: [] } : null;
@@ -887,7 +1202,8 @@ function locate(tool, d = defaultLocateDeps()) {
 }
 function childPath(d = defaultLocateDeps()) {
   const seen = /* @__PURE__ */ new Set();
-  return [...d.path.split(delimiter), ...extraBinDirs(d.home, d.nodePath)].filter((p) => p && !seen.has(p) && (seen.add(p), true)).join(delimiter);
+  const key = (p) => isWin(d) ? p.toLowerCase() : p;
+  return binDirs(d).filter((p) => p && !seen.has(key(p)) && (seen.add(key(p)), true)).join(isWin(d) ? ";" : delimiter);
 }
 
 // src/daemon/executor.ts
@@ -992,21 +1308,21 @@ function materialize(plan, tool, d = defaultLocateDeps()) {
     env: { ...plan.env, PATH: childPath(d) }
   };
 }
-function isDeferred(stdout6) {
+function isDeferred(stdout7) {
   try {
-    return JSON.parse(stdout6).stop_reason === "tool_deferred";
+    return JSON.parse(stdout7).stop_reason === "tool_deferred";
   } catch {
     return false;
   }
 }
-function parseClaudeSessionId(stdout6) {
+function parseClaudeSessionId(stdout7) {
   const pick = (o) => {
     const d = o ?? {};
     const v = d.session_id ?? d.sessionId;
     return typeof v === "string" && v ? v : null;
   };
   try {
-    const d = JSON.parse(stdout6);
+    const d = JSON.parse(stdout7);
     if (Array.isArray(d)) {
       for (const m of d) {
         const id = pick(m);
@@ -1019,8 +1335,8 @@ function parseClaudeSessionId(stdout6) {
     return null;
   }
 }
-function parseCodexSessionId(stdout6) {
-  for (const line of stdout6.split("\n")) {
+function parseCodexSessionId(stdout7) {
+  for (const line of stdout7.split("\n")) {
     const t = line.trim();
     if (!t) continue;
     try {
@@ -1034,8 +1350,8 @@ function parseCodexSessionId(stdout6) {
   }
   return null;
 }
-function parseOpencodeSessionId(stdout6) {
-  for (const line of stdout6.split("\n")) {
+function parseOpencodeSessionId(stdout7) {
+  for (const line of stdout7.split("\n")) {
     const t = line.trim();
     if (!t) continue;
     try {
@@ -1048,10 +1364,10 @@ function parseOpencodeSessionId(stdout6) {
   }
   return null;
 }
-function parseSessionId(tool, stdout6) {
-  if (tool === "codex") return parseCodexSessionId(stdout6);
-  if (tool === "opencode") return parseOpencodeSessionId(stdout6);
-  return parseClaudeSessionId(stdout6);
+function parseSessionId(tool, stdout7) {
+  if (tool === "codex") return parseCodexSessionId(stdout7);
+  if (tool === "opencode") return parseOpencodeSessionId(stdout7);
+  return parseClaudeSessionId(stdout7);
 }
 function startCommand(plan, tool, limitMs = EXEC_TIMEOUT_MS) {
   let remaining = limitMs;
@@ -1064,11 +1380,11 @@ function startCommand(plan, tool, limitMs = EXEC_TIMEOUT_MS) {
     startedAt = Date.now();
     timer = setTimeout(() => {
       timedOut = true;
-      child?.kill("SIGTERM");
+      killTree(child);
     }, Math.max(0, remaining));
   };
   let timedOut = false;
-  const done = new Promise((resolve3) => {
+  const done = new Promise((resolve5) => {
     child = execFile2(
       plan.file,
       plan.args,
@@ -1076,18 +1392,20 @@ function startCommand(plan, tool, limitMs = EXEC_TIMEOUT_MS) {
         cwd: plan.cwd,
         maxBuffer: EXEC_MAX_BUFFER,
         // agent 自己要读 PATH 里的东西，环境原样继承
-        env: { ...process.env, ...plan.env }
+        env: mergeEnv(process.env, plan.env),
+        // Windows：别给子进程弹黑框
+        windowsHide: true
       },
-      (err, stdout6) => {
+      (err, stdout7) => {
         finished = true;
         if (timer) clearTimeout(timer);
-        const out = String(stdout6 ?? "");
+        const out = String(stdout7 ?? "");
         if (err || timedOut) {
           const msg = timedOut ? `\u6267\u884C\u8D85\u8FC7 ${Math.round(limitMs / 1e3)} \u79D2\u6D3B\u52A8\u65F6\u95F4\uFF0C\u5DF2\u7EC8\u6B62` : err.message;
-          resolve3({ ok: false, sessionId: parseSessionId(tool, out), stdout: out, error: msg });
+          resolve5({ ok: false, sessionId: parseSessionId(tool, out), stdout: out, error: msg });
           return;
         }
-        resolve3({ ok: true, sessionId: parseSessionId(tool, out), stdout: out });
+        resolve5({ ok: true, sessionId: parseSessionId(tool, out), stdout: out });
       }
     );
     child?.stdin?.end();
@@ -1109,10 +1427,31 @@ function startCommand(plan, tool, limitMs = EXEC_TIMEOUT_MS) {
     }
   };
 }
+function mergeEnv(base, extra, platform = process.platform) {
+  const env = { ...base };
+  for (const [k, v] of Object.entries(extra ?? {})) {
+    if (platform === "win32") {
+      for (const old of Object.keys(env)) if (old !== k && old.toUpperCase() === k.toUpperCase()) delete env[old];
+    }
+    env[k] = v;
+  }
+  return env;
+}
+function killTree(child) {
+  if (!child) return;
+  if (process.platform === "win32" && child.pid) {
+    try {
+      execFileSync4("taskkill", ["/pid", String(child.pid), "/T", "/F"], { stdio: "ignore", windowsHide: true });
+      return;
+    } catch {
+    }
+  }
+  child.kill("SIGTERM");
+}
 
 // src/daemon/gate/approvals.ts
 import { createHash as createHash2 } from "crypto";
-import { mkdirSync as mkdirSync7, readFileSync as readFileSync7, renameSync as renameSync5, writeFileSync as writeFileSync7 } from "fs";
+import { mkdirSync as mkdirSync7, readFileSync as readFileSync9, renameSync as renameSync5, writeFileSync as writeFileSync7 } from "fs";
 import { join as join9 } from "path";
 var RETAIN_MS = 7 * 24 * 60 * 60 * 1e3;
 function fingerprint(toolName, toolInput) {
@@ -1134,7 +1473,7 @@ var ApprovalStore = class _ApprovalStore {
   }
   static load() {
     try {
-      const raw = JSON.parse(readFileSync7(storePath(), "utf8"));
+      const raw = JSON.parse(readFileSync9(storePath(), "utf8"));
       return new _ApprovalStore(Array.isArray(raw) ? raw : []);
     } catch {
       return new _ApprovalStore();
@@ -1330,12 +1669,12 @@ function isReadOnlyCommand(command) {
 }
 function classify(toolName, toolInput, cwd, policy = "commands", opts = {}) {
   const roots = (Array.isArray(cwd) ? cwd : [cwd]).filter(Boolean);
-  const real = opts.real;
+  const real2 = opts.real;
   const inside = (p) => {
     if (!roots.some((r) => isInside(r, p))) return false;
-    if (!real) return true;
-    const rp = real(resolve(roots[0] ?? "/", p));
-    return roots.some((r) => isInside(real(r), rp));
+    if (!real2) return true;
+    const rp = real2(resolve(roots[0] ?? "/", p));
+    return roots.some((r) => isInside(real2(r), rp));
   };
   const rel = (p) => {
     const r = roots.find((x) => isInside(x, p)) ?? roots[0] ?? "";
@@ -1352,7 +1691,7 @@ function classify(toolName, toolInput, cwd, policy = "commands", opts = {}) {
   if (paths) {
     const allInside = paths.length > 0 && paths.every(inside);
     const touchesProtected = paths.some(
-      (p) => isProtectedPath(roots[0] ?? "/", p) || (real ? isProtectedPath("/", real(resolve(roots[0] ?? "/", p))) : false)
+      (p) => isProtectedPath(roots[0] ?? "/", p) || (real2 ? isProtectedPath("/", real2(resolve(roots[0] ?? "/", p))) : false)
     );
     if (policy === "commands" && allInside && !touchesProtected) return { action: "auto" };
     const shown = paths.map((p) => inside(p) ? rel(p) : p);
@@ -1375,11 +1714,14 @@ function describe(toolName, toolInput, cwd) {
 }
 
 // src/daemon/gate/procs.ts
-import { execFileSync as execFileSync3 } from "child_process";
+import { execFileSync as execFileSync5 } from "child_process";
 function listDescendants(rootPid) {
+  if (process.platform === "win32") {
+    return descendantsOf(rootPid, (winProcs() ?? []).map((p) => ({ pid: p.pid, ppid: p.ppid, args: p.cmdline })));
+  }
   let out = "";
   try {
-    out = execFileSync3("ps", ["-A", "-ww", "-o", "pid=,ppid=,args="], {
+    out = execFileSync5("ps", ["-A", "-ww", "-o", "pid=,ppid=,args="], {
       encoding: "utf8",
       stdio: ["ignore", "pipe", "ignore"],
       maxBuffer: 16 * 1024 * 1024
@@ -1387,19 +1729,28 @@ function listDescendants(rootPid) {
   } catch {
     return [];
   }
-  const kids = /* @__PURE__ */ new Map();
+  const rows = [];
   for (const line of out.split("\n")) {
     const m = line.match(/^\s*(\d+)\s+(\d+)\s+(.*)$/);
-    if (!m) continue;
-    const pp = Number(m[2]);
-    const list = kids.get(pp) ?? [];
-    list.push({ pid: Number(m[1]), args: m[3] });
-    kids.set(pp, list);
+    if (m) rows.push({ pid: Number(m[1]), ppid: Number(m[2]), args: m[3] });
+  }
+  return descendantsOf(rootPid, rows);
+}
+function descendantsOf(rootPid, rows) {
+  const kids = /* @__PURE__ */ new Map();
+  for (const r of rows) {
+    if (r.pid === r.ppid) continue;
+    const list = kids.get(r.ppid) ?? [];
+    list.push({ pid: r.pid, args: r.args });
+    kids.set(r.ppid, list);
   }
+  const seen = /* @__PURE__ */ new Set([rootPid]);
   const res = [];
   const stack = [rootPid];
   while (stack.length > 0) {
     for (const c of kids.get(stack.pop()) ?? []) {
+      if (seen.has(c.pid)) continue;
+      seen.add(c.pid);
       res.push(c);
       stack.push(c.pid);
     }
@@ -1428,9 +1779,9 @@ function pickRememberSuggestion(suggestions) {
   return null;
 }
 var DEVICE_FALLBACK = "\u684C\u9762\u642D\u5B50";
-function windowNotice(decision, summary, deviceName = "") {
+function windowNotice(decision, summary2, deviceName = "") {
   const who = deviceName ? `\u300C${deviceName}\u300D` : DEVICE_FALLBACK;
-  const what = summary.length > 60 ? summary.slice(0, 59) + "\u2026" : summary;
+  const what = summary2.length > 60 ? summary2.slice(0, 59) + "\u2026" : summary2;
   return decision === "allow" ? `\u2705 \u5DF2\u5728${who}\u4E0A\u5141\u8BB8\uFF1A${what}` : `\u274C \u5DF2\u5728${who}\u4E0A\u62D2\u7EDD\uFF1A${what}`;
 }
 var WINDOW_SKIP_TOOLS = /* @__PURE__ */ new Set(["AskUserQuestion", "ExitPlanMode"]);
@@ -1463,17 +1814,17 @@ var ApprovalCoordinator = class {
   sessionOf(runId) {
     return this.#runs.get(runId)?.sessionId ?? "";
   }
-  async onGate(req, signal) {
-    if (req.window) return this.#onWindow(req.hook, signal, req.tool || "claude_code");
-    const run2 = this.#runs.get(req.runId ?? "");
+  async onGate(req2, signal) {
+    if (req2.window) return this.#onWindow(req2.hook, signal, req2.tool || "claude_code");
+    const run2 = this.#runs.get(req2.runId ?? "");
     if (!run2) return { decision: "deny", reason: REASON_UNKNOWN_RUN };
     if (run2.superseded) return { decision: "deny", reason: REASON_SUPERSEDED };
-    const toolName = typeof req.hook.tool_name === "string" ? req.hook.tool_name : "";
-    const sessionId = typeof req.hook.session_id === "string" && req.hook.session_id || run2.sessionId || "";
+    const toolName = typeof req2.hook.tool_name === "string" ? req2.hook.tool_name : "";
+    const sessionId = typeof req2.hook.session_id === "string" && req2.hook.session_id || run2.sessionId || "";
     if (sessionId && !run2.sessionId) run2.sessionId = sessionId;
-    const v = classify(toolName, req.hook.tool_input, cwdForms(run2.cwd), this.#d.policy(), { real: realpathNearest });
+    const v = classify(toolName, req2.hook.tool_input, cwdForms(run2.cwd), this.#d.policy(), { real: realpathNearest });
     if (v.action === "auto") return { decision: "allow" };
-    const fp = fingerprint(toolName, req.hook.tool_input);
+    const fp = fingerprint(toolName, req2.hook.tool_input);
     const store = this.#d.store;
     if (run2.mode === "defer" && sessionId) {
       const prev = store.latestFor(sessionId, fp);
@@ -1502,7 +1853,7 @@ var ApprovalCoordinator = class {
     store.save();
     let early = null;
     let settle;
-    const decided = new Promise((resolve3) => settle = resolve3);
+    const decided = new Promise((resolve5) => settle = resolve5);
     this.#waiters.set(rec.approvalId, (r) => {
       early = r;
       settle(r);
@@ -1526,8 +1877,8 @@ var ApprovalCoordinator = class {
     }
     run2.onWaitStart?.();
     try {
-      return await new Promise((resolve3) => {
-        void decided.then(resolve3);
+      return await new Promise((resolve5) => {
+        void decided.then(resolve5);
         const onAbort = () => {
           if (!this.#waiters.delete(rec.approvalId)) return;
           if (rec.status === "pending") {
@@ -1536,7 +1887,7 @@ var ApprovalCoordinator = class {
             store.save();
             void this.#cancelRemote(rec.approvalId, "\u667A\u80FD\u4F53\u8FDB\u7A0B\u5DF2\u7ED3\u675F");
           }
-          resolve3({ decision: "deny", reason: "\u5DF2\u53D6\u6D88" });
+          resolve5({ decision: "deny", reason: "\u5DF2\u53D6\u6D88" });
         };
         if (signal.aborted) onAbort();
         else signal.addEventListener("abort", onAbort, { once: true });
@@ -1559,7 +1910,7 @@ var ApprovalCoordinator = class {
     if (!toolName || !sessionId || WINDOW_SKIP_TOOLS.has(toolName)) return none;
     for (const run2 of this.#runs.values()) if (run2.sessionId === sessionId) return none;
     const store = this.#d.store;
-    const { kind, summary } = describe(toolName, hook.tool_input, cwd ? cwdForms(cwd) : []);
+    const { kind, summary: summary2 } = describe(toolName, hook.tool_input, cwd ? cwdForms(cwd) : []);
     const remember = tool === "claude_code" ? pickRememberSuggestion(hook.permission_suggestions) : null;
     const rec = {
       approvalId: randomUUID3(),
@@ -1569,7 +1920,7 @@ var ApprovalCoordinator = class {
       cwd,
       fingerprint: fingerprint(toolName, hook.tool_input),
       kind,
-      summary,
+      summary: summary2,
       mode: "window",
       status: "pending",
       createdAt: this.#now(),
@@ -1588,7 +1939,7 @@ var ApprovalCoordinator = class {
       ...watchProcs ? { pid, cmd, baseline: new Set(this.#descendants(pid).map((p) => p.pid)) } : {}
     });
     let settle;
-    const decided = new Promise((resolve3) => settle = resolve3);
+    const decided = new Promise((resolve5) => settle = resolve5);
     this.#waiters.set(rec.approvalId, settle);
     try {
       await this.#d.backend.create(rec);
@@ -1604,11 +1955,11 @@ var ApprovalCoordinator = class {
     }
     this.#d.log(`\u7A97\u53E3\u6388\u6743 ${rec.approvalId} \u5DF2\u63A8\u5230\u8BBE\u5907 kind=${rec.kind}`);
     if (rec.status !== "pending") void this.#cancelRemote(rec.approvalId, "\u7535\u8111\u4E0A\u5DF2\u5904\u7406");
-    return new Promise((resolve3) => {
-      void decided.then(resolve3);
+    return new Promise((resolve5) => {
+      void decided.then(resolve5);
       const onAbort = () => {
         if (this.#waiters.has(rec.approvalId)) this.#settleWindow(rec, "hook \u5DF2\u7ED3\u675F");
-        resolve3(none);
+        resolve5(none);
       };
       if (signal.aborted) onAbort();
       else signal.addEventListener("abort", onAbort, { once: true });
@@ -1882,8 +2233,8 @@ function realpathNearest(p) {
 }
 function cwdForms(cwd) {
   try {
-    const real = realpathSync(cwd);
-    return real === cwd ? [cwd] : [cwd, real];
+    const real2 = realpathSync(cwd);
+    return real2 === cwd ? [cwd] : [cwd, real2];
   } catch {
     return [cwd];
   }
@@ -1915,10 +2266,10 @@ var GateServer = class {
   }
   /** 起监听并写 gate.json。返回实际端口 */
   async start() {
-    const server = createServer((req, res) => void this.#serve(req, res));
-    await new Promise((resolve3, reject) => {
+    const server = createServer((req2, res) => void this.#serve(req2, res));
+    await new Promise((resolve5, reject) => {
       server.once("error", reject);
-      server.listen(0, "127.0.0.1", () => resolve3());
+      server.listen(0, "127.0.0.1", () => resolve5());
     });
     this.#server = server;
     const addr = server.address();
@@ -1939,21 +2290,21 @@ var GateServer = class {
     }
     const s = this.#server;
     this.#server = null;
-    if (s) await new Promise((resolve3) => s.close(() => resolve3()));
+    if (s) await new Promise((resolve5) => s.close(() => resolve5()));
   }
-  async #serve(req, res) {
+  async #serve(req2, res) {
     const reply = (status, body2) => {
       if (res.writableEnded || res.destroyed) return;
       res.writeHead(status, { "content-type": "application/json" });
       res.end(body2 ? JSON.stringify(body2) : "");
     };
-    if (req.method !== "POST" || req.url !== "/gate") return reply(404);
-    const token = req.headers["x-gate-token"];
+    if (req2.method !== "POST" || req2.url !== "/gate") return reply(404);
+    const token = req2.headers["x-gate-token"];
     if (typeof token !== "string" || !tokenEquals(token, this.#token)) return reply(403);
     let body = "";
     let size = 0;
     try {
-      for await (const chunk of req) {
+      for await (const chunk of req2) {
         size += chunk.length;
         if (size > MAX_BODY_BYTES) return reply(413);
         body += String(chunk);
@@ -1975,12 +2326,12 @@ var GateServer = class {
       if (!res.writableEnded) ac.abort();
     });
     try {
-      const req2 = window ? {
+      const req3 = window ? {
         window: true,
         tool: typeof parsed.tool === "string" && /^[a-z_]{1,32}$/.test(parsed.tool) ? parsed.tool : "claude_code",
         hook: parsed.hook
       } : { runId: parsed.runId, hook: parsed.hook };
-      const out = await this.#handler(req2, ac.signal);
+      const out = await this.#handler(req3, ac.signal);
       reply(200, out);
     } catch {
       reply(500);
@@ -2097,6 +2448,10 @@ var SessionQueue = class {
     });
     return next;
   }
+  /** 这个会话有没有在跑 / 在排队的任务 */
+  busy(sessionId) {
+    return this.#tails.has(sessionId || "");
+  }
   /** 当前有多少个会话still有在跑/排队的任务。只给测试和诊断用 */
   get activeSessions() {
     return this.#tails.size;
@@ -2110,7 +2465,7 @@ var SessionQueue = class {
 };
 
 // src/daemon/remote.ts
-import { mkdirSync as mkdirSync10, readFileSync as readFileSync8, renameSync as renameSync7, writeFileSync as writeFileSync9 } from "fs";
+import { mkdirSync as mkdirSync10, readFileSync as readFileSync10, renameSync as renameSync7, writeFileSync as writeFileSync9 } from "fs";
 import { join as join13 } from "path";
 function handleDir() {
   return join13(deskbuddyHome(), "remote");
@@ -2121,7 +2476,7 @@ function handlePath(tool) {
 }
 function readHandle(tool) {
   try {
-    const h = JSON.parse(readFileSync8(handlePath(tool), "utf8"));
+    const h = JSON.parse(readFileSync10(handlePath(tool), "utf8"));
     if (typeof h?.sessionId !== "string" || !h.sessionId) return null;
     if (typeof h?.cwd !== "string" || !h.cwd) return null;
     return h;
@@ -2187,7 +2542,7 @@ function failureMessage(reason) {
 }
 
 // src/daemon/seen.ts
-import { mkdirSync as mkdirSync11, readFileSync as readFileSync9, renameSync as renameSync8, writeFileSync as writeFileSync10 } from "fs";
+import { mkdirSync as mkdirSync11, readFileSync as readFileSync11, renameSync as renameSync8, writeFileSync as writeFileSync10 } from "fs";
 import { join as join14 } from "path";
 var SEEN_CAPACITY = 200;
 function seenPath() {
@@ -2222,7 +2577,7 @@ var SeenIds = class _SeenIds {
   }
   static load() {
     try {
-      const raw = JSON.parse(readFileSync9(seenPath(), "utf8"));
+      const raw = JSON.parse(readFileSync11(seenPath(), "utf8"));
       return new _SeenIds(Array.isArray(raw?.ids) ? raw.ids.filter((x) => typeof x === "string") : []);
     } catch {
       return new _SeenIds();
@@ -2240,11 +2595,25 @@ var SeenIds = class _SeenIds {
 };
 
 // src/daemon/codexWatch.ts
-import { execFileSync as execFileSync4 } from "child_process";
+import { execFileSync as execFileSync6 } from "child_process";
 import WebSocket from "ws";
+var TURN_LIMIT_MS = 10 * 60 * 1e3;
+var QUEUE_MAX_MS = 10 * 60 * 1e3;
+var IDLE_GRACE_MS = 5 * 1e3;
 var RESUME_RETRY_MS = 1e3;
 var RESUME_MAX_TRIES = 120;
 var REQUEST_TIMEOUT_MS = 30 * 1e3;
+function finalReply(items) {
+  let last = "";
+  let final = "";
+  for (const it of items) {
+    const i = it ?? {};
+    if (i.type !== "agentMessage" || typeof i.text !== "string") continue;
+    last = i.text;
+    if (i.phase === "final_answer") final = i.text;
+  }
+  return final || last;
+}
 function isLoopbackWs(url) {
   try {
     const u = new URL(url);
@@ -2263,17 +2632,29 @@ function parseAppServerUrls(psOutput) {
   return urls;
 }
 function discoverAppServer(configured) {
-  if (configured) return isLoopbackWs(configured) ? configured : null;
+  return discoverAppServers(configured)[0] ?? null;
+}
+function discoverAppServers(configured) {
+  if (configured) return isLoopbackWs(configured) ? [configured] : [];
+  if (process.platform === "win32") {
+    return parseAppServerUrls((winProcs() ?? []).map((p) => p.cmdline).join("\n"));
+  }
   try {
-    const out = execFileSync4("ps", ["-A", "-ww", "-o", "args="], { encoding: "utf8", stdio: ["ignore", "pipe", "ignore"] });
-    return parseAppServerUrls(out)[0] ?? null;
+    const out = execFileSync6("ps", ["-A", "-ww", "-o", "args="], { encoding: "utf8", stdio: ["ignore", "pipe", "ignore"] });
+    return parseAppServerUrls(out);
   } catch {
-    return null;
+    return [];
   }
 }
 function unwrapShell(command) {
   const m = command.match(/^\/bin\/(?:ba|z)?sh -lc '([\s\S]*)'$/);
-  return m ? m[1].replace(/'\\''/g, "'") : command;
+  if (m) return m[1].replace(/'\\''/g, "'");
+  const w = command.match(/^"?(?:[^"]*[\\/])?(?:powershell|pwsh)(?:\.exe)?"?(?: -NoLogo| -NoProfile| -NonInteractive)* -Command ([\s\S]+)$/i);
+  if (!w) return command;
+  const body = w[1].trim();
+  if (body.length >= 2 && body.startsWith('"') && body.endsWith('"')) return body.slice(1, -1).replace(/\\"/g, '"');
+  if (body.length >= 2 && body.startsWith("'") && body.endsWith("'")) return body.slice(1, -1).replace(/''/g, "'");
+  return body;
 }
 var CodexWatch = class {
   #d;
@@ -2295,17 +2676,48 @@ var CodexWatch = class {
   #idle = /* @__PURE__ */ new Set();
   /** 连接代数：断线重连后，上一条连接遗留的订阅重试不再跑 */
   #gen = 0;
+  /** initialize 已成功 */
+  #ready = false;
+  /** app-server 里已加载的会话（thread/loaded/list + 通知维护）。窗口开着 = 能往里发，据此上报 remoteWindow */
+  #loaded = /* @__PURE__ */ new Set();
+  /** 会话状态（thread/status/changed 是广播，没订阅也收得到） */
+  #status = /* @__PURE__ */ new Map();
+  /** 会话里正在跑的那一轮（turn/started 起、turn/completed 止；只有订阅了才收得到） */
+  #activeTurn = /* @__PURE__ */ new Map();
+  /** 会话 → 我们自己在排队 / 在跑的活数。🔴 有活时不退订（否则收不到 turn/completed） */
+  #own = /* @__PURE__ */ new Map();
+  /** 会话 → 我们发的轮次串行链：同一会话的设备指令一条跑完再发下一条 */
+  #chain = /* @__PURE__ */ new Map();
+  /** turnId → 我们发出、正在跟踪的那一轮 */
+  #turns = /* @__PURE__ */ new Map();
+  /** 会话 → 在途的 thread/resume（授权推送那条路径发的） */
+  #inflight = /* @__PURE__ */ new Map();
+  /** 回话还没到就先到了的 turn/completed（按 turnId 缓冲，最多几条） */
+  #early = /* @__PURE__ */ new Map();
+  /** 会话 → 等状态变化的回调（排队等空闲用） */
+  #wake = /* @__PURE__ */ new Map();
   constructor(deps) {
     this.#d = { connect: (url) => new WebSocket(url), ...deps };
   }
   get connected() {
     return this.#ws !== null;
   }
+  get url() {
+    return this.#url;
+  }
+  /** 这个会话此刻是否加载在 app-server 里（能直接往里发一轮） */
+  hasLoaded(threadId) {
+    return this.#ready && this.#loaded.has(threadId);
+  }
+  loadedThreads() {
+    return this.#ready ? [...this.#loaded] : [];
+  }
   /** 定时调：没连上就找一次 app-server 连上去；连着时 codex 被 disable 了就断开 */
   tick() {
     if (this.#stopped) return;
     if (this.#ws) {
       if (this.#d.enabled && !this.#d.enabled()) this.#teardown();
+      else if (this.#ready) void this.#syncLoaded();
       return;
     }
     const url = (this.#d.discover ?? (() => discoverAppServer()))();
@@ -2328,10 +2740,10 @@ var CodexWatch = class {
     this.#gen++;
     ws.on("open", () => void this.#onOpen());
     ws.on("message", (buf) => this.#onMessage(String(buf)));
-    ws.on("close", () => this.#teardown());
-    ws.on("error", () => this.#teardown());
+    ws.on("close", (code) => this.#teardown(`\u5173\u95ED ${code}`));
+    ws.on("error", (e) => this.#teardown(`\u51FA\u9519 ${e?.message ?? ""}`));
   }
-  #teardown() {
+  #teardown(why = "") {
     const ws = this.#ws;
     if (!ws) return;
     this.#ws = null;
@@ -2341,7 +2753,7 @@ var CodexWatch = class {
     }
     for (const c of this.#calls.values()) {
       clearTimeout(c.timer);
-      c.resolve({ error: { message: "disconnected" } });
+      c.resolve({ error: { message: "disconnected" }, local: true });
     }
     this.#calls.clear();
     for (const { ac } of this.#pending.values()) ac.abort();
@@ -2351,7 +2763,17 @@ var CodexWatch = class {
     this.#cwd.clear();
     this.#changes.clear();
     this.#idle.clear();
-    this.#d.log(`\u5DF2\u65AD\u5F00 Codex app-server ${this.#url}`);
+    this.#ready = false;
+    this.#status.clear();
+    this.#activeTurn.clear();
+    this.#inflight.clear();
+    this.#early.clear();
+    for (const t of [...this.#turns.values()]) this.#finishTurn(t, "disconnected");
+    this.#wakeAll();
+    const hadLoaded = this.#loaded.size > 0;
+    this.#loaded.clear();
+    if (hadLoaded) this.#notifyLoaded();
+    this.#d.log(`\u5DF2\u65AD\u5F00 Codex app-server ${this.#url}${why ? `\uFF08${why}\uFF09` : ""}`);
   }
   #send(obj) {
     try {
@@ -2361,13 +2783,13 @@ var CodexWatch = class {
   }
   #request(method, params) {
     const id = this.#nextId++;
-    return new Promise((resolve3) => {
+    return new Promise((resolve5) => {
       const timer = setTimeout(() => {
         this.#calls.delete(id);
-        resolve3({ error: { message: "timeout" } });
+        resolve5({ error: { message: "timeout" }, local: true });
       }, REQUEST_TIMEOUT_MS);
       timer.unref?.();
-      this.#calls.set(id, { resolve: resolve3, timer });
+      this.#calls.set(id, { resolve: resolve5, timer });
       this.#send({ id, method, params });
     });
   }
@@ -2379,7 +2801,64 @@ var CodexWatch = class {
       return;
     }
     this.#send({ method: "initialized" });
+    this.#ready = true;
     this.#d.log(`\u5DF2\u8FDE\u4E0A Codex app-server ${this.#url}\uFF0C\u7A97\u53E3\u6388\u6743\u53EF\u63A8\u5230\u8BBE\u5907`);
+    await this.#syncLoaded();
+  }
+  #notifyLoaded() {
+    try {
+      this.#d.onLoadedChange?.();
+    } catch {
+    }
+  }
+  #setLoaded(threadId, on) {
+    if (on === this.#loaded.has(threadId)) return;
+    if (on) this.#loaded.add(threadId);
+    else this.#loaded.delete(threadId);
+    this.#notifyLoaded();
+  }
+  /** 拉一遍已加载的会话（分页）。拉不到返回 null，不动现有集合 */
+  async #fetchLoaded() {
+    const gen = this.#gen;
+    const all = /* @__PURE__ */ new Set();
+    let cursor = null;
+    for (let page = 0; page < 20; page++) {
+      const r = await this.#request("thread/loaded/list", cursor ? { cursor } : {});
+      if (r.error || gen !== this.#gen) return null;
+      const res = r.result ?? {};
+      if (Array.isArray(res.data)) {
+        for (const id of res.data) if (typeof id === "string") all.add(id);
+      }
+      cursor = typeof res.nextCursor === "string" && res.nextCursor ? res.nextCursor : null;
+      if (!cursor) break;
+    }
+    return all;
+  }
+  async #syncLoaded() {
+    const gen = this.#gen;
+    const fresh = await this.#fetchLoaded();
+    if (!fresh || gen !== this.#gen) return null;
+    let changed = fresh.size !== this.#loaded.size;
+    if (!changed) {
+      for (const id of fresh) if (!this.#loaded.has(id)) changed = true;
+    }
+    if (changed) {
+      this.#loaded.clear();
+      for (const id of fresh) this.#loaded.add(id);
+      this.#notifyLoaded();
+    }
+    return fresh;
+  }
+  /** resume 的回话：记下工作目录与会话状态 */
+  #applyThread(threadId, r) {
+    const th = (r.result ?? {}).thread;
+    if (typeof th?.cwd === "string") this.#cwd.set(threadId, th.cwd);
+    const st = th?.status?.type;
+    if (typeof st === "string") {
+      this.#status.set(threadId, st);
+      if (st === "active") this.#idle.delete(threadId);
+      else this.#idle.add(threadId);
+    }
   }
   #subscribe(threadId) {
     if (this.#subscribed.has(threadId) || this.#retrying.has(threadId)) return;
@@ -2387,16 +2866,26 @@ var CodexWatch = class {
     const gen = this.#gen;
     const attempt = async () => {
       if (!this.#ws || gen !== this.#gen || !this.#retrying.has(threadId)) return;
-      const r = await this.#request("thread/resume", { threadId });
-      if (gen !== this.#gen || !this.#retrying.has(threadId)) {
-        if (!r.error && gen === this.#gen) void this.#request("thread/unsubscribe", { threadId });
+      const req2 = this.#request("thread/resume", { threadId, excludeTurns: true });
+      this.#inflight.set(threadId, req2);
+      const r = await req2;
+      if (this.#inflight.get(threadId) === req2) this.#inflight.delete(threadId);
+      if (gen !== this.#gen) return;
+      if (!this.#retrying.has(threadId)) {
+        if (!r.error) {
+          if ((this.#own.get(threadId) ?? 0) > 0 || this.#subscribed.has(threadId)) {
+            this.#subscribed.add(threadId);
+            this.#applyThread(threadId, r);
+          } else {
+            void this.#request("thread/unsubscribe", { threadId });
+          }
+        }
         return;
       }
       if (!r.error) {
         this.#retrying.delete(threadId);
         this.#subscribed.add(threadId);
-        const cwd = r.result?.thread?.cwd;
-        if (typeof cwd === "string") this.#cwd.set(threadId, cwd);
+        this.#applyThread(threadId, r);
         return;
       }
       const n = (this.#retrying.get(threadId) ?? 0) + 1;
@@ -2414,9 +2903,194 @@ var CodexWatch = class {
     this.#retrying.delete(threadId);
     if (!this.#subscribed.has(threadId)) return;
     for (const p of this.#pending.values()) if (p.threadId === threadId) return;
+    if ((this.#own.get(threadId) ?? 0) > 0) return;
     this.#subscribed.delete(threadId);
     void this.#request("thread/unsubscribe", { threadId });
   }
+  /**
+   * 往一个已加载的会话里发一轮（切片 B）。同一会话的多条串行；会话正忙时排队到空闲再发，
+   * 🔴 绝不在人正在跑的那一轮里插话（turn/start 打到 active 的会话上会并进当前那一轮，0.157.1 实测）。
+   *
+   * 返回 sent=false = 确定没发出去，调用方可以退回后台 exec；sent=true 之后无论结局如何都不能再重跑
+   */
+  async runTurn(req2, hooks = {}) {
+    const tid = req2.threadId;
+    let queued = false;
+    const h = {
+      onQueued: () => {
+        if (queued) return;
+        queued = true;
+        hooks.onQueued?.();
+      },
+      onStarted: () => hooks.onStarted?.()
+    };
+    this.#own.set(tid, (this.#own.get(tid) ?? 0) + 1);
+    const prev = this.#chain.get(tid);
+    let release2;
+    const mine = new Promise((r) => release2 = r);
+    const tail = (prev ?? Promise.resolve()).then(() => mine);
+    this.#chain.set(tid, tail);
+    try {
+      if (prev) {
+        h.onQueued?.();
+        await prev;
+      }
+      return await this.#runTurnNow(req2, h);
+    } catch (e) {
+      this.#d.log(`Codex \u53D1\u4E00\u8F6E\u51FA\u9519\uFF1A${e.message}`);
+      return { sent: false, reason: "start_failed" };
+    } finally {
+      release2();
+      if (this.#chain.get(tid) === tail) this.#chain.delete(tid);
+      const n = (this.#own.get(tid) ?? 1) - 1;
+      if (n > 0) this.#own.set(tid, n);
+      else {
+        this.#own.delete(tid);
+        if (this.#idle.has(tid)) this.#unsubscribe(tid);
+      }
+    }
+  }
+  #expired(req2, since) {
+    const now = Date.now();
+    return req2.expireAt > 0 ? now > req2.expireAt : now - since > QUEUE_MAX_MS;
+  }
+  async #runTurnNow(req2, h) {
+    const tid = req2.threadId;
+    const since = Date.now();
+    const gen = this.#gen;
+    const lost = () => !this.#ws || gen !== this.#gen;
+    if (!this.#ws || !this.#ready) return { sent: false, reason: "not_connected" };
+    const loaded = await this.#syncLoaded();
+    if (lost()) return { sent: false, reason: "disconnected" };
+    if (!loaded || !loaded.has(tid)) return { sent: false, reason: "not_loaded" };
+    const inflight = this.#inflight.get(tid);
+    if (inflight) {
+      this.#retrying.delete(tid);
+      await inflight;
+      if (lost()) return { sent: false, reason: "disconnected" };
+    }
+    if (!this.#subscribed.has(tid)) {
+      this.#retrying.delete(tid);
+      const r2 = await this.#request("thread/resume", { threadId: tid, excludeTurns: true });
+      if (lost()) return { sent: false, reason: "disconnected" };
+      if (r2.error) {
+        this.#d.log(`\u8BA2\u9605 Codex \u4F1A\u8BDD\u5931\u8D25\uFF1A${JSON.stringify(r2.error).slice(0, 120)}`);
+        return { sent: false, reason: "resume_failed" };
+      }
+      this.#subscribed.add(tid);
+      this.#applyThread(tid, r2);
+    }
+    for (; ; ) {
+      if (lost()) return { sent: false, reason: "disconnected" };
+      const st = this.#status.get(tid);
+      if (st === "notLoaded" || !this.#loaded.has(tid)) return { sent: false, reason: "closed" };
+      if (this.#expired(req2, since)) return { sent: false, reason: "expired" };
+      if (st !== "active") break;
+      h.onQueued?.();
+      const left = req2.expireAt > 0 ? req2.expireAt - Date.now() : QUEUE_MAX_MS - (Date.now() - since);
+      await this.#waitThread(tid, Math.max(1, Math.min(left + 5, 60 * 1e3)));
+    }
+    const humanTurn = this.#activeTurn.get(tid);
+    const r = await this.#request("turn/start", {
+      threadId: tid,
+      input: [{ type: "text", text: req2.text, text_elements: [] }]
+    });
+    if (r.error && !r.local) {
+      this.#d.log(`Codex turn/start \u88AB\u62D2\uFF1A${JSON.stringify(r.error).slice(0, 120)}`);
+      return { sent: false, reason: "start_failed" };
+    }
+    if (r.error) {
+      return { sent: true, end: "disconnected", turnId: "", text: "", error: String(r.error.message ?? "") };
+    }
+    const turnId = String((r.result ?? {}).turn?.id ?? "");
+    const merged = !!turnId && (turnId === humanTurn || turnId === this.#activeTurn.get(tid));
+    if (merged) this.#d.log("\u8BBE\u5907\u6307\u4EE4\u5E76\u8FDB\u4E86\u7A97\u53E3\u91CC\u6B63\u5728\u8DD1\u7684\u90A3\u4E00\u8F6E");
+    h.onStarted?.();
+    if (!turnId) return { sent: true, end: "failed", turnId: "", text: "", error: "no turn id" };
+    if (lost()) return { sent: true, end: "disconnected", turnId, text: "" };
+    const out = await this.#trackTurn(tid, turnId);
+    return { ...out, ...merged ? { merged } : {} };
+  }
+  #trackTurn(threadId, turnId) {
+    return new Promise((resolve5) => {
+      const limit = this.#d.turnLimitMs ?? TURN_LIMIT_MS;
+      const step = this.#d.turnTickMs ?? 1e3;
+      const t = {
+        threadId,
+        turnId,
+        items: [],
+        used: 0,
+        timer: null,
+        grace: null,
+        done: (end, text, error) => resolve5({ sent: true, end, turnId, text, ...error ? { error } : {} })
+      };
+      this.#turns.set(turnId, t);
+      const early = this.#early.get(turnId);
+      if (early) {
+        this.#early.delete(turnId);
+        const items = Array.isArray(early.items) ? early.items : [];
+        const st = early.status;
+        const err = early.error?.message;
+        this.#finishTurn(t, st === "interrupted" ? "interrupted" : st === "failed" ? "failed" : "completed", finalReply(items), typeof err === "string" ? err : void 0);
+        return;
+      }
+      t.timer = setInterval(() => {
+        if (this.#waitingApproval(threadId)) return;
+        t.used += step;
+        if (t.used < limit) return;
+        this.#d.log(`Codex \u4F1A\u8BDD\u8FD9\u4E00\u8F6E\u8D85\u8FC7 ${Math.round(limit / 1e3)} \u79D2\u6D3B\u52A8\u65F6\u95F4\uFF0C\u6253\u65AD`);
+        void this.#request("turn/interrupt", { threadId, turnId });
+        this.#finishTurn(t, "timeout");
+      }, step);
+      t.timer.unref?.();
+      if (this.#status.get(threadId) !== "active") this.#armIdleGrace(t);
+    });
+  }
+  #waitingApproval(threadId) {
+    for (const p of this.#pending.values()) if (p.threadId === threadId) return true;
+    return false;
+  }
+  /** 会话已空闲却等不到 turn/completed（丢了一条通知）：过一会儿按已完成收尾 */
+  #armIdleGrace(t) {
+    if (t.grace) return;
+    t.grace = setTimeout(() => {
+      t.grace = null;
+      if (!this.#turns.has(t.turnId) || this.#status.get(t.threadId) === "active") return;
+      this.#d.log("Codex \u4F1A\u8BDD\u5DF2\u7A7A\u95F2\u4F46\u6CA1\u6536\u5230 turn/completed\uFF0C\u6309\u5DF2\u5B8C\u6210\u6536\u5C3E");
+      this.#finishTurn(t, "completed", finalReply(t.items));
+    }, IDLE_GRACE_MS);
+    t.grace.unref?.();
+  }
+  #finishTurn(t, end, text = "", error) {
+    if (this.#turns.get(t.turnId) !== t) return;
+    this.#turns.delete(t.turnId);
+    if (t.timer) clearInterval(t.timer);
+    if (t.grace) clearTimeout(t.grace);
+    t.done(end, text || (end === "completed" ? "" : finalReply(t.items)), error);
+  }
+  #waitThread(threadId, ms) {
+    return new Promise((resolve5) => {
+      let set = this.#wake.get(threadId);
+      if (!set) this.#wake.set(threadId, set = /* @__PURE__ */ new Set());
+      const s = set;
+      const fire = () => {
+        clearTimeout(timer);
+        s.delete(fire);
+        if (s.size === 0 && this.#wake.get(threadId) === s) this.#wake.delete(threadId);
+        resolve5();
+      };
+      const timer = setTimeout(fire, ms);
+      timer.unref?.();
+      s.add(fire);
+    });
+  }
+  #wakeThread(threadId) {
+    const s = this.#wake.get(threadId);
+    if (s) for (const f of [...s]) f();
+  }
+  #wakeAll() {
+    for (const id of [...this.#wake.keys()]) this.#wakeThread(id);
+  }
   #onMessage(raw) {
     let m;
     try {
@@ -2447,29 +3121,64 @@ var CodexWatch = class {
       case "thread/started": {
         const t = p.thread;
         if (t && typeof t.id === "string" && typeof t.cwd === "string") this.#cwd.set(t.id, t.cwd);
+        if (t && typeof t.id === "string") this.#setLoaded(t.id, true);
         return;
       }
       case "thread/status/changed": {
         const id = typeof p.threadId === "string" ? p.threadId : "";
         const type = p.status?.type;
         if (!id) return;
+        if (typeof type === "string") this.#status.set(id, type);
+        if (type === "notLoaded") this.#setLoaded(id, false);
+        else if (typeof type === "string") this.#setLoaded(id, true);
         if (type === "active") {
           this.#idle.delete(id);
           this.#subscribe(id);
         } else {
           this.#idle.add(id);
           this.#unsubscribe(id);
+          for (const t of this.#turns.values()) if (t.threadId === id) this.#armIdleGrace(t);
         }
+        this.#wakeThread(id);
         return;
       }
       case "thread/closed":
         if (typeof p.threadId === "string") {
-          this.#idle.delete(p.threadId);
-          this.#subscribed.delete(p.threadId);
-          this.#retrying.delete(p.threadId);
-          this.#cwd.delete(p.threadId);
+          const id = p.threadId;
+          this.#idle.delete(id);
+          this.#subscribed.delete(id);
+          this.#retrying.delete(id);
+          this.#cwd.delete(id);
+          this.#status.set(id, "notLoaded");
+          this.#activeTurn.delete(id);
+          this.#setLoaded(id, false);
+          for (const t of [...this.#turns.values()]) if (t.threadId === id) this.#finishTurn(t, "closed");
+          this.#wakeThread(id);
+        }
+        return;
+      case "turn/started": {
+        const turn = p.turn;
+        if (typeof p.threadId === "string" && turn && typeof turn.id === "string") this.#activeTurn.set(p.threadId, turn.id);
+        return;
+      }
+      case "turn/completed": {
+        const turn = p.turn ?? {};
+        const tid = typeof p.threadId === "string" ? p.threadId : "";
+        if (tid && this.#activeTurn.get(tid) === turn.id) this.#activeTurn.delete(tid);
+        const own = typeof turn.id === "string" ? this.#turns.get(turn.id) : void 0;
+        if (own) {
+          const items = Array.isArray(turn.items) ? turn.items : [];
+          const text = finalReply(items) || finalReply(own.items);
+          const st = turn.status;
+          const end = st === "interrupted" ? "interrupted" : st === "failed" ? "failed" : "completed";
+          const err = turn.error?.message;
+          this.#finishTurn(own, end, text, typeof err === "string" ? err : void 0);
+        } else if (typeof turn.id === "string") {
+          this.#early.set(turn.id, turn);
+          while (this.#early.size > 16) this.#early.delete(this.#early.keys().next().value);
         }
         return;
+      }
       case "item/started": {
         const item = p.item;
         if (item && item.type === "fileChange" && typeof item.id === "string" && Array.isArray(item.changes)) {
@@ -2481,6 +3190,8 @@ var CodexWatch = class {
       case "item/completed": {
         const item = p.item;
         if (item && typeof item.id === "string") this.#changes.delete(item.id);
+        const own = typeof p.turnId === "string" ? this.#turns.get(p.turnId) : void 0;
+        if (own && item && item.type === "agentMessage") own.items.push(item);
         return;
       }
       case "serverRequest/resolved": {
@@ -2517,7 +3228,7 @@ var CodexWatch = class {
     const ac = new AbortController();
     const entry = { ac, threadId };
     this.#pending.set(key, entry);
-    const req = {
+    const req2 = {
       window: true,
       tool: "codex",
       hook: { hook_event_name: "PermissionRequest", session_id: threadId, ...hook }
@@ -2525,7 +3236,7 @@ var CodexWatch = class {
     const settled = () => {
       if (this.#idle.has(threadId)) this.#unsubscribe(threadId);
     };
-    void this.#d.gate(req, ac.signal).then((reply) => {
+    void this.#d.gate(req2, ac.signal).then((reply) => {
       if (this.#pending.get(key) !== entry) return;
       this.#pending.delete(key);
       if (reply.decision === "allow") this.#send({ id, result: { decision: "accept" } });
@@ -2538,64 +3249,376 @@ var CodexWatch = class {
   }
 };
 
-// src/daemon/index.ts
-var IDLE_TIMEOUT_MS = 150 * 1e3;
-var POLICY_VIOLATION = 1008;
-var PING_FRAME_SERVICE = "ping";
-var PONG_FRAME = JSON.stringify({ service: "pong", version: "1.0" });
-var CODEX_WATCH_MS = 5 * 1e3;
-function defaultCodexAppServer() {
-  const cfg = loadConfig();
-  return cfg.enabledTools.includes("codex") ? discoverAppServer(cfg.codexAppServer) : null;
-}
-function opencodeReady() {
-  return isOcPluginInstalled(opencodePluginPath()) && existsSync10(ocPluginModule(installedHookPath()));
+// src/core/codexRemote.ts
+import { mkdirSync as mkdirSync12, renameSync as renameSync9, rmSync as rmSync4, writeFileSync as writeFileSync11 } from "fs";
+import { join as join15 } from "path";
+function codexRemotePath() {
+  return join15(deskbuddyHome(), "codex-remote.json");
 }
-function orphanResumeText(summary) {
-  return `\uFF08\u4F60\u5728\u8BBE\u5907\u4E0A\u5DF2\u6279\u51C6\uFF1A${summary}\uFF09\u8BF7\u7EE7\u7EED\u521A\u624D\u88AB\u4E2D\u65AD\u7684\u64CD\u4F5C\u3002`;
+function writeCodexRemote(threads, pid = process.pid, now = Date.now()) {
+  try {
+    mkdirSync12(deskbuddyHome(), { recursive: true });
+    const p = codexRemotePath();
+    writeFileSync11(p + ".tmp", JSON.stringify({ pid, threads: [...threads], at: now }), "utf8");
+    renameSync9(p + ".tmp", p);
+  } catch {
+  }
 }
-var ALIVE_REPORT_MS = 60 * 1e3;
-var Daemon = class {
-  #queue = new SessionQueue();
-  #seen = SeenIds.load();
-  #deps;
-  #store = ApprovalStore.load();
-  #coord;
-  #gate;
-  /** runId → 这次 run 结束的 promise。defer 续跑要等原进程真退出了再起（见 #scheduleResume） */
-  #runsDone = /* @__PURE__ */ new Map();
-  #attempt = 0;
-  #stopped = false;
-  #ws = null;
-  #idleTimer = null;
-  #windowScan = null;
-  #aliveReport = null;
-  #codexTimer = null;
-  #codex = null;
-  constructor(deps = {}) {
-    this.#deps = {
-      connect: deps.connect ?? ((url) => new WebSocket2(url)),
-      now: deps.now ?? (() => Date.now()),
-      backend: deps.backend ?? serverBackend(),
-      gateScript: deps.gateScript ?? defaultGateScript(),
-      // 🔴 优先用 PATH 上那个稳定的 node（如 /opt/homebrew/bin/node 这种链接），不用 process.execPath：
-      //    后者是 Cellar 里的真实路径，`brew upgrade node` 之后就被删了，而 daemon 还活着、
-      //    hook 命令里写的还是旧路径 —— hook 起不来，Qoder 在 bypass 下就是全放行（评审 R3）
-      nodePath: deps.nodePath ?? whichIn("node", defaultLocateDeps()) ?? process.execPath,
-      materialize: deps.materialize ?? ((plan, tool) => materialize(plan, tool)),
-      opencodeReady: deps.opencodeReady ?? opencodeReady,
-      codexAppServer: deps.codexAppServer ?? defaultCodexAppServer
-    };
-    this.#store.prune(this.#deps.now());
-    this.#coord = new ApprovalCoordinator({
-      store: this.#store,
-      backend: this.#deps.backend,
-      policy: () => loadConfig().approvalPolicy ?? "commands",
-      resume: (r, kind) => this.#scheduleResume(r, kind),
-      log,
-      now: this.#deps.now
-    });
-    this.#gate = new GateServer((req, signal) => this.#coord.onGate(req, signal));
+function removeCodexRemote() {
+  try {
+    rmSync4(codexRemotePath(), { force: true });
+  } catch {
+  }
+}
+
+// src/wrap/channel.ts
+import { chmodSync as chmodSync2, rmSync as rmSync5 } from "fs";
+import { connect, createServer as createServer2 } from "net";
+var MAX_LINE_BYTES = 64 * 1024;
+function lines(sock, onLine) {
+  let buf = "";
+  sock.setEncoding("utf8");
+  sock.on("data", (d) => {
+    buf += d;
+    if (buf.length > MAX_LINE_BYTES) {
+      sock.destroy();
+      return;
+    }
+    let i;
+    while ((i = buf.indexOf("\n")) >= 0) {
+      const line = buf.slice(0, i);
+      buf = buf.slice(i + 1);
+      if (line.trim()) onLine(line);
+    }
+  });
+}
+function parseRequest(line) {
+  let m;
+  try {
+    m = JSON.parse(line);
+  } catch {
+    return null;
+  }
+  if (!m || typeof m !== "object") return null;
+  const instructionId = typeof m.instructionId === "string" ? m.instructionId : "";
+  const sessionId = typeof m.sessionId === "string" ? m.sessionId : "";
+  if (!isValidId(instructionId) || !isValidId(sessionId)) return null;
+  const text = sanitizeText(typeof m.text === "string" ? m.text : "");
+  if (!text || text.length > MAX_TEXT_LENGTH) return null;
+  const expireAt = typeof m.expireAt === "number" && Number.isFinite(m.expireAt) ? m.expireAt : 0;
+  return { instructionId, sessionId, text, expireAt };
+}
+function startChannelServer(path, onRequest, platform = process.platform) {
+  return new Promise((resolve5) => {
+    const server = createServer2((sock) => {
+      let open = true;
+      sock.on("error", () => {
+      });
+      sock.on("close", () => open = false);
+      const reply = (r) => {
+        if (sock.destroyed || !sock.writable) return;
+        try {
+          sock.write(JSON.stringify(r) + "\n");
+        } catch {
+        }
+      };
+      lines(sock, (line) => {
+        const req2 = parseRequest(line);
+        if (!req2) {
+          reply({ instructionId: "", status: "rejected", reason: "bad_request" });
+          return;
+        }
+        onRequest(req2, reply, () => open);
+      });
+    });
+    if (platform !== "win32") {
+      try {
+        rmSync5(path, { force: true });
+      } catch {
+      }
+    }
+    const oldMask = platform === "win32" ? null : process.umask(127);
+    const restore = () => {
+      if (oldMask !== null) process.umask(oldMask);
+    };
+    server.once("error", () => {
+      restore();
+      resolve5(null);
+    });
+    server.listen(path, () => {
+      restore();
+      if (platform !== "win32") {
+        try {
+          chmodSync2(path, 384);
+        } catch {
+        }
+      }
+      server.on("error", () => {
+      });
+      resolve5(server);
+    });
+  });
+}
+function closeChannelServer(server, path, platform = process.platform) {
+  try {
+    server?.close();
+  } catch {
+  }
+  if (platform !== "win32") {
+    try {
+      rmSync5(path, { force: true });
+    } catch {
+    }
+  }
+}
+var FINAL = /* @__PURE__ */ new Set(["started", "rejected", "failed", "not_here"]);
+function sendToWindow(path, req2, onReply, opts = {}) {
+  return new Promise((resolve5) => {
+    let settled = false;
+    let handled = false;
+    let done = false;
+    const settle = (v) => {
+      if (settled) return;
+      settled = true;
+      handled = v === "handled";
+      clearTimeout(timer);
+      resolve5(v);
+    };
+    let sock;
+    try {
+      sock = connect(path);
+    } catch {
+      resolve5("fallback");
+      return;
+    }
+    const timer = setTimeout(() => {
+      settle("fallback");
+      sock.destroy();
+    }, opts.ackTimeoutMs ?? 3e3);
+    sock.on("error", () => {
+      if (!settled) settle("fallback");
+    });
+    sock.on("close", () => {
+      if (!settled) {
+        settle("fallback");
+        return;
+      }
+      if (handled && !done) {
+        done = true;
+        onReply({ instructionId: req2.instructionId, status: "failed", mode: "window", reason: "window_failed" });
+      }
+    });
+    sock.on("connect", () => {
+      sock.write(JSON.stringify(req2) + "\n");
+    });
+    lines(sock, (line) => {
+      let r;
+      try {
+        r = JSON.parse(line);
+      } catch {
+        return;
+      }
+      if (r.instructionId !== req2.instructionId) return;
+      if (!settled) {
+        if (r.status === "ack") {
+          settle("handled");
+          return;
+        }
+        settle("fallback");
+        sock.destroy();
+        return;
+      }
+      if (done) return;
+      if (FINAL.has(r.status)) {
+        done = true;
+        onReply(r);
+        sock.end();
+        return;
+      }
+      onReply(r);
+    });
+  });
+}
+
+// src/core/wrapWindows.ts
+import { chmodSync as chmodSync3, mkdirSync as mkdirSync13, readdirSync as readdirSync2, readFileSync as readFileSync12, renameSync as renameSync10, rmSync as rmSync6, statSync as statSync3, writeFileSync as writeFileSync12 } from "fs";
+import { tmpdir } from "os";
+import { join as join16 } from "path";
+var WINDOW_ID_RE = /^[a-f0-9]{32}$/;
+function windowsDir() {
+  return join16(deskbuddyHome(), "windows");
+}
+function bySessionDir() {
+  return join16(windowsDir(), "by-session");
+}
+function safeSid(sessionId) {
+  return String(sessionId).replace(/[^A-Za-z0-9_-]/g, "");
+}
+function ensureDir(dir) {
+  mkdirSync13(dir, { recursive: true, mode: 448 });
+}
+function atomicWrite(file, text) {
+  const tmp = `${file}.${process.pid}.tmp`;
+  writeFileSync12(tmp, text, { encoding: "utf8", mode: 384 });
+  renameSync10(tmp, file);
+}
+function windowFile(windowId) {
+  return join16(windowsDir(), `${windowId}.json`);
+}
+function writeWindow(windowId, rec) {
+  if (!WINDOW_ID_RE.test(windowId)) return;
+  ensureDir(windowsDir());
+  atomicWrite(windowFile(windowId), JSON.stringify(rec));
+}
+function readWindow(windowId) {
+  if (!WINDOW_ID_RE.test(windowId)) return null;
+  try {
+    const r = JSON.parse(readFileSync12(windowFile(windowId), "utf8"));
+    return r && typeof r.pid === "number" ? r : null;
+  } catch {
+    return null;
+  }
+}
+function removeWindow(windowId) {
+  if (!WINDOW_ID_RE.test(windowId)) return;
+  for (const f of [windowFile(windowId), lastEventFile(windowId)]) {
+    try {
+      rmSync6(f, { force: true });
+    } catch {
+    }
+  }
+  let names = [];
+  try {
+    names = readdirSync2(bySessionDir());
+  } catch {
+    return;
+  }
+  for (const n of names) {
+    const f = join16(bySessionDir(), n);
+    try {
+      if (readFileSync12(f, "utf8").trim() === windowId) rmSync6(f, { force: true });
+    } catch {
+    }
+  }
+}
+function readBySession(sessionId) {
+  const safe = safeSid(sessionId);
+  if (!safe) return null;
+  try {
+    const id = readFileSync12(join16(bySessionDir(), safe), "utf8").trim();
+    return WINDOW_ID_RE.test(id) ? id : null;
+  } catch {
+    return null;
+  }
+}
+function lastEventFile(windowId) {
+  return join16(windowsDir(), `${windowId}.last`);
+}
+function readLastEvent(windowId) {
+  if (!WINDOW_ID_RE.test(windowId)) return null;
+  try {
+    const e = JSON.parse(readFileSync12(lastEventFile(windowId), "utf8"));
+    return e && typeof e.ev === "string" && typeof e.at === "number" ? { ev: e.ev, sid: String(e.sid ?? ""), at: e.at } : null;
+  } catch {
+    return null;
+  }
+}
+function channelPath(windowId, platform = process.platform, home = deskbuddyHome()) {
+  if (platform === "win32") return `\\\\.\\pipe\\deskbuddy-${windowId}`;
+  const name = `${windowId.slice(0, 16)}.sock`;
+  const primary = join16(home, "win", name);
+  if (Buffer.byteLength(primary) <= 103) return primary;
+  const uid = typeof process.getuid === "function" ? process.getuid() : 0;
+  return join16(tmpdir(), `deskbuddy-${uid}`, name);
+}
+function ensureChannelDir(sockPath) {
+  const dir = join16(sockPath, "..");
+  try {
+    mkdirSync13(dir, { recursive: true, mode: 448 });
+    const st = statSync3(dir);
+    if (typeof process.getuid === "function" && st.uid !== process.getuid()) return false;
+    chmodSync3(dir, 448);
+    return true;
+  } catch {
+    return false;
+  }
+}
+
+// src/daemon/window.ts
+function windowForSession(sessionId) {
+  const id = readBySession(sessionId);
+  if (!id) return null;
+  const rec = readWindow(id);
+  if (!rec || !isAlive(rec.pid)) return null;
+  return id;
+}
+
+// src/daemon/index.ts
+var IDLE_TIMEOUT_MS = 150 * 1e3;
+var POLICY_VIOLATION = 1008;
+var PING_FRAME_SERVICE = "ping";
+var PONG_FRAME = JSON.stringify({ service: "pong", version: "1.0" });
+var CODEX_REMOTE_REFRESH_MS = 30 * 1e3;
+var CODEX_WATCH_MS = 5 * 1e3;
+function defaultCodexAppServers() {
+  const cfg = loadConfig();
+  return cfg.enabledTools.includes("codex") ? discoverAppServers(cfg.codexAppServer) : [];
+}
+function opencodeReady() {
+  return isOcPluginInstalled(opencodePluginPath()) && existsSync10(ocPluginModule(installedHookPath()));
+}
+function orphanResumeText(summary2) {
+  return `\uFF08\u4F60\u5728\u8BBE\u5907\u4E0A\u5DF2\u6279\u51C6\uFF1A${summary2}\uFF09\u8BF7\u7EE7\u7EED\u521A\u624D\u88AB\u4E2D\u65AD\u7684\u64CD\u4F5C\u3002`;
+}
+var ALIVE_REPORT_MS = 60 * 1e3;
+var Daemon = class {
+  #queue = new SessionQueue();
+  #seen = SeenIds.load();
+  #deps;
+  #store = ApprovalStore.load();
+  #coord;
+  #gate;
+  /** runId → 这次 run 结束的 promise。defer 续跑要等原进程真退出了再起（见 #scheduleResume） */
+  #runsDone = /* @__PURE__ */ new Map();
+  #attempt = 0;
+  #stopped = false;
+  #ws = null;
+  #idleTimer = null;
+  #windowScan = null;
+  #aliveReport = null;
+  #codexTimer = null;
+  /** url → 连着它的 CodexWatch。插入顺序 = 发现顺序（DeskBuddy 管的在前） */
+  #codex = /* @__PURE__ */ new Map();
+  #codexStarted = false;
+  #codexReportTimer = null;
+  constructor(deps = {}) {
+    this.#deps = {
+      connect: deps.connect ?? ((url) => new WebSocket2(url)),
+      now: deps.now ?? (() => Date.now()),
+      backend: deps.backend ?? serverBackend(),
+      gateScript: deps.gateScript ?? defaultGateScript(),
+      // 🔴 优先用 PATH 上那个稳定的 node（如 /opt/homebrew/bin/node 这种链接），不用 process.execPath：
+      //    后者是 Cellar 里的真实路径，`brew upgrade node` 之后就被删了，而 daemon 还活着、
+      //    hook 命令里写的还是旧路径 —— hook 起不来，Qoder 在 bypass 下就是全放行（评审 R3）
+      nodePath: deps.nodePath ?? whichIn("node", defaultLocateDeps()) ?? process.execPath,
+      materialize: deps.materialize ?? ((plan, tool) => materialize(plan, tool)),
+      opencodeReady: deps.opencodeReady ?? opencodeReady,
+      codexAppServers: deps.codexAppServers ?? defaultCodexAppServers,
+      codexRoute: deps.codexRoute ?? ((tid) => this.#codexRouteFor(tid)),
+      report: deps.report ?? ((p) => api.commandResult(p)),
+      windowFor: deps.windowFor ?? windowForSession,
+      sendToWindow: deps.sendToWindow ?? ((id, req2, onReply) => sendToWindow(channelPath(id), req2, onReply))
+    };
+    this.#store.prune(this.#deps.now());
+    this.#coord = new ApprovalCoordinator({
+      store: this.#store,
+      backend: this.#deps.backend,
+      policy: () => loadConfig().approvalPolicy ?? "commands",
+      resume: (r, kind) => this.#scheduleResume(r, kind),
+      log,
+      now: this.#deps.now
+    });
+    this.#gate = new GateServer((req2, signal) => this.#coord.onGate(req2, signal));
   }
   /** 起本地授权端点。必须在执行任何指令之前起好 —— 否则 gate 连不上，全部 exit 2 */
   async startGate() {
@@ -2605,17 +3628,82 @@ var Daemon = class {
     this.#windowScan.unref();
     this.#aliveReport = setInterval(() => void this.#reportAlive(), ALIVE_REPORT_MS);
     this.#aliveReport.unref();
-    this.#codex = new CodexWatch({
-      gate: (req, signal) => this.#coord.onGate(req, signal),
-      log,
-      discover: () => this.#deps.codexAppServer(),
-      enabled: () => loadConfig().enabledTools.includes("codex")
-    });
-    this.#codex.tick();
-    this.#codexTimer = setInterval(() => this.#codex?.tick(), CODEX_WATCH_MS);
+    this.#codexStarted = true;
+    this.#codexTick();
+    this.#codexTimer = setInterval(() => this.#codexTick(), CODEX_WATCH_MS);
     this.#codexTimer.unref();
     return port;
   }
+  /** 找 app-server：新出现的连上，不在了且已断开的丢掉；连着的各自 tick */
+  #codexTick() {
+    let urls = [];
+    try {
+      urls = this.#deps.codexAppServers();
+    } catch {
+      urls = [];
+    }
+    for (const url of urls) {
+      if (this.#codex.has(url)) continue;
+      this.#codex.set(
+        url,
+        new CodexWatch({
+          gate: (req2, signal) => this.#coord.onGate(req2, signal),
+          log,
+          discover: () => url,
+          enabled: () => loadConfig().enabledTools.includes("codex"),
+          onLoadedChange: () => this.#onCodexLoaded()
+        })
+      );
+    }
+    for (const [url, w] of [...this.#codex]) {
+      if (!urls.includes(url) && !w.connected) {
+        w.stop();
+        this.#codex.delete(url);
+        continue;
+      }
+      w.tick();
+    }
+    if (this.#deps.now() - this.#codexRemoteAt >= CODEX_REMOTE_REFRESH_MS) this.#writeCodexRemote();
+  }
+  #codexRemoteAt = 0;
+  #writeCodexRemote() {
+    this.#codexRemoteAt = this.#deps.now();
+    writeCodexRemote(this.#codexLoaded(), process.pid, this.#codexRemoteAt);
+  }
+  /** 哪个 app-server 里加载着这个会话；不止一个 → 'ambiguous'（评审 #6） */
+  #codexRouteFor(threadId) {
+    const hits = [...this.#codex.values()].filter((w) => w.hasLoaded(threadId));
+    if (hits.length > 1) return "ambiguous";
+    return hits[0] ?? null;
+  }
+  #codexLoaded() {
+    const all = /* @__PURE__ */ new Set();
+    for (const w of this.#codex.values()) for (const id of w.loadedThreads()) all.add(id);
+    return all;
+  }
+  /**
+   * 已加载的会话变了（切片 B）：落清单给 hook 用，并立刻补报一次 codex 快照（remoteWindow 进 / 出），
+   * 否则设备要等下一次 hook 事件或 60 秒保活才知道
+   */
+  #onCodexLoaded() {
+    if (!this.#codexStarted) return;
+    this.#writeCodexRemote();
+    if (this.#codexReportTimer) return;
+    this.#codexReportTimer = setTimeout(() => {
+      this.#codexReportTimer = null;
+      void this.#reportCodex();
+    }, 300);
+    this.#codexReportTimer.unref?.();
+  }
+  async #reportCodex() {
+    const cfg = loadConfig();
+    if (!cfg.clientId || !cfg.boundAt || !cfg.enabledTools.includes("codex")) return;
+    try {
+      await postReport(buildSnapshot(readAliveStates("codex"), "codex", cfg, this.#deps.now(), this.#codexLoaded()));
+    } catch (e) {
+      log(`\u4E0A\u62A5 codex \u5FEB\u7167\u5931\u8D25\uFF1A${e.message}`);
+    }
+  }
   #lastDirs = "";
   #dirsTick = 0;
   /**
@@ -2640,7 +3728,7 @@ var Daemon = class {
     const cfg = loadConfig();
     if (!cfg.clientId || !cfg.boundAt) return;
     for (const tool of cfg.enabledTools) {
-      await postReport(buildSnapshot(readAliveStates(tool), tool, cfg, this.#deps.now()));
+      await postReport(buildSnapshot(readAliveStates(tool), tool, cfg, this.#deps.now(), tool === "codex" ? this.#codexLoaded() : null));
     }
     if (++this.#dirsTick % 10 === 0) await this.#reportDirs();
   }
@@ -2653,7 +3741,10 @@ var Daemon = class {
     if (this.#windowScan) clearInterval(this.#windowScan);
     if (this.#aliveReport) clearInterval(this.#aliveReport);
     if (this.#codexTimer) clearInterval(this.#codexTimer);
-    this.#codex?.stop();
+    if (this.#codexReportTimer) clearTimeout(this.#codexReportTimer);
+    for (const w of this.#codex.values()) w.stop();
+    this.#codex.clear();
+    if (this.#codexStarted) removeCodexRemote();
     this.#ws?.close();
     void this.#gate.stop();
   }
@@ -2757,8 +3848,139 @@ var Daemon = class {
       return;
     }
     this.#seen.save();
+    if (cmd.sessionId && !isExpired(cmd, this.#deps.now())) {
+      const sid = resolveAlias(cmd.sessionId);
+      let win = null;
+      try {
+        win = this.#deps.windowFor(sid);
+      } catch {
+        win = null;
+      }
+      if (win) {
+        void this.#toWindow(cmd, sid, win);
+        return;
+      }
+      if (cmd.tool === "codex" && !this.#queue.busy(sid)) {
+        let route = null;
+        try {
+          route = this.#deps.codexRoute(sid);
+        } catch {
+          route = null;
+        }
+        if (route === "ambiguous") {
+          log(`\u6307\u4EE4 ${cmd.instructionId} Codex \u4F1A\u8BDD\u540C\u65F6\u5F00\u5728\u591A\u4E2A\u7A97\u53E3\u91CC\uFF0C\u4E0D\u77E5\u9053\u53D1\u7ED9\u54EA\u4E2A`);
+          this.#report(cmd, sid, "failed", "window", "window_failed");
+          return;
+        }
+        if (route) {
+          void this.#toCodexWindow(cmd, sid, route);
+          return;
+        }
+      }
+    }
+    this.#dispatch(cmd);
+  }
+  /**
+   * 经 app-server 往 Codex 会话里发一轮（切片 B）。回报语义与 Claude 窗口一致（mode=window）：
+   * 排队 queued → 发出 started；排队中过期 rejected/expired。
+   * 🔴 只有确定窗口里没有这个会话（未连上 / 未加载 / 会话已关）才退回后台 exec；
+   *    订阅失败 / turn/start 被拒 / 发之前断线 → failed/window_failed（会话还开在窗口里，后台跑会两个进程抢一个会话）；
+   *    发出去之后任何失败 → failed/exec_failed，绝不再后台重跑（会执行两遍）
+   */
+  async #toCodexWindow(cmd, sessionId, route) {
+    let out;
+    try {
+      out = await route.runTurn(
+        { threadId: sessionId, text: cmd.text, expireAt: cmd.expireAt },
+        {
+          onQueued: () => {
+            log(`\u6307\u4EE4 ${cmd.instructionId} Codex \u4F1A\u8BDD\u6B63\u5FD9\uFF0C\u6392\u961F`);
+            this.#report(cmd, sessionId, "queued", "window");
+          },
+          onStarted: () => {
+            log(`\u6307\u4EE4 ${cmd.instructionId} \u5DF2\u5728 Codex \u7A97\u53E3\u4F1A\u8BDD\u91CC\u53D1\u51FA len=${cmd.text.length}`);
+            this.#report(cmd, sessionId, "started", "window");
+          }
+        }
+      );
+    } catch (e) {
+      out = { sent: false, reason: "start_failed" };
+      log(`\u6307\u4EE4 ${cmd.instructionId} \u7ECF app-server \u53D1\u51FA\u51FA\u9519\uFF1A${e.message}`);
+    }
+    if (!out.sent) {
+      if (out.reason === "expired") {
+        log(`\u6307\u4EE4 ${cmd.instructionId} \u6392\u961F\u7B49 Codex \u4F1A\u8BDD\u7A7A\u95F2\u65F6\u8FC7\u671F`);
+        this.#report(cmd, sessionId, "rejected", "window", "expired");
+        return;
+      }
+      if (out.reason === "not_connected" || out.reason === "not_loaded" || out.reason === "closed") {
+        log(`\u6307\u4EE4 ${cmd.instructionId} \u7A97\u53E3\u91CC\u5DF2\u6CA1\u6709\u8FD9\u4E2A Codex \u4F1A\u8BDD\uFF08${out.reason}\uFF09\uFF0C\u6539\u8D70\u540E\u53F0`);
+        this.#dispatch(cmd);
+        return;
+      }
+      log(`\u6307\u4EE4 ${cmd.instructionId} \u6CA1\u80FD\u7ECF app-server \u53D1\u51FA\uFF08${out.reason}\uFF09`);
+      this.#report(cmd, sessionId, "failed", "window", "window_failed");
+      return;
+    }
+    if (out.end === "completed") {
+      log(`\u6307\u4EE4 ${cmd.instructionId} Codex \u7A97\u53E3\u8FD9\u4E00\u8F6E\u5B8C\u6210\uFF0C\u56DE\u590D ${out.text.length} \u5B57`);
+      return;
+    }
+    log(`\u6307\u4EE4 ${cmd.instructionId} Codex \u7A97\u53E3\u8FD9\u4E00\u8F6E\u6CA1\u5B8C\u6210\uFF1A${out.end}${out.error ? " " + out.error.slice(0, 120) : ""}`);
+    this.#report(cmd, sessionId, "failed", "window", "exec_failed");
+  }
+  /** 回报一条指令的处理结果。2 秒超时、失败不重试，只记日志（seen 去重命中的不会走到这里） */
+  #report(cmd, sessionId, status, mode, reason = "") {
+    const payload = {
+      instructionId: cmd.instructionId,
+      sessionId,
+      tool: cmd.tool,
+      status,
+      mode,
+      reason: status === "started" || status === "queued" ? "" : reason,
+      at: String(this.#deps.now())
+    };
+    let p;
+    try {
+      p = this.#deps.report(payload);
+    } catch (e) {
+      log(`\u56DE\u62A5\u6307\u4EE4 ${cmd.instructionId} \u7ED3\u679C\u5931\u8D25\uFF1A${e.message}`);
+      return;
+    }
+    p.catch((e) => log(`\u56DE\u62A5\u6307\u4EE4 ${cmd.instructionId} \u7ED3\u679C\u5931\u8D25\uFF1A${e.message}`));
+  }
+  async #toWindow(cmd, sessionId, windowId) {
+    let fellBack = false;
+    const fallback = () => {
+      if (fellBack) return;
+      fellBack = true;
+      this.#dispatch(cmd);
+    };
+    const req2 = { instructionId: cmd.instructionId, sessionId, text: cmd.text, expireAt: cmd.expireAt };
+    let r;
+    try {
+      r = await this.#deps.sendToWindow(windowId, req2, (reply) => {
+        if (reply.status === "not_here") {
+          log(`\u6307\u4EE4 ${cmd.instructionId} \u7A97\u53E3\u91CC\u5DF2\u4E0D\u662F\u8FD9\u4E2A\u4F1A\u8BDD\uFF0C\u6539\u8D70\u540E\u53F0`);
+          fallback();
+          return;
+        }
+        if (reply.status === "ack") return;
+        log(`\u6307\u4EE4 ${cmd.instructionId} \u7A97\u53E3 ${reply.status}${reply.reason ? " " + reply.reason : ""}`);
+        this.#report(cmd, sessionId, reply.status, "window", reply.reason ?? "");
+      });
+    } catch (e) {
+      log(`\u6307\u4EE4 ${cmd.instructionId} \u4EA4\u7ED9\u7A97\u53E3\u51FA\u9519\uFF1A${e.message}`);
+      r = "fallback";
+    }
+    if (r === "fallback") fallback();
+    else log(`\u6307\u4EE4 ${cmd.instructionId} \u5DF2\u4EA4\u7ED9\u7A97\u53E3 len=${cmd.text.length}`);
+  }
+  /** 原来的后台路径：校验 → 定位会话与目录 → 排队执行 */
+  #dispatch(cmd) {
     if (isExpired(cmd, this.#deps.now())) {
       log(`\u6307\u4EE4 ${cmd.instructionId} \u5DF2\u8FC7\u671F\uFF0C\u4E22\u5F03`);
+      this.#report(cmd, cmd.sessionId, "rejected", "", "expired");
       return;
     }
     const target = resolveTarget(cmd, {
@@ -2772,6 +3994,7 @@ var Daemon = class {
     });
     if (!target.ok) {
       log(`\u6307\u4EE4 ${cmd.instructionId} \u65E0\u6CD5\u6267\u884C\uFF1A${failureMessage(target.reason)}`);
+      this.#report(cmd, cmd.sessionId, "rejected", "", target.reason);
       return;
     }
     if (target.sessionId) this.#coord.cancelSession(target.sessionId);
@@ -2782,6 +4005,7 @@ var Daemon = class {
       const fresh = readState(sessionId);
       if (!fresh) {
         log(`\u6307\u4EE4 ${cmd.instructionId} \u653E\u5F03\uFF1A\u4F1A\u8BDD ${sessionId} \u5728\u6267\u884C\u524D\u5DF2\u6D88\u5931`);
+        this.#report(cmd, sessionId, "rejected", "", "session_gone");
         return;
       }
     }
@@ -2789,17 +4013,22 @@ var Daemon = class {
     const plan = buildSpawnPlan({ ...cmd, sessionId }, cwd, this.#gateTarget(runId));
     if (!plan) {
       log(`\u6307\u4EE4 ${cmd.instructionId} \u653E\u5F03\uFF1A\u672C\u673A\u4E0D\u652F\u6301\u8FDC\u7A0B\u6267\u884C ${cmd.tool}`);
+      this.#report(cmd, sessionId, "rejected", "", "tool_unsupported");
       return;
     }
     log(`\u6267\u884C ${cmd.instructionId} tool=${cmd.tool} ${sessionId ? "resume" : "new"} cwd=\u2026/${basename6(cwd)} len=${cmd.text.length}`);
-    const result = await this.#run(plan, cmd.tool, runId, sessionId, cwd);
-    if (!result) {
-      log(`\u6307\u4EE4 ${cmd.instructionId} \u653E\u5F03\uFF1A\u672C\u673A\u627E\u4E0D\u5230 ${cmd.tool} \u7684\u53EF\u6267\u884C\u6587\u4EF6`);
+    const result = await this.#run(plan, cmd.tool, runId, sessionId, cwd, () => this.#report(cmd, sessionId, "started", "headless"));
+    if ("fail" in result) {
+      log(
+        result.fail === "gate_unavailable" ? `\u6307\u4EE4 ${cmd.instructionId} \u653E\u5F03\uFF1A\u6388\u6743\u5173\u5361\u4E0D\u53EF\u7528` : `\u6307\u4EE4 ${cmd.instructionId} \u653E\u5F03\uFF1A\u672C\u673A\u627E\u4E0D\u5230 ${cmd.tool} \u7684\u53EF\u6267\u884C\u6587\u4EF6`
+      );
+      this.#report(cmd, sessionId, "failed", "", result.fail);
       return;
     }
     if (isDeferred(result.stdout)) log(`\u6307\u4EE4 ${cmd.instructionId} \u505C\u5728\u7B49\u8BBE\u5907\u6388\u6743\u4E0A\uFF0C\u8FDB\u7A0B\u5DF2\u9000\u51FA`);
     if (!result.ok) {
       log(`\u6307\u4EE4 ${cmd.instructionId} \u6267\u884C\u5931\u8D25\uFF1A${result.error}`);
+      this.#report(cmd, sessionId || result.sessionId || "", "failed", "headless", "exec_failed");
     }
     if (!sessionId) {
       const newId = result.sessionId ?? parseSessionId(cmd.tool, result.stdout);
@@ -2845,28 +4074,29 @@ var Daemon = class {
       r.consumed = true;
       this.#store.save();
     }
-    if (!result) log(`\u7EED\u8DD1\u4F1A\u8BDD ${r.sessionId} \u653E\u5F03\uFF1A\u672C\u673A\u627E\u4E0D\u5230 ${r.tool} \u7684\u53EF\u6267\u884C\u6587\u4EF6`);
+    if ("fail" in result) log(`\u7EED\u8DD1\u4F1A\u8BDD ${r.sessionId} \u653E\u5F03\uFF1A${result.fail === "gate_unavailable" ? "\u6388\u6743\u5173\u5361\u4E0D\u53EF\u7528" : `\u672C\u673A\u627E\u4E0D\u5230 ${r.tool} \u7684\u53EF\u6267\u884C\u6587\u4EF6`}`);
     else if (isDeferred(result.stdout)) log(`\u4F1A\u8BDD ${r.sessionId} \u53C8\u505C\u5728\u4E86\u4E0B\u4E00\u4E2A\u7B49\u6388\u6743\u7684\u64CD\u4F5C\u4E0A`);
     else if (!result.ok) log(`\u7EED\u8DD1\u4F1A\u8BDD ${r.sessionId} \u5931\u8D25\uFF1A${result.error}`);
     else log(`\u7EED\u8DD1\u4F1A\u8BDD ${r.sessionId} \u5B8C\u6210`);
   }
   /**
    * 起进程并在授权协调器里登记这次 run（gate 靠 runId 认人）。
-   * 找不到可执行文件返回 null。
+   * 起不了（关卡不可用 / 找不到可执行文件）返回 {fail}；进程起来那一刻调 onStarted
    */
-  async #run(plan, tool, runId, sessionId, cwd) {
+  async #run(plan, tool, runId, sessionId, cwd, onStarted) {
     if (!existsSync10(this.#deps.nodePath) || !existsSync10(this.#deps.gateScript)) {
       log(`\u6388\u6743\u5173\u5361\u4E0D\u53EF\u7528\uFF08node \u6216 gate.cjs \u627E\u4E0D\u5230\uFF09\uFF0C\u62D2\u7EDD\u6267\u884C ${tool}`);
-      return null;
+      return { fail: "gate_unavailable" };
     }
     if (tool === "opencode" && !this.#deps.opencodeReady()) {
       log("opencode \u63D2\u4EF6\u4E0D\u5728\uFF08deskbuddy enable opencode \u6CA1\u88C5\u6216\u5DF2\u5378\u8F7D\uFF09\uFF0C\u62D2\u7EDD\u6267\u884C opencode");
-      return null;
+      return { fail: "gate_unavailable" };
     }
-    const real = this.#deps.materialize(plan, tool);
-    if (!real) return null;
+    const real2 = this.#deps.materialize(plan, tool);
+    if (!real2) return { fail: "binary_not_found" };
     const startedAt = this.#deps.now();
-    const rc = startCommand(real, tool);
+    const rc = startCommand(real2, tool);
+    onStarted?.();
     this.#coord.registerRun({
       runId,
       tool,
@@ -2907,7 +4137,7 @@ async function runDaemonCommand(opts = {}) {
   }
   if (opts.foreground) process.env.DESKBUDDY_DAEMON_FOREGROUND = "1";
   try {
-    writeFileSync11(pidFilePath(), String(process.pid), "utf8");
+    writeFileSync13(pidFilePath(), String(process.pid), "utf8");
   } catch {
   }
   let daemon;
@@ -2923,7 +4153,7 @@ async function runDaemonCommand(opts = {}) {
     log(`\u6536\u5230 ${sig}\uFF0C\u9000\u51FA`);
     daemon.stop();
     try {
-      rmSync4(pidFilePath(), { force: true });
+      rmSync7(pidFilePath(), { force: true });
     } catch {
     }
     process.exit(0);
@@ -2940,8 +4170,8 @@ async function runDaemonCommand(opts = {}) {
 }
 
 // src/core/registry.ts
-import { mkdirSync as mkdirSync12, readFileSync as readFileSync10, writeFileSync as writeFileSync12 } from "fs";
-import { join as join15 } from "path";
+import { mkdirSync as mkdirSync14, readFileSync as readFileSync13, writeFileSync as writeFileSync14 } from "fs";
+import { join as join17 } from "path";
 var FALLBACK = {
   version: "builtin",
   tools: {
@@ -3019,11 +4249,11 @@ var FALLBACK = {
   }
 };
 function registryCachePath() {
-  return join15(deskbuddyHome(), "tool-registry.json");
+  return join17(deskbuddyHome(), "tool-registry.json");
 }
 function loadRegistry() {
   try {
-    return JSON.parse(readFileSync10(registryCachePath(), "utf8"));
+    return JSON.parse(readFileSync13(registryCachePath(), "utf8"));
   } catch {
     return FALLBACK;
   }
@@ -3031,15 +4261,15 @@ function loadRegistry() {
 async function refreshRegistry() {
   try {
     const registry = await api.toolRegistry();
-    mkdirSync12(deskbuddyHome(), { recursive: true });
-    writeFileSync12(registryCachePath(), JSON.stringify(registry, null, 2), "utf8");
+    mkdirSync14(deskbuddyHome(), { recursive: true });
+    writeFileSync14(registryCachePath(), JSON.stringify(registry, null, 2), "utf8");
   } catch {
   }
 }
 
 // src/adapters/ccHook.ts
-import { chmodSync as chmodSync2, existsSync as existsSync11, mkdirSync as mkdirSync13, readFileSync as readFileSync11, renameSync as renameSync9, statSync as statSync3, writeFileSync as writeFileSync13 } from "fs";
-import { dirname as dirname6, join as join16 } from "path";
+import { chmodSync as chmodSync4, existsSync as existsSync11, mkdirSync as mkdirSync15, readFileSync as readFileSync14, renameSync as renameSync11, statSync as statSync4, writeFileSync as writeFileSync15 } from "fs";
+import { dirname as dirname6, join as join18 } from "path";
 var CC_EVENTS = [
   "UserPromptSubmit",
   "PreToolUse",
@@ -3050,7 +4280,7 @@ var CC_EVENTS = [
 ];
 function readSettings(path) {
   if (!existsSync11(path)) return {};
-  const raw = readFileSync11(path, "utf8");
+  const raw = readFileSync14(path, "utf8");
   if (raw.trim() === "") return {};
   try {
     return JSON.parse(raw);
@@ -3059,26 +4289,32 @@ function readSettings(path) {
   }
 }
 function writeSettings(path, settings) {
-  mkdirSync13(dirname6(path), { recursive: true });
+  mkdirSync15(dirname6(path), { recursive: true });
   let mode;
   try {
-    mode = statSync3(path).mode & 511;
+    mode = statSync4(path).mode & 511;
   } catch {
     mode = void 0;
   }
   const tmp = path + ".deskbuddy.tmp";
-  writeFileSync13(tmp, JSON.stringify(settings, null, 2), "utf8");
-  if (mode !== void 0) chmodSync2(tmp, mode);
-  renameSync9(tmp, path);
+  writeFileSync15(tmp, JSON.stringify(settings, null, 2), "utf8");
+  if (mode !== void 0) chmodSync4(tmp, mode);
+  renameSync11(tmp, path);
 }
-function installCcHook(settingsPath, hookPath, events = CC_EVENTS, tool = "claude_code") {
+function mentions(command, script) {
+  return !!command && (command.includes(script) || command.includes(fwdSlash(script)));
+}
+function scriptArg(script, platform, quote = (s) => s) {
+  return platform === "win32" ? winCmdPath(script) : quote(script);
+}
+function installCcHook(settingsPath, hookPath, events = CC_EVENTS, tool = "claude_code", platform = process.platform) {
   const settings = readSettings(settingsPath);
   settings.hooks ??= {};
   for (const event of events) {
     const groups = settings.hooks[event] ??= [];
-    const already = groups.some((g) => g.hooks?.some((h) => h.command?.includes(hookPath)));
+    const already = groups.some((g) => g.hooks?.some((h) => mentions(h.command, hookPath)));
     if (already) continue;
-    groups.push({ hooks: [{ type: "command", command: `node ${hookPath} ${tool}` }] });
+    groups.push({ hooks: [{ type: "command", command: `node ${scriptArg(hookPath, platform)} ${tool}` }] });
   }
   writeSettings(settingsPath, settings);
 }
@@ -3086,26 +4322,26 @@ var WINDOW_GATE_TIMEOUT_S = 7 * 24 * 60 * 60;
 function shQuote2(s) {
   return `'${s.replace(/'/g, `'\\''`)}'`;
 }
-function installCcWindowGate(settingsPath, gatePath, tool = "claude_code") {
+function installCcWindowGate(settingsPath, gatePath, tool = "claude_code", platform = process.platform) {
   const settings = readSettings(settingsPath);
   settings.hooks ??= {};
   const groups = settings.hooks.PermissionRequest ??= [];
-  if (groups.some((g) => g.hooks?.some((h) => h.command?.includes(gatePath)))) return;
+  if (groups.some((g) => g.hooks?.some((h) => mentions(h.command, gatePath)))) return;
   const toolArg = tool === "claude_code" ? "" : ` --tool ${tool}`;
   groups.push({
-    hooks: [{ type: "command", command: `node ${shQuote2(gatePath)} --window${toolArg}`, timeout: WINDOW_GATE_TIMEOUT_S }]
+    hooks: [{ type: "command", command: `node ${scriptArg(gatePath, platform, shQuote2)} --window${toolArg}`, timeout: WINDOW_GATE_TIMEOUT_S }]
   });
   writeSettings(settingsPath, settings);
 }
 function uninstallCcHook(settingsPath, hookPath) {
   const settings = readSettings(settingsPath);
   if (!settings.hooks) return;
-  const gatePath = join16(dirname6(hookPath), "gate.cjs");
+  const gatePath = join18(dirname6(hookPath), "gate.cjs");
   for (const event of Object.keys(settings.hooks)) {
     const groups = settings.hooks[event] ?? [];
     const kept = [];
     for (const g of groups) {
-      const hooks = (g.hooks ?? []).filter((h) => !h.command?.includes(hookPath) && !h.command?.includes(gatePath));
+      const hooks = (g.hooks ?? []).filter((h) => !mentions(h.command, hookPath) && !mentions(h.command, gatePath));
       if (hooks.length > 0) kept.push({ ...g, hooks });
     }
     settings.hooks[event] = kept;
@@ -3114,8 +4350,8 @@ function uninstallCcHook(settingsPath, hookPath) {
 }
 
 // src/adapters/codexHook.ts
-import { chmodSync as chmodSync3, existsSync as existsSync12, mkdirSync as mkdirSync14, readFileSync as readFileSync12, renameSync as renameSync10, statSync as statSync4, writeFileSync as writeFileSync14 } from "fs";
-import { dirname as dirname7, join as join17 } from "path";
+import { chmodSync as chmodSync5, existsSync as existsSync12, mkdirSync as mkdirSync16, readFileSync as readFileSync15, renameSync as renameSync12, statSync as statSync5, writeFileSync as writeFileSync16 } from "fs";
+import { dirname as dirname7, join as join19 } from "path";
 var CODEX_MARKER_BEGIN = "# >>> deskbuddy >>>";
 var CODEX_MARKER_END = "# <<< deskbuddy <<<";
 var CODEX_EVENTS = [
@@ -3128,13 +4364,13 @@ var CODEX_EVENTS = [
 ];
 var CODEX_TRUST_NOTICE = "\u26A0\uFE0F  \u4E0B\u6B21\u542F\u52A8 Codex \u65F6\u4F1A\u8981\u6C42\u4F60\u786E\u8BA4\u4FE1\u4EFB\u8FD9\u4E2A hook\uFF0C\u8BF7\u9009\u62E9\u540C\u610F\u2014\u2014\u4E0D\u786E\u8BA4\u7684\u8BDD Codex \u4E0D\u4F1A\u6267\u884C\u5B83\u3002\n   Codex \u7ECF `--remote` \u8FDE\u5E38\u9A7B app-server \u4F7F\u7528\u65F6\uFF0C\u7A97\u53E3\u91CC\u7684\u6388\u6743\u6846\u4E5F\u80FD\u5728\u8BBE\u5907\u4E0A\u786E\u8BA4\uFF08\u5B88\u62A4\u8FDB\u7A0B\u5728\u8DD1\u65F6\u751F\u6548\uFF09";
 function codexConfigPath() {
-  return join17(codexHome(), "config.toml");
+  return join19(codexHome(), "config.toml");
 }
-function renderBlock(hookPath, events, tool) {
-  const command = JSON.stringify(`node ${hookPath} ${tool}`);
-  const lines = [CODEX_MARKER_BEGIN];
+function renderBlock(hookPath, events, tool, platform) {
+  const command = JSON.stringify(`node ${platform === "win32" ? winPsPath(hookPath) : hookPath} ${tool}`);
+  const lines2 = [CODEX_MARKER_BEGIN];
   for (const event of events) {
-    lines.push(
+    lines2.push(
       `[[hooks.${event}]]`,
       'matcher = ""',
       "hooks = [",
@@ -3143,21 +4379,21 @@ function renderBlock(hookPath, events, tool) {
       ""
     );
   }
-  lines.push(CODEX_MARKER_END);
-  return lines.join("\n");
+  lines2.push(CODEX_MARKER_END);
+  return lines2.join("\n");
 }
 function writeAtomic(path, content) {
-  mkdirSync14(dirname7(path), { recursive: true });
+  mkdirSync16(dirname7(path), { recursive: true });
   let mode;
   try {
-    mode = statSync4(path).mode & 511;
+    mode = statSync5(path).mode & 511;
   } catch {
     mode = void 0;
   }
   const tmp = path + ".deskbuddy.tmp";
-  writeFileSync14(tmp, content, "utf8");
-  if (mode !== void 0) chmodSync3(tmp, mode);
-  renameSync10(tmp, path);
+  writeFileSync16(tmp, content, "utf8");
+  if (mode !== void 0) chmodSync5(tmp, mode);
+  renameSync12(tmp, path);
 }
 function assertSafeToAppend(raw, path) {
   for (const quote of ['"""', "'''"]) {
@@ -3166,35 +4402,35 @@ function assertSafeToAppend(raw, path) {
     }
   }
 }
-function installCodexHook(configPath2, hookPath, events = CODEX_EVENTS, tool = "codex") {
-  const raw = existsSync12(configPath2) ? readFileSync12(configPath2, "utf8") : "";
+function installCodexHook(configPath2, hookPath, events = CODEX_EVENTS, tool = "codex", platform = process.platform) {
+  const raw = existsSync12(configPath2) ? readFileSync15(configPath2, "utf8") : "";
   if (raw.includes(CODEX_MARKER_BEGIN)) return;
   assertSafeToAppend(raw, configPath2);
-  const block = renderBlock(hookPath, events, tool);
+  const block = renderBlock(hookPath, events, tool, platform);
   const head = raw === "" ? "" : (raw.endsWith("\n") ? raw : raw + "\n") + "\n";
   writeAtomic(configPath2, head + block + "\n");
 }
 function uninstallCodexHook(configPath2) {
   if (!existsSync12(configPath2)) return;
-  const raw = readFileSync12(configPath2, "utf8");
-  const lines = raw.split("\n");
-  const begin = lines.findIndex((l) => l.trim() === CODEX_MARKER_BEGIN);
+  const raw = readFileSync15(configPath2, "utf8");
+  const lines2 = raw.split("\n");
+  const begin = lines2.findIndex((l) => l.trim() === CODEX_MARKER_BEGIN);
   if (begin === -1) return;
-  const end = lines.findIndex((l, i) => i > begin && l.trim() === CODEX_MARKER_END);
+  const end = lines2.findIndex((l, i) => i > begin && l.trim() === CODEX_MARKER_END);
   if (end === -1) {
     throw new Error(`${configPath2} \u91CC\u53EA\u627E\u5230\u5F00\u59CB\u6807\u8BB0\u3001\u6CA1\u6709\u7ED3\u675F\u6807\u8BB0\uFF0C\u4E3A\u514D\u8BEF\u5220\u5DF2\u4E2D\u6B62\uFF0C\u8BF7\u624B\u5DE5\u68C0\u67E5`);
   }
-  const start = begin > 0 && lines[begin - 1].trim() === "" ? begin - 1 : begin;
-  lines.splice(start, end - start + 1);
-  writeAtomic(configPath2, lines.join("\n"));
+  const start = begin > 0 && lines2[begin - 1].trim() === "" ? begin - 1 : begin;
+  lines2.splice(start, end - start + 1);
+  writeAtomic(configPath2, lines2.join("\n"));
 }
 
 // src/commands/tools.ts
-import { existsSync as existsSync13, readFileSync as readFileSync13 } from "fs";
+import { existsSync as existsSync13, readFileSync as readFileSync16 } from "fs";
 function fileContains(path, needle) {
   try {
     if (!existsSync13(path)) return false;
-    return readFileSync13(path, "utf8").includes(needle);
+    return readFileSync16(path, "utf8").includes(needle);
   } catch {
     return false;
   }
@@ -3209,7 +4445,8 @@ var ADAPTERS = {
     configPath: (tool) => CC_CONFIG_PATHS[tool]?.() ?? null,
     install: (p, hook, events, tool) => installCcHook(p, hook, events, tool),
     uninstall: (p, hook) => uninstallCcHook(p, hook),
-    isInstalled: (p, hook) => fileContains(p, hook),
+    // Windows 上装出去的是正斜杠形式；JSON 里的反斜杠还会被转义成两个，原样搜不到
+    isInstalled: (p, hook) => fileContains(p, hook) || fileContains(p, fwdSlash(hook)),
     defaultEvents: CC_EVENTS,
     // 实测 PermissionRequest 与窗口授权框并行的：Claude Code（S10 §2）、Qoder CN 桌面端（二期 V8）。
     // WorkBuddy 桌面端弹授权框不触发 PermissionRequest；Codex 的 hook 会阻塞授权框——都不装
@@ -3260,91 +4497,427 @@ function subscribedEvents(registry, tool, fallback) {
   return picked.length > 0 ? picked : fallback;
 }
 
-// src/commands/disable.ts
-function stdout(line) {
-  process.stdout.write(line + "\n");
+// src/commands/enable.ts
+import { dirname as dirname9, join as join22 } from "path";
+
+// src/wrap/shim.ts
+import { execFileSync as execFileSync7 } from "child_process";
+import { chmodSync as chmodSync6, existsSync as existsSync14, mkdirSync as mkdirSync17, readdirSync as readdirSync3, readFileSync as readFileSync17, rmdirSync, rmSync as rmSync8, writeFileSync as writeFileSync17 } from "fs";
+import { homedir as homedir5 } from "os";
+import { delimiter as delimiter2, join as join20, resolve as resolve2 } from "path";
+var SHIM_FALLBACK_EXIT = 213;
+var WIN_SHIM_ENABLED = false;
+var SHIM_COMMANDS = { claude_code: "claude", codex: "codex" };
+var SHIM_MARKER = "DeskBuddy window-wrap shim";
+var RC_BEGIN = "# >>> deskbuddy >>>";
+var RC_END = "# <<< deskbuddy <<<";
+var RC_FILES = [".zshrc", ".bashrc"];
+var WIN_PENDING = "Windows \u7A97\u53E3\u63A5\u7BA1\u5F85\u9A8C\u8BC1\uFF0C\u6682\u672A\u5F00\u542F";
+function shimDir() {
+  return join20(deskbuddyHome(), "bin");
+}
+function shimFile(binDir, command, platform = process.platform) {
+  return join20(binDir, platform === "win32" ? `${command}.cmd` : command);
+}
+function shQuote3(s) {
+  return `'${s.replace(/'/g, `'\\''`)}'`;
 }
-function toolsToDisable(explicit) {
-  if (explicit.length > 0) return explicit;
-  const known = Object.keys(loadRegistry()?.tools ?? {});
-  return [.../* @__PURE__ */ new Set([...loadConfig().enabledTools, ...known])];
+function shStripPath(command) {
+  return [
+    // 🔴 防递归：exec 不换 pid，同一个 pid 第二次走到这里 = 垫片 exec 到了自己（PATH 里还有别的写法指向垫片）
+    'if [ "${DESKBUDDY_SHIM_HOPS:-}" = "$$" ]; then',
+    `  echo "deskbuddy: \u627E\u4E0D\u5230\u771F\u6B63\u7684 ${command}\uFF08\u57AB\u7247\u5728\u8C03\u7528\u81EA\u5DF1\uFF09\u3002\u53EF\u8BBE DESKBUDDY_WRAP_OFF=1 \u6216\u68C0\u67E5 PATH" >&2`,
+    "  exit 127",
+    "fi",
+    "DESKBUDDY_SHIM_HOPS=$$",
+    "export DESKBUDDY_SHIM_HOPS",
+    "set -f",
+    "DB_P=''",
+    "DB_IFS=$IFS",
+    "IFS=:",
+    "for d in $PATH; do",
+    '  case "$d" in "$DB_BIN"|"$DB_BIN/") ;; *) DB_P="${DB_P:+$DB_P:}$d" ;; esac',
+    "done",
+    "IFS=$DB_IFS",
+    "set +f",
+    "PATH=$DB_P",
+    "export PATH"
+  ];
 }
-async function runDisable(tools, opts = {}) {
-  const out = opts.out ?? stdout;
-  const registry = loadRegistry();
-  const hookPath = installedHookPath();
-  const targets = toolsToDisable(tools);
-  const cfg = loadConfig();
-  const enabled = new Set(cfg.enabledTools);
-  let failed = 0;
-  for (const tool of targets) {
-    const adapter = adapterFor(registry, tool);
-    if (!adapter) {
-      continue;
+function shScript(tool, command, nodePath, cliPath, binDir) {
+  return [
+    "#!/bin/sh",
+    `# ${SHIM_MARKER} (${tool}). Generated by deskbuddy; \`deskbuddy disable ${tool}\` removes it.`,
+    "# DeskBuddy \u7A97\u53E3\u63A5\u7BA1\u57AB\u7247\uFF1A\u51FA\u4EFB\u4F55\u95EE\u9898\u53EF\u7528 DESKBUDDY_WRAP_OFF=1 \u4E34\u65F6\u7ED5\u5F00",
+    `DB_NODE=${shQuote3(nodePath)}`,
+    `DB_CLI=${shQuote3(cliPath)}`,
+    `DB_BIN=${shQuote3(binDir)}`,
+    'if [ -z "${DESKBUDDY_WRAPPED:-}" ] && [ "${DESKBUDDY_WRAP_OFF:-}" != "1" ] && [ -x "$DB_NODE" ] && [ -f "$DB_CLI" ]; then',
+    // 不 exec：wrap 找不到真程序时以 213 退出，垫片接着走下面的放行分支（约定见 run.ts SHIM_FALLBACK_EXIT）
+    `  DESKBUDDY_SHIM=1 "$DB_NODE" "$DB_CLI" wrap ${tool} "$@"`,
+    "  DB_RC=$?",
+    `  [ "$DB_RC" -eq ${SHIM_FALLBACK_EXIT} ] || exit "$DB_RC"`,
+    "fi",
+    "# \u653E\u884C\uFF1A\u628A\u672C\u76EE\u5F55\u4ECE PATH \u91CC\u62FF\u6389\uFF0C\u76F4\u63A5\u8DD1\u771F\u7684\u7A0B\u5E8F",
+    ...shStripPath(command),
+    `exec ${command} "$@"`,
+    ""
+  ].join("\n");
+}
+function cmdPath(p, env) {
+  let out = p.replace(/%/g, "%%");
+  for (const name of ["LOCALAPPDATA", "APPDATA", "USERPROFILE"]) {
+    const v = env[name];
+    if (v && p.toLowerCase().startsWith(v.toLowerCase() + "\\")) {
+      out = `%${name}%` + p.slice(v.length).replace(/%/g, "%%");
+      break;
     }
-    const configPath2 = adapter.configPath(tool);
-    if (!configPath2) continue;
+  }
+  return /^[\x20-\x7e]*$/.test(out) && !out.includes('"') ? out : null;
+}
+function cmdScript(tool, command, node, cli, bin) {
+  return [
+    "@echo off",
+    `rem ${SHIM_MARKER} (${tool}). Generated by deskbuddy; "deskbuddy disable ${tool}" removes it.`,
+    "rem Set DESKBUDDY_WRAP_OFF=1 to bypass.",
+    "setlocal",
+    "if defined DESKBUDDY_WRAPPED goto direct",
+    'if "%DESKBUDDY_WRAP_OFF%"=="1" goto direct',
+    `if not exist "${node}" goto direct`,
+    `if not exist "${cli}" goto direct`,
+    'set "DESKBUDDY_SHIM=1"',
+    `"${node}" "${cli}" wrap ${tool} %*`,
+    `if not "%ERRORLEVEL%"=="${SHIM_FALLBACK_EXIT}" exit /b %ERRORLEVEL%`,
+    'set "DESKBUDDY_SHIM="',
+    ":direct",
+    // 从 PATH 里去掉本目录（cmd 的替换不分大小写）；相邻重复项一次替换删不净，循环到不再变化。
+    // 延迟展开只开在这一小段：它会吃掉 %* 里的 !
+    "setlocal EnableDelayedExpansion",
+    `set "DB_BIN=${bin}"`,
+    'set "DB_P=;!PATH!;"',
+    ":dbstrip",
+    'set "DB_Q=!DB_P:;%DB_BIN%;=;!"',
+    'if not "!DB_Q!"=="!DB_P!" (set "DB_P=!DB_Q!" & goto dbstrip)',
+    'endlocal & set "PATH=%DB_P:~1,-1%"',
+    `${command} %*`,
+    "exit /b %ERRORLEVEL%",
+    ""
+  ].join("\r\n");
+}
+function rcBlock(binDir, rcHome) {
+  const std = resolve2(rcHome, ".deskbuddy", "bin") === resolve2(binDir);
+  const dir = std ? "$HOME/.deskbuddy/bin" : binDir.replace(/(["\\$`])/g, "\\$1");
+  return [
+    RC_BEGIN,
+    "# DeskBuddy \u7A97\u53E3\u63A5\u7BA1\uFF1A\u7EC8\u7AEF\u91CC\u7684 claude \u7ECF DeskBuddy \u6253\u5F00\uFF0C\u8BBE\u5907\u4E0A\u7684\u56DE\u590D\u80FD\u5199\u8FDB\u7A97\u53E3\u3002",
+    "# `deskbuddy disable claude_code` \u4F1A\u5220\u6389\u8FD9\u4E00\u6BB5\u3002",
+    `export PATH="${dir}:$PATH"`,
+    RC_END
+  ].join("\n");
+}
+var RC_NL_FLAG = " (+nl)";
+function locateBlock(content) {
+  const i = content.indexOf(RC_BEGIN);
+  if (i < 0) return null;
+  if (i > 0 && content[i - 1] !== "\n") return null;
+  const k = content.indexOf(RC_END, i);
+  if (k < 0) return null;
+  const lineEnd = content.indexOf("\n", i);
+  const beginLine = content.slice(i, lineEnd < 0 ? void 0 : lineEnd);
+  return { i, j: k + RC_END.length, addedNl: beginLine.endsWith(RC_NL_FLAG) };
+}
+function flagged(block) {
+  return block.replace(RC_BEGIN, RC_BEGIN + RC_NL_FLAG);
+}
+function addRcBlock(content, block) {
+  const loc = locateBlock(content);
+  if (loc) {
+    const next = content.slice(0, loc.i) + (loc.addedNl ? flagged(block) : block) + content.slice(loc.j);
+    return next === content ? null : next;
+  }
+  if (content === "" || content.endsWith("\n")) return content + block + "\n";
+  return content + "\n" + flagged(block) + "\n";
+}
+function removeRcBlock(content) {
+  const loc = locateBlock(content);
+  if (!loc) return null;
+  const start = loc.addedNl && loc.i > 0 && content[loc.i - 1] === "\n" ? loc.i - 1 : loc.i;
+  const end = content[loc.j] === "\n" ? loc.j + 1 : loc.j;
+  return content.slice(0, start) + content.slice(end);
+}
+function readRc(p) {
+  return readFileSync17(p).toString("latin1");
+}
+function writeRc(p, latin1) {
+  writeFileSync17(p, Buffer.from(latin1, "latin1"));
+}
+function toLatin1(utf8) {
+  return Buffer.from(utf8, "utf8").toString("latin1");
+}
+function winKey(p) {
+  return p.replace(/\//g, "\\").replace(/\\+$/, "").toLowerCase();
+}
+function addPathEntry(value, dir) {
+  const parts = value.split(";");
+  if (parts.some((p) => winKey(p) === winKey(dir))) return null;
+  return value === "" ? dir : `${dir};${value}`;
+}
+function removePathEntry(value, dir) {
+  const parts = value.split(";");
+  const kept = parts.filter((p) => winKey(p) !== winKey(dir));
+  if (kept.length === parts.length) return null;
+  return kept.join(";");
+}
+var PS_READ = "$k=[Microsoft.Win32.Registry]::CurrentUser.OpenSubKey('Environment');$v='';if($k){$v=$k.GetValue('Path','',[Microsoft.Win32.RegistryValueOptions]::DoNotExpandEnvironmentNames)};[Console]::Out.Write([Convert]::ToBase64String([Text.Encoding]::UTF8.GetBytes([string]$v)))";
+var PS_WRITE = "$k=[Microsoft.Win32.Registry]::CurrentUser.CreateSubKey('Environment');$kind=[Microsoft.Win32.RegistryValueKind]::ExpandString;try{$kind=$k.GetValueKind('Path')}catch{};if([string]::IsNullOrEmpty($env:DESKBUDDY_NEW_PATH)){$k.DeleteValue('Path',$false)}else{$k.SetValue('Path',$env:DESKBUDDY_NEW_PATH,$kind)};[Environment]::SetEnvironmentVariable('DESKBUDDY_PATH_REFRESH','1','User');[Environment]::SetEnvironmentVariable('DESKBUDDY_PATH_REFRESH',$null,'User')";
+function psWinPath() {
+  const ps = (script, env) => execFileSync7("powershell.exe", ["-NoProfile", "-NonInteractive", "-ExecutionPolicy", "Bypass", "-Command", script], {
+    encoding: "utf8",
+    stdio: ["ignore", "pipe", "ignore"],
+    windowsHide: true,
+    timeout: 15e3,
+    env: env ?? process.env
+  });
+  return {
+    read: () => {
+      try {
+        return Buffer.from(ps(PS_READ).trim(), "base64").toString("utf8");
+      } catch {
+        return null;
+      }
+    },
+    write: (v) => {
+      ps(PS_WRITE, { ...process.env, DESKBUDDY_NEW_PATH: v });
+    }
+  };
+}
+function defaultShimEnv(nodePath, cliPath) {
+  const env = process.env;
+  const isolated = !!env.VITEST || !!env.DESKBUDDY_HOME;
+  const rcHome = env.DESKBUDDY_RC_HOME || (isolated ? null : homedir5());
+  return {
+    platform: process.platform,
+    binDir: shimDir(),
+    nodePath,
+    cliPath,
+    rcHome,
+    winPath: process.platform === "win32" && !isolated ? psWinPath() : null,
+    env
+  };
+}
+function installShim(tool, e) {
+  const command = SHIM_COMMANDS[tool];
+  if (!command) return { ok: false, message: "" };
+  if (e.platform === "win32" && !WIN_SHIM_ENABLED) return { ok: false, message: WIN_PENDING };
+  if (e.platform === "win32" && tool === "codex") return { ok: false, message: WIN_PENDING };
+  const file = shimFile(e.binDir, command, e.platform);
+  if (e.platform === "win32") {
+    const node = cmdPath(e.nodePath, e.env);
+    const cli = cmdPath(e.cliPath, e.env);
+    const bin = cmdPath(e.binDir, e.env);
+    if (!node || !cli || !bin) {
+      return { ok: false, message: "\u7A97\u53E3\u63A5\u7BA1\u6CA1\u88C5\uFF1A\u5B89\u88C5\u8DEF\u5F84\u91CC\u6709\u975E ASCII \u5B57\u7B26\uFF0CWindows \u7684 .cmd \u8BFB\u4E0D\u4E86\uFF08\u4E0D\u5F71\u54CD\u5176\u5B83\u529F\u80FD\uFF09" };
+    }
+    mkdirSync17(e.binDir, { recursive: true });
+    writeFileSync17(file, cmdScript(tool, command, node, cli, bin), "utf8");
+  } else {
+    mkdirSync17(e.binDir, { recursive: true, mode: 448 });
+    writeFileSync17(file, shScript(tool, command, e.nodePath, e.cliPath, e.binDir), { encoding: "utf8", mode: 493 });
+    chmodSync6(file, 493);
+  }
+  const touched = [];
+  if (e.platform === "win32") {
+    if (e.winPath) {
+      const cur = e.winPath.read();
+      if (cur === null) return { ok: false, message: "\u7A97\u53E3\u63A5\u7BA1\uFF1A\u8BFB\u4E0D\u5230\u7528\u6237 PATH\uFF0C\u8BF7\u624B\u52A8\u628A " + e.binDir + " \u52A0\u5230\u7528\u6237 PATH \u6700\u524D\u9762" };
+      const next = addPathEntry(cur, e.binDir);
+      if (next !== null) e.winPath.write(next);
+      touched.push("\u7528\u6237 PATH");
+    }
+  } else if (e.rcHome) {
+    const block = toLatin1(rcBlock(e.binDir, e.rcHome));
+    for (const name of RC_FILES) {
+      const rc = join20(e.rcHome, name);
+      if (!existsSync14(rc)) continue;
+      const next = addRcBlock(readRc(rc), block);
+      if (next !== null) writeRc(rc, next);
+      touched.push(`~/${name}`);
+    }
+  }
+  if (touched.length === 0) {
+    return {
+      ok: true,
+      message: `\u7A97\u53E3\u63A5\u7BA1\uFF1A\u57AB\u7247\u5DF2\u88C5\u5728 ${e.binDir}\uFF0C\u4F46\u6CA1\u6539 shell \u914D\u7F6E\u2014\u2014\u8981\u751F\u6548\u8BF7\u628A\u5B83\u52A0\u5230 PATH \u6700\u524D\u9762`
+    };
+  }
+  return {
+    ok: true,
+    message: `\u7A97\u53E3\u63A5\u7BA1\u5DF2\u5F00\u542F\uFF08\u5DF2\u6539 ${touched.join("\u3001")}\uFF09\uFF1A\u65B0\u5F00\u7684\u7EC8\u7AEF\u91CC\u6572 ${command} \u5C31\u7ECF DeskBuddy \u6253\u5F00\uFF0C\u5DF2\u5F00\u7740\u7684\u7EC8\u7AEF\u8981\u91CD\u5F00\u624D\u751F\u6548`
+  };
+}
+function ourShims(binDir) {
+  let names;
+  try {
+    names = readdirSync3(binDir);
+  } catch {
+    return [];
+  }
+  return names.filter((n) => {
     try {
-      adapter.uninstall(configPath2, hookPath);
-      out(`\u2705 ${tool}\uFF1A\u5DF2\u4ECE ${configPath2} \u79FB\u9664`);
-    } catch (e) {
-      out(`\u2717 ${tool}\uFF1A${e.message}`);
-      failed += 1;
-      continue;
+      return readFileSync17(join20(binDir, n), "utf8").includes(SHIM_MARKER);
+    } catch {
+      return false;
     }
-    enabled.delete(tool);
+  });
+}
+function uninstallShim(tool, e) {
+  const command = SHIM_COMMANDS[tool];
+  if (!command) return { ok: true, message: "" };
+  let removed = false;
+  const file = shimFile(e.binDir, command, e.platform);
+  try {
+    if (existsSync14(file) && readFileSync17(file, "utf8").includes(SHIM_MARKER)) {
+      rmSync8(file, { force: true });
+      removed = true;
+    }
+  } catch {
   }
-  cfg.enabledTools = [...enabled];
-  saveConfig(cfg);
-  if (enabled.size === 0 && !opts.keepAutostart) {
-    const r = await uninstallAutostart();
-    if (r.message) out(r.ok ? `\u2705 ${r.message}` : `\u26A0\uFE0F  ${r.message}`);
+  if (ourShims(e.binDir).length > 0) return { ok: true, message: removed ? `\u5DF2\u5220\u9664\u7A97\u53E3\u63A5\u7BA1\u57AB\u7247 ${file}` : "" };
+  const touched = [];
+  if (e.platform === "win32") {
+    if (e.winPath) {
+      const cur = e.winPath.read();
+      const next = cur === null ? null : removePathEntry(cur, e.binDir);
+      if (next !== null) {
+        e.winPath.write(next);
+        touched.push("\u7528\u6237 PATH");
+      }
+    }
+  } else if (e.rcHome) {
+    for (const name of RC_FILES) {
+      const rc = join20(e.rcHome, name);
+      if (!existsSync14(rc)) continue;
+      const next = removeRcBlock(readRc(rc));
+      if (next !== null) {
+        writeRc(rc, next);
+        touched.push(`~/${name}`);
+      }
+    }
   }
-  if (!opts.brief) {
-    out("");
-    out("\u5DF2\u505C\u6B62\u91C7\u96C6\u3002\u6388\u6743\u4E0E clientId \u4ECD\u4FDD\u7559\uFF0C\u91CD\u65B0 deskbuddy enable \u5373\u53EF\u6062\u590D\u3002");
-    out("\u8981\u5F7B\u5E95\u6E05\u9664\u672C\u673A\u6570\u636E\u8BF7\u8FD0\u884C\uFF1Adeskbuddy logout");
+  try {
+    if (existsSync14(e.binDir) && readdirSync3(e.binDir).length === 0) rmdirSync(e.binDir);
+  } catch {
   }
-  return failed > 0 ? 1 : 0;
+  if (!removed && touched.length === 0) return { ok: true, message: "" };
+  return { ok: true, message: `\u7A97\u53E3\u63A5\u7BA1\u5DF2\u5173\u95ED${touched.length ? `\uFF08\u5DF2\u4ECE ${touched.join("\u3001")} \u79FB\u9664\uFF09` : ""}\uFF0C\u65B0\u5F00\u7684\u7EC8\u7AEF\u751F\u6548` };
+}
+function shimState(tool, binDir, pathEnv, platform = process.platform) {
+  const command = SHIM_COMMANDS[tool];
+  if (!command) return { installed: false, inPath: false };
+  const file = shimFile(binDir, command, platform);
+  let installed = false;
+  try {
+    installed = readFileSync17(file, "utf8").includes(SHIM_MARKER);
+  } catch {
+    installed = false;
+  }
+  const win = platform === "win32";
+  const key = (p) => win ? winKey(p) : p.replace(/\/+$/, "");
+  const inPath = pathEnv.split(win ? ";" : delimiter2).some((p) => p && key(p) === key(binDir));
+  return { installed, inPath };
+}
+
+// src/wrap/pty.ts
+import { chmodSync as chmodSync7, existsSync as existsSync15, statSync as statSync6 } from "fs";
+import { createRequire as createRequire2 } from "module";
+import { dirname as dirname8, join as join21 } from "path";
+var req = createRequire2(import.meta.url);
+function fixSpawnHelper() {
+  if (process.platform !== "darwin") return;
+  try {
+    const dir = join21(dirname8(req.resolve("node-pty/package.json")), "prebuilds", `darwin-${process.arch}`);
+    const helper = join21(dir, "spawn-helper");
+    if (existsSync15(helper) && (statSync6(helper).mode & 73) === 0) chmodSync7(helper, 493);
+  } catch {
+  }
+}
+function loadPty() {
+  try {
+    fixSpawnHelper();
+    const m = req("node-pty");
+    return typeof m?.spawn === "function" ? m : null;
+  } catch {
+    return null;
+  }
+}
+function loadHeadless() {
+  try {
+    const m = req("@xterm/headless");
+    return typeof m?.Terminal === "function" ? m.Terminal : null;
+  } catch {
+    return null;
+  }
+}
+function screenLines(term) {
+  const b = term.buffer.active;
+  const out = [];
+  for (let i = b.viewportY; i < b.viewportY + term.rows; i++) {
+    const l = b.getLine(i);
+    out.push(l ? l.translateToString(true) : "");
+  }
+  return out;
 }
 
 // src/commands/enable.ts
-import { dirname as dirname8, join as join18 } from "path";
-function stdout2(line) {
+function stdout(line) {
   process.stdout.write(line + "\n");
 }
 function parseTools(arg) {
   return (arg ?? "").split(",").map((s) => s.trim()).filter((s) => s !== "");
 }
-async function runEnable(tools, opts = {}) {
-  const out = opts.out ?? stdout2;
-  if (tools.length === 0) {
-    out("\u7528\u6CD5\uFF1Adeskbuddy enable <tool[,tool]>\uFF0C\u4F8B\u5982 deskbuddy enable claude_code,codex");
-    return 1;
+function defaultShimEnvForInstall() {
+  let node = null;
+  try {
+    node = whichIn("node", defaultLocateDeps());
+  } catch {
+    node = null;
   }
-  if (!loadConfig().boundAt) {
-    out("\u8FD8\u6CA1\u6709\u6388\u6743\u3002\u8BF7\u5148\u8FD0\u884C\uFF1Adeskbuddy setup");
-    return 1;
+  return defaultShimEnv(node ?? process.execPath, defaultCliPath());
+}
+function installShims(tools, out, shim) {
+  if (!shim) return;
+  for (const tool of tools) {
+    if (!SHIM_COMMANDS[tool]) continue;
+    try {
+      const r = installShim(tool, shim);
+      if (r.message) out(r.ok ? `\u2705 ${r.message}` : `\u26A0\uFE0F  ${r.message}`);
+      if (r.ok && tool === "claude_code" && (!loadPty() || !loadHeadless())) {
+        out("\u26A0\uFE0F  node-pty \u6CA1\u88C5\u4E0A\uFF1A\u7A97\u53E3\u63A5\u7BA1\u5148\u964D\u7EA7\u4E3A\u76F4\u63A5\u8FD0\u884C\uFF08claude \u7167\u5E38\u80FD\u7528\uFF0C\u53EA\u662F\u8BBE\u5907\u56DE\u590D\u5199\u4E0D\u8FDB\u7A97\u53E3\uFF09");
+      }
+    } catch (e) {
+      out(`\u26A0\uFE0F  \u7A97\u53E3\u63A5\u7BA1\u6CA1\u88C5\u4E0A\uFF1A${e.message}\uFF08\u4E0D\u5F71\u54CD\u5176\u5B83\u529F\u80FD\uFF09`);
+    }
   }
-  ensureClientId();
-  if (!opts.skipRefresh) await refreshRegistry();
+}
+function installTools(tools, out, shim = defaultShimEnvForInstall()) {
   const registry = loadRegistry();
   const hookPath = installedHookPath();
   syncHookFile();
   const cfg = loadConfig();
   const enabled = new Set(cfg.enabledTools);
-  let failed = 0;
+  const installed = [];
+  const failed = [];
   for (const tool of tools) {
     const adapter = adapterFor(registry, tool);
     if (!adapter) {
       out(`\u2717 ${tool}\uFF1A\u6620\u5C04\u8868\u91CC\u6CA1\u6709\u8FD9\u4E2A\u5DE5\u5177\uFF08\u6216\u5B83\u7684 format \u672C\u5BA2\u6237\u7AEF\u8FD8\u4E0D\u652F\u6301\uFF09\uFF0C\u5DF2\u8DF3\u8FC7`);
-      failed += 1;
+      failed.push({ tool, reason: "\u672C\u5BA2\u6237\u7AEF\u8FD8\u4E0D\u652F\u6301" });
       continue;
     }
     const configPath2 = adapter.configPath(tool);
     if (!configPath2) {
       out(`\u2717 ${tool}\uFF1A\u672C\u5BA2\u6237\u7AEF\u4E0D\u77E5\u9053\u5B83\u7684\u914D\u7F6E\u6587\u4EF6\u5728\u54EA\uFF0C\u5DF2\u8DF3\u8FC7`);
-      failed += 1;
+      failed.push({ tool, reason: "\u627E\u4E0D\u5230\u914D\u7F6E\u6587\u4EF6" });
       continue;
     }
     const events = subscribedEvents(registry, tool, adapter.defaultEvents);
@@ -3352,13 +4925,14 @@ async function runEnable(tools, opts = {}) {
       adapter.install(configPath2, hookPath, events, tool);
     } catch (e) {
       out(`\u2717 ${tool}\uFF1A${e.message}`);
-      failed += 1;
+      failed.push({ tool, reason: e.message });
       continue;
     }
     enabled.add(tool);
+    installed.push(tool);
     out(`\u2705 ${tool}\uFF1Ahook \u5DF2\u88C5\u8FDB ${configPath2}\uFF08${events.length} \u4E2A\u4E8B\u4EF6\uFF09`);
     try {
-      if (adapter.installWindowGate?.(configPath2, join18(dirname8(hookPath), "gate.cjs"), tool)) {
+      if (adapter.installWindowGate?.(configPath2, join22(dirname9(hookPath), "gate.cjs"), tool)) {
         out(`   \u7A97\u53E3\u91CC\u5F39\u6388\u6743\u6846\u65F6\uFF0C\u8BBE\u5907\u4E0A\u4E5F\u80FD\u786E\u8BA4\uFF08\u5B88\u62A4\u8FDB\u7A0B\u5728\u8DD1\u65F6\u751F\u6548\uFF09`);
       }
     } catch (e) {
@@ -3368,6 +4942,22 @@ async function runEnable(tools, opts = {}) {
   }
   cfg.enabledTools = [...enabled];
   saveConfig(cfg);
+  installShims(installed, out, shim);
+  return { installed, failed };
+}
+async function runEnable(tools, opts = {}) {
+  const out = opts.out ?? stdout;
+  if (tools.length === 0) {
+    out("\u7528\u6CD5\uFF1Adeskbuddy enable <tool[,tool]>\uFF0C\u4F8B\u5982 deskbuddy enable claude_code,codex");
+    return 1;
+  }
+  if (!loadConfig().boundAt) {
+    out("\u8FD8\u6CA1\u6709\u6388\u6743\u3002\u8BF7\u5148\u8FD0\u884C\uFF1Adeskbuddy setup");
+    return 1;
+  }
+  ensureClientId();
+  if (!opts.skipRefresh) await refreshRegistry();
+  const { failed } = installTools(tools, out, opts.shim === void 0 ? defaultShimEnvForInstall() : opts.shim);
   if (!opts.skipAutostart) {
     const r = await installAutostart({ execPath: process.execPath, cliPath: defaultCliPath() });
     out("");
@@ -3377,69 +4967,132 @@ async function runEnable(tools, opts = {}) {
   out("\u88C5\u5B8C\u4E86\u3002\u72B6\u6001\u91C7\u96C6\u9760 hook\uFF0C\u4E0D\u9700\u8981\u5E38\u9A7B\u8FDB\u7A0B\uFF1B");
   out("\u5B88\u62A4\u8FDB\u7A0B\u53EA\u5728\u300C\u786C\u4EF6\u4E0A\u7ED9\u8FD9\u53F0\u7535\u8111\u4E0B\u6307\u4EE4\u300D\u65F6\u624D\u7528\u5F97\u7740\uFF0C\u5DF2\u968F\u4E0A\u9762\u4E00\u6B65\u8BBE\u597D\u5F00\u673A\u81EA\u542F\u3002");
   out("\u968F\u65F6\u53EF\u4EE5 deskbuddy status \u770B\u91C7\u96C6\u5230\u4E86\u4EC0\u4E48\u3001deskbuddy disable \u5E72\u51C0\u79FB\u9664\u3002");
-  return failed > 0 ? 1 : 0;
+  return failed.length > 0 ? 1 : 0;
 }
 
-// src/commands/logout.ts
-import { createInterface } from "readline";
-import { existsSync as existsSync14, rmSync as rmSync5 } from "fs";
-function stdout3(line) {
+// src/commands/disable.ts
+function stdout2(line) {
   process.stdout.write(line + "\n");
 }
-function askYesNo(question) {
-  return new Promise((resolve3) => {
-    const rl = createInterface({ input: process.stdin, output: process.stdout });
-    rl.question(question, (answer) => {
-      rl.close();
-      resolve3(/^(y|yes)$/i.test(answer.trim()));
-    });
-  });
+function toolsToDisable(explicit) {
+  if (explicit.length > 0) return explicit;
+  const known = Object.keys(loadRegistry()?.tools ?? {});
+  return [.../* @__PURE__ */ new Set([...loadConfig().enabledTools, ...known])];
 }
-async function runLogout(opts = {}) {
-  const out = opts.out ?? stdout3;
-  const home = deskbuddyHome();
-  out("deskbuddy logout \u4F1A\u505A\u8FD9\u4E24\u4EF6\u4E8B\uFF1A");
-  out("  1. \u4ECE\u5404\u667A\u80FD\u4F53\u7684\u914D\u7F6E\u91CC\u79FB\u9664 DeskBuddy \u7684 hook\uFF08\u4F60\u81EA\u5DF1\u7684 hook \u4E0D\u52A8\uFF09");
-  out(`  2. \u5220\u9664\u6574\u4E2A ${home}\uFF08clientId\u3001\u6388\u6743\u72B6\u6001\u3001\u4F1A\u8BDD\u72B6\u6001\u3001\u6620\u5C04\u8868\u7F13\u5B58\uFF09`);
-  out("");
-  out("\u5220\u6389\u4E4B\u540E\u518D\u7528\u5C31\u8981\u91CD\u65B0 deskbuddy setup \u626B\u7801\u3002");
-  out("\u6CE8\u610F\uFF1A\u8FD9\u53EA\u6E05\u9664\u672C\u673A\u6570\u636E\uFF0C\u670D\u52A1\u7AEF\u7684\u7ED1\u5B9A\u5173\u7CFB\u9700\u8981\u5728 App \u91CC\u64A4\u9500\uFF08\u6682\u672A\u652F\u6301\uFF09\uFF1B");
-  out("\u4F46\u91CD\u65B0 setup \u4F1A\u6362\u4E00\u4E2A\u65B0\u7684 clientId\uFF0C\u65E7\u7684\u4E0D\u4F1A\u518D\u4E0A\u62A5\u3002");
-  if (!opts.yes) {
-    const confirm = opts.confirm ?? (() => askYesNo("\u786E\u8BA4\u6267\u884C\uFF1F(y/N) "));
-    if (!await confirm()) {
-      out("\u5DF2\u53D6\u6D88\uFF0C\u4EC0\u4E48\u90FD\u6CA1\u52A8\u3002");
-      return 1;
+async function runDisable(tools, opts = {}) {
+  const out = opts.out ?? stdout2;
+  const registry = loadRegistry();
+  const hookPath = installedHookPath();
+  const targets = toolsToDisable(tools);
+  const cfg = loadConfig();
+  const enabled = new Set(cfg.enabledTools);
+  let failed = 0;
+  for (const tool of targets) {
+    const adapter = adapterFor(registry, tool);
+    if (!adapter) {
+      continue;
+    }
+    const configPath2 = adapter.configPath(tool);
+    if (!configPath2) continue;
+    try {
+      adapter.uninstall(configPath2, hookPath);
+      out(`\u2705 ${tool}\uFF1A\u5DF2\u4ECE ${configPath2} \u79FB\u9664`);
+    } catch (e) {
+      out(`\u2717 ${tool}\uFF1A${e.message}`);
+      failed += 1;
+      continue;
     }
+    enabled.delete(tool);
   }
-  await runDisable([], { out, brief: true, keepAutostart: opts.keepAutostart });
-  if (existsSync14(home)) {
-    rmSync5(home, { recursive: true, force: true });
+  cfg.enabledTools = [...enabled];
+  saveConfig(cfg);
+  const shim = opts.shim === void 0 ? defaultShimEnvForInstall() : opts.shim;
+  if (shim) {
+    for (const tool of targets) {
+      if (!SHIM_COMMANDS[tool]) continue;
+      try {
+        const r = uninstallShim(tool, shim);
+        if (r.message) out(`\u2705 ${r.message}`);
+      } catch (e) {
+        out(`\u2717 \u7A97\u53E3\u63A5\u7BA1\u57AB\u7247\u6CA1\u5220\u5E72\u51C0\uFF1A${e.message}`);
+        failed += 1;
+      }
+    }
   }
-  out("");
-  out("\u2705 \u5DF2\u6E05\u9664\u672C\u673A\u7684 DeskBuddy \u6570\u636E\u3002");
-  return 0;
+  if (enabled.size === 0 && !opts.keepAutostart) {
+    const r = await uninstallAutostart();
+    if (r.message) out(r.ok ? `\u2705 ${r.message}` : `\u26A0\uFE0F  ${r.message}`);
+  }
+  if (!opts.brief) {
+    out("");
+    out("\u5DF2\u505C\u6B62\u91C7\u96C6\u3002\u6388\u6743\u4E0E clientId \u4ECD\u4FDD\u7559\uFF0C\u91CD\u65B0 deskbuddy enable \u5373\u53EF\u6062\u590D\u3002");
+    out("\u8981\u5F7B\u5E95\u6E05\u9664\u672C\u673A\u6570\u636E\u8BF7\u8FD0\u884C\uFF1Adeskbuddy logout");
+  }
+  return failed > 0 ? 1 : 0;
+}
+
+// src/commands/install.ts
+import { mkdirSync as mkdirSync18, rmSync as rmSync9, writeFileSync as writeFileSync18 } from "fs";
+import { join as join23 } from "path";
+
+// src/core/detect.ts
+import { existsSync as existsSync16 } from "fs";
+import { dirname as dirname10 } from "path";
+var ALL_TOOLS = ["claude_code", "codex", "workbuddy", "qoder", "opencode"];
+function toolConfigDir(tool) {
+  switch (tool) {
+    case "claude_code":
+      return claudeHome();
+    case "codex":
+      return codexHome();
+    case "workbuddy":
+      return dirname10(workbuddySettingsPath());
+    case "qoder":
+      return dirname10(qoderSettingsPath());
+    case "opencode":
+      return dirname10(dirname10(opencodePluginPath()));
+    default:
+      return null;
+  }
+}
+var defaultDetectDeps = () => ({
+  located: (tool) => locate(tool) != null,
+  exists: existsSync16,
+  env: process.env
+});
+function callerTool(env) {
+  if (env.CLAUDECODE === "1") return "claude_code";
+  return null;
+}
+function detectTools(d = defaultDetectDeps()) {
+  const caller = callerTool(d.env);
+  return ALL_TOOLS.filter((tool) => {
+    if (tool === caller) return true;
+    if (d.located(tool)) return true;
+    const dir = toolConfigDir(tool);
+    return dir != null && d.exists(dir);
+  });
 }
 
 // src/commands/setup.ts
 import qrcode from "qrcode-terminal";
 
 // src/commands/remoteCwd.ts
-import { existsSync as existsSync15, statSync as statSync5 } from "fs";
-import { createInterface as createInterface2 } from "readline";
-import { homedir as homedir5 } from "os";
-import { isAbsolute as isAbsolute2, resolve as resolve2 } from "path";
-function normalizePath(raw, home = homedir5()) {
+import { existsSync as existsSync17, statSync as statSync7 } from "fs";
+import { createInterface } from "readline";
+import { homedir as homedir6 } from "os";
+import { isAbsolute as isAbsolute2, resolve as resolve3 } from "path";
+function normalizePath(raw, home = homedir6()) {
   const s = (raw || "").trim();
   if (!s) return null;
-  const expanded = s === "~" ? home : s.startsWith("~/") ? resolve2(home, s.slice(2)) : s;
-  const abs = isAbsolute2(expanded) ? expanded : resolve2(process.cwd(), expanded);
+  const expanded = s === "~" ? home : s.startsWith("~/") || process.platform === "win32" && s.startsWith("~\\") ? resolve3(home, s.slice(2)) : s;
+  const abs = isAbsolute2(expanded) ? expanded : resolve3(process.cwd(), expanded);
   return abs;
 }
 function checkPath(abs) {
-  if (!existsSync15(abs)) return "missing";
+  if (!existsSync17(abs)) return "missing";
   try {
-    return statSync5(abs).isDirectory() ? "ok" : "not_a_dir";
+    return statSync7(abs).isDirectory() ? "ok" : "not_a_dir";
   } catch {
     return "missing";
   }
@@ -3470,7 +5123,7 @@ async function askRemoteCwd(deps) {
 }
 function terminalAsk(prompt) {
   if (!process.stdin.isTTY) return Promise.resolve(null);
-  const rl = createInterface2({ input: process.stdin, output: process.stdout });
+  const rl = createInterface({ input: process.stdin, output: process.stdout });
   return new Promise((res) => {
     rl.question(prompt, (answer) => {
       rl.close();
@@ -3551,11 +5204,11 @@ function parseApiBase(argv) {
 function sleep(ms) {
   return new Promise((r) => setTimeout(r, ms));
 }
-function stdout4(line) {
+function stdout3(line) {
   process.stdout.write(line + "\n");
 }
 async function runSetup(opts = {}) {
-  const out = opts.out ?? stdout4;
+  const out = opts.out ?? stdout3;
   const clientId = ensureClientId();
   if (opts.apiBase) applyApiBase(opts.apiBase);
   const cfg = loadConfig();
@@ -3588,25 +5241,250 @@ async function runSetup(opts = {}) {
   return 0;
 }
 
-// src/commands/status.ts
-function fmtTime(ms) {
-  const d = new Date(ms);
-  const p = (n) => String(n).padStart(2, "0");
-  return `${d.getFullYear()}-${p(d.getMonth() + 1)}-${p(d.getDate())} ${p(d.getHours())}:${p(d.getMinutes())}`;
-}
-function stdout5(line) {
-  process.stdout.write(line + "\n");
-}
-var STATE_LABELS = {
-  watch: "\u8FDB\u884C\u4E2D",
-  ask_approval: "\u5F85\u786E\u8BA4",
-  done: "\u5DF2\u5B8C\u6210",
-  failed: "\u5931\u8D25"
+// src/commands/install.ts
+var EXIT = {
+  ok: 0,
+  error: 1,
+  codeInvalid: 2,
+  boundOther: 3,
+  network: 4,
+  permission: 5,
+  partial: 6
 };
-function relativeTime(from, now) {
-  const sec = Math.max(0, Math.round((now - from) / 1e3));
-  if (sec < 60) return `${sec} \u79D2\u524D`;
-  const min = Math.round(sec / 60);
+var CODE_INSTALL_INVALID = "8257";
+var CODE_BOUND_OTHER = "8254";
+var CODE_RATE_LIMITED = "5020";
+var TOOL_LABELS = {
+  claude_code: "Claude Code",
+  codex: "Codex",
+  workbuddy: "WorkBuddy",
+  qoder: "Qoder CN",
+  opencode: "opencode"
+};
+function checkApiBase(raw, env = process.env) {
+  const norm2 = raw.replace(/\/+$/, "");
+  return norm2 === PROD_API_BASE || norm2 === TEST_API_BASE || env.DESKBUDDY_ALLOW_CUSTOM_API === "1";
+}
+function parseCode(argv) {
+  const eq = argv.find((a) => a.startsWith("--code="));
+  if (eq) return eq.slice("--code=".length).trim();
+  const i = argv.indexOf("--code");
+  const v = i >= 0 ? argv[i + 1] : void 0;
+  return v && !v.startsWith("-") ? v.trim() : "";
+}
+function npxPrefix(version = packageVersion()) {
+  return `npx -y deskbuddy@${/-beta/.test(version) ? "beta" : "latest"}`;
+}
+var PERM_CODES = /* @__PURE__ */ new Set(["EACCES", "EPERM", "EROFS"]);
+var NET_CODES = /* @__PURE__ */ new Set(["ENOTFOUND", "EAI_AGAIN", "ECONNREFUSED", "ECONNRESET", "ETIMEDOUT", "ENETUNREACH", "EHOSTUNREACH"]);
+function errCode(e) {
+  const x = e;
+  return String(x?.code ?? x?.cause?.code ?? "");
+}
+function isPermissionError(e) {
+  return PERM_CODES.has(errCode(e));
+}
+function isNetworkError(e) {
+  if (e instanceof ApiError) return false;
+  const name = e?.name;
+  return name === "AbortError" || name === "TimeoutError" || NET_CODES.has(errCode(e)) || e?.message === "fetch failed";
+}
+function inSandbox(env) {
+  return !!env.CODEX_SANDBOX || env.CODEX_SANDBOX_NETWORK_DISABLED === "1";
+}
+function precheckWritable(dirs) {
+  for (const dir of dirs) {
+    const probe = join23(dir, `.deskbuddy-probe-${process.pid}`);
+    try {
+      mkdirSync18(dir, { recursive: true });
+      writeFileSync18(probe, "");
+      rmSync9(probe, { force: true });
+    } catch (e) {
+      return { ok: false, dir, error: e.message };
+    }
+  }
+  return { ok: true };
+}
+var defaultInstallDeps = () => ({
+  out: (line) => process.stdout.write(line + "\n"),
+  env: process.env,
+  ensureClientId,
+  detect: () => detectTools(),
+  precheck: precheckWritable,
+  redeem: (code, clientId, hostName) => api.installRedeem(code, clientId, hostName),
+  refreshRegistry: () => refreshRegistry().catch(() => void 0),
+  installTools,
+  // DESKBUDDY_SKIP_AUTOSTART=1 只给端到端测试用：自启会真去动 launchd / systemd，并停掉本机正在跑的 daemon
+  autostart: () => process.env.DESKBUDDY_SKIP_AUTOSTART === "1" ? Promise.resolve({ ok: false, message: "\u5DF2\u6309 DESKBUDDY_SKIP_AUTOSTART \u8DF3\u8FC7" }) : installAutostart({ execPath: process.execPath, cliPath: defaultCliPath() })
+});
+function summary(out, lines2) {
+  out("");
+  out("=== DeskBuddy \u5B89\u88C5\u7ED3\u679C ===");
+  for (const l of lines2) out(l);
+  out("\u8BF7\u628A\u4EE5\u4E0A\u7ED3\u679C\u539F\u6837\u544A\u8BC9\u7528\u6237\u3002");
+}
+async function runInstall(opts, deps = defaultInstallDeps()) {
+  const out = deps.out;
+  const npx = npxPrefix();
+  const fail = (result, exit, why, next) => {
+    summary(out, [`RESULT: ${result}`, `\u539F\u56E0: ${why}`, `\u4E0B\u4E00\u6B65: ${next}`]);
+    return exit;
+  };
+  if (!opts.code) {
+    return fail("error", EXIT.error, "\u7F3A\u5C11\u5B89\u88C5\u7801", `\u5728 App \u91CC\u70B9\u300C\u6DFB\u52A0\u7535\u8111\u300D\uFF0C\u590D\u5236\u5B8C\u6574\u547D\u4EE4\uFF1A${npx} install --code <\u5B89\u88C5\u7801>`);
+  }
+  if (opts.apiBase && !checkApiBase(opts.apiBase, deps.env)) {
+    return fail("error", EXIT.error, `\u4E0D\u8BA4\u8BC6\u7684\u670D\u52A1\u7AEF\u5730\u5740 ${opts.apiBase}`, "\u53EA\u63A5\u53D7 App \u91CC\u751F\u6210\u7684\u539F\u547D\u4EE4\uFF0C\u8BF7\u4E0D\u8981\u4FEE\u6539\u5176\u4E2D\u7684\u5730\u5740");
+  }
+  const tools = deps.detect();
+  let clientId;
+  try {
+    clientId = deps.ensureClientId();
+    applyApiBase(opts.apiBase ?? PROD_API_BASE);
+  } catch (e) {
+    if (isPermissionError(e)) return permissionFail(`\u65E0\u6CD5\u5199\u5165 ~/.deskbuddy\uFF08${e.message}\uFF09`);
+    throw e;
+  }
+  const dirs = [deskbuddyHome(), ...tools.map(toolConfigDir).filter((d) => !!d)];
+  const pre = deps.precheck(dirs);
+  if (!pre.ok) return permissionFail(`\u65E0\u6CD5\u5199\u5165 ${pre.dir}\uFF08${pre.error}\uFF09`);
+  function permissionFail(why) {
+    return fail(
+      "permission",
+      EXIT.permission,
+      why,
+      "\u5F53\u524D\u53EF\u80FD\u8FD0\u884C\u5728\u6C99\u7BB1\u91CC\uFF0C\u6CA1\u6709\u5199\u914D\u7F6E\u76EE\u5F55\u6216\u8054\u7F51\u7684\u6743\u9650\u3002\u8BF7\u7533\u8BF7\u63D0\u5347\u6743\u9650\uFF08\u5728\u6C99\u7BB1\u5916\u6267\u884C\uFF09\u540E\u91CD\u65B0\u8FD0\u884C\u540C\u4E00\u6761\u547D\u4EE4\uFF0C\u5B89\u88C5\u7801\u4ECD\u7136\u6709\u6548"
+    );
+  }
+  const cfg = loadConfig();
+  out(`\u670D\u52A1\u7AEF\uFF1A${cfg.apiBase}`);
+  const envBase = deps.env.DESKBUDDY_API_BASE;
+  if (envBase && !checkApiBase(envBase, {})) out(`\u26A0\uFE0F  \u6CE8\u610F\uFF1A\u73AF\u5883\u53D8\u91CF DESKBUDDY_API_BASE \u628A\u670D\u52A1\u7AEF\u6307\u5411\u4E86 ${envBase}\uFF0C\u8FD9\u4E0D\u662F\u5B98\u65B9\u5730\u5740`);
+  let redeemed;
+  try {
+    redeemed = await deps.redeem(opts.code, clientId, cfg.hostName);
+  } catch (e) {
+    if (e instanceof ApiError) {
+      if (e.code === CODE_INSTALL_INVALID) {
+        return fail("code_invalid", EXIT.codeInvalid, "\u5B89\u88C5\u7801\u65E0\u6548\u3001\u5DF2\u8FC7\u671F\u6216\u5DF2\u88AB\u4F7F\u7528", "\u8BF7\u5728 App \u91CC\u91CD\u65B0\u70B9\u300C\u6DFB\u52A0\u7535\u8111\u300D\u751F\u6210\u65B0\u7801\u3002\u4E0D\u8981\u91CD\u8BD5\u540C\u4E00\u4E2A\u7801");
+      }
+      if (e.code === CODE_BOUND_OTHER) {
+        return fail(
+          "bound_other",
+          EXIT.boundOther,
+          "\u8FD9\u53F0\u7535\u8111\u5DF2\u7ED1\u5B9A\u5176\u4ED6\u8D26\u53F7",
+          `\u5148\u95EE\u7528\u6237\u662F\u5426\u8981\u6362\u7ED1\uFF0C**\u4E0D\u8981\u81EA\u52A8\u6267\u884C**\u3002\u7528\u6237\u786E\u8BA4\u540E\u8FD0\u884C ${npx} logout --yes\uFF0C\u518D\u91CD\u65B0\u8FD0\u884C\u540C\u4E00\u6761\u5B89\u88C5\u547D\u4EE4\uFF08\u5B89\u88C5\u7801 10 \u5206\u949F\u5185\u6709\u6548\uFF09`
+        );
+      }
+      if (e.code === CODE_RATE_LIMITED) {
+        return fail("error", EXIT.error, "\u8BF7\u6C42\u8FC7\u4E8E\u9891\u7E41", "\u7B49\u4E00\u5206\u949F\u540E\u91CD\u65B0\u8FD0\u884C\u540C\u4E00\u6761\u547D\u4EE4");
+      }
+      return fail("error", EXIT.error, `\u670D\u52A1\u7AEF\u8FD4\u56DE ${e.message}`, "\u7A0D\u540E\u91CD\u65B0\u8FD0\u884C\u540C\u4E00\u6761\u547D\u4EE4\uFF1B\u53CD\u590D\u5931\u8D25\u8BF7\u5728 App \u91CC\u91CD\u65B0\u751F\u6210\u5B89\u88C5\u7801");
+    }
+    if (isNetworkError(e) && inSandbox(deps.env)) return permissionFail(`\u8FDE\u4E0D\u4E0A\u670D\u52A1\u7AEF\uFF08${e.message}\uFF09\uFF0C\u6C99\u7BB1\u53EF\u80FD\u7981\u6B62\u4E86\u8054\u7F51`);
+    if (isNetworkError(e)) {
+      return fail("network", EXIT.network, `\u8FDE\u4E0D\u4E0A\u670D\u52A1\u7AEF\uFF08${e.message}\uFF09`, "\u68C0\u67E5\u7F51\u7EDC\u540E\u91CD\u65B0\u8FD0\u884C\u540C\u4E00\u6761\u547D\u4EE4");
+    }
+    return fail("error", EXIT.error, `\u670D\u52A1\u7AEF\u5F02\u5E38\uFF08${e.message}\uFF09`, "\u7A0D\u540E\u91CD\u65B0\u8FD0\u884C\u540C\u4E00\u6761\u547D\u4EE4");
+  }
+  try {
+    markBound();
+  } catch (e) {
+    if (isPermissionError(e)) return permissionFail(`\u65E0\u6CD5\u5199\u5165 ~/.deskbuddy\uFF08${e.message}\uFF09`);
+    throw e;
+  }
+  await deps.refreshRegistry();
+  out("");
+  const r = tools.length > 0 ? deps.installTools(tools, out) : { installed: [], failed: [] };
+  const bound = loadConfig();
+  if (!bound.remoteCwd) {
+    bound.remoteCwd = defaultRemoteCwd();
+    saveConfig(bound);
+  }
+  const auto = await deps.autostart();
+  const label = (t) => TOOL_LABELS[t] ?? t;
+  const ok = r.installed.length > 0;
+  const lines2 = [
+    `RESULT: ${ok ? "ok" : "partial"}`,
+    `\u8D26\u53F7: ${redeemed.accountHint || "\uFF08\u672A\u77E5\uFF09"}${redeemed.reused ? "\uFF08\u8FD9\u53F0\u7535\u8111\u4E4B\u524D\u5DF2\u7ED1\u5B9A\u8BE5\u8D26\u53F7\uFF09" : ""}\u2014\u2014\u5982\u679C\u8FD9\u4E0D\u662F\u4F60\u7684\u8D26\u53F7\uFF0C\u8BF7\u7ACB\u5373\u8FD0\u884C ${npx} logout --yes`,
+    `\u5DF2\u63A5\u5165: ${r.installed.map(label).join("\u3001") || "\u65E0"}` + (r.failed.length > 0 ? `    \u672A\u63A5\u5165: ${r.failed.map((f) => `${label(f.tool)}\uFF08${f.reason}\uFF09`).join("\u3001")}` : ""),
+    `\u5F00\u673A\u81EA\u542F/\u5B88\u62A4\u8FDB\u7A0B: ${auto.ok ? "\u5DF2\u542F\u52A8" : `\u672A\u8BBE\u7F6E\uFF08${auto.message}\uFF09`}`,
+    `\u8FDC\u7A0B\u65B0\u5EFA\u4EFB\u52A1\u76EE\u5F55: ${loadConfig().remoteCwd}`
+  ];
+  if (ok) {
+    const restart = r.installed.map(label).join(" / ");
+    lines2.push(
+      `\u4E0B\u4E00\u6B65: \u91CD\u542F ${restart} \u540E\u5F00\u59CB\u540C\u6B65\u72B6\u6001\uFF08\u6B63\u5728\u8FD0\u884C\u7684\u4F1A\u8BDD\u4E0D\u4F1A\u91CD\u65B0\u52A0\u8F7D hook\uFF09` + (r.installed.includes("codex") ? "\uFF1BCodex \u4E0B\u6B21\u542F\u52A8\u4F1A\u8981\u6C42\u4FE1\u4EFB DeskBuddy \u7684 hook\uFF0C\u8BF7\u9009\u62E9\u540C\u610F" : "")
+    );
+  } else {
+    lines2.push(
+      tools.length === 0 ? `\u4E0B\u4E00\u6B65: \u8FD9\u53F0\u7535\u8111\u4E0A\u6CA1\u68C0\u6D4B\u5230\u652F\u6301\u7684\u667A\u80FD\u4F53\uFF08Claude Code / Codex / WorkBuddy / Qoder CN / opencode\uFF09\u3002\u88C5\u597D\u540E\u8FD0\u884C ${npx} enable <\u5DE5\u5177\u540D>\uFF0C\u5982 claude_code` : `\u4E0B\u4E00\u6B65: \u624B\u52A8\u8FD0\u884C ${npx} enable ${tools.join(",")} \u91CD\u8BD5\uFF0C\u5E76\u628A\u62A5\u9519\u544A\u8BC9\u7528\u6237`
+    );
+  }
+  summary(out, lines2);
+  return ok ? EXIT.ok : EXIT.partial;
+}
+
+// src/commands/logout.ts
+import { createInterface as createInterface2 } from "readline";
+import { existsSync as existsSync18, rmSync as rmSync10 } from "fs";
+function stdout4(line) {
+  process.stdout.write(line + "\n");
+}
+function askYesNo(question) {
+  return new Promise((resolve5) => {
+    const rl = createInterface2({ input: process.stdin, output: process.stdout });
+    rl.question(question, (answer) => {
+      rl.close();
+      resolve5(/^(y|yes)$/i.test(answer.trim()));
+    });
+  });
+}
+async function runLogout(opts = {}) {
+  const out = opts.out ?? stdout4;
+  const home = deskbuddyHome();
+  out("deskbuddy logout \u4F1A\u505A\u8FD9\u4E24\u4EF6\u4E8B\uFF1A");
+  out("  1. \u4ECE\u5404\u667A\u80FD\u4F53\u7684\u914D\u7F6E\u91CC\u79FB\u9664 DeskBuddy \u7684 hook\uFF08\u4F60\u81EA\u5DF1\u7684 hook \u4E0D\u52A8\uFF09");
+  out(`  2. \u5220\u9664\u6574\u4E2A ${home}\uFF08clientId\u3001\u6388\u6743\u72B6\u6001\u3001\u4F1A\u8BDD\u72B6\u6001\u3001\u6620\u5C04\u8868\u7F13\u5B58\uFF09`);
+  out("");
+  out("\u5220\u6389\u4E4B\u540E\u518D\u7528\u5C31\u8981\u91CD\u65B0 deskbuddy setup \u626B\u7801\u3002");
+  out("\u6CE8\u610F\uFF1A\u8FD9\u53EA\u6E05\u9664\u672C\u673A\u6570\u636E\uFF0C\u670D\u52A1\u7AEF\u7684\u7ED1\u5B9A\u5173\u7CFB\u9700\u8981\u5728 App \u91CC\u64A4\u9500\uFF08\u6682\u672A\u652F\u6301\uFF09\uFF1B");
+  out("\u4F46\u91CD\u65B0 setup \u4F1A\u6362\u4E00\u4E2A\u65B0\u7684 clientId\uFF0C\u65E7\u7684\u4E0D\u4F1A\u518D\u4E0A\u62A5\u3002");
+  if (!opts.yes) {
+    const confirm = opts.confirm ?? (() => askYesNo("\u786E\u8BA4\u6267\u884C\uFF1F(y/N) "));
+    if (!await confirm()) {
+      out("\u5DF2\u53D6\u6D88\uFF0C\u4EC0\u4E48\u90FD\u6CA1\u52A8\u3002");
+      return 1;
+    }
+  }
+  await runDisable([], { out, brief: true, keepAutostart: opts.keepAutostart });
+  if (existsSync18(home)) {
+    rmSync10(home, { recursive: true, force: true });
+  }
+  out("");
+  out("\u2705 \u5DF2\u6E05\u9664\u672C\u673A\u7684 DeskBuddy \u6570\u636E\u3002");
+  return 0;
+}
+
+// src/commands/status.ts
+function fmtTime(ms) {
+  const d = new Date(ms);
+  const p = (n) => String(n).padStart(2, "0");
+  return `${d.getFullYear()}-${p(d.getMonth() + 1)}-${p(d.getDate())} ${p(d.getHours())}:${p(d.getMinutes())}`;
+}
+function stdout5(line) {
+  process.stdout.write(line + "\n");
+}
+var STATE_LABELS = {
+  watch: "\u8FDB\u884C\u4E2D",
+  ask_approval: "\u5F85\u786E\u8BA4",
+  done: "\u5DF2\u5B8C\u6210",
+  failed: "\u5931\u8D25"
+};
+function relativeTime(from, now) {
+  const sec = Math.max(0, Math.round((now - from) / 1e3));
+  if (sec < 60) return `${sec} \u79D2\u524D`;
+  const min = Math.round(sec / 60);
   if (min < 60) return `${min} \u5206\u949F\u524D`;
   const hour = Math.round(min / 60);
   if (hour < 24) return `${hour} \u5C0F\u65F6\u524D`;
@@ -3617,48 +5495,58 @@ function pad(s, width) {
   return s + " ".repeat(Math.max(1, width - w));
 }
 function formatStatus(input) {
-  const lines = [];
+  const lines2 = [];
   const cfg = input.config;
-  lines.push("DeskBuddy \u72B6\u6001");
+  lines2.push("DeskBuddy \u72B6\u6001");
   const account = cfg.boundAt ? `\u5DF2\u6388\u6743\uFF08clientId ${cfg.clientId.slice(0, 4)}\u2026\uFF0C\u7ED1\u5B9A\u4E8E ${fmtTime(cfg.boundAt)}\uFF09` : "\u672A\u6388\u6743 \u2014\u2014 \u8FD0\u884C deskbuddy setup \u626B\u7801\u6388\u6743";
-  lines.push(`  ${pad("\u8D26\u53F7", 10)}${account}`);
-  lines.push(`  ${pad("\u670D\u52A1\u7AEF", 10)}${cfg.apiBase}\uFF08${environmentLabel(cfg.apiBase)}\uFF09`);
+  lines2.push(`  ${pad("\u8D26\u53F7", 10)}${account}`);
+  lines2.push(`  ${pad("\u670D\u52A1\u7AEF", 10)}${cfg.apiBase}\uFF08${environmentLabel(cfg.apiBase)}\uFF09`);
   if (cfg.boundAt && cfg.boundApiBase && cfg.boundApiBase !== cfg.apiBase) {
-    lines.push(
+    lines2.push(
       `  \u26A0\uFE0F \u6388\u6743\u65F6\u8FDE\u7684\u662F ${cfg.boundApiBase}\uFF08${environmentLabel(cfg.boundApiBase)}\uFF09\uFF0C\u4E0E\u5F53\u524D\u4E0D\u4E00\u81F4 \u2014\u2014 \u5F53\u524D\u73AF\u5883\u5E76\u4E0D\u8BA4\u8BC6\u8FD9\u53F0\u673A\u5668\uFF0C\u9700\u8981\u91CD\u65B0 deskbuddy setup`
     );
   }
   if (input.envOverride?.active) {
-    lines.push(
+    lines2.push(
       `  \u26A0\uFE0F \u73AF\u5883\u53D8\u91CF DESKBUDDY_API_BASE=${input.envOverride.envValue} \u6B63\u5728\u8986\u76D6 config.json \u91CC\u7684 ${input.envOverride.fileValue}\uFF08\u591A\u534A\u662F\u5199\u8FDB\u4E86 .zshrc \u4E4B\u7C7B\uFF09`
     );
   }
   if (input.tools.length === 0) {
-    lines.push(`  ${pad("\u5DF2\u542F\u7528", 10)}\u65E0 \u2014\u2014 \u8FD0\u884C deskbuddy enable claude_code,codex`);
+    lines2.push(`  ${pad("\u5DF2\u542F\u7528", 10)}\u65E0 \u2014\u2014 \u8FD0\u884C deskbuddy enable claude_code,codex`);
   } else {
     const desc = input.tools.map((t) => `${t.tool}\uFF08${t.installed ? "hook \u5DF2\u88C5" : "\u26A0\uFE0F hook \u672A\u88C5\uFF0C\u91CD\u8DD1 deskbuddy enable"}\uFF09`).join("\u3001");
-    lines.push(`  ${pad("\u5DF2\u542F\u7528", 10)}${desc}`);
+    lines2.push(`  ${pad("\u5DF2\u542F\u7528", 10)}${desc}`);
   }
   const versionNote = input.hookVersion === null ? "\u672A\u5B89\u88C5" : input.hookVersion === input.currentVersion ? `${input.hookVersion}\uFF08\u4E0E\u5F53\u524D\u5305\u4E00\u81F4\uFF09` : `${input.hookVersion} \u26A0\uFE0F \u5F53\u524D\u5305\u662F ${input.currentVersion}\uFF0C\u4E0B\u6B21\u8FD0\u884C\u4EFB\u610F deskbuddy \u547D\u4EE4\u4F1A\u81EA\u52A8\u6821\u51C6`;
-  lines.push(`  ${pad("hook \u7248\u672C", 10)}${versionNote}`);
+  lines2.push(`  ${pad("hook \u7248\u672C", 10)}${versionNote}`);
+  if (input.windowWrap) {
+    const w = input.windowWrap;
+    const text = w.winPending ? WIN_PENDING : !w.installed ? "\u672A\u5B89\u88C5 \u2014\u2014 \u91CD\u8DD1 deskbuddy enable claude_code" : !w.inPath ? `\u672A\u751F\u6548\uFF08\u5F53\u524D shell \u7684 PATH \u91CC\u6CA1\u6709 ${w.binDir}\uFF0C\u65B0\u5F00\u4E00\u4E2A\u7EC8\u7AEF\u518D\u770B\uFF09` : !w.ptyOk ? "\u5DF2\u5F00\u542F\uFF0C\u4F46 node-pty \u6CA1\u88C5\u4E0A\uFF0C\u6682\u65F6\u964D\u7EA7\u4E3A\u76F4\u63A5\u8FD0\u884C" : "\u5DF2\u5F00\u542F\uFF08\u7EC8\u7AEF\u91CC\u6572 claude \u4F1A\u7ECF DeskBuddy \u6253\u5F00\uFF0C\u8BBE\u5907\u56DE\u590D\u80FD\u5199\u8FDB\u7A97\u53E3\uFF09";
+    lines2.push(`  ${pad("\u7A97\u53E3\u63A5\u7BA1", 10)}${text}`);
+  }
+  if (input.codexWrap) {
+    const w = input.codexWrap;
+    const text = w.winPending ? WIN_PENDING : !w.installed ? "\u672A\u5B89\u88C5 \u2014\u2014 \u91CD\u8DD1 deskbuddy enable codex" : !w.inPath ? `\u672A\u751F\u6548\uFF08\u5F53\u524D shell \u7684 PATH \u91CC\u6CA1\u6709 ${w.binDir}\uFF0C\u65B0\u5F00\u4E00\u4E2A\u7EC8\u7AEF\u518D\u770B\uFF09` : "\u5DF2\u5F00\u542F\uFF08\u7EC8\u7AEF\u91CC\u6572 codex \u4F1A\u7ED9\u8FD9\u4E2A\u7A97\u53E3\u8D77\u4E00\u4E2A app-server \u518D\u8FDE\u4E0A\u53BB\uFF1Bdaemon \u5728\u8DD1\u65F6\u8BBE\u5907\u6307\u4EE4\u80FD\u53D1\u8FDB\u7A97\u53E3\uFF09";
+    lines2.push(`  ${pad("Codex\u7A97\u53E3", 10)}${text}`);
+  }
   for (const t of input.tools) {
-    if (t.notice) lines.push(`  ${t.notice}`);
+    if (t.notice) lines2.push(`  ${t.notice}`);
   }
-  lines.push("");
+  lines2.push("");
   const sorted = [...input.sessions].sort((a, b) => b.updatedAt - a.updatedAt);
-  lines.push(`\u5F53\u524D\u672C\u5730\u4F1A\u8BDD\uFF08${sorted.length}\uFF09`);
+  lines2.push(`\u5F53\u524D\u672C\u5730\u4F1A\u8BDD\uFF08${sorted.length}\uFF09`);
   if (sorted.length === 0) {
-    lines.push("  \u6682\u65E0 \u2014\u2014 \u667A\u80FD\u4F53\u8DD1\u8D77\u6765\u4E4B\u540E\u8FD9\u91CC\u5C31\u4F1A\u6709\u5185\u5BB9");
+    lines2.push("  \u6682\u65E0 \u2014\u2014 \u667A\u80FD\u4F53\u8DD1\u8D77\u6765\u4E4B\u540E\u8FD9\u91CC\u5C31\u4F1A\u6709\u5185\u5BB9");
   }
   for (const s of sorted) {
-    lines.push(
+    lines2.push(
       `  ${pad(s.tool, 14)}${pad(s.title || s.project || "-", 24)}${pad(STATE_LABELS[s.state] ?? s.state, 8)}${relativeTime(s.updatedAt, input.now)}`
     );
   }
-  lines.push("");
-  lines.push("\u91C7\u96C6\u8303\u56F4\uFF1A\u53EA\u4E0A\u62A5 \u5DE5\u5177\u540D/\u72B6\u6001/\u4F1A\u8BDD\u6807\u9898/\u9879\u76EE\u76EE\u5F55\u540D/\u65F6\u95F4\u6233");
-  lines.push("\u4E0D\u4E0A\u62A5\uFF1Aprompt \u539F\u6587\u3001\u547D\u4EE4\u3001\u6587\u4EF6\u8DEF\u5F84\u3001\u4EE3\u7801\u5185\u5BB9");
-  return lines.join("\n");
+  lines2.push("");
+  lines2.push("\u91C7\u96C6\u8303\u56F4\uFF1A\u53EA\u4E0A\u62A5 \u5DE5\u5177\u540D/\u72B6\u6001/\u4F1A\u8BDD\u6807\u9898/\u9879\u76EE\u76EE\u5F55\u540D/\u65F6\u95F4\u6233");
+  lines2.push("\u4E0D\u4E0A\u62A5\uFF1Aprompt \u539F\u6587\u3001\u547D\u4EE4\u3001\u6587\u4EF6\u8DEF\u5F84\u3001\u4EE3\u7801\u5185\u5BB9");
+  return lines2.join("\n");
 }
 function collectStatus(now = Date.now()) {
   const config = loadConfig();
@@ -3680,7 +5568,21 @@ function collectStatus(now = Date.now()) {
     });
     sessions.push(...readAliveStates(tool));
   }
+  const wrapTool = config.enabledTools.find((t) => t === "claude_code" && SHIM_COMMANDS[t]);
+  let windowWrap;
+  let codexWrap;
+  if (config.enabledTools.includes("codex")) {
+    const binDir = shimDir();
+    codexWrap = { ...shimState("codex", binDir, process.env.PATH ?? ""), binDir, winPending: process.platform === "win32" };
+  }
+  if (wrapTool) {
+    const binDir = shimDir();
+    const st = shimState(wrapTool, binDir, process.env.PATH ?? "");
+    windowWrap = { ...st, binDir, ptyOk: !!loadPty() && !!loadHeadless(), winPending: process.platform === "win32" && !WIN_SHIM_ENABLED };
+  }
   return {
+    windowWrap,
+    codexWrap,
     config,
     hookVersion: installedHookVersion(),
     currentVersion: packageVersion(),
@@ -3696,16 +5598,1038 @@ function runStatus(opts = {}) {
   return 0;
 }
 
+// src/commands/update.ts
+function stdout6(line) {
+  process.stdout.write(line + "\n");
+}
+async function runUpdate(opts = {}) {
+  const out = opts.out ?? stdout6;
+  const cfg = loadConfig();
+  if (!cfg.boundAt) {
+    out("\u8FD8\u6CA1\u6709\u6388\u6743\u3002\u8BF7\u5148\u8FD0\u884C\uFF1Adeskbuddy setup");
+    return 1;
+  }
+  if (cfg.enabledTools.length === 0) {
+    out("\u672C\u673A\u8FD8\u6CA1\u6709\u542F\u7528\u4EFB\u4F55\u5DE5\u5177\uFF0C\u6CA1\u4EC0\u4E48\u8981\u5347\u7EA7\u7684\u3002\u7528 deskbuddy enable <tool> \u542F\u7528");
+    return 1;
+  }
+  out(`\u5347\u7EA7\u5230 DeskBuddy ${packageVersion()}\uFF0C\u91CD\u88C5\u5DF2\u542F\u7528\u7684\uFF1A${cfg.enabledTools.join(", ")}`);
+  out("");
+  return runEnable([...cfg.enabledTools], opts);
+}
+
+// src/wrap/run.ts
+import { randomBytes as randomBytes6 } from "crypto";
+import { appendFileSync as appendFileSync2, mkdirSync as mkdirSync20, statSync as statSync9, truncateSync as truncateSync3 } from "fs";
+import { join as join25 } from "path";
+import { StringDecoder } from "string_decoder";
+
+// src/wrap/screen.ts
+var ESC = "\x1B";
+var PASTE_BEGIN = ESC + "[200~";
+var PASTE_END = ESC + "[201~";
+function sanitize(text) {
+  return String(text).replace(/\r\n?/g, "\n").replace(/[\x00-\x08\x0b-\x1f\x7f-\x9f]/g, "");
+}
+function prepare(text) {
+  return " " + sanitize(text).trim();
+}
+var PERMISSION_RE = /Do you want to (proceed|make|create|run|allow)|[❯>]\s*1\. Yes/;
+function inspectLines(lines2) {
+  const text = lines2.join("\n");
+  const permission = PERMISSION_RE.test(text);
+  const rules = [];
+  lines2.forEach((l, i) => {
+    if (/^─{20,}/.test(l.trim())) rules.push(i);
+  });
+  let input = null;
+  if (rules.length >= 2) {
+    const a = rules[rules.length - 2];
+    const b = rules[rules.length - 1];
+    input = lines2.slice(a + 1, b).join("\n").replace(/^\s*[❯>]\s?/, "").trimEnd();
+  }
+  return { permission, input };
+}
+function boxMatches(view, body) {
+  if (view.input === null || view.permission) return false;
+  const flat = (x) => x.replace(/\s+/g, "");
+  return flat(view.input) === flat(body) || /\[Pasted text #\d+/.test(view.input);
+}
+
+// src/wrap/injector.ts
+var QUIET_MS = 1500;
+var KEY_QUIET_MS = 3e3;
+var PASTE_SETTLE_MS = 400;
+var SUBMIT_WAIT_MS = 1e4;
+var IDLE_EVENTS = /* @__PURE__ */ new Set(["Stop", "SessionStart"]);
+var Injector = class {
+  #d;
+  #queue = [];
+  #lastOut;
+  #lastKey = 0;
+  #busy = false;
+  #closed = false;
+  constructor(deps) {
+    this.#d = deps;
+    this.#lastOut = deps.now();
+  }
+  noteOutput() {
+    this.#lastOut = this.#d.now();
+  }
+  noteKey() {
+    this.#lastKey = this.#d.now();
+  }
+  get pending() {
+    return this.#queue.length;
+  }
+  /** 回终态（只回一次），并移出队列 */
+  #final(job, msg) {
+    const i = this.#queue.indexOf(job);
+    if (i >= 0) this.#queue.splice(i, 1);
+    if (job.done) return;
+    job.done = true;
+    job.reply({ instructionId: job.instructionId, ...msg });
+  }
+  /**
+   * 这个会话还是不是本窗口当前的会话。
+   * 🔴 不是（/clear 换了会话号、会话 SessionEnd）时回 rejected/session_gone，**不回 not_here**：
+   *    claude 还在这个窗口里活着，交回 daemon 走后台也只会被 window_open / session_gone 拒掉，
+   *    而且旧会话的上下文已经不在窗口里了，写进新会话等于答非所问。只有窗口真正关闭（drain）才 not_here
+   */
+  #owns(sessionId) {
+    const last = this.#d.lastEvent();
+    if (!last) return true;
+    return last.sid === sessionId && last.ev !== "SessionEnd";
+  }
+  /** 通道收到一条指令 */
+  submit(job) {
+    if (this.#closed) {
+      job.reply({ instructionId: job.instructionId, status: "not_here" });
+      return;
+    }
+    if (!this.#owns(job.sessionId)) {
+      job.done = true;
+      job.reply({ instructionId: job.instructionId, status: "rejected", mode: "window", reason: "session_gone" });
+      return;
+    }
+    job.phase = "queued";
+    job.reply({ instructionId: job.instructionId, status: "ack" });
+    this.#queue.push(job);
+    if (this.#queue.length > 1 || this.#busy) this.#markQueued(job);
+    void this.tick();
+  }
+  #markQueued(job) {
+    if (job.queuedSent) return;
+    job.queuedSent = true;
+    job.reply({ instructionId: job.instructionId, status: "queued", mode: "window", reason: "" });
+  }
+  /** 空闲判断。返回不满足的原因，空数组 = 可以写 */
+  precheck() {
+    const why = [];
+    const v = this.#d.view();
+    if (!v) return ["no-screen"];
+    if (v.permission) why.push("permission");
+    if (v.input === null) why.push("no-input-box");
+    else if (v.input !== "") why.push("user-typing");
+    const last = this.#d.lastEvent();
+    if (!last) why.push("hook:none");
+    else if (!IDLE_EVENTS.has(last.ev)) why.push("hook:" + last.ev);
+    const now = this.#d.now();
+    if (now - this.#lastOut < QUIET_MS) why.push("screen-busy");
+    if (now - this.#lastKey < KEY_QUIET_MS) why.push("recent-key");
+    return why;
+  }
+  /** 定时调（包装层每 300ms 一次）。一次最多处理队首一条 */
+  async tick() {
+    if (this.#busy || this.#closed || this.#queue.length === 0) return;
+    const job = this.#queue[0];
+    if (job.alive && !job.alive()) {
+      this.#queue.shift();
+      job.done = true;
+      this.#d.log?.("daemon \u8FDE\u63A5\u5DF2\u65AD\uFF0C\u4E22\u5F03\u672A\u5199\u5165\u7684\u4E00\u6761");
+      return;
+    }
+    if (job.expireAt > 0 && this.#d.now() > job.expireAt) {
+      this.#final(job, { status: "rejected", mode: "window", reason: "expired" });
+      return;
+    }
+    if (!this.#owns(job.sessionId)) {
+      this.#final(job, { status: "rejected", mode: "window", reason: "session_gone" });
+      return;
+    }
+    let why;
+    try {
+      why = this.precheck();
+    } catch (e) {
+      why = ["precheck-error"];
+      this.#d.log?.(`\u7A7A\u95F2\u5224\u65AD\u51FA\u9519\uFF1A${e.message}`);
+    }
+    if (why.length > 0) {
+      this.#markQueued(job);
+      return;
+    }
+    this.#busy = true;
+    try {
+      await this.#inject(job);
+    } catch (e) {
+      this.#d.log?.(`\u5199\u5165\u51FA\u9519\uFF1A${e.message}`);
+      this.#final(job, job.phase === "entered" ? { status: "started", mode: "window", reason: "" } : { status: "failed", mode: "window", reason: "window_failed" });
+    } finally {
+      this.#busy = false;
+    }
+  }
+  async #inject(job) {
+    const body = prepare(job.text);
+    let enterAt = 0;
+    this.#d.holdKeys(true);
+    try {
+      job.phase = "pasted";
+      this.#d.write(PASTE_BEGIN + body + PASTE_END);
+      await this.#d.sleep(PASTE_SETTLE_MS);
+      if (job.done) return;
+      const v = this.#d.view();
+      if (!v || !boxMatches(v, body)) {
+        this.#d.log?.("\u7C98\u8D34\u540E\u8F93\u5165\u6846\u5BF9\u4E0D\u4E0A\uFF0C\u653E\u5F03\u8FD9\u6761");
+        this.#final(job, { status: "failed", mode: "window", reason: "window_failed" });
+        return;
+      }
+      enterAt = this.#d.now();
+      job.phase = "entered";
+      this.#d.write("\r");
+    } finally {
+      this.#d.holdKeys(false);
+    }
+    let ok = false;
+    const deadline = this.#d.now() + SUBMIT_WAIT_MS;
+    while (this.#d.now() < deadline && !job.done) {
+      const e = this.#d.lastEvent();
+      if (e && e.at >= enterAt && e.ev !== "SessionEnd") {
+        ok = true;
+        break;
+      }
+      await this.#d.sleep(200);
+    }
+    if (!ok && !job.done) {
+      const v = this.#d.view();
+      ok = !!v && v.input === "";
+    }
+    this.#final(job, ok ? { status: "started", mode: "window", reason: "" } : { status: "failed", mode: "window", reason: "window_failed" });
+  }
+  /**
+   * 窗口要关了（或包装层降级、关掉写入能力）：
+   * - 还没碰窗口的 → not_here，交回 daemon 走后台（窗口一关，会话就能 --resume 了）
+   * - 已回车的 → started（大概率已经提交）；已粘贴未回车的 → failed/window_failed
+   * 🔴 后两种绝不能 not_here：daemon 会在后台再执行一遍
+   */
+  drain() {
+    this.#closed = true;
+    for (const job of [...this.#queue]) {
+      if (job.phase === "entered") this.#final(job, { status: "started", mode: "window", reason: "" });
+      else if (job.phase === "pasted") this.#final(job, { status: "failed", mode: "window", reason: "window_failed" });
+      else this.#final(job, { status: "not_here" });
+    }
+  }
+};
+
+// src/wrap/passthrough.ts
+import { spawn as spawn2 } from "child_process";
+import { realpathSync as realpathSync2 } from "fs";
+import { constants as constants2 } from "os";
+import { dirname as dirname11, resolve as resolve4 } from "path";
+var CLAUDE_SUBCOMMANDS = /* @__PURE__ */ new Set([
+  "agents",
+  "attach",
+  "auth",
+  "auto-mode",
+  "config",
+  "doctor",
+  "gateway",
+  "import",
+  "install",
+  "kill",
+  "logs",
+  "mcp",
+  "migrate-installer",
+  "plugin",
+  "plugins",
+  "project",
+  "respawn",
+  "rm",
+  "setup-token",
+  "stop",
+  "ultrareview",
+  "update",
+  "upgrade"
+]);
+var WRAPPABLE_TOOLS = /* @__PURE__ */ new Set(["claude_code"]);
+var LONG_PASS = /* @__PURE__ */ new Set(["--print", "--output-format", "--version", "--help", "--input-format"]);
+function passthroughReason(i) {
+  if (!WRAPPABLE_TOOLS.has(i.tool)) return "tool";
+  if (i.env.DESKBUDDY_WRAP_OFF === "1") return "wrap_off";
+  if (i.env.DESKBUDDY_WRAPPED) return "wrapped";
+  if (i.env.DESKBUDDY_RUN_ID) return "remote_run";
+  if (!i.stdinTTY || !i.stdoutTTY) return "not_tty";
+  let firstPositional = null;
+  for (const a of i.args) {
+    if (a === "--") break;
+    if (a.startsWith("--")) {
+      if (LONG_PASS.has(a.split("=")[0])) return "flag";
+      continue;
+    }
+    if (/^-[a-zA-Z]+$/.test(a)) {
+      if (/[pvh]/.test(a.slice(1))) return "flag";
+      continue;
+    }
+    if (firstPositional === null) firstPositional = a;
+  }
+  if (firstPositional !== null && CLAUDE_SUBCOMMANDS.has(firstPositional)) return "subcommand";
+  return null;
+}
+function norm(p, win) {
+  const r = resolve4(p).replace(/[\\/]+$/, "");
+  return win ? r.replace(/\//g, "\\").toLowerCase() : r;
+}
+function real(p) {
+  try {
+    return realpathSync2(p);
+  } catch {
+    return p;
+  }
+}
+function findReal(tool, d = defaultLocateDeps(), skip = shimDir()) {
+  const win = (d.platform ?? process.platform) === "win32";
+  const skipKeys = /* @__PURE__ */ new Set([norm(skip, win), norm(real(skip), win)]);
+  const inSkip = (file) => skipKeys.has(norm(dirname11(file), win)) || skipKeys.has(norm(dirname11(real(file)), win));
+  const dd = { ...d, skipDirs: [...d.skipDirs ?? [], skip] };
+  const name = SHIM_COMMANDS[tool];
+  if (!name) {
+    const loc = locate(tool, dd);
+    return loc && !inSkip(loc.prefixArgs[0] && /\.(?:c|m)?js$/i.test(loc.prefixArgs[0]) ? loc.prefixArgs[0] : loc.file) ? loc : null;
+  }
+  for (const f of whichAllIn(name, dd)) {
+    if (inSkip(f)) continue;
+    const loc = win ? resolveWinLaunch(f, dd) : { file: f, prefixArgs: [] };
+    if (!loc) continue;
+    const target = loc.prefixArgs[0] && /\.(?:c|m)?js$/i.test(loc.prefixArgs[0]) ? loc.prefixArgs[0] : loc.file;
+    if (inSkip(target)) continue;
+    return loc;
+  }
+  return null;
+}
+function withoutShimFlag(env) {
+  const out = { ...env };
+  delete out.DESKBUDDY_SHIM;
+  return out;
+}
+function runDirect(real2, args, env = process.env) {
+  return new Promise((done) => {
+    let child;
+    try {
+      child = spawn2(real2.file, [...real2.prefixArgs, ...args], {
+        stdio: "inherit",
+        // 🔴 再经过垫片也直接放行，不会绕回来
+        env: withoutShimFlag({ ...env, DESKBUDDY_WRAPPED: "1" }),
+        windowsHide: false
+      });
+    } catch (e) {
+      process.stderr.write(`deskbuddy: \u542F\u52A8 ${real2.file} \u5931\u8D25\uFF1A${e.message}
+`);
+      done(127);
+      return;
+    }
+    const ignore = () => {
+    };
+    const forward = (sig) => () => {
+      try {
+        child.kill(sig);
+      } catch {
+      }
+    };
+    const handlers = [
+      ["SIGINT", ignore],
+      ["SIGQUIT", ignore],
+      ["SIGTERM", forward("SIGTERM")],
+      ["SIGHUP", forward("SIGHUP")]
+    ];
+    for (const [s, h] of handlers) {
+      try {
+        process.on(s, h);
+      } catch {
+      }
+    }
+    const cleanup = () => {
+      for (const [s, h] of handlers) process.removeListener(s, h);
+    };
+    child.on("error", (e) => {
+      cleanup();
+      process.stderr.write(`deskbuddy: \u542F\u52A8 ${real2.file} \u5931\u8D25\uFF1A${e.message}
+`);
+      done(127);
+    });
+    child.on("exit", (code, signal) => {
+      cleanup();
+      if (code !== null) done(code);
+      else done(128 + (signal && constants2.signals[signal] || 1));
+    });
+  });
+}
+
+// src/wrap/codexLaunch.ts
+import { spawn as spawn3 } from "child_process";
+import { closeSync, mkdirSync as mkdirSync19, openSync, readdirSync as readdirSync4, readFileSync as readFileSync18, rmSync as rmSync11, statSync as statSync8, truncateSync as truncateSync2, writeFileSync as writeFileSync19, renameSync as renameSync13 } from "fs";
+import { request } from "http";
+import { createServer as createServer3 } from "net";
+import { join as join24 } from "path";
+
+// src/core/codexServer.ts
+import { execFileSync as execFileSync8 } from "child_process";
+function isAppServerArgs(args, url) {
+  return /\bapp-server\b/.test(args) && new RegExp(`--listen[= ]${url.replace(/[.*+?^${}()|[\]\\]/g, "\\$&")}(?:\\s|$)`).test(args);
+}
+function processArgs(pid) {
+  if (process.platform === "win32") return null;
+  try {
+    const out = execFileSync8("ps", ["-ww", "-o", "args=", "-p", String(pid)], {
+      encoding: "utf8",
+      stdio: ["ignore", "pipe", "ignore"]
+    });
+    return out.trim() || null;
+  } catch {
+    return null;
+  }
+}
+
+// src/wrap/codexLaunch.ts
+var TAKEOVER_VALUE_OPTS = /* @__PURE__ */ new Set(["-c", "--config", "-m", "--model", "-s", "--sandbox", "-a", "--ask-for-approval", "-C", "--cd", "--enable", "--disable"]);
+var SHORT_VALUE_OPTS = /* @__PURE__ */ new Set(["-c", "-m", "-s", "-a", "-C"]);
+var TAKEOVER_FLAGS = /* @__PURE__ */ new Set(["--search", "--no-alt-screen", "--dangerously-bypass-approvals-and-sandbox"]);
+var RESUME_FLAGS = /* @__PURE__ */ new Set(["--last", "--all", "--include-non-interactive"]);
+var CODEX_TUI_SUBCOMMANDS = /* @__PURE__ */ new Set(["resume", "fork"]);
+var CODEX_SUBCOMMANDS = /* @__PURE__ */ new Set([
+  "agents",
+  "exec",
+  "e",
+  "review",
+  "login",
+  "logout",
+  "mcp",
+  "plugin",
+  "app-server",
+  "remote-control",
+  "app",
+  "completion",
+  "update",
+  "doctor",
+  "sandbox",
+  "debug",
+  "apply",
+  "a",
+  "resume",
+  "queue",
+  "archive",
+  "delete",
+  "migrate-rollouts",
+  "unarchive",
+  "fork",
+  "cloud",
+  "exec-server",
+  "features",
+  "help",
+  "mcp-server"
+]);
+function codexTakeoverBlock(args) {
+  let sub = null;
+  let prompt = false;
+  for (let i = 0; i < args.length; i++) {
+    const a = args[i];
+    if (a === "--") return null;
+    if (a.startsWith("-") && a !== "-") {
+      let name = a;
+      let inline = false;
+      if (a.startsWith("--")) {
+        name = a.split("=")[0];
+        inline = a.includes("=");
+      } else if (a.length > 2 && SHORT_VALUE_OPTS.has(a.slice(0, 2))) {
+        name = a.slice(0, 2);
+        inline = true;
+      }
+      if (name === "--remote") return "remote";
+      if (TAKEOVER_VALUE_OPTS.has(name)) {
+        if (!inline) i++;
+        continue;
+      }
+      if (TAKEOVER_FLAGS.has(name)) continue;
+      if (sub && RESUME_FLAGS.has(name)) continue;
+      return `option:${name}`;
+    }
+    if (sub || prompt) continue;
+    if (CODEX_TUI_SUBCOMMANDS.has(a)) {
+      sub = a;
+      continue;
+    }
+    if (CODEX_SUBCOMMANDS.has(a)) return `subcommand:${a}`;
+    prompt = true;
+  }
+  return null;
+}
+function hasCdFlag(args) {
+  const end = args.indexOf("--");
+  return (end < 0 ? args : args.slice(0, end)).some((a) => a === "-C" || a === "--cd" || a.startsWith("--cd=") || a.startsWith("-C") && a.length > 2);
+}
+var READY_WAIT_MS = 10 * 1e3;
+var READY_POLL_MS = 50;
+function codexPassthroughReason(args, d) {
+  if (d.platform === "win32") return "windows";
+  if (d.env.DESKBUDDY_WRAP_OFF === "1") return "wrap_off";
+  if (d.env.DESKBUDDY_WRAPPED) return "wrapped";
+  if (d.env.DESKBUDDY_RUN_ID) return "remote_run";
+  if (!d.stdinTTY || !d.stdoutTTY) return "not_tty";
+  return codexTakeoverBlock(args);
+}
+async function runCodexWindow(real2, args, d) {
+  let rec = null;
+  let tuiArgs = null;
+  try {
+    const why = codexPassthroughReason(args, d) ?? (d.daemonAlive() ? null : "no_daemon");
+    if (why) {
+      d.log(`codex \u76F4\u63A5\u8FD0\u884C\uFF08${why}\uFF09`);
+    } else {
+      try {
+        d.reap();
+      } catch {
+      }
+      const t0 = d.now();
+      const url = `ws://127.0.0.1:${await d.freePort()}`;
+      const pid = d.startServer(real2, url);
+      if (!pid) {
+        d.log("app-server \u8D77\u4E0D\u6765\uFF0Ccodex \u76F4\u63A5\u8FD0\u884C");
+      } else {
+        rec = { supervisor: process.pid, server: pid, url };
+        d.record(rec);
+        let ok = false;
+        for (; ; ) {
+          if (await d.ready(url)) {
+            ok = true;
+            break;
+          }
+          if (d.now() - t0 >= READY_WAIT_MS) break;
+          await d.sleep(READY_POLL_MS);
+        }
+        if (ok) {
+          d.log(`app-server ${url} \u5C31\u7EEA ${d.now() - t0}ms`);
+          tuiArgs = ["--remote", url, ...hasCdFlag(args) ? [] : ["-C", d.cwd()], ...args];
+        } else {
+          d.log("app-server \u6CA1\u80FD\u6309\u65F6\u5C31\u7EEA\uFF0Ccodex \u76F4\u63A5\u8FD0\u884C");
+          d.killServer(pid, url);
+          d.unrecord(rec);
+          rec = null;
+        }
+      }
+    }
+  } catch (e) {
+    d.log(`codex \u7A97\u53E3\u51C6\u5907\u51FA\u9519\uFF0C\u76F4\u63A5\u8FD0\u884C\uFF1A${e.message}`);
+    if (rec) {
+      d.killServer(rec.server, rec.url);
+      d.unrecord(rec);
+      rec = null;
+    }
+    tuiArgs = null;
+  }
+  if (!tuiArgs) return d.runDirect(real2, args);
+  try {
+    return await d.runDirect(real2, tuiArgs);
+  } finally {
+    if (rec) {
+      d.killServer(rec.server, rec.url);
+      d.unrecord(rec);
+    }
+  }
+}
+var MAX_LOG_BYTES2 = 1024 * 1024;
+function appServerLogPath() {
+  return join24(deskbuddyHome(), "codex-app-server.log");
+}
+function windowsDir2() {
+  return join24(deskbuddyHome(), "codex-windows");
+}
+function pidAlive(pid) {
+  try {
+    process.kill(pid, 0);
+    return true;
+  } catch {
+    return false;
+  }
+}
+function daemonAlive(pidFile = pidFilePath(), args = processArgs) {
+  let pid = 0;
+  try {
+    pid = Number(readFileSync18(pidFile, "utf8").trim());
+  } catch {
+    return false;
+  }
+  if (!Number.isInteger(pid) || pid <= 0 || !pidAlive(pid)) return false;
+  const a = args(pid);
+  return !!a && /cli\.js daemon(?:\s|$)/.test(a);
+}
+function probeReady(url) {
+  const port = Number(url.slice(url.lastIndexOf(":") + 1));
+  return new Promise((resolve5) => {
+    const req2 = request({ host: "127.0.0.1", port, path: "/readyz", method: "GET", timeout: 800 }, (res) => {
+      res.resume();
+      resolve5((res.statusCode ?? 0) >= 200 && (res.statusCode ?? 0) < 300);
+    });
+    req2.on("timeout", () => req2.destroy());
+    req2.on("error", () => resolve5(false));
+    req2.end();
+  });
+}
+function freePort() {
+  return new Promise((resolve5, reject) => {
+    const srv = createServer3();
+    srv.unref();
+    srv.on("error", reject);
+    srv.listen(0, "127.0.0.1", () => {
+      const addr = srv.address();
+      const port = typeof addr === "object" && addr ? addr.port : 0;
+      srv.close(() => port ? resolve5(port) : reject(new Error("no port")));
+    });
+  });
+}
+function startServer(real2, url, env, cwd) {
+  const logPath2 = appServerLogPath();
+  mkdirSync19(deskbuddyHome(), { recursive: true });
+  try {
+    if (statSync8(logPath2).size > MAX_LOG_BYTES2) truncateSync2(logPath2, 0);
+  } catch {
+  }
+  const fd = openSync(logPath2, "a");
+  try {
+    const childEnv2 = { ...env, DESKBUDDY_WRAPPED: "1" };
+    delete childEnv2.DESKBUDDY_SHIM;
+    const child = spawn3(real2.file, [...real2.prefixArgs, "app-server", "--listen", url], {
+      detached: true,
+      stdio: ["ignore", fd, fd],
+      cwd,
+      env: childEnv2
+    });
+    child.on("error", () => {
+    });
+    child.unref();
+    return child.pid ?? null;
+  } finally {
+    closeSync(fd);
+  }
+}
+function killServer(pid) {
+  try {
+    process.kill(-pid, "SIGTERM");
+  } catch {
+  }
+}
+function killOwnServer(pid, url) {
+  const a = processArgs(pid);
+  if (a && isAppServerArgs(a, url)) killServer(pid);
+}
+function recordPath(rec) {
+  return join24(windowsDir2(), `${rec.server}.json`);
+}
+function writeRecord(rec) {
+  try {
+    mkdirSync19(windowsDir2(), { recursive: true, mode: 448 });
+    const p = recordPath(rec);
+    writeFileSync19(p + ".tmp", JSON.stringify(rec), { encoding: "utf8", mode: 384 });
+    renameSync13(p + ".tmp", p);
+  } catch {
+  }
+}
+function removeRecord(rec) {
+  try {
+    rmSync11(recordPath(rec), { force: true });
+  } catch {
+  }
+}
+function reapWindows(dir = windowsDir2(), alive = pidAlive, args = processArgs, kill = killServer) {
+  let names = [];
+  try {
+    names = readdirSync4(dir).filter((n) => n.endsWith(".json"));
+  } catch {
+    return;
+  }
+  for (const n of names) {
+    const p = join24(dir, n);
+    let rec;
+    try {
+      rec = JSON.parse(readFileSync18(p, "utf8"));
+    } catch {
+      rmSync11(p, { force: true });
+      continue;
+    }
+    if (typeof rec.supervisor !== "number" || typeof rec.server !== "number" || typeof rec.url !== "string") {
+      rmSync11(p, { force: true });
+      continue;
+    }
+    if (alive(rec.supervisor)) continue;
+    if (alive(rec.server)) {
+      const a = args(rec.server);
+      if (a && isAppServerArgs(a, rec.url)) kill(rec.server);
+    }
+    rmSync11(p, { force: true });
+  }
+}
+function launchLog(line) {
+  try {
+    mkdirSync19(deskbuddyHome(), { recursive: true });
+    writeFileSync19(join24(deskbuddyHome(), "wrap.log"), `${(/* @__PURE__ */ new Date()).toISOString()} [codex ${process.pid}] ${line}
+`, { flag: "a" });
+  } catch {
+  }
+}
+function defaultCodexWindowDeps(base) {
+  return {
+    ...base,
+    now: () => Date.now(),
+    sleep: (ms) => new Promise((r) => setTimeout(r, ms)),
+    daemonAlive: () => daemonAlive(),
+    freePort,
+    startServer: (real2, url) => startServer(real2, url, base.env, base.cwd()),
+    ready: probeReady,
+    killServer: killOwnServer,
+    record: writeRecord,
+    unrecord: removeRecord,
+    reap: () => reapWindows(),
+    log: launchLog
+  };
+}
+
+// src/wrap/run.ts
+var DEFAULT_TTL_MS = 10 * 60 * 1e3;
+var TICK_MS = 300;
+var MAX_LOG_BYTES3 = 512 * 1024;
+var WRAP_HINT = "DeskBuddy \u5305\u88C5\u51FA\u9519\uFF0C\u8BF7\u8BBE DESKBUDDY_WRAP_OFF=1 \u4E34\u65F6\u7ED5\u5F00\uFF08\u4F8B\u5982 DESKBUDDY_WRAP_OFF=1 claude\uFF09";
+var SESSION_ENV = ["DESKBUDDY_SHIM", "CLAUDECODE", "CLAUDE_CODE_CHILD_SESSION", "CLAUDE_CODE_SESSION_ID", "CLAUDE_PID", "CLAUDE_CODE_ENTRYPOINT"];
+function childEnv(src, windowId) {
+  const env = {};
+  for (const [k, v] of Object.entries(src)) {
+    if (SESSION_ENV.includes(k)) continue;
+    env[k] = v;
+  }
+  env.DESKBUDDY_WINDOW = windowId;
+  env.DESKBUDDY_WRAPPED = "1";
+  return env;
+}
+function wrapLog(line) {
+  try {
+    const p = join25(deskbuddyHome(), "wrap.log");
+    mkdirSync20(deskbuddyHome(), { recursive: true });
+    try {
+      if (statSync9(p).size > MAX_LOG_BYTES3) truncateSync3(p, 0);
+    } catch {
+    }
+    appendFileSync2(p, `${(/* @__PURE__ */ new Date()).toISOString()} [${process.pid}] ${line}
+`, "utf8");
+  } catch {
+  }
+}
+var defaultWrapDeps = () => ({
+  env: process.env,
+  stdin: process.stdin,
+  stdout: process.stdout,
+  stderr: process.stderr,
+  platform: process.platform,
+  cwd: () => process.cwd(),
+  findReal: (tool) => findReal(tool),
+  runDirect: (real2, args) => runDirect(real2, args),
+  loadPty,
+  loadHeadless,
+  log: wrapLog
+});
+async function runWrap(argv, deps = defaultWrapDeps()) {
+  const viaShim = deps.env.DESKBUDDY_SHIM === "1";
+  const r = await runWrapInner(argv, deps);
+  if (r === "not_found") {
+    if (viaShim) return SHIM_FALLBACK_EXIT;
+    deps.stderr.write(`deskbuddy: \u627E\u4E0D\u5230 ${SHIM_COMMANDS[argv[0] ?? ""] ?? argv[0]}\uFF08\u5DF2\u8DF3\u8FC7 DeskBuddy \u81EA\u5DF1\u7684\u57AB\u7247\u76EE\u5F55\uFF09
+`);
+    return 127;
+  }
+  return viaShim && r === SHIM_FALLBACK_EXIT ? 1 : r;
+}
+async function runWrapInner(argv, deps) {
+  const tool = argv[0] ?? "";
+  const args = argv.slice(1);
+  let real2 = null;
+  try {
+    real2 = deps.findReal(tool);
+  } catch {
+    real2 = null;
+  }
+  if (!real2) return "not_found";
+  if (tool === "codex") {
+    return runCodexWindow(
+      real2,
+      args,
+      defaultCodexWindowDeps({
+        env: deps.env,
+        platform: deps.platform,
+        stdinTTY: !!deps.stdin.isTTY,
+        stdoutTTY: !!deps.stdout.isTTY,
+        cwd: deps.cwd,
+        runDirect: deps.runDirect
+      })
+    );
+  }
+  let reason;
+  try {
+    reason = passthroughReason({
+      tool,
+      args,
+      env: deps.env,
+      stdinTTY: !!deps.stdin.isTTY,
+      stdoutTTY: !!deps.stdout.isTTY
+    });
+  } catch {
+    reason = "error";
+  }
+  if (reason) return deps.runDirect(real2, args);
+  let r = null;
+  try {
+    r = await wrapInPty(tool, real2, args, deps);
+  } catch (e) {
+    deps.log(`\u5305\u88C5\u5931\u8D25\uFF0C\u653E\u884C\u76F4\u8DD1\uFF1A${e.message}`);
+    r = null;
+  }
+  if (r !== null) return r;
+  return deps.runDirect(real2, args);
+}
+async function wrapInPty(tool, real2, args, deps) {
+  const pty = deps.loadPty();
+  const Headless = deps.loadHeadless();
+  if (!pty || !Headless) {
+    deps.log("node-pty / @xterm/headless \u52A0\u8F7D\u4E0D\u4E86\uFF0C\u653E\u884C\u76F4\u8DD1");
+    return null;
+  }
+  const { stdout: stdout7 } = deps;
+  const windowId = randomBytes6(16).toString("hex");
+  const cols = stdout7.columns || 80;
+  const rows = stdout7.rows || 24;
+  const term = new Headless({ cols, rows, allowProposedApi: true });
+  let p;
+  try {
+    p = pty.spawn(real2.file, [...real2.prefixArgs, ...args], {
+      name: deps.env.TERM || "xterm-256color",
+      cols,
+      rows,
+      cwd: deps.cwd(),
+      env: childEnv(deps.env, windowId)
+    });
+  } catch (e) {
+    deps.log(`pty \u8D77\u4E0D\u6765\uFF0C\u653E\u884C\u76F4\u8DD1\uFF1A${e.message}`);
+    return null;
+  }
+  return runAttached(tool, p, term, windowId, deps);
+}
+function runAttached(tool, p, term0, windowId, deps) {
+  const { stdin, stdout: stdout7 } = deps;
+  let term = term0;
+  let finished = false;
+  let held = null;
+  let server = null;
+  let timer = null;
+  const sock = channelPath(windowId, deps.platform);
+  const decoder = new StringDecoder("utf8");
+  const toPty = (s) => {
+    try {
+      p.write(s);
+    } catch {
+    }
+  };
+  const injector = new Injector({
+    now: () => Date.now(),
+    view: () => term ? inspectLines(screenLines(term)) : null,
+    lastEvent: () => readLastEvent(windowId),
+    write: toPty,
+    sleep: (ms) => new Promise((r) => setTimeout(r, ms)),
+    holdKeys: (on) => {
+      if (on) {
+        held = held ?? [];
+        return;
+      }
+      const h = held ?? [];
+      held = null;
+      for (const s of h) toPty(s);
+    },
+    log: (m) => deps.log(`[${windowId.slice(0, 8)}] ${m}`)
+  });
+  p.onData((d) => {
+    try {
+      stdout7.write(d);
+    } catch {
+    }
+    if (term) {
+      try {
+        term.write(d);
+      } catch {
+        term = null;
+      }
+    }
+    injector.noteOutput();
+  });
+  const onStdin = (b) => {
+    injector.noteKey();
+    const s = typeof b === "string" ? b : decoder.write(b);
+    if (!s) return;
+    if (held) held.push(s);
+    else toPty(s);
+  };
+  const onResize = () => {
+    const c = stdout7.columns;
+    const r = stdout7.rows;
+    if (!c || !r) return;
+    try {
+      p.resize(c, r);
+    } catch {
+    }
+    try {
+      term?.resize(c, r);
+    } catch {
+      term = null;
+    }
+  };
+  const restoreTerminal = () => {
+    try {
+      stdin.off("data", onStdin);
+      if (stdin.isTTY) stdin.setRawMode(false);
+      stdin.pause();
+    } catch {
+    }
+    try {
+      stdout7.off("resize", onResize);
+    } catch {
+    }
+  };
+  try {
+    if (stdin.isTTY) stdin.setRawMode(true);
+    stdin.on("data", onStdin);
+    stdin.resume();
+    stdout7.on("resize", onResize);
+  } catch (e) {
+    deps.log(`\u63A5\u7BA1\u7EC8\u7AEF\u51FA\u9519\uFF1A${e.message}`);
+  }
+  try {
+    writeWindow(windowId, { pid: process.pid, childPid: p.pid, sock, tool, cwd: deps.cwd(), at: Date.now() });
+  } catch (e) {
+    deps.log(`\u767B\u8BB0\u7A97\u53E3\u5931\u8D25\uFF1A${e.message}`);
+  }
+  const channelOk = deps.platform === "win32" || ensureChannelDir(sock);
+  if (channelOk) {
+    void startChannelServer(
+      sock,
+      (req2, reply, alive) => {
+        try {
+          injector.submit({ ...req2, expireAt: req2.expireAt || Date.now() + DEFAULT_TTL_MS, reply, alive });
+        } catch (e) {
+          deps.log(`\u6536\u6307\u4EE4\u51FA\u9519\uFF1A${e.message}`);
+        }
+      },
+      deps.platform
+    ).then((s) => {
+      if (finished) {
+        closeChannelServer(s, sock, deps.platform);
+        return;
+      }
+      server = s;
+      if (!s) deps.log("\u901A\u9053\u8D77\u4E0D\u6765\uFF0C\u8FD9\u4E2A\u7A97\u53E3\u6536\u4E0D\u5230\u8BBE\u5907\u6307\u4EE4");
+    });
+  }
+  timer = setInterval(() => {
+    injector.tick().catch(() => {
+    });
+  }, TICK_MS);
+  return new Promise((resolve5) => {
+    let degraded = false;
+    const onFatal = (e) => {
+      deps.log(`\u5305\u88C5\u5C42\u5F02\u5E38\uFF1A${e?.stack ?? String(e)}`);
+      if (degraded) return;
+      degraded = true;
+      if (timer) clearInterval(timer);
+      term = null;
+      try {
+        injector.drain();
+      } catch {
+      }
+      closeChannelServer(server, sock, deps.platform);
+      try {
+        removeWindow(windowId);
+      } catch {
+      }
+      try {
+        deps.stderr.write(`\r
+${WRAP_HINT}\uFF08\u8BBE\u5907\u56DE\u590D\u6682\u65F6\u5199\u4E0D\u8FDB\u8FD9\u4E2A\u7A97\u53E3\uFF09\r
+`);
+      } catch {
+      }
+    };
+    const sigs = ["SIGTERM", "SIGHUP", "SIGINT"];
+    const onSignal = (sig) => {
+      try {
+        if (deps.platform === "win32") p.kill();
+        else p.kill(sig);
+      } catch {
+      }
+      setTimeout(() => finish(128 + (sig === "SIGHUP" ? 1 : sig === "SIGINT" ? 2 : 15)), 3e3).unref();
+    };
+    const sigHandlers = sigs.map((s) => [s, () => onSignal(s)]);
+    function finish(code) {
+      if (finished) return;
+      finished = true;
+      if (timer) clearInterval(timer);
+      const pending = injector.pending;
+      try {
+        injector.drain();
+      } catch {
+      }
+      closeChannelServer(server, sock, deps.platform);
+      try {
+        removeWindow(windowId);
+      } catch {
+      }
+      restoreTerminal();
+      process.removeListener("uncaughtException", onFatal);
+      for (const [s, h] of sigHandlers) process.removeListener(s, h);
+      if (pending > 0) setTimeout(() => resolve5(code), 150);
+      else resolve5(code);
+    }
+    process.on("uncaughtException", onFatal);
+    for (const [s, h] of sigHandlers) {
+      try {
+        process.on(s, h);
+      } catch {
+      }
+    }
+    p.onExit(({ exitCode, signal }) => {
+      const flushed = decoder.end();
+      if (flushed) toPty(flushed);
+      finish(signal ? 128 + signal : exitCode);
+    });
+  });
+}
+
 // src/cli.ts
 var USAGE = `deskbuddy \u2014\u2014 \u628A AI \u7F16\u7801\u667A\u80FD\u4F53\u6BCF\u4E2A\u4F1A\u8BDD\u7A97\u53E3\u7684\u72B6\u6001\u540C\u6B65\u5230\u684C\u9762\u786C\u4EF6\u5C4F\u5E55
 
 \u7528\u6CD5:
+  deskbuddy install --code <\u5B89\u88C5\u7801>     \u4E00\u952E\u63A5\u5165\uFF1A\u7528 App\u300C\u6DFB\u52A0\u7535\u8111\u300D\u7ED9\u7684\u5B89\u88C5\u7801\u7ED1\u5B9A\u8D26\u53F7\uFF0C
+                                        \u5E76\u63A5\u5165\u672C\u673A\u6240\u6709\u667A\u80FD\u4F53\u3001\u8BBE\u597D\u5F00\u673A\u81EA\u542F\uFF08\u4E0D\u9700\u8981\u4EFB\u4F55\u4EA4\u4E92\uFF09
   deskbuddy setup [--api-base <url>]    \u626B\u7801\u6388\u6743\uFF08--api-base \u6307\u5B9A\u7F51\u5173\u5E76\u8BB0\u4F4F\uFF0C\u9ED8\u8BA4\u751F\u4EA7\uFF09
   deskbuddy enable <tool[,tool]>        \u5B89\u88C5\u91C7\u96C6 hook\uFF08\u5982 claude_code,codex\uFF09
   deskbuddy disable [tool[,tool]]       \u79FB\u9664\u91C7\u96C6 hook\uFF08\u4E0D\u5E26\u53C2\u6570=\u5168\u90E8\uFF09
+  deskbuddy update                      \u5347\u7EA7\u5230\u5F53\u524D\u8FD9\u7248\uFF1A\u91CD\u88C5\u5DF2\u542F\u7528\u5DE5\u5177\u7684 hook\u3001\u91CD\u542F daemon
+                                        \uFF08npx deskbuddy@<\u7248\u672C> update\uFF09
   deskbuddy daemon [--foreground]       \u5E38\u9A7B\u6536\u53D6\u8BBE\u5907\u4E0B\u53D1\u7684\u6307\u4EE4\uFF08\u5F00\u673A\u81EA\u542F\u4F1A\u81EA\u52A8\u62C9\u8D77\uFF09
   deskbuddy status                      \u770B\u91C7\u96C6\u5230\u4E86\u4EC0\u4E48\u3001\u4E0A\u62A5\u4E86\u54EA\u4E9B\u5B57\u6BB5
   deskbuddy logout [--yes]              \u79FB\u9664 hook \u5E76\u6E05\u9664\u672C\u673A\u6570\u636E
+  deskbuddy wrap <tool> [\u53C2\u6570\u2026]         \uFF08\u57AB\u7247\u5185\u90E8\u7528\uFF09\u7ECF DeskBuddy \u6253\u5F00\u667A\u80FD\u4F53\u7A97\u53E3\uFF0C
+                                        \u8BBE\u5907\u4E0A\u7684\u56DE\u590D\u80FD\u5199\u8FDB\u8FD9\u4E2A\u7A97\u53E3\uFF1BDESKBUDDY_WRAP_OFF=1 \u53EF\u7ED5\u5F00
 
 \u72B6\u6001\u91C7\u96C6\u4E0D\u9700\u8981\u5E38\u9A7B\u8FDB\u7A0B\uFF08\u53EA\u662F\u5F80\u5404\u667A\u80FD\u4F53\u7684 hook \u914D\u7F6E\u91CC\u52A0\u4E86\u4E00\u6761\u8BB0\u5F55\uFF09\uFF1B
 \u8981\u5728\u786C\u4EF6\u4E0A\u7ED9\u7535\u8111\u4E0B\u6307\u4EE4\uFF0C\u624D\u9700\u8981 daemon \u5E38\u9A7B\u2014\u2014setup \u65F6\u4F1A\u5E2E\u4F60\u8BBE\u597D\u5F00\u673A\u81EA\u542F\u3002
@@ -3714,7 +6638,7 @@ var USAGE = `deskbuddy \u2014\u2014 \u628A AI \u7F16\u7801\u667A\u80FD\u4F53\u6B
 async function main(argv) {
   const cmd = argv[2];
   const arg = argv[3];
-  if (cmd && !["-h", "--help", "help", "-v", "--version"].includes(cmd)) {
+  if (cmd && !["-h", "--help", "help", "-v", "--version", "wrap"].includes(cmd)) {
     try {
       syncHookFile();
     } catch {
@@ -3731,18 +6655,24 @@ async function main(argv) {
     case "--version":
       process.stdout.write(packageVersion() + "\n");
       return 0;
+    case "install":
+      return runInstall({ code: parseCode(argv), apiBase: parseApiBase(argv) });
     case "setup":
       return runSetup({ apiBase: parseApiBase(argv) });
     case "enable":
       return runEnable(parseTools(arg));
     case "disable":
       return runDisable(parseTools(arg));
+    case "update":
+      return runUpdate();
     case "daemon":
       return runDaemonCommand({ foreground: argv.includes("--foreground") || argv.includes("-f") });
     case "status":
       return runStatus();
     case "logout":
       return runLogout({ yes: argv.includes("--yes") || argv.includes("-y") });
+    case "wrap":
+      return runWrap(argv.slice(3));
     default:
       process.stderr.write(`\u672A\u77E5\u547D\u4EE4\uFF1A${cmd}