deskbuddy 0.2.0-beta.23 → 0.2.0-beta.25

package/dist/{chunk-UKA3BUTV.js → chunk-VTQ5IMJJ.js}

@@ -2400,7 +2400,7 @@ function subscribedEvents(registry, tool, fallback) {
 }
 
 // src/wrap/shim.ts
-import { execFileSync as execFileSync5 } from "child_process";
+import { execFile as execFile3, execFileSync as execFileSync5 } from "child_process";
 import { chmodSync as chmodSync3, existsSync as existsSync12, mkdirSync as mkdirSync10, readdirSync as readdirSync2, readFileSync as readFileSync13, rmdirSync, rmSync as rmSync4, writeFileSync as writeFileSync10 } from "fs";
 import { homedir as homedir4 } from "os";
 import { delimiter as delimiter2, join as join11, resolve as resolve3 } from "path";
@@ -2412,6 +2412,7 @@ 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";
+var WIN_PATH_RETRY = "DeskBuddy \u540E\u53F0\u6BCF\u5C0F\u65F6\u4F1A\u81EA\u52A8\u91CD\u8BD5\uFF1B\u4E5F\u53EF\u624B\u52A8\u628A\u5B83\u52A0\u5230\u7528\u6237 PATH \u6700\u524D\u9762";
 function shimDir() {
   return join11(deskbuddyHome(), "bin");
 }
@@ -2568,8 +2569,7 @@ 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;
+  if (hasPathEntry(value, dir)) return null;
   return value === "" ? dir : `${dir};${value}`;
 }
 function removePathEntry(value, dir) {
@@ -2580,27 +2580,94 @@ function removePathEntry(value, dir) {
 }
 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) => execFileSync5("powershell.exe", ["-NoProfile", "-NonInteractive", "-ExecutionPolicy", "Bypass", "-Command", script], {
-    encoding: "utf8",
-    stdio: ["ignore", "pipe", "ignore"],
-    windowsHide: true,
-    timeout: 15e3,
-    env: env ?? process.env
-  });
+var PS_PATH_TIMEOUT_MS = 6e4;
+function withRetry(fn) {
+  try {
+    return fn();
+  } catch {
+    return fn();
+  }
+}
+function psError(e) {
+  const err = e;
+  if (err?.code === "ETIMEDOUT" || err?.signal === "SIGTERM") return `PowerShell ${PS_PATH_TIMEOUT_MS / 1e3} \u79D2\u6CA1\u54CD\u5E94`;
+  return err?.message || String(e);
+}
+function psWinPath(exec = execFileSync5) {
+  const ps = (script, env) => String(
+    exec("powershell.exe", ["-NoProfile", "-NonInteractive", "-ExecutionPolicy", "Bypass", "-Command", script], {
+      encoding: "utf8",
+      stdio: ["ignore", "pipe", "ignore"],
+      windowsHide: true,
+      timeout: PS_PATH_TIMEOUT_MS,
+      env: env ?? process.env
+    })
+  );
   return {
     read: () => {
       try {
-        return Buffer.from(ps(PS_READ).trim(), "base64").toString("utf8");
+        return Buffer.from(withRetry(() => ps(PS_READ)).trim(), "base64").toString("utf8");
       } catch {
         return null;
       }
     },
     write: (v) => {
-      ps(PS_WRITE, { ...process.env, DESKBUDDY_NEW_PATH: v });
+      try {
+        withRetry(() => ps(PS_WRITE, { ...process.env, DESKBUDDY_NEW_PATH: v }));
+      } catch (e) {
+        throw new Error(`\u5199\u7528\u6237 PATH \u5931\u8D25\uFF08${psError(e)}\uFF0C\u5DF2\u91CD\u8BD5\u4E00\u6B21\uFF09`);
+      }
+    }
+  };
+}
+function psWinPathAsync(exec = execFile3) {
+  const ps = (script, env) => new Promise((done, fail) => {
+    exec(
+      "powershell.exe",
+      ["-NoProfile", "-NonInteractive", "-ExecutionPolicy", "Bypass", "-Command", script],
+      { encoding: "utf8", windowsHide: true, timeout: PS_PATH_TIMEOUT_MS, env: env ?? process.env },
+      (err, stdout2) => err ? fail(err) : done(String(stdout2))
+    );
+  });
+  const retry = async (fn) => {
+    try {
+      return await fn();
+    } catch {
+      return fn();
+    }
+  };
+  return {
+    read: async () => {
+      try {
+        return Buffer.from((await retry(() => ps(PS_READ))).trim(), "base64").toString("utf8");
+      } catch {
+        return null;
+      }
+    },
+    write: async (v) => {
+      try {
+        await retry(() => ps(PS_WRITE, { ...process.env, DESKBUDDY_NEW_PATH: v }));
+      } catch (e) {
+        throw new Error(`\u5199\u7528\u6237 PATH \u5931\u8D25\uFF08${psError(e)}\uFF0C\u5DF2\u91CD\u8BD5\u4E00\u6B21\uFF09`);
+      }
     }
   };
 }
