deskbuddy 0.2.0-beta.41 → 0.2.0-beta.42

package/dist/{chunk-W2GIOQDI.js → chunk-RDJUEATP.js}

@@ -7,14 +7,49 @@ import { dirname as dirname19, join as join37 } from "path";
 import { randomUUID } from "crypto";
 import { existsSync, mkdirSync, readFileSync, renameSync, writeFileSync } from "fs";
 import { homedir, hostname } from "os";
-import { dirname, join } from "path";
-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;
+import { dirname, join, resolve } from "path";
+function defaultRemoteCwd(home = homedir()) {
+  return process.env.DESKBUDDY_DEFAULT_REMOTE_CWD || join(home, "DeskBuddy");
+}
+function legacyRemoteCwds(home = homedir()) {
+  return [join(home, "Desktop"), join(home, "OneDrive", "Desktop")];
+}
+function samePath(a, b, platform) {
+  const n = (p) => {
+    const r = resolve(p).replace(/[\\/]+$/, "");
+    return platform === "win32" ? r.toLowerCase() : r;
+  };
+  return n(a) === n(b);
+}
+function ensureDefaultRemoteCwd(cwd) {
+  if (!cwd || !samePath(cwd, defaultRemoteCwd(), process.platform)) return;
+  try {
+    mkdirSync(cwd, { recursive: true });
+  } catch {
   }
-  return desktop;
+}
+function remoteCwdReady() {
+  const cwd = loadConfig().remoteCwd || "";
+  ensureDefaultRemoteCwd(cwd);
+  return cwd;
+}
+function migrateRemoteCwd(home = homedir(), platform = process.platform) {
+  const cfg = loadConfig();
+  if (cfg.remoteCwdMigrated || !cfg.boundAt) return null;
+  const from = cfg.remoteCwd || "";
+  const hit = !!from && legacyRemoteCwds(home).some((p) => samePath(from, p, platform));
+  const to = defaultRemoteCwd(home);
+  if (hit) {
+    try {
+      mkdirSync(to, { recursive: true });
+    } catch {
+      return null;
+    }
+    cfg.remoteCwd = to;
+  }
+  cfg.remoteCwdMigrated = true;
+  saveConfig(cfg);
+  return hit ? { from, to } : null;
 }
 var PROD_API_BASE = "https://api.shifengintelli.com";
 var TEST_API_BASE = "https://test-api.shifengintelli.com";
