deskbuddy 0.2.0-beta.17 → 0.2.0-beta.18

package/dist/cli.js

@@ -731,7 +731,13 @@ function winNormalizedArgs(name, cmdline) {
   }
   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";
+var WIN_PS_SCRIPT = "[Console]::OutputEncoding=[Text.Encoding]::UTF8;Get-CimInstance Win32_Process | Select-Object ProcessId,ParentProcessId,Name,CommandLine,CreationDate | ConvertTo-Json -Compress";
+function winCreationMs(v) {
+  if (typeof v !== "string" || !v) return void 0;
+  const m = /^\/?Date\((\d+)/.exec(v);
+  const ms = m ? Number(m[1]) : Date.parse(v);
+  return Number.isFinite(ms) && ms > 0 ? ms : void 0;
+}
 function parseWinProcJson(json) {
   let d;
   try {
@@ -746,12 +752,14 @@ function parseWinProcJson(json) {
     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, " ") : "";
+    const start = winCreationMs(r.CreationDate);
     out.push({
       pid,
       ppid: Number(r.ParentProcessId) || 0,
       name: winEffectiveName(rawName, cmdline),
       args: winNormalizedArgs(rawName, cmdline),
-      cmdline
+      cmdline,
+      ...start !== void 0 ? { start } : {}
     });
   }
   return out;
@@ -1499,10 +1507,27 @@ import { existsSync as existsSync8 } from "fs";
 import { dirname as dirname7 } from "path";
 
 // src/daemon/locate.ts
-import { execFileSync as execFileSync5 } from "child_process";
-import { accessSync, constants, existsSync as existsSync7, lstatSync, readFileSync as readFileSync6, realpathSync, statSync as statSync2 } from "fs";
+import { execFile as execFile3, execFileSync as execFileSync5 } from "child_process";
+import { accessSync, closeSync as closeSync2, constants, existsSync as existsSync7, lstatSync, openSync as openSync2, readFileSync as readFileSync6, readSync, realpathSync, statSync as statSync2 } from "fs";
 import { homedir as homedir3 } from "os";
 import { delimiter, dirname as dirname6, join as join7, win32 as win322 } from "path";
+
+// src/core/agentEnv.ts
+var BUN_HIJACK_ENV = ["BUN_BE_BUN", "BUN_OPTIONS"];
+function scrubAgentEnv(env) {
+  for (const k of Object.keys(env)) {
+    if (BUN_HIJACK_ENV.includes(k.toUpperCase())) delete env[k];
+  }
+  return env;
+}
+var AGENT_SPAWNING_COMMANDS = ["daemon", "wrap"];
+function scrubForCommand(cmd, env = process.env) {
+  if (!cmd || !AGENT_SPAWNING_COMMANDS.includes(cmd)) return false;
+  scrubAgentEnv(env);
+  return true;
+}
+
+// src/daemon/locate.ts
 function qoderWorker(d, worker, appBin) {
   if (d.isExecutable(appBin)) return { file: appBin, prefixArgs: [worker], env: { ELECTRON_RUN_AS_NODE: "1" } };
   return { file: d.nodePath, prefixArgs: [worker] };
@@ -1541,8 +1566,124 @@ var defaultLocateDeps = () => ({
   },
   // 🔴 daemon 自己也不能找到垫片：远程任务要的是真程序（窗口接管 spec 2026-09-30 §3.1）
   skipDirs: [join7(deskbuddyHome(), "bin")],
-  winAppHints: (product, exe) => winInstallDirs(product, exe)
+  winAppHints: (product, exe) => winInstallDirs(product, exe),
+  isPe: (p) => {
+    let fd = null;
+    try {
+      fd = openSync2(p, "r");
+      const b = Buffer.alloc(2);
+      return readSync(fd, b, 0, 2, 0) === 2 && b.toString("latin1") === "MZ";
+    } catch {
+      return false;
+    } finally {
+      if (fd !== null) closeSync2(fd);
+    }
+  },
+  versionOf: (loc) => probeVersion(loc)
+});
+var PROBE_TIMEOUT_MS = 3e3;
+var PROBE_SHORT_TTL_MS = 5 * 60 * 1e3;
+function createVersionProbe(d) {
+  const cache2 = /* @__PURE__ */ new Map();
+  const keyOf = (loc) => {
+    let key = [loc.file, ...loc.prefixArgs].join("\0");
+    for (const p of [loc.file, ...loc.prefixArgs.slice(0, 1)]) {
+      const st = d.stat(p);
+      if (st) key += `\0${st.size}:${st.mtimeMs}`;
+    }
+    return key;
+  };
+  const cached = (key) => {
+    const hit = cache2.get(key);
+    if (!hit) return null;
+    if (hit.until > d.now()) return hit;
+    cache2.delete(key);
+    return null;
+  };
+  const record = (key, r) => {
+    if (r.kind === "spawn_error") return null;
+    if (r.kind === "timeout") {
+      cache2.set(key, { out: null, until: d.now() + PROBE_SHORT_TTL_MS });
+      return null;
+    }
+    const ok = /Claude Code/i.test(r.out);
+    cache2.set(key, { out: r.out, until: ok ? Number.POSITIVE_INFINITY : d.now() + PROBE_SHORT_TTL_MS });
+    return r.out;
+  };
+  return {
+    probe(loc) {
+      const key = keyOf(loc);
+      const hit = cached(key);
+      if (hit) return hit.out;
+      return record(key, d.runSync(loc));
+    },
+    async warm(loc) {
+      const key = keyOf(loc);
+      if (cached(key)) return;
+      record(key, await d.runAsync(loc));
+    }
+  };
+}
+var probeEnv = (loc) => ({ ...scrubAgentEnv({ ...process.env }), ...loc.env ?? {} });
+function classifySyncError(e) {
+  const err = e;
+  if (err.code === "ETIMEDOUT" || err.signal) return { kind: "timeout" };
+  if (typeof err.status === "number") return { kind: "done", out: `${err.stdout ?? ""}${err.stderr ?? ""}` };
+  return { kind: "spawn_error" };
+}
+function classifyAsyncError(e, stdout7, stderr) {
+  const err = e;
+  if (typeof err.code === "string") return { kind: "spawn_error" };
+  if (err.killed || err.signal) return { kind: "timeout" };
+  return { kind: "done", out: `${stdout7}${stderr}` };
+}
+var defaultProbe = createVersionProbe({
+  stat: (p) => {
+    try {
+      const st = statSync2(p);
+      return { size: st.size, mtimeMs: st.mtimeMs };
+    } catch {
+      return null;
+    }
+  },
+  runSync: (loc) => {
+    try {
+      const out = execFileSync5(loc.file, [...loc.prefixArgs, "--version"], {
+        encoding: "utf8",
+        stdio: ["ignore", "pipe", "pipe"],
+        windowsHide: true,
+        timeout: PROBE_TIMEOUT_MS,
+        env: probeEnv(loc)
+      });
+      return { kind: "done", out };
+    } catch (e) {
+      return classifySyncError(e);
+    }
+  },
+  runAsync: (loc) => new Promise((resolve10) => {
+    try {
+      execFile3(
+        loc.file,
+        [...loc.prefixArgs, "--version"],
+        { encoding: "utf8", windowsHide: true, timeout: PROBE_TIMEOUT_MS, env: probeEnv(loc) },
+        (err, stdout7, stderr) => resolve10(err ? classifyAsyncError(err, String(stdout7 ?? ""), String(stderr ?? "")) : { kind: "done", out: `${stdout7}${stderr}` })
+      );
+    } catch {
+      resolve10({ kind: "spawn_error" });
+    }
+  }),
+  now: () => Date.now()
 });
+function probeVersion(loc) {
+  return defaultProbe.probe(loc);
+}
+async function warmClaudeProbe(d = defaultLocateDeps()) {
+  if (!isWin(d)) return;
+  try {
+    for (const { loc } of winClaudeLaunches(d)) await defaultProbe.warm(loc);
+  } catch {
+  }
+}
 function installDirsFromProcs(procs, exe) {
   const out = [];
   for (const p of procs ?? []) {
@@ -1639,6 +1780,7 @@ function parseNpmCmdShim(shimPath, text) {
   if (!m) return null;
   return join7(dirname6(shimPath), m[1].replace(/^\\/, ""));
 }
+var JS_RUNTIME_EXE = /^(?:node|bun|bunx|deno)(?:\.exe)?$/i;
 function resolveWinLaunch(file, d) {
   const lower = file.toLowerCase();
   if (lower.endsWith(".exe") || lower.endsWith(".com")) return { file, prefixArgs: [] };
@@ -1647,6 +1789,7 @@ function resolveWinLaunch(file, d) {
     const target = text ? parseNpmCmdShim(file, text) : null;
     if (!target || !d.exists(target)) return null;
     if (/\.(?:cmd|bat)$/i.test(target)) return null;
+    if (JS_RUNTIME_EXE.test(win322.basename(target.replace(/\//g, "\\")))) return null;
     return resolveWinLaunch(target, d);
   }
   if (/\.(?:c|m)?js$/.test(lower)) return { file: d.nodePath, prefixArgs: [file] };
@@ -1673,6 +1816,32 @@ function winClaudeExeCandidates(d) {
     ...d.appData ? [join7(d.appData, "npm", "node_modules", "@anthropic-ai", "claude-code", "bin", "claude.exe")] : []
   ];
 }
+function winClaudeLaunches(d) {
+  const out = [];
+  for (const p of winClaudeExeCandidates(d)) if (d.exists(p)) out.push({ src: p, loc: { file: p, prefixArgs: [] } });
+  for (const f of whichAllIn("claude", d)) {
+    const loc = resolveWinLaunch(f, d);
+    if (loc) out.push({ src: f, loc });
+  }
+  return out;
+}
+function isClaudeCode(loc, d) {
+  if (loc.prefixArgs.length === 0 && /\.exe$/i.test(loc.file) && d.isPe && !d.isPe(loc.file)) return false;
+  const out = d.versionOf?.(loc);
+  if (out === void 0 || out === null) return true;
+  return /Claude Code/i.test(out);
+}
+function pickWinClaude(d, accept = () => true) {
+  const tried = /* @__PURE__ */ new Set();
+  for (const { src, loc } of winClaudeLaunches(d)) {
+    if (!accept(src, loc)) continue;
+    const key = [loc.file, ...loc.prefixArgs].join("\0").toLowerCase();
+    if (tried.has(key)) continue;
+    tried.add(key);
+    if (isClaudeCode(loc, d)) return loc;
+  }
+  return null;
+}
 function locateWin(tool, d) {
   const plain = (name) => {
     for (const f of whichAllIn(name, d)) {
@@ -1683,8 +1852,7 @@ function locateWin(tool, d) {
   };
   switch (tool) {
     case "claude_code":
-      for (const p of winClaudeExeCandidates(d)) if (d.exists(p)) return { file: p, prefixArgs: [] };
-      return plain("claude");
+      return pickWinClaude(d);
     case "codex":
       return plain("codex");
     case "workbuddy": {
@@ -1917,7 +2085,9 @@ var FALLBACK = {
     // Qoder 国内版（Qoder CN.app，配置 ~/.qoder-cn）
     qoder_cn: {
       format: "cc-hook",
-      processNames: ["Qoder CN"],
+      // qoderclicn：终端里的命令行窗口（Bug 204）。认不出它的话会话没有进程号、interactive=false，
+      // 打断补落与窗口授权都不管（2026-10-03 qoderclicn 1.1.59 实测）
+      processNames: ["Qoder CN", "qoderclicn"],
       // 桌面端会话库里的标题（先是首条指令，后被换成 AI 摘要）；命令行跑的会话不在库里，落到首条指令
       // （CLI 1.1.61 实测 transcript 里没有 ai-title，UserPromptSubmit 带 prompt）
       titleSources: ["qoder-session-title", "first-prompt", "git-branch", "project"],
@@ -3211,7 +3381,7 @@ var AutoEnabler = class {
 // src/daemon/index.ts
 import { randomBytes as randomBytes7 } from "crypto";
 import { existsSync as existsSync20, statSync as statSync14 } from "fs";
-import { basename as basename9, dirname as dirname18, join as join36 } from "path";
+import { basename as basename9, dirname as dirname19, join as join36 } from "path";
 import WebSocket2 from "ws";
 
 // src/core/state.ts
@@ -3277,8 +3447,55 @@ function isAlive(pid, expectName) {
   return name != null && name.toLowerCase().includes(expectName.toLowerCase());
 }
 
+// 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, platform = process.platform, procs, fresh = false) {
+  if (platform === "win32") {
+    const list = procs ? procs() : winProcs(Date.now(), { force: fresh });
+    const p = (list ?? []).find((x) => x.pid === pid);
+    return p?.args || 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;
+  }
+}
+function isCodexManagedDaemonArgs(args) {
+  const s2 = String(args || "").replace(/\\/g, "/");
+  return /(?:^|\s)--managed-daemon(?:[=\s]|$)/.test(s2) || /\/app-server-daemon\//i.test(programOf(s2)) || /(?:^|\s)app-server\s+daemon(?:\s|$)/.test(s2);
+}
+var SCRIPT_HOST_RE = /^(?:node|bun|deno)(?:\.exe)?$/i;
+function baseName(p) {
+  return p.replace(/\\/g, "/").split("/").pop().toLowerCase();
+}
+function progAt(all, i, re) {
+  for (let j = i; j < Math.min(all.length, i + 8); j++) {
+    const cand = all.slice(i, j + 1).join(" ");
+    if (re.test(baseName(cand))) return { prog: cand, next: j + 1 };
+    if (!/^(?:\/|[A-Za-z]:\/)/.test(all[i].replace(/\\/g, "/"))) break;
+  }
+  return null;
+}
+function programOf(args) {
+  const all = String(args || "").trim().split(/\s+/).filter(Boolean);
+  const h = progAt(all, 0, SCRIPT_HOST_RE);
+  if (h) {
+    const k = all.findIndex((a, n) => n >= h.next && !a.startsWith("-"));
+    if (k >= 0) return all[k];
+  }
+  return all[0] || "";
+}
+
 // src/core/ended.ts
-import { closeSync as closeSync2, mkdirSync as mkdirSync12, openSync as openSync2, readdirSync as readdirSync4, readFileSync as readFileSync14, readSync, realpathSync as realpathSync2, renameSync as renameSync8, rmSync as rmSync6, statSync as statSync5, writeFileSync as writeFileSync11 } from "fs";
+import { closeSync as closeSync3, mkdirSync as mkdirSync12, openSync as openSync3, readdirSync as readdirSync4, readFileSync as readFileSync14, readSync as readSync2, realpathSync as realpathSync2, renameSync as renameSync8, rmSync as rmSync6, statSync as statSync5, writeFileSync as writeFileSync11 } from "fs";
 import { join as join16 } from "path";
 var ENDED_TTL_MS = 7 * 24 * 60 * 60 * 1e3;
 var SID_RE = /^[A-Za-z0-9_-]{1,64}$/;
@@ -3328,11 +3545,11 @@ function readChunk(file, fromEnd, max) {
     const size = statSync5(file).size;
     const len = Math.min(size, max);
     const buf = Buffer.alloc(len);
-    fd = openSync2(file, "r");
-    readSync(fd, buf, 0, len, fromEnd ? size - len : 0);
+    fd = openSync3(file, "r");
+    readSync2(fd, buf, 0, len, fromEnd ? size - len : 0);
     return buf.toString("utf8");
   } finally {
-    if (fd !== void 0) closeSync2(fd);
+    if (fd !== void 0) closeSync3(fd);
   }
 }
 function cwdsIn(text) {
@@ -3446,6 +3663,13 @@ function isStaleNoPid(s2, now, pending) {
   if (s2.pid || !STALE_STATES.has(s2.state) || !(now - s2.updatedAt > STALE_NO_PID_MS)) return false;
   return !pending().has(s2.sessionId);
 }
+function dropManagedDaemonPid(s2, args = (pid) => processArgs(pid)) {
+  if (s2.tool !== "codex" || !s2.pid || s2.pidChecked === true || !isCodexManagedDaemonArgs(args(s2.pid) ?? "")) return s2;
+  const next = { ...s2 };
+  delete next.pid;
+  delete next.pidName;
+  return next;
+}
 function readAliveStates(tool, opts = {}) {
   if (!existsSync16(stateDir())) return [];
   const now = opts.now ?? Date.now();
@@ -3466,6 +3690,7 @@ function readAliveStates(tool, opts = {}) {
       retireState(s2);
       continue;
     }
+    s2 = dropManagedDaemonPid(s2, opts.args);
     if (isStaleNoPid(s2, now, pending)) {
       try {
         opts.onStale?.(s2);
@@ -3713,7 +3938,7 @@ function isExpired(cmd, now = Date.now()) {
 }
 
 // src/daemon/executor.ts
-import { execFile as execFile3, execFileSync as execFileSync8 } from "child_process";
+import { execFile as execFile4, execFileSync as execFileSync9 } from "child_process";
 import { homedir as homedir6 } from "os";
 import { join as join19 } from "path";
 var EXEC_TIMEOUT_MS = 10 * 60 * 1e3;
@@ -3991,7 +4216,7 @@ function startCommand(plan, tool, limitMs = EXEC_TIMEOUT_MS) {
   };
   let timedOut = false;
   const done = new Promise((resolve10) => {
-    child = execFile3(
+    child = execFile4(
       plan.file,
       plan.args,
       {
@@ -4039,7 +4264,7 @@ function startCommand(plan, tool, limitMs = EXEC_TIMEOUT_MS) {
   };
 }
 function mergeEnv(base, extra, platform = process.platform) {
-  const env = { ...base };
+  const env = scrubAgentEnv({ ...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];
@@ -4052,7 +4277,7 @@ function killTree(child) {
   if (!child) return;
   if (process.platform === "win32" && child.pid) {
     try {
-      execFileSync8("taskkill", ["/pid", String(child.pid), "/T", "/F"], { stdio: "ignore", windowsHide: true });
+      execFileSync9("taskkill", ["/pid", String(child.pid), "/T", "/F"], { stdio: "ignore", windowsHide: true });
       return;
     } catch {
     }
@@ -4345,7 +4570,7 @@ function editInProject(toolName, toolInput, cwd, opts) {
 }
 
 // src/daemon/gate/question.ts
-import { closeSync as closeSync3, openSync as openSync3, readSync as readSync2, statSync as statSync6 } from "fs";
+import { closeSync as closeSync4, openSync as openSync4, readSync as readSync3, statSync as statSync6 } from "fs";
 var MAX_QUESTIONS = 4;
 var MAX_OPTIONS = 4;
 var HEADER_MAX = 12;
@@ -4455,11 +4680,11 @@ function lastAssistantText(transcriptPath) {
     const size = statSync6(transcriptPath).size;
     const len = Math.min(size, TAIL_BYTES);
     const buf = Buffer.alloc(len);
-    const fd = openSync3(transcriptPath, "r");
+    const fd = openSync4(transcriptPath, "r");
     try {
-      readSync2(fd, buf, 0, len, size - len);
+      readSync3(fd, buf, 0, len, size - len);
     } finally {
-      closeSync3(fd);
+      closeSync4(fd);
     }
     text = buf.toString("utf8");
   } catch {
@@ -4575,14 +4800,14 @@ function pcAnswers(toolInput, rec) {
 }
 
 // src/daemon/gate/procs.ts
-import { execFileSync as execFileSync9 } from "child_process";
+import { execFileSync as execFileSync10 } 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 = execFileSync9("ps", ["-A", "-ww", "-o", "pid=,ppid=,args="], {
+    out = execFileSync10("ps", ["-A", "-ww", "-o", "pid=,ppid=,args="], {
       encoding: "utf8",
       stdio: ["ignore", "pipe", "ignore"],
       maxBuffer: 16 * 1024 * 1024
@@ -6241,7 +6466,7 @@ function sleep(ms) {
 }
 
 // src/daemon/workbuddyBridge.ts
-import { closeSync as closeSync5, openSync as openSync5, readSync as readSync4, realpathSync as realpathSync4, statSync as statSync10 } from "fs";
+import { closeSync as closeSync6, openSync as openSync6, readSync as readSync5, realpathSync as realpathSync4, statSync as statSync10 } from "fs";
 import { dirname as dirname16, sep as sep3 } from "path";
 
 // src/core/wrapWindows.ts
@@ -6250,9 +6475,9 @@ import { tmpdir as tmpdir3 } from "os";
 import { join as join27 } from "path";
 
 // src/core/wake.ts
-import { execFileSync as execFileSync10 } from "child_process";
+import { execFileSync as execFileSync11 } from "child_process";
 import { createHash as createHash3, createHmac as createHmac2, timingSafeEqual as timingSafeEqual2 } from "crypto";
-import { chmodSync as chmodSync6, closeSync as closeSync4, mkdirSync as mkdirSync19, openSync as openSync4, readdirSync as readdirSync6, readFileSync as readFileSync20, readSync as readSync3, renameSync as renameSync13, rmSync as rmSync9, statSync as statSync8, writeFileSync as writeFileSync17 } from "fs";
+import { chmodSync as chmodSync6, closeSync as closeSync5, mkdirSync as mkdirSync19, openSync as openSync5, readdirSync as readdirSync6, readFileSync as readFileSync20, readSync as readSync4, renameSync as renameSync13, rmSync as rmSync9, statSync as statSync8, writeFileSync as writeFileSync17 } from "fs";
 import { tmpdir as tmpdir2 } from "os";
 import { join as join26 } from "path";
 function wakeDir(home = deskbuddyHome()) {
@@ -6343,7 +6568,7 @@ function writeWakeSecret(hex, platform = process.platform) {
   writeFileSync17(tmp, hex, { encoding: "utf8", mode: 384 });
   if (platform === "win32") {
     try {
-      execFileSync10("icacls", [tmp, "/inheritance:r", "/grant:r", `${currentUserSid()}:F`], { stdio: "ignore", windowsHide: true });
+      execFileSync11("icacls", [tmp, "/inheritance:r", "/grant:r", `${currentUserSid()}:F`], { stdio: "ignore", windowsHide: true });
     } catch {
       renameSync13(tmp, file);
       return "\u7A97\u53E3\u5524\u9192\u5BC6\u94A5\u6587\u4EF6\u7684\u6743\u9650\u6CA1\u80FD\u6536\u7D27\uFF08icacls \u5931\u8D25\uFF09";
@@ -6357,7 +6582,7 @@ function writeWakeSecret(hex, platform = process.platform) {
 function restrictToUser(file, platform = process.platform) {
   if (platform !== "win32") return true;
   try {
-    execFileSync10("icacls", [file, "/inheritance:r", "/grant:r", `${currentUserSid()}:F`], { stdio: "ignore", windowsHide: true });
+    execFileSync11("icacls", [file, "/inheritance:r", "/grant:r", `${currentUserSid()}:F`], { stdio: "ignore", windowsHide: true });
     return true;
   } catch {
     return false;
@@ -6365,7 +6590,7 @@ function restrictToUser(file, platform = process.platform) {
 }
 function currentUserSid() {
   try {
-    const out = execFileSync10("whoami", ["/user", "/fo", "csv", "/nh"], { encoding: "utf8", windowsHide: true });
+    const out = execFileSync11("whoami", ["/user", "/fo", "csv", "/nh"], { encoding: "utf8", windowsHide: true });
     const m = /"(S-1-[0-9-]+)"/.exec(out);
     if (m) return `*${m[1]}`;
   } catch {
@@ -6403,8 +6628,8 @@ function analyzeTranscript(file) {
     const size = statSync8(file).size;
     const len = Math.min(size, TRANSCRIPT_TAIL2);
     const buf = Buffer.alloc(len);
-    fd = openSync4(file, "r");
-    readSync3(fd, buf, 0, len, size - len);
+    fd = openSync5(file, "r");
+    readSync4(fd, buf, 0, len, size - len);
     const lines2 = buf.toString("utf8").split("\n");
     let seg = false;
     let reply = null;
@@ -6445,7 +6670,7 @@ function analyzeTranscript(file) {
   } finally {
     if (fd !== void 0) {
       try {
-        closeSync4(fd);
+        closeSync5(fd);
       } catch {
       }
     }
@@ -6820,6 +7045,12 @@ function parseAnswer(m) {
     const toolName = toolNameOf(a.toolName);
     if (!toolName) return null;
     if (a.trust !== true && a.prompt !== void 0) return null;
+    if (a.login !== void 0) {
+      if (a.login !== true || a.trust !== void 0 || a.questions !== void 0) return null;
+      const fp = a.fingerprint === void 0 ? void 0 : str3(a.fingerprint, 200);
+      if (fp === null) return null;
+      return { instructionId, sessionId, expireAt, answer: { kind: "probe", toolName, login: true, ...fp ? { fingerprint: fp } : {} } };
+    }
     if (a.trust === true) {
       if (a.fingerprint !== void 0 || a.questions !== void 0) return null;
       return { instructionId, sessionId, expireAt, answer: { kind: "probe", toolName, trust: true, ...hooks } };
@@ -7141,11 +7372,11 @@ function tail(path) {
     const size = statSync10(path).size;
     const len = Math.min(size, TAIL_BYTES2);
     const buf = Buffer.alloc(len);
-    const fd = openSync5(path, "r");
+    const fd = openSync6(path, "r");
     try {
-      readSync4(fd, buf, 0, len, size - len);
+      readSync5(fd, buf, 0, len, size - len);
     } finally {
-      closeSync5(fd);
+      closeSync6(fd);
     }
     return buf.toString("utf8");
   } catch {
@@ -7291,6 +7522,16 @@ var WorkbuddyBridge = class {
     this.#prune();
     if (this.#seen.has(key)) return;
     this.#seen.set(key, this.#now());
+    if (await this.#onLoginPage(windowId, rec, call2.callId, toolName, fingerprint2)) {
+      this.#seen.delete(key);
+      this.#d.log(`WorkBuddy\uFF1A\u4F1A\u8BDD ${sessionId.slice(0, 8)} \u7684 ${toolName} \u6388\u6743\u4E0D\u63A8\u8BBE\u5907\u3001\u64A4\u5361\uFF08\u9700\u8981\u767B\u5F55\uFF1A\u7A97\u53E3\u8FD8\u505C\u5728\u767B\u5F55\u9875\uFF09`);
+      try {
+        this.#d.loginBlocked?.(windowId, sessionId);
+      } catch {
+      }
+      return;
+    }
+    if (this.#stopped) return;
     const old = this.#cards.get(sessionId);
     if (old) {
       this.#cards.delete(sessionId);
@@ -7322,6 +7563,23 @@ var WorkbuddyBridge = class {
     this.#cards.delete(sessionId);
     await this.#answer(card, reply);
   }
+  /**
+   * 窗口此刻还在登录页？只问认出过登录页的窗口；🔴 拿不准（通道不通、老包装层不认、超时）一律按不在 —— 宁可照常推卡，不误撤
+   */
+  async #onLoginPage(windowId, rec, callId, toolName, fingerprint2) {
+    try {
+      if (!this.#d.loginWindow?.(windowId)) return false;
+      const r = await this.#send(windowId, rec, {
+        instructionId: `login-${callId}`.replace(/[^0-9a-zA-Z_-]/g, "").slice(0, 64) || "login",
+        sessionId: "",
+        expireAt: 0,
+        answer: { kind: "probe", toolName, login: true, ...fingerprint2 ? { fingerprint: fingerprint2 } : {} }
+      });
+      return r?.status === "started";
+    } catch {
+      return false;
+    }
+  }
   async #answer(card, reply) {
     let spec;
     if (card.toolName === "AskUserQuestion") {
@@ -7374,6 +7632,10 @@ var WorkbuddyBridge = class {
     }
     return n;
   }
+  /** 这个会话手上有没有在等的卡 */
+  hasCard(sessionId) {
+    return this.#cards.has(sessionId);
+  }
   /** 这个窗口里在等的卡所属的会话号（没登录回报时带上） */
   sessionOfWindow(windowId) {
     for (const card of this.#cards.values()) if (card.windowId === windowId) return card.sessionId;
@@ -7783,6 +8045,12 @@ var TrustWatcher = class {
   #notify() {
     this.#d.notify({ kind: this.#kind ?? "trust", ...this.#count ? { count: this.#count } : {}, ...this.#repoRoot ? { repoRoot: this.#repoRoot } : {} });
   }
+  #mismatchLogged = false;
+  #mismatch(msg) {
+    if (this.#mismatchLogged) return;
+    this.#mismatchLogged = true;
+    this.#d.log(msg);
+  }
   tick(lines2) {
     const v = lines2 ? inspectTrust(lines2, this.#d.tool) : null;
     if (!v || v.kind !== this.#kind) {
@@ -7791,6 +8059,7 @@ var TrustWatcher = class {
       this.#contactAt = null;
       this.#kind = v ? v.kind : null;
       this.#repoRoot = void 0;
+      this.#mismatchLogged = false;
       if (!v) return;
     }
     this.#count = v.count;
@@ -7815,8 +8084,10 @@ var TrustWatcher = class {
     }
     const scope = this.#scope();
     if (scope?.kind === "repo") {
+      const shownRoot = v.widenedRoot ?? "";
       if (!repoAnswerable(v, this.#d.tool, this.#forms, scope.root)) {
-        this.#d.log("\u4FE1\u4EFB\u6846\u4F1A\u843D\u5230 git \u4ED3\u5E93\u6839\uFF0C\u4F46\u6846\u91CC\u7684\u76EE\u5F55\u548C\u6211\u4EEC\u627E\u5230\u7684\u4ED3\u5E93\u6839\u5BF9\u4E0D\u4E0A\uFF0C\u4E0D\u63A8\u8BBE\u5907\uFF0C\u8BF7\u5728\u7535\u8111\u4E0A\u786E\u8BA4");
+        this.#reported = false;
+        this.#mismatch(`\u4FE1\u4EFB\u6846\u4F1A\u843D\u5230 git \u4ED3\u5E93\u6839\uFF0C\u4F46\u6846\u91CC\u7684\u76EE\u5F55\u548C\u6211\u4EEC\u627E\u5230\u7684\u4ED3\u5E93\u6839\u5BF9\u4E0D\u4E0A\uFF0C\u6682\u4E0D\u63A8\u8BBE\u5907\uFF08\u6846\u91CC\u4ED3\u5E93\u6839\u300C${shownRoot}\u300D\uFF0C\u6211\u4EEC\u627E\u5230\u300C${scope.root}\u300D\uFF09`);
         return;
       }
       this.#d.log("\u4FE1\u4EFB\u6846\u4F1A\u843D\u5230 git \u4ED3\u5E93\u6839\uFF0C\u63A8\u8BBE\u5907\u786E\u8BA4\uFF08\u4ED3\u5E93\u6839\u5361\u7247\uFF09");
@@ -7836,7 +8107,8 @@ var TrustWatcher = class {
       return;
     }
     if (!pathShown(v, this.#forms)) {
-      this.#d.log("\u4FE1\u4EFB\u6846\u91CC\u7684\u76EE\u5F55\u548C\u7A97\u53E3\u5DE5\u4F5C\u76EE\u5F55\u5BF9\u4E0D\u4E0A\uFF0C\u4E0D\u63A8\u8BBE\u5907");
+      this.#reported = false;
+      this.#mismatch("\u4FE1\u4EFB\u6846\u91CC\u7684\u76EE\u5F55\u548C\u7A97\u53E3\u5DE5\u4F5C\u76EE\u5F55\u5BF9\u4E0D\u4E0A\uFF0C\u6682\u4E0D\u63A8\u8BBE\u5907");
       return;
     }
     this.#d.log("\u4FE1\u4EFB\u6846\u51FA\u73B0\uFF0C\u63A8\u8BBE\u5907\u786E\u8BA4");
@@ -8114,6 +8386,11 @@ function defaultSend2(windowId, rec, req2) {
 // src/daemon/loginRequired.ts
 var LOGIN_REASON = "agent_not_logged_in";
 var LOGIN_CANCEL_REASON = "\u9700\u8981\u767B\u5F55\uFF1AWorkBuddy \u547D\u4EE4\u884C\u6CA1\u767B\u5F55\uFF0C\u8BF7\u5728\u7535\u8111\u7EC8\u7AEF\u91CC\u767B\u5F55\u4E00\u6B21";
+function loginBlockedState(st, notAfter = Infinity) {
+  if (!st || st.tool !== "workbuddy" || st.state !== "ask_approval") return null;
+  if (st.updatedAt > notAfter) return null;
+  return { ...st, state: "failed", updatedAt: st.updatedAt + 1 };
+}
 function windowReplyAction(launch, status) {
   if (status === "ack") return "skip";
   if (launch.ended) return "ended";
@@ -8123,6 +8400,28 @@ function windowReplyAction(launch, status) {
   }
   return status === "not_here" ? "fallback" : "report";
 }
+var LOGIN_BLOCKED_RETRY_MS = [2e3, 6e3];
+function markLoginBlocked(sid, d) {
+  let baseline;
+  try {
+    baseline = Math.max(d.now(), d.readState(sid)?.updatedAt ?? 0);
+  } catch {
+    baseline = d.now();
+  }
+  const tryOnce = () => {
+    if (d.stopped() || d.hasCard(sid)) return;
+    try {
+      const next = loginBlockedState(d.readState(sid), baseline);
+      if (!next) return;
+      d.writeState(next);
+      d.log(`\u4F1A\u8BDD ${sid.slice(0, 8)} \u6388\u6743\u88AB\u767B\u5F55\u9875\u6321\u4F4F\uFF0C\u72B6\u6001 ask_approval \u6539\u6210 failed\uFF08\u670D\u52A1\u7AEF\u6CA1\u6709\u300C\u9700\u8981\u767B\u5F55\u300D\u72B6\u6001\u4E5F\u6CA1\u6709 reason \u5B57\u6BB5\uFF0Cfailed \u8BA9\u8BBE\u5907\u63D0\u793A\u53BB\u7535\u8111\u4E0A\u770B\uFF09`);
+      d.report();
+    } catch {
+    }
+  };
+  tryOnce();
+  for (const ms of LOGIN_BLOCKED_RETRY_MS) d.later(tryOnce, ms);
+}
 function isLoginNotify(req2) {
   return !!req2 && !!req2.hook && req2.hook.hook_event_name === LOGIN_EVENT;
 }
@@ -8132,6 +8431,10 @@ var LoginRequired = class {
   constructor(d) {
     this.#d = d;
   }
+  /** 这个窗口认出过登录页（WorkbuddyBridge 据此对新授权卡先问包装层登录页还在不在） */
+  isLoginWindow(windowId) {
+    return this.#done.has(windowId);
+  }
   onNotify(req2) {
     try {
       this.#onNotify(req2);
@@ -8155,6 +8458,7 @@ var LoginRequired = class {
     const short = windowId.slice(0, 8);
     const sid = this.#d.sessionOfWindow(windowId);
     const n = this.#d.cancelCards(windowId, LOGIN_CANCEL_REASON);
+    if (n > 0 && sid) this.#d.markBlocked?.(sid);
     this.#d.log(`WorkBuddy \u7A97\u53E3 ${short} \u505C\u5728\u767B\u5F55\u9875\uFF1A\u547D\u4EE4\u884C\u6CA1\u767B\u5F55\uFF08\u684C\u9762 App \u7684\u767B\u5F55\u4E0D\u5171\u4EAB\u7ED9\u547D\u4EE4\u884C\uFF09\uFF0C\u9700\u8981\u5728\u7EC8\u7AEF\u91CC\u767B\u5F55\u4E00\u6B21\uFF1B\u64A4\u5361 ${n} \u5F20`);
     const entry = typeof rec.launchId === "string" ? this.#d.launchOf(rec.launchId) : void 0;
     if (!entry) {
@@ -8185,7 +8489,7 @@ function pidAlive4(pid) {
 }
 
 // src/daemon/dumateWatch.ts
-import { execFileSync as execFileSync11, spawn as spawn3 } from "child_process";
+import { execFileSync as execFileSync12, spawn as spawn3 } from "child_process";
 import { readdirSync as readdirSync8, realpathSync as realpathSync6, statSync as statSync12 } from "fs";
 import { request as httpRequest } from "http";
 import { join as join29 } from "path";
@@ -8323,11 +8627,11 @@ var keyCache = null;
 function defaultDiscover() {
   if (process.platform === "win32" || typeof process.getuid !== "function") return null;
   try {
-    const ps = execFileSync11("ps", ["-A", "-ww", "-o", "pid=,uid=,args="], { encoding: "utf8", stdio: ["ignore", "pipe", "ignore"] });
+    const ps = execFileSync12("ps", ["-A", "-ww", "-o", "pid=,uid=,args="], { encoding: "utf8", stdio: ["ignore", "pipe", "ignore"] });
     const hit = parseDumateServe(ps, process.getuid());
     if (!hit) return null;
     if (keyCache && keyCache.pid === hit.pid && keyCache.port === hit.port) return keyCache;
-    const env = execFileSync11("ps", ["eww", "-p", String(hit.pid), "-o", "command="], { encoding: "utf8", stdio: ["ignore", "pipe", "ignore"] });
+    const env = execFileSync12("ps", ["eww", "-p", String(hit.pid), "-o", "command="], { encoding: "utf8", stdio: ["ignore", "pipe", "ignore"] });
     const key = parseInappKey(env);
     keyCache = key ? { ...hit, key } : null;
     return keyCache;
@@ -8969,7 +9273,7 @@ function runHook(node, input, agentPid) {
 }
 
 // src/daemon/codexWatch.ts
-import { execFileSync as execFileSync12, spawn as spawn4 } from "child_process";
+import { execFileSync as execFileSync13, spawn as spawn4 } from "child_process";
 import WebSocket from "ws";
 var TURN_LIMIT_MS = 10 * 60 * 1e3;
 var QUEUE_MAX_MS = 10 * 60 * 1e3;
@@ -9014,7 +9318,7 @@ function discoverAppServers(configured) {
     return parseAppServerUrls((winProcs() ?? []).map((p) => p.cmdline).join("\n"));
   }
   try {
-    const out = execFileSync12("ps", ["-A", "-ww", "-o", "args="], { encoding: "utf8", stdio: ["ignore", "pipe", "ignore"] });
+    const out = execFileSync13("ps", ["-A", "-ww", "-o", "args="], { encoding: "utf8", stdio: ["ignore", "pipe", "ignore"] });
     return parseAppServerUrls(out);
   } catch {
     return [];
@@ -10079,8 +10383,15 @@ function launchPending(runId) {
 }
 
 // src/core/interrupt.ts
-import { closeSync as closeSync6, openSync as openSync6, readdirSync as readdirSync9, readSync as readSync5, statSync as statSync13 } from "fs";
-import { join as join32 } from "path";
+import { closeSync as closeSync7, openSync as openSync7, readdirSync as readdirSync9, readSync as readSync6, statSync as statSync13 } from "fs";
+import { dirname as dirname18, join as join32 } from "path";
+var INTERRUPT_TOOLS = ["claude_code", "qoder_cn", "qoder"];
+function transcriptHome(tool) {
+  if (tool === "claude_code") return claudeHome();
+  if (tool === "qoder_cn") return dirname18(qoderCnSettingsPath());
+  if (tool === "qoder") return dirname18(qoderSettingsPath());
+  return null;
+}
 var TAIL = 64 * 1024;
 var SID_RE2 = /^[A-Za-z0-9_-]{1,64}$/;
 function userText2(content) {
@@ -10094,8 +10405,8 @@ function interruptedAt(file) {
     const st = statSync13(file);
     const len = Math.min(st.size, TAIL);
     const buf = Buffer.alloc(len);
-    fd = openSync6(file, "r");
-    readSync5(fd, buf, 0, len, st.size - len);
+    fd = openSync7(file, "r");
+    readSync6(fd, buf, 0, len, st.size - len);
     const lines2 = buf.toString("utf8").split("\n");
     for (let i = lines2.length - 1; i >= 0; i--) {
       const line = lines2[i];
@@ -10124,7 +10435,7 @@ function interruptedAt(file) {
   } finally {
     if (fd !== void 0) {
       try {
-        closeSync6(fd);
+        closeSync7(fd);
       } catch {
       }
     }
@@ -10159,7 +10470,7 @@ function claudeTranscriptFile(sessionId, cwd, home = claudeHome()) {
 var INTERRUPT_SETTLE_MS = 2e3;
 var INTERRUPT_TOLERANCE_MS = 5e3;
 function shouldSettleInterrupt(st, markerAt, now) {
-  if (markerAt === null || st.tool !== "claude_code") return false;
+  if (markerAt === null || !INTERRUPT_TOOLS.includes(st.tool)) return false;
   if (st.state !== "watch" && st.state !== "ask_approval") return false;
   if (st.interactive !== true && st.embedded !== true) return false;
   if (now - markerAt < INTERRUPT_SETTLE_MS) return false;
@@ -10169,7 +10480,7 @@ function shouldSettleInterrupt(st, markerAt, now) {
 }
 
 // src/daemon/openWindow.ts
-import { execFile as execFile4, execFileSync as execFileSync13, spawn as spawn5 } from "child_process";
+import { execFile as execFile5, execFileSync as execFileSync14, spawn as spawn5 } from "child_process";
 import { chmodSync as chmodSync9, mkdirSync as mkdirSync23, rmSync as rmSync14, writeFileSync as writeFileSync21 } from "fs";
 import { userInfo } from "os";
 import { join as join33 } from "path";
@@ -10220,14 +10531,14 @@ var defaultGuiDeps = () => ({
   env: process.env,
   macManager: () => {
     try {
-      return execFileSync13("launchctl", ["managername"], { encoding: "utf8", stdio: ["ignore", "pipe", "ignore"], timeout: 3e3 });
+      return execFileSync14("launchctl", ["managername"], { encoding: "utf8", stdio: ["ignore", "pipe", "ignore"], timeout: 3e3 });
     } catch {
       return "";
     }
   },
   macConsoleUser: () => {
     try {
-      return execFileSync13("stat", ["-f", "%Su", "/dev/console"], { encoding: "utf8", stdio: ["ignore", "pipe", "ignore"], timeout: 3e3 });
+      return execFileSync14("stat", ["-f", "%Su", "/dev/console"], { encoding: "utf8", stdio: ["ignore", "pipe", "ignore"], timeout: 3e3 });
     } catch {
       return "";
     }
@@ -10241,7 +10552,7 @@ var defaultGuiDeps = () => ({
   },
   winSessionId: () => {
     try {
-      const out = execFileSync13("tasklist", ["/FI", `PID eq ${process.pid}`, "/FO", "CSV", "/NH"], {
+      const out = execFileSync14("tasklist", ["/FI", `PID eq ${process.pid}`, "/FO", "CSV", "/NH"], {
         encoding: "utf8",
         stdio: ["ignore", "pipe", "ignore"],
         windowsHide: true,
@@ -10259,7 +10570,7 @@ var defaultOpenerDeps = (findWt2) => ({
   platform: process.platform,
   findWt: findWt2,
   run: (file, args) => new Promise((resolve10, reject) => {
-    execFile4(file, args, { windowsHide: true, timeout: 15e3 }, (err) => err ? reject(err) : resolve10());
+    execFile5(file, args, { windowsHide: true, timeout: 15e3 }, (err) => err ? reject(err) : resolve10());
   }),
   spawnDetached: (file, args) => {
     const c = spawn5(file, args, { detached: true, stdio: "ignore", shell: false, windowsHide: false });
@@ -10964,7 +11275,7 @@ function defaultCodexAppServers() {
 }
 function opencodeReady() {
   const mod = ocPluginModule(installedHookPath());
-  return isOcPluginInstalled(opencodePluginPath()) && existsSync20(mod) && existsSync20(join36(dirname18(mod), "ocTranslate.mjs"));
+  return isOcPluginInstalled(opencodePluginPath()) && existsSync20(mod) && existsSync20(join36(dirname19(mod), "ocTranslate.mjs"));
 }
 var INTERNAL_PROMPT_MARK = "[DeskBuddy]";
 function orphanResumeText(summary2) {
@@ -11135,7 +11446,9 @@ var Daemon = class {
     this.#workbuddy = new WorkbuddyBridge({
       gate: (req2, signal) => this.#coord.onGate(req2, signal),
       log,
-      enabled: () => loadConfig().enabledTools.includes("workbuddy")
+      enabled: () => loadConfig().enabledTools.includes("workbuddy"),
+      loginWindow: (windowId) => this.#login.isLoginWindow(windowId),
+      loginBlocked: (_windowId, sid) => this.#markLoginBlocked(sid)
     });
     this.#trust = new TrustBridge({
       gate: (req2, signal) => this.#coord.onGate(req2, signal),
@@ -11147,7 +11460,8 @@ var Daemon = class {
       launchOf: (id) => this.#launches.get(id),
       report: (cmd, sid, status, reason) => this.#report(cmd, sid, status, "window", reason),
       cancelCards: (windowId, reason) => this.#workbuddy.cancelWindow(windowId, reason) + this.#trust.cancelWindow(windowId, reason),
-      sessionOfWindow: (windowId) => this.#workbuddy.sessionOfWindow(windowId)
+      sessionOfWindow: (windowId) => this.#workbuddy.sessionOfWindow(windowId),
+      markBlocked: (sid) => this.#markLoginBlocked(sid)
     });
     this.#qwenwork = new QwenWorkBridge({
       gate: (req2, signal) => this.#coord.onGate(req2, signal),
@@ -11278,6 +11592,22 @@ var Daemon = class {
     }, CODEX_IDLE_SETTLE_MS);
     t.unref?.();
   }
+  /**
+   * WorkBuddy 窗口停在登录页、授权卡没推 / 被撤（loginRequired.ts loginBlockedState）：会话状态从 ask_approval 改成 failed 并上报。
+   * 推卡的通知与写 ask_approval 的 hook 是同一事件的两次独立调用，谁先到不一定：现在改一次，隔几秒再各看一次
+   */
+  #markLoginBlocked(sid) {
+    markLoginBlocked(sid, {
+      now: this.#deps.now,
+      readState,
+      writeState,
+      hasCard: (id) => this.#workbuddy.hasCard(id),
+      stopped: () => this.#stopped,
+      log,
+      report: () => void this.#reportAlive().catch(() => void 0),
+      later: (fn, ms) => void setTimeout(fn, ms).unref?.()
+    });
+  }
   /** 状态还停在忙且 since 之后没有新事件 → 改成 done。改了返回 true */
   #settleBusy(sessionId, tool, since, why) {
     try {
@@ -11291,34 +11621,39 @@ var Daemon = class {
     }
   }
   /**
-   * 扫一遍 Claude Code 窗口里还在忙的会话：transcript 显示已被打断就补落 done（Bug 表 160）；
+   * 扫一遍 Claude Code / Qoder 窗口里还在忙的会话：transcript 显示已被打断就补落 done（Bug 表 160 / 204）；
    * 会话开在 DeskBuddy 窗口里的，同时把窗口的 .last 补成 Stop（包装层据此判空闲，否则设备回复一直排队到过期）
    */
   #settleInterrupted() {
-    if (this.#stopped || !loadConfig().enabledTools.includes("claude_code")) return;
+    if (this.#stopped) return;
+    const enabled = loadConfig().enabledTools;
+    const tools = INTERRUPT_TOOLS.filter((t) => enabled.includes(t));
+    if (tools.length === 0) return;
     const now = this.#deps.now();
-    let changed = false;
     const alive = /* @__PURE__ */ new Set();
-    for (const st of this.#aliveStates("claude_code")) {
-      alive.add(st.sessionId);
-      if (!BUSY_STATES2.has(st.state) || st.interactive !== true && st.embedded !== true) {
-        this.#transcriptSeen.delete(st.sessionId);
-        continue;
-      }
-      const file = this.#transcriptOf(st, now);
-      if (!file) continue;
-      const sig = transcriptSig(file);
-      if (sig && this.#transcriptSeen.get(st.sessionId) === sig) continue;
-      const at = interruptedAt(file);
-      if (sig && (at === null || now - at >= INTERRUPT_SETTLE_MS)) this.#transcriptSeen.set(st.sessionId, sig);
-      if (at === null || !shouldSettleInterrupt(st, at, now)) continue;
-      if (this.#settleBusy(st.sessionId, "claude_code", st.updatedAt, "\u5728\u7A97\u53E3\u91CC\u88AB\u6253\u65AD\uFF08Claude Code \u4E0D\u53D1 Stop\uFF09")) {
-        changed = true;
-        this.#idleWindowAfterInterrupt(st.sessionId, at);
+    for (const tool of tools) {
+      let changed = false;
+      for (const st of this.#aliveStates(tool)) {
+        alive.add(st.sessionId);
+        if (!BUSY_STATES2.has(st.state) || st.interactive !== true && st.embedded !== true) {
+          this.#transcriptSeen.delete(st.sessionId);
+          continue;
+        }
+        const file = this.#transcriptOf(st, now);
+        if (!file) continue;
+        const sig = transcriptSig(file);
+        if (sig && this.#transcriptSeen.get(st.sessionId) === sig) continue;
+        const at = interruptedAt(file);
+        if (sig && (at === null || now - at >= INTERRUPT_SETTLE_MS)) this.#transcriptSeen.set(st.sessionId, sig);
+        if (at === null || !shouldSettleInterrupt(st, at, now)) continue;
+        if (this.#settleBusy(st.sessionId, tool, st.updatedAt, `\u5728\u7A97\u53E3\u91CC\u88AB\u6253\u65AD\uFF08${tool} \u4E0D\u53D1 Stop\uFF09`)) {
+          changed = true;
+          this.#idleWindowAfterInterrupt(st.sessionId, at);
+        }
       }
+      if (changed) void this.#reportTool(tool);
     }
     for (const m of [this.#transcripts, this.#transcriptMiss, this.#transcriptSeen]) for (const k of [...m.keys()]) if (!alive.has(k)) m.delete(k);
-    if (changed) void this.#reportTool("claude_code");
   }
   /** 会话的 transcript：hook 记在状态里的优先；没有再按目录找，找不到的一段时间内不再找 */
   #transcriptOf(st, now) {
@@ -11327,7 +11662,8 @@ var Daemon = class {
     if (cached && existsSync20(cached)) return cached;
     const missAt = this.#transcriptMiss.get(st.sessionId);
     if (missAt !== void 0 && now - missAt < TRANSCRIPT_MISS_TTL_MS) return null;
-    const f = claudeTranscriptFile(st.sessionId, st.cwd);
+    const home = transcriptHome(st.tool);
+    const f = home ? claudeTranscriptFile(st.sessionId, st.cwd, home) : null;
     if (f) {
       this.#transcripts.set(st.sessionId, f);
       this.#transcriptMiss.delete(st.sessionId);
@@ -12396,6 +12732,7 @@ async function runDaemonCommand(opts = {}) {
 `);
     return 1;
   }
+  void warmClaudeProbe();
   const d = daemon;
   const updater = opts.foreground ? null : new AutoUpdater({
     currentVersion: packageVersion(),
@@ -13340,7 +13677,7 @@ var Injector = class {
 import { spawn as spawn6 } from "child_process";
 import { realpathSync as realpathSync7 } from "fs";
 import { constants as constants2 } from "os";
-import { dirname as dirname19, resolve as resolve9 } from "path";
+import { dirname as dirname20, resolve as resolve9 } from "path";
 var CLAUDE_SUBCOMMANDS = /* @__PURE__ */ new Set([
   "agents",
   "attach",
@@ -13404,7 +13741,7 @@ function real(p) {
 function findReal(tool, d = defaultLocateDeps(), skip = shimDir()) {
   const win = (d.platform ?? process.platform) === "win32";
   const skipKeys = /* @__PURE__ */ new Set([norm2(skip, win), norm2(real(skip), win)]);
-  const inSkip = (file) => skipKeys.has(norm2(dirname19(file), win)) || skipKeys.has(norm2(dirname19(real(file)), win));
+  const inSkip = (file) => skipKeys.has(norm2(dirname20(file), win)) || skipKeys.has(norm2(dirname20(real(file)), win));
   const dd = { ...d, skipDirs: [...d.skipDirs ?? [], skip] };
   const name = SHIM_COMMANDS[tool];
   if (!name) {
@@ -13412,7 +13749,11 @@ function findReal(tool, d = defaultLocateDeps(), skip = shimDir()) {
     return loc && !inSkip(loc.prefixArgs[0] && /\.(?:c|m)?js$/i.test(loc.prefixArgs[0]) ? loc.prefixArgs[0] : loc.file) ? loc : null;
   }
   if (win && tool === "claude_code") {
-    for (const p of winClaudeExeCandidates(dd)) if (dd.exists(p) && !inSkip(p)) return { file: p, prefixArgs: [] };
+    return pickWinClaude(dd, (src, loc) => {
+      if (inSkip(src)) return false;
+      const target = loc.prefixArgs[0] && /\.(?:c|m)?js$/i.test(loc.prefixArgs[0]) ? loc.prefixArgs[0] : loc.file;
+      return !inSkip(target);
+    });
   }
   for (const f of whichAllIn(name, dd)) {
     if (inSkip(f)) continue;
@@ -13427,7 +13768,7 @@ function findReal(tool, d = defaultLocateDeps(), skip = shimDir()) {
 function withoutShimFlag(env) {
   const out = { ...env };
   delete out.DESKBUDDY_SHIM;
-  return out;
+  return scrubAgentEnv(out);
 }
 function runDirect(real2, args, env = process.env) {
   return new Promise((done) => {
@@ -13484,34 +13825,10 @@ function runDirect(real2, args, env = process.env) {
 
 // src/wrap/codexLaunch.ts
 import { execFileSync as execFileSync15, spawn as spawn7 } from "child_process";
-import { closeSync as closeSync7, mkdirSync as mkdirSync27, openSync as openSync7, readdirSync as readdirSync11, readFileSync as readFileSync26, rmSync as rmSync21, statSync as statSync16, truncateSync as truncateSync2, writeFileSync as writeFileSync26, renameSync as renameSync19 } from "fs";
+import { closeSync as closeSync8, mkdirSync as mkdirSync27, openSync as openSync8, readdirSync as readdirSync11, readFileSync as readFileSync26, rmSync as rmSync21, statSync as statSync16, truncateSync as truncateSync2, writeFileSync as writeFileSync26, renameSync as renameSync19 } from "fs";
 import { request as request2 } from "http";
 import { createServer as createServer4 } from "net";
 import { join as join38 } from "path";
-
-// src/core/codexServer.ts
-import { execFileSync as execFileSync14 } 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, platform = process.platform, procs, fresh = false) {
-  if (platform === "win32") {
-    const list = procs ? procs() : winProcs(Date.now(), { force: fresh });
-    const p = (list ?? []).find((x) => x.pid === pid);
-    return p?.args || null;
-  }
-  try {
-    const out = execFileSync14("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"]);
@@ -13738,7 +14055,7 @@ function startServer(real2, url, env, cwd, platform = process.platform) {
     if (statSync16(logPath2).size > MAX_LOG_BYTES2) truncateSync2(logPath2, 0);
   } catch {
   }
-  const fd = openSync7(logPath2, "a");
+  const fd = openSync8(logPath2, "a");
   try {
     const childEnv2 = { ...env, DESKBUDDY_WRAPPED: "1" };
     delete childEnv2.DESKBUDDY_SHIM;
@@ -13748,7 +14065,7 @@ function startServer(real2, url, env, cwd, platform = process.platform) {
     child.unref();
     return child.pid ?? null;
   } finally {
-    closeSync7(fd);
+    closeSync8(fd);
   }
 }
 function killServer(pid, platform = process.platform, run2 = taskkill) {
@@ -14004,8 +14321,10 @@ function isLoginPage(lines2) {
   if (title < 0) return false;
   const below = lines2.slice(title + 1);
   const options = below.filter((l) => OPTION.test(l)).length;
-  return options >= 2 && below.some((l) => HINT.test(l));
+  const tail2 = lines2.filter((l) => l.trim() !== "").slice(-HINT_TAIL_LINES);
+  return options >= 2 && tail2.some((l) => HINT.test(l));
 }
+var HINT_TAIL_LINES = 3;
 var LOGIN_STABLE_MS = 500;
 var LoginWatcher = class {
   constructor(d) {
@@ -14046,6 +14365,11 @@ async function applyAnswer(req2, io, trust) {
   if (req2.expireAt > 0 && Date.now() > req2.expireAt) return { instructionId: id, status: "rejected", reason: "expired" };
   const a = req2.answer;
   if ((a.kind === "trust" || a.kind === "probe" && a.trust) && !trust) return { instructionId: id, status: "rejected", reason: "unsupported" };
+  if (a.kind === "probe" && a.login) {
+    if (!io.loginOnScreen) return { instructionId: id, status: "rejected", reason: "unsupported" };
+    const onLogin = io.loginOnScreen() && !(a.fingerprint && isPermissionDialog(io.screen() ?? [], a.toolName, a.fingerprint));
+    return onLogin ? { instructionId: id, status: "started", mode: "window" } : { instructionId: id, status: "rejected", reason: "not_waiting" };
+  }
   if (!io.screen()) return { instructionId: id, status: "rejected", reason: "no_screen" };
   if (a.kind === "probe") {
     const waiting = a.trust ? trustWaiting(io.screen() ?? [], trust?.tool ?? "", a.prompt ?? "trust") : stillWaiting(io.screen() ?? [], a);
@@ -14210,7 +14534,8 @@ async function runAnswerWindow(tool, real2, args, env, windowId, d) {
               }
             },
             write: toPty,
-            sleep: (ms) => new Promise((res) => setTimeout(res, ms))
+            sleep: (ms) => new Promise((res) => setTimeout(res, ms)),
+            ...login ? { loginOnScreen: () => login.onScreen } : {}
           }, trustCtx);
           if (req2.answer.kind !== "probe") d.log(`[${windowId.slice(0, 8)}] \u8BBE\u5907\u7B54\u590D\uFF08${req2.answer.kind}\uFF09\uFF1A${r.status}${r.reason ? " " + r.reason : ""}`);
           reply(r);
@@ -14273,7 +14598,7 @@ function childEnv(src, windowId) {
   }
   env.DESKBUDDY_WINDOW = windowId;
   env.DESKBUDDY_WRAPPED = "1";
-  return env;
+  return scrubAgentEnv(env);
 }
 function wrapLog(line) {
   try {
@@ -14771,6 +15096,7 @@ async function main(argv) {
     } catch {
     }
   }
+  scrubForCommand(cmd);
   switch (cmd) {
     case void 0:
     case "-h":