+async function addWinPathAsync(binDir, ops) {
+  const cur = await ops.read();
+  if (cur === null) return { ok: false, message: `\u7A97\u53E3\u63A5\u7BA1\uFF1A\u8BFB\u4E0D\u5230\u7528\u6237 PATH\uFF08${WIN_PATH_RETRY}\uFF09` };
+  const next = addPathEntry(cur, binDir);
+  if (next === null) return { ok: true, message: "" };
+  try {
+    await ops.write(next);
+  } catch (e) {
+    return { ok: false, message: `\u7A97\u53E3\u63A5\u7BA1\uFF1A${e.message}\uFF08${WIN_PATH_RETRY}\uFF09` };
+  }
+  return { ok: true, message: "\u7A97\u53E3\u63A5\u7BA1\uFF1A\u5DF2\u628A\u57AB\u7247\u76EE\u5F55\u52A0\u5230\u7528\u6237 PATH \u6700\u524D\uFF0C\u65B0\u5F00\u7684\u7EC8\u7AEF\u91CC\u6572 claude \u5C31\u7ECF DeskBuddy \u6253\u5F00" };
+}
+function hasPathEntry(value, dir) {
+  return value.split(";").some((p) => winKey(p) === winKey(dir));
+}
 function winShadowWarning(command, binDir, w) {
   let hit = null;
   try {
@@ -2673,11 +2740,14 @@ function defaultShimEnv(nodePath, cliPath) {
     env
   };
 }
+function daemonShimEnv(base) {
+  return { ...base, winPath: null, winWhere: null, deferWinPath: base.platform === "win32" };
+}
 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 };