@@ -144,6 +179,7 @@ function loadConfig() {
       // 于是下一次保存还会把它抹掉），而且全程不报错
       boundApiBase: parsed.boundApiBase,
       remoteCwd: parsed.remoteCwd,
+      remoteCwdMigrated: parsed.remoteCwdMigrated === true ? true : void 0,
       // 不认识的值一律回落默认，不能让一个手滑写错的配置变成"全放行"或"全拦"
       approvalPolicy: parsed.approvalPolicy === "all" ? "all" : parsed.approvalPolicy === "commands" ? "commands" : void 0,
       codexAppServer: typeof parsed.codexAppServer === "string" ? parsed.codexAppServer : void 0,
@@ -314,13 +350,13 @@ import { execFile, spawn } from "child_process";
 import { existsSync as existsSync4, mkdirSync as mkdirSync4, readFileSync as readFileSync4, rmSync as rmSync2, writeFileSync as writeFileSync4 } from "fs";
 import { homedir as homedir2 } from "os";
 import { fileURLToPath as fileURLToPath2 } from "url";
-import { basename as basename2, dirname as dirname4, join as join4, resolve as resolve2 } from "path";
+import { basename as basename2, dirname as dirname4, join as join4, resolve as resolve3 } from "path";
 import { promisify } from "util";
 
 // src/core/versions.ts
 import { execFileSync } from "child_process";
 import { cpSync, existsSync as existsSync3, mkdirSync as mkdirSync3, readdirSync, readFileSync as readFileSync3, renameSync as renameSync3, rmSync, writeFileSync as writeFileSync3 } from "fs";
-import { basename, dirname as dirname3, join as join3, relative, resolve, sep } from "path";
+import { basename, dirname as dirname3, join as join3, relative, resolve as resolve2, sep } from "path";
 function versionsDir(home = deskbuddyHome()) {
   return join3(home, "versions");
 }
@@ -400,7 +436,7 @@ function markGood(version, home) {
   return true;
 }
 function versionDirOf(cliPath, home) {
-  const rel = relative(versionsDir(home), resolve(cliPath));
+  const rel = relative(versionsDir(home), resolve2(cliPath));
   if (!rel || rel.startsWith("..") || rel.startsWith(sep) || /^[a-zA-Z]:/.test(rel)) return null;
   const first = rel.split(/[\\/]/)[0];
   return isValidVersion(first) ? first : null;
@@ -516,7 +552,7 @@ function registerRunningCli(running, deps = {}) {
   if (!isValidVersion(running.version) || running.version.startsWith("0.0.0")) {
     throw new Error(`\u5F00\u53D1\u7248\uFF08${running.version}\uFF09\u4E0D\u767B\u8BB0`);
   }
-  let cliPath = resolve(running.cliPath);
+  let cliPath = resolve2(running.cliPath);
   if (!existsSync3(cliPath)) throw new Error(`\u5165\u53E3\u6587\u4EF6\u4E0D\u5B58\u5728\uFF1A${cliPath}`);
   let how = "already";
   let note;
@@ -910,7 +946,7 @@ function autostartPointsTo(configText, home) {
   });
 }
 function isCustomHome(home = deskbuddyHome(), defaultHome = join4(homedir2(), ".deskbuddy")) {
-  return resolve2(home) !== resolve2(defaultHome);
+  return resolve3(home) !== resolve3(defaultHome);
 }
 async function uninstallAutostart(platform = process.platform, deps = {}) {
   const d = { ...defaultUninstallDeps(), ...deps };
@@ -3182,7 +3218,7 @@ function traeNoticeSummary(toolName, toolInput, described, notice) {
 // src/daemon/workbuddyApp/keeper.ts
 import { execFile as execFile6, spawn as spawn2 } from "child_process";
 import { existsSync as existsSync19, mkdirSync as mkdirSync21, readdirSync as readdirSync10, readFileSync as readFileSync24, renameSync as renameSync15, writeFileSync as writeFileSync21 } from "fs";
-import { delimiter as delimiter3, join as join22, resolve as resolve4 } from "path";
+import { delimiter as delimiter3, join as join22, resolve as resolve5 } from "path";
 
 // src/core/process.ts
 import { execFileSync as execFileSync5 } from "child_process";
@@ -3710,7 +3746,7 @@ function resolveAlias(sessionId, now = Date.now()) {
 import { execFile as execFile3, execFileSync as execFileSync7 } from "child_process";
 import { chmodSync as chmodSync3, existsSync as existsSync14, mkdirSync as mkdirSync16, readdirSync as readdirSync6, readFileSync as readFileSync17, rmdirSync, rmSync as rmSync9, writeFileSync as writeFileSync16 } from "fs";
 import { homedir as homedir3 } from "os";
-import { delimiter, join as join15, resolve as resolve3 } from "path";
+import { delimiter, join as join15, resolve as resolve4 } from "path";
 var SHIM_FALLBACK_EXIT = 213;
 var WIN_SHIM_ENABLED = true;
 var SHIM_COMMANDS = { claude_code: "claude", codex: "codex" };
@@ -3823,7 +3859,7 @@ function cmdScript(tool, command, node, cli, bin) {
   ].join("\r\n");
 }
 function rcBlock(binDir, rcHome) {
-  const std = resolve3(rcHome, ".deskbuddy", "bin") === resolve3(binDir);
+  const std = resolve4(rcHome, ".deskbuddy", "bin") === resolve4(binDir);
   const dir2 = std ? "$HOME/.deskbuddy/bin" : binDir.replace(/(["\\$`])/g, "\\$1");
   return [
     RC_BEGIN,
@@ -4948,16 +4984,16 @@ var defaultProbe = createVersionProbe({
       return classifySyncError(e);
     }
   },
-  runAsync: (loc) => new Promise((resolve6) => {
+  runAsync: (loc) => new Promise((resolve7) => {
     try {
       execFile4(
         loc.file,
         [...loc.prefixArgs, "--version"],
         { encoding: "utf8", windowsHide: true, timeout: PROBE_TIMEOUT_MS, env: probeEnv(loc) },
-        (err, stdout2, stderr) => resolve6(err ? classifyAsyncError(err, String(stdout2 ?? ""), String(stderr ?? "")) : { kind: "done", out: `${stdout2}${stderr}` })
+        (err, stdout2, stderr) => resolve7(err ? classifyAsyncError(err, String(stdout2 ?? ""), String(stderr ?? "")) : { kind: "done", out: `${stdout2}${stderr}` })
       );
     } catch {
-      resolve6({ kind: "spawn_error" });
+      resolve7({ kind: "spawn_error" });
     }
   }),
   now: () => Date.now()
@@ -5535,12 +5571,12 @@ function defaultWbElectron(d = defaultLocateDeps()) {
   }
 }
 function defaultAppRunning(platform = process.platform) {
-  return new Promise((resolve6) => {
+  return new Promise((resolve7) => {
     try {
       if (platform === "darwin") {
         execFile5("pgrep", ["-f", "WorkBuddy.app/Contents/MacOS/"], { timeout: 5e3 }, (err) => {
           const code = err?.code;
-          resolve6(!err ? true : code === 1 ? false : true);
+          resolve7(!err ? true : code === 1 ? false : true);
         });
         return;
       }
@@ -5549,13 +5585,13 @@ function defaultAppRunning(platform = process.platform) {
           "tasklist",
           ["/FI", "IMAGENAME eq WorkBuddy.exe", "/FO", "CSV", "/NH"],
           { timeout: 1e4, windowsHide: true, encoding: "utf8" },
-          (err, stdout2) => resolve6(err ? true : /"WorkBuddy\.exe"/i.test(String(stdout2)))
+          (err, stdout2) => resolve7(err ? true : /"WorkBuddy\.exe"/i.test(String(stdout2)))
         );
         return;
       }
-      resolve6(true);
+      resolve7(true);
     } catch {
-      resolve6(true);
+      resolve7(true);
     }
   });
 }
@@ -5590,13 +5626,13 @@ var defaultWbAppDbDeps = () => ({
   configDir: () => dirname12(workbuddySettingsPath()),
   loadSqlite: loadNodeSqlite,
   electron: () => defaultWbElectron(),
-  runElectron: (bin, script, input) => new Promise((resolve6, reject) => {
+  runElectron: (bin, script, input) => new Promise((resolve7, reject) => {
     const env = { ...process.env, ELECTRON_RUN_AS_NODE: "1" };
     const c = execFile5(
       bin,
       ["-e", script],
       { env, timeout: 15e3, windowsHide: true, maxBuffer: 1024 * 1024 },
-      (err, stdout2) => err ? reject(err) : resolve6(String(stdout2))
+      (err, stdout2) => err ? reject(err) : resolve7(String(stdout2))
     );
     c.stdin?.on("error", () => {
     });
@@ -5741,12 +5777,12 @@ function openWs(target, port, d, info) {
   const url = loopbackWsUrl(target.webSocketDebuggerUrl, port);
   if (!url) return Promise.reject(new Error("\u4E3B\u7A97\u53E3\u7684\u8C03\u8BD5\u5730\u5740\u4E0D\u5BF9"));
   const ws = (d.ws ?? ((u) => new WebSocket(u, { handshakeTimeout: 5e3 })))(url);
-  return new Promise((resolve6, reject) => {
+  return new Promise((resolve7, reject) => {
     let opened = false;
     const client = new WsCdpClient(ws, info);
     ws.on("open", () => {
       opened = true;
-      resolve6(client);
+      resolve7(client);
     });
     ws.on("error", (e) => {
       if (!opened) reject(e instanceof Error ? e : new Error("CDP \u8FDE\u63A5\u5931\u8D25"));
@@ -5844,12 +5880,12 @@ var WsCdpClient = class {
   #rpc(method, params, timeoutMs, raw) {
     if (this.#closed) return Promise.reject(new Error("CDP \u8FDE\u63A5\u5DF2\u65AD\u5F00"));
     const id = ++this.#id;
-    return new Promise((resolve6, reject) => {
+    return new Promise((resolve7, reject) => {
       const timer = setTimeout(() => {
         this.#waiting.delete(id);
         reject(new Error("\u9875\u9762\u811A\u672C\u8D85\u65F6"));
       }, timeoutMs);
-      this.#waiting.set(id, { resolve: resolve6, reject, timer, ...raw ? { raw } : {} });
+      this.#waiting.set(id, { resolve: resolve7, reject, timer, ...raw ? { raw } : {} });
       try {
         this.#ws.send(JSON.stringify({ id, method, params }));
       } catch (e) {
@@ -5909,7 +5945,7 @@ function cleanLaunchEnv(src = process.env, shim = shimDir()) {
   const out = {};
   const shimReal = (() => {
     try {
-      return resolve4(shim);
+      return resolve5(shim);
     } catch {
       return shim;
     }
@@ -5922,7 +5958,7 @@ function cleanLaunchEnv(src = process.env, shim = shimDir()) {
   if (pathKey && typeof out[pathKey] === "string") {
     out[pathKey] = out[pathKey].split(delimiter3).filter((p) => {
       try {
-        return resolve4(p) !== shimReal;
+        return resolve5(p) !== shimReal;
       } catch {
         return p !== shim;
       }
@@ -6722,7 +6758,7 @@ async function defaultWinProcs() {
 // src/daemon/qoderApp/task.ts
 import { createHash as createHash3 } from "crypto";
 import { realpathSync as realpathSync3 } from "fs";
-import { resolve as resolve5 } from "path";
+import { resolve as resolve6 } from "path";
 
 // src/daemon/command.ts
 var SERVICE_COMMAND = "deskbuddy.command";
@@ -6994,7 +7030,7 @@ function normalizeCwd(p, platform = process.platform, real = (x) => realpathSync
     r = r.replace(/\//g, "\\").replace(/\\+$/, "");
     return (/^[a-z]:$/i.test(r) ? r + "\\" : r).toLowerCase().replace(/\\/g, "/");
   }
-  r = resolve5(r);
+  r = resolve6(r);
   return r.length > 1 ? r.replace(/\/+$/, "") : r;
 }
 function appBusy(st) {
@@ -8468,7 +8504,7 @@ var DumateWatch = class {
   }
 };
 function runHook(node, input, agentPid, tool = "dumate") {
-  return new Promise((resolve6) => {
+  return new Promise((resolve7) => {
     let child;
     try {
       child = spawn3(node, [installedHookPath(), tool], {
@@ -8476,18 +8512,18 @@ function runHook(node, input, agentPid, tool = "dumate") {
         env: { ...process.env, DESKBUDDY_AGENT_PID: String(agentPid) }
       });
     } catch {
-      resolve6();
+      resolve7();
       return;
     }
     const timer = setTimeout(() => child.kill("SIGKILL"), HOOK_KILL_MS);
     timer.unref?.();
     child.on("error", () => {
       clearTimeout(timer);
-      resolve6();
+      resolve7();
     });
     child.on("close", () => {
       clearTimeout(timer);
-      resolve6();
+      resolve7();
     });
     child.stdin.on("error", () => {
     });
@@ -10538,7 +10574,7 @@ function startCommand(plan, tool, limitMs = EXEC_TIMEOUT_MS) {
     }, Math.max(0, remaining));
   };
   let timedOut = false;
-  const done = new Promise((resolve6) => {
+  const done = new Promise((resolve7) => {
     child = execFile7(
       plan.file,
       plan.args,
@@ -10558,10 +10594,10 @@ function startCommand(plan, tool, limitMs = EXEC_TIMEOUT_MS) {
         if (err || timedOut) {
           const e = err;
           const msg = timedOut ? `\u6267\u884C\u8D85\u8FC7 ${Math.round(limitMs / 1e3)} \u79D2\u6D3B\u52A8\u65F6\u95F4\uFF0C\u5DF2\u7EC8\u6B62` : e && typeof e.code === "number" ? `\u9000\u51FA\u7801 ${e.code}` : e && e.signal ? `\u88AB\u4FE1\u53F7 ${String(e.signal)} \u7ED3\u675F` : `\u8D77\u4E0D\u6765\uFF08${String(e?.code ?? "unknown")}\uFF09`;
-          resolve6({ ok: false, sessionId: parseSessionId(tool, out), stdout: out, stderr: errOut, error: msg });
+          resolve7({ ok: false, sessionId: parseSessionId(tool, out), stdout: out, stderr: errOut, error: msg });
           return;
         }
-        resolve6({ ok: true, sessionId: parseSessionId(tool, out), stdout: out, stderr: errOut });
+        resolve7({ ok: true, sessionId: parseSessionId(tool, out), stdout: out, stderr: errOut });
       }
     );
     child?.stdin?.end();
@@ -10700,8 +10736,8 @@ var defaultGuiDeps = () => ({
 var defaultOpenerDeps = (findWt2) => ({
   platform: process.platform,
   findWt: findWt2,
-  run: (file3, args) => new Promise((resolve6, reject) => {
-    execFile8(file3, args, { windowsHide: true, timeout: 15e3 }, (err) => err ? reject(err) : resolve6());
+  run: (file3, args) => new Promise((resolve7, reject) => {
+    execFile8(file3, args, { windowsHide: true, timeout: 15e3 }, (err) => err ? reject(err) : resolve7());
   }),
   spawnDetached: (file3, args) => {
     const c = spawn4(file3, args, { detached: true, stdio: "ignore", shell: false, windowsHide: false });
@@ -10872,12 +10908,12 @@ async function checkLogin(tool, d) {
     return { tool, state: "unknown", note: `\u68C0\u6D4B\u51FA\u9519\uFF1A${e?.message ?? e}` };
   }
 }
-var defaultProbeRun = (file3, args, env, timeoutMs) => new Promise((resolve6) => {
+var defaultProbeRun = (file3, args, env, timeoutMs) => new Promise((resolve7) => {
   let settled = false;
   const done = (r) => {
     if (settled) return;
     settled = true;
-    resolve6(r);
+    resolve7(r);
   };
   const win = process.platform === "win32";
   const opts = { env, windowsHide: true, maxBuffer: 8 * 1024 * 1024, detached: !win };
@@ -11074,7 +11110,7 @@ var defaultLoginOpenDeps = () => ({
 });
 async function installCodebuddyHooks(log) {
   try {
-    const { installTools: installTools2 } = await import("./enable-3G3TWPSH.js");
+    const { installTools: installTools2 } = await import("./enable-RN5EXNR3.js");
     installTools2(["workbuddy"], () => {
     }, null, { auto: true });
   } catch (e) {
@@ -11277,7 +11313,7 @@ var DIALOG_TEXT = [
   `\u73B0\u5728\u5B89\u88C5\u5417\uFF1F\uFF08\u4F1A\u6267\u884C npm i -g ${WORKBUDDY_STANDALONE_PKG}\uFF0C\u7EA6\u9700\u4E00\u4E24\u5206\u949F\uFF0C\u88C5\u5B8C\u4F1A\u6253\u5F00\u4E00\u4E2A\u7EC8\u7AEF\u7A97\u53E3\uFF0C\u6309\u63D0\u793A\u9009 Log in via Chinese Site\uFF08\u56FD\u5185\u7248\uFF09\u767B\u5F55\uFF1B\u7EC8\u7AEF\u7A97\u53E3\u5982\u679C\u662F\u9ED1\u7684\uFF0C\u6309\u4E00\u4E0B\u56DE\u8F66\u5C31\u4F1A\u663E\u793A\uFF09`
 ].join("\n");
 var LIMITED_NOTE = "\u8BBE\u5907\u4E0A\u53EA\u80FD\u770B\u4EFB\u52A1\u72B6\u6001\u3001\u56DE\u7B54\u6388\u6743";
-var defaultRunner = (file3, args, opts) => new Promise((resolve6) => {
+var defaultRunner = (file3, args, opts) => new Promise((resolve7) => {
   try {
     const child = execFile10(
       file3,
@@ -11285,7 +11321,7 @@ var defaultRunner = (file3, args, opts) => new Promise((resolve6) => {
       { env: opts.env, timeout: opts.timeoutMs, windowsHide: true, maxBuffer: 8 * 1024 * 1024, encoding: "utf8" },
       (err, stdout2, stderr) => {
         const e = err;
-        resolve6({
+        resolve7({
           code: e ? typeof e.code === "number" ? e.code : null : 0,
           stdout: String(stdout2 ?? ""),
           stderr: String(stderr ?? ""),
@@ -11296,7 +11332,7 @@ var defaultRunner = (file3, args, opts) => new Promise((resolve6) => {
     );
     child.stdin?.end();
   } catch {
-    resolve6({ code: null, stdout: "", stderr: "", timedOut: false, spawnError: true });
+    resolve7({ code: null, stdout: "", stderr: "", timedOut: false, spawnError: true });
   }
 });
 function checkTimeout(s) {
@@ -11588,7 +11624,7 @@ function defaultOfferDeps(log) {
     }),
     openLogin: () => defaultOpenLogin(platform),
     installHooks: async () => {
-      const { installTools: installTools2 } = await import("./enable-3G3TWPSH.js");
+      const { installTools: installTools2 } = await import("./enable-RN5EXNR3.js");
       installTools2(["workbuddy"], (l) => log(`[WorkBuddy \u72EC\u7ACB\u7248] ${l}`), null, { auto: true });
     },
     log: (l) => log(`[WorkBuddy \u72EC\u7ACB\u7248] ${l}`),
@@ -11829,6 +11865,9 @@ async function runEnable(tools, opts = {}) {
 
 export {
   defaultRemoteCwd,
+  ensureDefaultRemoteCwd,
+  remoteCwdReady,
+  migrateRemoteCwd,
   PROD_API_BASE,
   TEST_API_BASE,
   environmentLabel,

package/dist/cli.js

@@ -114,6 +114,7 @@ import {
   detectTools,
   dshOptions,
   ensureClientId,
+  ensureDefaultRemoteCwd,
   ensureDumateShortcuts,
   ensureQoderShortcuts,
   ensureQwenworkShortcuts,
@@ -173,6 +174,7 @@ import {
   markWbAppSession,
   materialize,
   migrateLegacyQoder,
+  migrateRemoteCwd,
   ocPluginModule,
   openTerminal,
   opencodeOptions,
@@ -210,6 +212,7 @@ import {
   recordAttemptFailure,
   refreshRegistry,
   registerWorkbuddySession,
+  remoteCwdReady,
   removeCommandFile,
   removeWakeMark,
   replyVerdict,
@@ -271,7 +274,7 @@ import {
   writeState,
   writeWakeMark,
   writeWakeSecret
-} from "./chunk-W2GIOQDI.js";
+} from "./chunk-RDJUEATP.js";
 
 // src/commands/config.ts
 function runConfig(args, out = (s2) => process.stdout.write(s2 + "\n")) {
@@ -16296,6 +16299,12 @@ var Daemon = class {
     log(`\u6388\u6743\u7AEF\u70B9\u5DF2\u5C31\u7EEA 127.0.0.1:${port}`);
     enableFatalReport(deskbuddyHome());
     log(`${envLine()}\uFF1B${memLine()}`);
+    try {
+      const m = migrateRemoteCwd();
+      if (m) log(`\u8FDC\u7A0B\u65B0\u5EFA\u4EFB\u52A1\u7684\u9ED8\u8BA4\u76EE\u5F55\u5DF2\u4ECE ${m.from} \u6539\u4E3A ${m.to}\uFF08\u684C\u9762\u53D7\u7CFB\u7EDF\u4FDD\u62A4\u3001\u4F1A\u88AB\u540C\u6B65\u4E0A\u4E91\uFF1B\u60F3\u6362\u56DE\u6765\u8DD1 deskbuddy setup\uFF09`);
+    } catch (e) {
+      log(`\u8FDC\u7A0B\u65B0\u5EFA\u4EFB\u52A1\u76EE\u5F55\u8FC1\u79FB\u51FA\u9519\uFF1A${e?.message ?? e}`);
+    }
     this.#memLog = setInterval(() => log(memLine()), MEM_LOG_MS);
     this.#memLog.unref();
     this.#windowScan = setInterval(() => this.#coord.scanWindows(), 1e3);
@@ -17033,7 +17042,7 @@ var Daemon = class {
           this.#report(cmd, "", "rejected", "", "dir_gone");
           return;
         }
-      } else cwd = loadConfig().remoteCwd || "";
+      } else cwd = remoteCwdReady();
       this.#toDumateNew(cmd, cwd);
       return;
     }
@@ -17064,7 +17073,7 @@ var Daemon = class {
           return;
         }
       } else {
-        cwd = loadConfig().remoteCwd || "";
+        cwd = remoteCwdReady();
         if (!cwd) {
           this.#report(cmd, "", "rejected", "", "no_remote_cwd");
           return;
@@ -17082,7 +17091,7 @@ var Daemon = class {
           return;
         }
       } else {
-        cwd = loadConfig().remoteCwd || "";
+        cwd = remoteCwdReady();
         if (!cwd) {
           this.#report(cmd, "", "rejected", "", "no_remote_cwd");
           return;
@@ -17288,7 +17297,7 @@ var Daemon = class {
           return;
         }
       } else {
-        cwd = loadConfig().remoteCwd || "";
+        cwd = remoteCwdReady();
         if (!cwd) {
           this.#report(cmd, "", "rejected", "", "no_remote_cwd");
           return;
@@ -18054,7 +18063,7 @@ var Daemon = class {
     }
     const target = resolveTarget(cmd, {
       readState,
-      remoteCwd: () => loadConfig().remoteCwd || "",
+      remoteCwd: () => remoteCwdReady(),
       alias: resolveAlias,
       dirOf: (ref) => dirOf(ref),
       windowOpen: (s2) => s2.interactive === true && !!s2.pid && isAlive(s2.pid, s2.pidName)
@@ -18794,6 +18803,8 @@ function verdictMessage(reason, path) {
 var MAX_ATTEMPTS = 3;
 async function askRemoteCwd(deps2) {
   const defaultPath = deps2.defaultPath ?? defaultRemoteCwd();
+  if (!deps2.defaultPath) ensureDefaultRemoteCwd(defaultPath);
+  deps2.out("  \u8FDC\u7A0B\u4EFB\u52A1\u9ED8\u8BA4\u653E\u5728 DeskBuddy \u6587\u4EF6\u5939\u91CC\uFF08\u4E0D\u7528\u684C\u9762\uFF1A\u684C\u9762\u53D7\u7CFB\u7EDF\u4FDD\u62A4\u3001\u53EF\u80FD\u88AB\u540C\u6B65\u4E0A\u4E91\uFF09\uFF0C\u56DE\u8F66\u5373\u7528");
   for (let i = 0; i < MAX_ATTEMPTS; i++) {
     const raw = await deps2.ask(`\u8FDC\u7A0B\u300C\u65B0\u5EFA\u4EFB\u52A1\u300D\u7684\u5DE5\u4F5C\u76EE\u5F55 [${defaultPath}]\uFF1A`);
     if (raw === null) {
@@ -18919,6 +18930,7 @@ async function runSetup(opts = {}) {
   const remoteCwd = await askRemoteCwd({ out, ask: terminalAsk });
   const bound = loadConfig();
   bound.remoteCwd = remoteCwd;
+  bound.remoteCwdMigrated = true;
   saveConfig(bound);
   out(`  \u5DF2\u8BB0\u4E0B\uFF1A${remoteCwd}`);
   out("  \u63D0\u793A\uFF1AClaude Code \u7B2C\u4E00\u6B21\u5728\u65B0\u76EE\u5F55\u91CC\u542F\u52A8\u4F1A\u95EE\u300C\u662F\u5426\u4FE1\u4EFB\u6B64\u6587\u4EF6\u5939\u300D\uFF0CDeskBuddy \u4E0D\u4F1A\u66FF\u4F60\u56DE\u7B54\u3002");
@@ -19093,8 +19105,10 @@ async function runInstall(opts, deps2 = defaultInstallDeps()) {
   const bound = loadConfig();
   if (!bound.remoteCwd) {
     bound.remoteCwd = defaultRemoteCwd();
+    bound.remoteCwdMigrated = true;
     saveConfig(bound);
   }
+  ensureDefaultRemoteCwd(bound.remoteCwd);
   const auto = await deps2.autostart();
   let logins = [];
   try {
@@ -19206,6 +19220,7 @@ function formatStatus(input) {
   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";
   lines3.push(`  ${pad("\u8D26\u53F7", 10)}${account}`);
   lines3.push(`  ${pad("\u670D\u52A1\u7AEF", 10)}${cfg.apiBase}\uFF08${environmentLabel(cfg.apiBase)}\uFF09`);
+  if (cfg.remoteCwd) lines3.push(`  ${pad("\u65B0\u5EFA\u4EFB\u52A1\u76EE\u5F55", 10)}${cfg.remoteCwd}`);
   if (cfg.boundAt && cfg.boundApiBase && cfg.boundApiBase !== cfg.apiBase) {
     lines3.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`

package/dist/{enable-3G3TWPSH.js → enable-RN5EXNR3.js}

@@ -5,7 +5,7 @@ import {
   installTools,
   parseTools,
   runEnable
-} from "./chunk-W2GIOQDI.js";
+} from "./chunk-RDJUEATP.js";
 export {
   defaultShimEnvForInstall,
   installShims,

package/dist/hook.cjs

@@ -2666,13 +2666,17 @@ async function main(argv) {
   if (event === 'UserPromptSubmit') recordDir(payload.cwd, now)
   // 窗口对话轮数（spec 2026-10-02 §2.1）：一轮开始的事件加 1
   const internal = event === 'UserPromptSubmit' && isInternalPrompt(payload.prompt)
-  const isTurn = !internal && turnEvents(registry, tool).indexOf(event) >= 0
+  // 子代理发的事件（带 agent_id）：Codex 0.159 实测（10-13）子代理 thread 的 hook 带父会话的 session_id，
+  // 但 turn_id / transcript_path 是子代理自己的，派它时那句话还会以 UserPromptSubmit 触发一次。
+  // 归到父会话（状态、授权照常），但不算父会话的一轮、不当首句、不换掉父会话的 transcript
+  const sub = typeof payload.agent_id === 'string' && payload.agent_id !== ''
+  const isTurn = !internal && !sub && turnEvents(registry, tool).indexOf(event) >= 0
   // 首条指令（标题来源 first-prompt）：只记第一次
   // 状态没了（会话结束后被续跑）就接已结束记录里的首句；DeskBuddy 注入的话不算首句
   const firstPrompt =
     (prev && prev.firstPrompt) ||
     (prev ? undefined : endedFirstPrompt(sessionId)) ||
-    (event === 'UserPromptSubmit' && !internal ? cleanPrompt(payload.prompt) : '') ||
+    (event === 'UserPromptSubmit' && !internal && !sub ? cleanPrompt(payload.prompt) : '') ||
     undefined
   if (superseded(prev, eventAt)) {
     // 被并发的更晚事件（多半是同一轮的 Stop）抢先写了：状态不覆盖，但首条指令要补上，不然标题就成了第二条指令
@@ -2754,7 +2758,7 @@ async function main(argv) {
     firstPrompt: firstPrompt,
     // transcript 路径（Claude Code 的 hook 输入带）：daemon 据此认 Esc 打断（Bug 表 160）。🔴 只落本机、不上报
     transcriptPath:
-      typeof payload.transcript_path === 'string' && payload.transcript_path ? payload.transcript_path : (prev && prev.transcriptPath) || undefined,
+      !sub && typeof payload.transcript_path === 'string' && payload.transcript_path ? payload.transcript_path : (prev && prev.transcriptPath) || undefined,
     // WorkBuddy：会话在 ~/.workbuddy 还是 ~/.codebuddy（spec 2026-10-08 codebuddy-default-dir），续写按它选目录。🔴 只落本机、不上报
     configDir: tool === 'workbuddy' ? workbuddyConfigDir(payload, process.env) || (prev && prev.configDir) || undefined : undefined,
     // 进程号是按窗口登记先记下的、还没核对过祖先链（spec §3.5）。🔴 只落本机
@@ -2780,7 +2784,7 @@ async function main(argv) {
   //    cc-ai-title 要读 transcript，长任务期间 PreToolUse/PostToolUse 触发极频繁
   next.title =
     resolveTitle(titleSources(registry, tool), {
-      transcriptPath: payload.transcript_path,
+      transcriptPath: sub ? next.transcriptPath : payload.transcript_path,
       cwd: next.project,
       sessionId: sessionId,
       tool: tool,

package/hook/hook-debug.log

@@ -482,3 +482,21 @@
 2026-10-13T02:29:35.919Z [opencode] opencode 版本 读不出：带说明的拒绝不走新路由
 2026-10-13T02:29:35.919Z [opencode] opencode 版本不确定支持带说明的拒绝，设备上的反馈没有带给模型
 2026-10-13T02:29:38.734Z [opencode] 后台任务里的提问 que_r2 没法在设备上回答（后台任务不能提问，请在电脑上继续），已拒绝
+2026-10-13T03:30:01.372Z [opencode] 回填选择题失败：/question/{requestID}/reply status=404
+2026-10-13T03:30:06.278Z [opencode] opencode 版本 1.4.3：带说明的拒绝不走新路由
+2026-10-13T03:30:06.278Z [opencode] opencode 版本不确定支持带说明的拒绝，设备上的反馈没有带给模型
+2026-10-13T03:30:06.390Z [opencode] opencode 版本 读不出：带说明的拒绝不走新路由
+2026-10-13T03:30:06.390Z [opencode] opencode 版本不确定支持带说明的拒绝，设备上的反馈没有带给模型
+2026-10-13T03:30:08.716Z [opencode] 后台任务里的提问 que_r2 没法在设备上回答（后台任务不能提问，请在电脑上继续），已拒绝
+2026-10-13T03:32:18.623Z [opencode] 回填选择题失败：/question/{requestID}/reply status=404
+2026-10-13T03:32:23.571Z [opencode] opencode 版本 1.4.3：带说明的拒绝不走新路由
+2026-10-13T03:32:23.571Z [opencode] opencode 版本不确定支持带说明的拒绝，设备上的反馈没有带给模型
+2026-10-13T03:32:23.683Z [opencode] opencode 版本 读不出：带说明的拒绝不走新路由
+2026-10-13T03:32:23.683Z [opencode] opencode 版本不确定支持带说明的拒绝，设备上的反馈没有带给模型
+2026-10-13T03:32:26.513Z [opencode] 后台任务里的提问 que_r2 没法在设备上回答（后台任务不能提问，请在电脑上继续），已拒绝
+2026-10-13T03:35:16.340Z [opencode] 回填选择题失败：/question/{requestID}/reply status=404
+2026-10-13T03:35:21.305Z [opencode] opencode 版本 1.4.3：带说明的拒绝不走新路由
+2026-10-13T03:35:21.305Z [opencode] opencode 版本不确定支持带说明的拒绝，设备上的反馈没有带给模型
+2026-10-13T03:35:21.411Z [opencode] opencode 版本 读不出：带说明的拒绝不走新路由
+2026-10-13T03:35:21.411Z [opencode] opencode 版本不确定支持带说明的拒绝，设备上的反馈没有带给模型
+2026-10-13T03:35:23.952Z [opencode] 后台任务里的提问 que_r2 没法在设备上回答（后台任务不能提问，请在电脑上继续），已拒绝

package/hook/hook.cjs

@@ -2666,13 +2666,17 @@ async function main(argv) {
   if (event === 'UserPromptSubmit') recordDir(payload.cwd, now)
   // 窗口对话轮数（spec 2026-10-02 §2.1）：一轮开始的事件加 1
   const internal = event === 'UserPromptSubmit' && isInternalPrompt(payload.prompt)
-  const isTurn = !internal && turnEvents(registry, tool).indexOf(event) >= 0
+  // 子代理发的事件（带 agent_id）：Codex 0.159 实测（10-13）子代理 thread 的 hook 带父会话的 session_id，
+  // 但 turn_id / transcript_path 是子代理自己的，派它时那句话还会以 UserPromptSubmit 触发一次。
+  // 归到父会话（状态、授权照常），但不算父会话的一轮、不当首句、不换掉父会话的 transcript
+  const sub = typeof payload.agent_id === 'string' && payload.agent_id !== ''
+  const isTurn = !internal && !sub && turnEvents(registry, tool).indexOf(event) >= 0
   // 首条指令（标题来源 first-prompt）：只记第一次
   // 状态没了（会话结束后被续跑）就接已结束记录里的首句；DeskBuddy 注入的话不算首句
   const firstPrompt =
     (prev && prev.firstPrompt) ||
     (prev ? undefined : endedFirstPrompt(sessionId)) ||
-    (event === 'UserPromptSubmit' && !internal ? cleanPrompt(payload.prompt) : '') ||
+    (event === 'UserPromptSubmit' && !internal && !sub ? cleanPrompt(payload.prompt) : '') ||
     undefined
   if (superseded(prev, eventAt)) {
     // 被并发的更晚事件（多半是同一轮的 Stop）抢先写了：状态不覆盖，但首条指令要补上，不然标题就成了第二条指令
@@ -2754,7 +2758,7 @@ async function main(argv) {
     firstPrompt: firstPrompt,
     // transcript 路径（Claude Code 的 hook 输入带）：daemon 据此认 Esc 打断（Bug 表 160）。🔴 只落本机、不上报
     transcriptPath:
-      typeof payload.transcript_path === 'string' && payload.transcript_path ? payload.transcript_path : (prev && prev.transcriptPath) || undefined,
+      !sub && typeof payload.transcript_path === 'string' && payload.transcript_path ? payload.transcript_path : (prev && prev.transcriptPath) || undefined,
     // WorkBuddy：会话在 ~/.workbuddy 还是 ~/.codebuddy（spec 2026-10-08 codebuddy-default-dir），续写按它选目录。🔴 只落本机、不上报
     configDir: tool === 'workbuddy' ? workbuddyConfigDir(payload, process.env) || (prev && prev.configDir) || undefined : undefined,
     // 进程号是按窗口登记先记下的、还没核对过祖先链（spec §3.5）。🔴 只落本机
@@ -2780,7 +2784,7 @@ async function main(argv) {
   //    cc-ai-title 要读 transcript，长任务期间 PreToolUse/PostToolUse 触发极频繁
   next.title =
     resolveTitle(titleSources(registry, tool), {
-      transcriptPath: payload.transcript_path,
+      transcriptPath: sub ? next.transcriptPath : payload.transcript_path,
       cwd: next.project,
       sessionId: sessionId,
       tool: tool,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "deskbuddy",
-  "version": "0.2.0-beta.41",
+  "version": "0.2.0-beta.42",
   "description": "把 Claude Code、Codex 等 AI 编码智能体每个会话窗口的状态，实时同步到桌面硬件屏幕",
   "keywords": [
     "ai",