+  if (e.platform === "win32" && tool === "codex") return { ok: false, message: "" };
   const file = shimFile(e.binDir, command, e.platform);
   if (e.platform === "win32") {
     const node = cmdPath(e.nodePath, e.env);
@@ -2693,13 +2763,22 @@ function installShim(tool, e) {
     writeFileSync10(file, shScript(tool, command, e.nodePath, e.cliPath, e.binDir), { encoding: "utf8", mode: 493 });
     chmodSync3(file, 493);
   }
+  if (e.platform === "win32" && e.deferWinPath) {
+    return { ok: true, message: `\u7A97\u53E3\u63A5\u7BA1\uFF1A\u57AB\u7247\u5DF2\u88C5\u5728 ${e.binDir}\uFF0C\u7528\u6237 PATH \u7531\u540E\u53F0\u7A0D\u540E\u8865\u4E0A` };
+  }
   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" };
+      if (cur === null) return { ok: false, message: `\u7A97\u53E3\u63A5\u7BA1\uFF1A\u57AB\u7247\u5DF2\u88C5\u5728 ${e.binDir}\uFF0C\u4F46\u8BFB\u4E0D\u5230\u7528\u6237 PATH\uFF08${WIN_PATH_RETRY}\uFF09` };
       const next = addPathEntry(cur, e.binDir);
-      if (next !== null) e.winPath.write(next);
+      if (next !== null) {
+        try {
+          e.winPath.write(next);
+        } catch (err) {
+          return { ok: false, message: `\u7A97\u53E3\u63A5\u7BA1\uFF1A\u57AB\u7247\u5DF2\u88C5\u5728 ${e.binDir}\uFF0C\u4F46${err.message}\uFF08${WIN_PATH_RETRY}\uFF09` };
+        }
+      }
       touched.push("\u7528\u6237 PATH");
     }
   } else if (e.rcHome) {
@@ -2752,6 +2831,9 @@ function uninstallShim(tool, e) {
   } catch {
   }
   if (ourShims(e.binDir).length > 0) return { ok: true, message: removed ? `\u5DF2\u5220\u9664\u7A97\u53E3\u63A5\u7BA1\u57AB\u7247 ${file}` : "" };
+  if (e.platform === "win32" && e.deferWinPath) {
+    return { ok: true, message: `\u7A97\u53E3\u63A5\u7BA1\uFF1A\u57AB\u7247\u5DF2\u88C5\u5728 ${e.binDir}\uFF0C\u7528\u6237 PATH \u7531\u540E\u53F0\u7A0D\u540E\u8865\u4E0A` };
+  }
   const touched = [];
   if (e.platform === "win32") {
     if (e.winPath) {
@@ -3020,7 +3102,7 @@ function migrateLegacyQoder(out, detect = () => detectTools()) {
 }
 
 // src/daemon/loginGuide.ts
-import { execFile as execFile5, execFileSync as execFileSync9 } from "child_process";
+import { execFile as execFile6, execFileSync as execFileSync9 } from "child_process";
 import { chmodSync as chmodSync7, existsSync as existsSync15, mkdirSync as mkdirSync14, readFileSync as readFileSync16, writeFileSync as writeFileSync14 } from "fs";
 import { homedir as homedir6 } from "os";
 import { join as join19 } from "path";
@@ -3288,7 +3370,7 @@ function launchPending(runId) {
 }
 
 // src/daemon/executor.ts
-import { execFile as execFile3, execFileSync as execFileSync7 } from "child_process";
+import { execFile as execFile4, execFileSync as execFileSync7 } from "child_process";
 import { homedir as homedir5 } from "os";
 import { join as join17 } from "path";
 
@@ -3589,7 +3671,7 @@ function startCommand(plan, tool, limitMs = EXEC_TIMEOUT_MS) {
   };
   let timedOut = false;
   const done = new Promise((resolve4) => {
-    child = execFile3(
+    child = execFile4(
       plan.file,
       plan.args,
       {
@@ -3661,7 +3743,7 @@ function killTree(child) {
 }
 
 // src/daemon/openWindow.ts
-import { execFile as execFile4, execFileSync as execFileSync8, spawn as spawn2 } from "child_process";
+import { execFile as execFile5, execFileSync as execFileSync8, spawn as spawn2 } from "child_process";
 import { chmodSync as chmodSync6, mkdirSync as mkdirSync13, rmSync as rmSync7, writeFileSync as writeFileSync13 } from "fs";
 import { userInfo } from "os";
 import { join as join18 } from "path";
@@ -3751,7 +3833,7 @@ var defaultOpenerDeps = (findWt2) => ({
   platform: process.platform,
   findWt: findWt2,
   run: (file, args) => new Promise((resolve4, reject) => {
-    execFile4(file, args, { windowsHide: true, timeout: 15e3 }, (err) => err ? reject(err) : resolve4());
+    execFile5(file, args, { windowsHide: true, timeout: 15e3 }, (err) => err ? reject(err) : resolve4());
   }),
   spawnDetached: (file, args) => {
     const c = spawn2(file, args, { detached: true, stdio: "ignore", shell: false, windowsHide: false });
@@ -3929,7 +4011,7 @@ var defaultProbeRun = (file, args, env, timeoutMs) => new Promise((resolve4) =>
   };
   const win = process.platform === "win32";
   const opts = { env, windowsHide: true, maxBuffer: 8 * 1024 * 1024, detached: !win };
-  const child = execFile5(file, args, opts, (err, stdout2, stderr) => {
+  const child = execFile6(file, args, opts, (err, stdout2, stderr) => {
     clearTimeout(timer);
     const e = err;
     done({
@@ -4107,7 +4189,7 @@ var defaultLoginOpenDeps = () => ({
 });
 async function installCodebuddyHooks(log) {
   try {
-    const { installTools: installTools2 } = await import("./enable-A2TXGR7H.js");
+    const { installTools: installTools2 } = await import("./enable-GWWMUIV7.js");
     installTools2(["workbuddy"], () => {
     }, null, { auto: true });
   } catch (e) {
@@ -4289,7 +4371,7 @@ async function autoEnableLoginLog(tools, check, log) {
 }
 
 // src/daemon/workbuddySetup.ts
-import { execFile as execFile6, spawn as spawn3 } from "child_process";
+import { execFile as execFile7, spawn as spawn3 } from "child_process";
 import { existsSync as existsSync16, mkdirSync as mkdirSync15, readFileSync as readFileSync17, rmSync as rmSync8, statSync as statSync6, writeFileSync as writeFileSync15 } from "fs";
 import { dirname as dirname13, join as join20 } from "path";
 var DIALOG_TITLE = "DeskBuddy";
@@ -4310,7 +4392,7 @@ var DIALOG_TEXT = [
 var LIMITED_NOTE = "\u8BBE\u5907\u4E0A\u53EA\u80FD\u770B\u4EFB\u52A1\u72B6\u6001\u3001\u56DE\u7B54\u6388\u6743";
 var defaultRunner = (file, args, opts) => new Promise((resolve4) => {
   try {
-    const child = execFile6(
+    const child = execFile7(
       file,
       args,
       { env: opts.env, timeout: opts.timeoutMs, windowsHide: true, maxBuffer: 8 * 1024 * 1024, encoding: "utf8" },
@@ -4674,7 +4756,7 @@ function defaultOfferDeps(log) {
     }),
     openLogin: () => defaultOpenLogin(platform),
     installHooks: async () => {
-      const { installTools: installTools2 } = await import("./enable-A2TXGR7H.js");
+      const { installTools: installTools2 } = await import("./enable-GWWMUIV7.js");
       installTools2(["workbuddy"], (l) => log(`[WorkBuddy \u72EC\u7ACB\u7248] ${l}`), null, { auto: true });
     },
     log: (l) => log(`[WorkBuddy \u72EC\u7ACB\u7248] ${l}`),
@@ -4997,10 +5079,17 @@ export {
   SHIM_FALLBACK_EXIT,
   WIN_SHIM_ENABLED,
   SHIM_COMMANDS,
+  SHIM_MARKER,
   WIN_PENDING,
   shimDir,
+  shimFile,
+  psWinPathAsync,
+  addWinPathAsync,
+  hasPathEntry,
   winShadowWarning,
   psWinWhere,
+  daemonShimEnv,
+  installShim,
   uninstallShim,
   shimState,
   migrateLegacyQoder,