npm - agent-dag - Versions diffs - 1.33.2 → 1.33.3 - Mend

agent-dag 1.33.2 → 1.33.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (6) hide show

package/dist/web/assets/{index-D4UiP6Xm.js → index-VG3Xh-3i.js} +1 -1
package/dist/web/index.html +1 -1
package/package.json +1 -1
package/src/server/cswap-admin.mjs +36 -12
package/src/server/cswap-install.mjs +39 -10
package/src/server/exec.mjs +40 -3

package/dist/web/index.html CHANGED Viewed

@@ -5,7 +5,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1" />
     <title>agents-deck</title>
     <link rel="icon" href="data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 100 100'%3E%3Ctext y='84' font-size='84'%3E%E2%97%89%3C/text%3E%3C/svg%3E" />
-    <script type="module" crossorigin src="/assets/index-D4UiP6Xm.js"></script>
+    <script type="module" crossorigin src="/assets/index-VG3Xh-3i.js"></script>
     <link rel="stylesheet" crossorigin href="/assets/index-hRjhJVfb.css">
   </head>
   <body>

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "agent-dag",
-  "version": "1.33.2",
+  "version": "1.33.3",
   "description": "Live deck of Claude Code and Codex agents — watch parallel subagents fork, call tools, and return on one calm canvas. Also available as npx ccdeck and npx agent-dag.",
   "type": "module",
   "bin": {

package/src/server/cswap-admin.mjs CHANGED Viewed

@@ -19,8 +19,9 @@
 import { readFile } from "node:fs/promises";
 import { homedir } from "node:os";
 import { join } from "node:path";
-import { run, runDetached, runInteractive } from "./exec.mjs";
+import { looksMissing, run, runDetached, runInteractive } from "./exec.mjs";
 import { invalidateClaudeAccountsCache } from "./claude-accounts.mjs";
+import { cswapBin } from "./cswap-install.mjs";
 // An OAuth code is short-lived at the source; there is no point holding a child
 // open longer than a user would plausibly take to fetch one.
@@ -65,9 +66,13 @@ export function withStoreLock(fn) {
 // ── shared helpers ───────────────────────────────────────────────────────────
-async function cswapBin() {
-  return process.env.AGENTS_DECK_CSWAP ?? "cswap";
-}
+// cswapBin comes from cswap-install.mjs, which searches the places uv and pipx
+// actually install to. This module used to answer the bare name "cswap"
+// instead, which is fine on a Mac where ~/.local/bin is usually on PATH and
+// wrong on Windows where it is usually not: every mutation here — share,
+// import, remove, rename, reorder — failed with cmd.exe's "is not recognized",
+// while the read-only half of the panel worked, because it was already using
+// the resolver. Reported from Windows on 2026-08-14.
 async function claudeBin() {
   return process.env.AGENTS_DECK_CLAUDE ?? "claude";
 }
@@ -224,7 +229,7 @@ export async function startLogin({ email } = {}) {
     if (flow !== _login) return;
     if (flow.state === "awaiting_url" || flow.state === "awaiting_code") {
       flow.state = "failed";
-      flow.error = r.timedOut ? "the sign-in window expired" : firstUseful(r.stderr || r.stdout) || "sign-in ended without a code";
+      flow.error = r.timedOut ? "the sign-in window expired" : failureText(r, "claude auth login") || "sign-in ended without a code";
     }
   });
@@ -274,7 +279,7 @@ export async function submitLoginCode(code) {
   }
   if (!r.ok) {
     flow.state = "failed";
-    flow.error = r.timedOut ? "the sign-in window expired" : firstUseful(r.stderr || r.stdout) || "the code was not accepted";
+    flow.error = r.timedOut ? "the sign-in window expired" : failureText(r, "claude auth login") || "the code was not accepted";
     return { ok: false, reason: "login_failed", ...loginState() };
   }
@@ -372,7 +377,7 @@ export async function shareAccount(num) {
   if (!Number.isInteger(n) || n < 1 || n > 999) return { ok: false, reason: "bad_account" };
   const r = await run(await cswapBin(), ["export", "-", "--account", String(n)], { timeout: CSWAP_TIMEOUT_MS });
   if (!r.ok || !r.stdout.trim()) {
-    return { ok: false, reason: "export_failed", detail: firstUseful(r.stderr || r.stdout) };
+    return { ok: false, reason: "export_failed", detail: failureText(r, "cswap export") };
   }
   return { ok: true, blob: wrapShare(r.stdout), expiresAt: Date.now() + SHARE_TTL_MS };
 }
@@ -390,7 +395,7 @@ export async function importAccount(blob) {
     endStdin(child);
     const r = await child.done;
-    if (!r.ok) return { ok: false, reason: "import_failed", detail: firstUseful(r.stderr || r.stdout) };
+    if (!r.ok) return { ok: false, reason: "import_failed", detail: failureText(r, "cswap import") };
     const after = await readStore();
     const slot = newSlot(before, after);
@@ -429,7 +434,7 @@ export async function removeAccount(num) {
     });
     const r = await child.done;
     invalidateClaudeAccountsCache();
-    if (!r.ok) return { ok: false, reason: "remove_failed", detail: firstUseful(r.stderr || r.stdout) };
+    if (!r.ok) return { ok: false, reason: "remove_failed", detail: failureText(r, "cswap remove") };
     // Exit 0 without the prompt means cswap declined for its own reason — a
     // live session on that account, most often — and printed why.
     if (!answered) return { ok: false, reason: "not_confirmed", detail: firstUseful(r.stdout || r.stderr) };
@@ -447,7 +452,7 @@ export async function setAlias(num, alias) {
     invalidateClaudeAccountsCache();
     return r.ok
       ? { ok: true, output: firstUseful(r.stdout) }
-      : { ok: false, reason: "alias_failed", detail: firstUseful(r.stderr || r.stdout) };
+      : { ok: false, reason: "alias_failed", detail: failureText(r, "cswap alias") };
   });
 }
@@ -460,12 +465,31 @@ export async function moveAccount(num, slot) {
     invalidateClaudeAccountsCache();
     return r.ok
       ? { ok: true, output: firstUseful(r.stdout) }
-      : { ok: false, reason: "move_failed", detail: firstUseful(r.stderr || r.stdout) };
+      : { ok: false, reason: "move_failed", detail: failureText(r, "cswap move") };
   });
 }
 // ── text ─────────────────────────────────────────────────────────────────────
+/**
+ * What went wrong, in a sentence the user can act on.
+ *
+ * The missing-tool case is singled out because its own output is useless: on
+ * Windows it is cmd.exe's two-line "is not recognized …/operable program or
+ * batch file.", and `firstUseful` — which takes the LAST line, correctly for
+ * every other CLI — leaves the second half on screen by itself.
+ */
+export function failureText(r, what = "cswap") {
+  const out = `${r?.stderr ?? ""}\n${r?.stdout ?? ""}`;
+  const tool = String(what).split(" ")[0];
+  if (r?.code === "ENOENT" || looksMissing(out)) {
+    return tool === "claude"
+      ? "the claude CLI could not be run: not on PATH. Set AGENTS_DECK_CLAUDE to its full path."
+      : "cswap could not be run: not on PATH, and not in the places uv and pipx install to. Set AGENTS_DECK_CSWAP to its full path.";
+  }
+  return firstUseful(out) || `${what} exited ${r?.code}`;
+}
 /** The line worth showing a user out of a CLI's output. */
 export function firstUseful(text) {
   const lines = stripTerminalEscapes(text)
@@ -488,7 +512,7 @@ export function addFailureText(r) {
   if (/keychain/i.test(text)) {
     return `${text} — start agents-deck from a Terminal window rather than a background service.`;
   }
-  return text || `cswap add exited ${r.code}`;
+  return failureText(r, "cswap add");
 }
 async function waitFor(get, timeoutMs, stepMs = 100) {

package/src/server/cswap-install.mjs CHANGED Viewed

@@ -10,7 +10,7 @@
 import { run, runDetached } from "./exec.mjs";
 import { bootstrapUv, existingBootstrappedUv } from "./uv-bootstrap.mjs";
 import { existsSync, mkdirSync, statSync, writeFileSync } from "node:fs";
-import { join } from "node:path";
+import { join, posix as posixPath, win32 as winPath } from "node:path";
 import { homedir } from "node:os";
 const INSTALL_TIMEOUT_MS = 180_000; // uv resolves + builds a Python env
@@ -34,20 +34,49 @@ const MARKER = join(homedir(), ".agents-deck", ".cswap-update-check");
  * Re-resolved when a lookup fails so an install during this process is picked
  * up without a restart.
  */
+/**
+ * Every place an installer is known to leave cswap. Pure, and the platform is a
+ * parameter, so the Windows list can be checked from a Mac — which is the only
+ * way this list stays right, since it exists entirely for machines the author is
+ * not sitting at.
+ */
+export function cswapCandidates(platform = process.platform, env = process.env, home = homedir()) {
+  // The path flavour follows the PLATFORM ARGUMENT, not the host: node's `join`
+  // would emit forward slashes when this is exercised from a Mac, which is both
+  // wrong for the caller and invisible in a test.
+  const { join } = platform === "win32" ? winPath : posixPath;
+  const exe = platform === "win32" ? "cswap.exe" : "cswap";
+  const dirs = [];
+  // Explicit configuration first: someone who set these means them.
+  if (env.UV_TOOL_BIN_DIR) dirs.push(env.UV_TOOL_BIN_DIR);
+  if (env.XDG_BIN_HOME) dirs.push(env.XDG_BIN_HOME);
+  // Where `uv tool install` and `pipx install` put executables, everywhere.
+  dirs.push(join(home, ".local", "bin"));
+  if (platform === "win32") {
+    // pipx before 1.5, and any `pip install --user`. APPDATA is respected when
+    // set because a roaming profile moves it off the home directory.
+    dirs.push(join(env.APPDATA || join(home, "AppData", "Roaming"), "Python", "Scripts"));
+    dirs.push(join(env.LOCALAPPDATA || join(home, "AppData", "Local"), "Programs", "Python", "Scripts"));
+    dirs.push(join(home, "scoop", "shims"));
+  } else {
+    dirs.push(join(home, ".pyenv", "shims"));
+    // uv keeps the tool's own venv here and only symlinks into ~/.local/bin; if
+    // that link was never made, this is still a working executable.
+    dirs.push(join(home, ".local", "share", "uv", "tools", "claude-swap", "bin"));
+    dirs.push("/opt/homebrew/bin", "/usr/local/bin");
+  }
+  return dirs.map(d => join(d, exe));
+}
 let _bin = null;
 export async function cswapBin() {
+  // An explicit path wins over everything and is never cached away — someone
+  // debugging a bad resolution needs it to take effect immediately.
+  if (process.env.AGENTS_DECK_CSWAP) return process.env.AGENTS_DECK_CSWAP;
   if (_bin) return _bin;
   if ((await run("cswap", ["--version"], { timeout: 8_000 })).ok) return (_bin = "cswap");
-  const exe = process.platform === "win32" ? "cswap.exe" : "cswap";
-  const candidates = [
-    join(homedir(), ".local", "bin", exe),
-    // pipx before 1.5 on Windows, and any pip --user install.
-    process.platform === "win32"
-      ? join(homedir(), "AppData", "Roaming", "Python", "Scripts", exe)
-      : join(homedir(), ".pyenv", "shims", exe),
-  ];
-  for (const c of candidates) {
+  for (const c of cswapCandidates()) {
     if (existsSync(c) && (await run(c, ["--version"], { timeout: 8_000 })).ok) return (_bin = c);
   }
   return "cswap";   // not found; leave the bare name so errors read sensibly

package/src/server/exec.mjs CHANGED Viewed

@@ -66,6 +66,26 @@ export const tryNext = (err) =>
   Boolean(err) && (err.code === "ENOENT" || err.code === "EACCES" ||
                    err.code === "EINVAL" || err.code === "UNKNOWN");
+/**
+ * cmd.exe's way of saying ENOENT.
+ *
+ * A .cmd or .bat candidate is launched THROUGH cmd.exe, and cmd.exe exists — so
+ * a missing tool is not a spawn error at all. It is a healthy shell exiting 1
+ * after printing two lines:
+ *
+ *     'cswap' is not recognized as an internal or external command,
+ *     operable program or batch file.
+ *
+ * Read as a real failure, that stops the candidate loop early AND puts the
+ * second line — on its own, meaningless — in front of the user. Reported from
+ * Windows on 2026-08-14: the accounts panel said only "operable program or
+ * batch file." when sharing an account.
+ */
+export const looksMissing = (text) =>
+  /is not recognized as an internal or external command/i.test(String(text ?? "")) ||
+  /operable program or batch file/i.test(String(text ?? "")) ||
+  /The system cannot find the (?:path|file) specified/i.test(String(text ?? ""));
 /**
  * Run a command and collect its output. Never rejects, and never throws —
  * failures come back as `{ ok: false }`, because every caller here is a poll or
@@ -86,11 +106,16 @@ export function run(cmd, args, { timeout = 20_000, maxBuffer = 4 << 20 } = {}) {
         : { file: raw, args, opts: {} };
       const done = (err, stdout, stderr) => {
-        if (err && tryNext(err) && i + 1 < tries.length) return attempt(i + 1);
+        // cmd.exe's "is not recognized" counts as "not this spelling" too, and
+        // it arrives as a normal non-zero exit rather than a spawn error.
+        const missing = Boolean(err) && looksMissing(`${stderr ?? ""}\n${stdout ?? ""}`);
+        if (err && (tryNext(err) || missing) && i + 1 < tries.length) return attempt(i + 1);
         if (!err) resolved.set(cmd, raw);
         resolve({
           ok: !err,
-          code: err?.code ?? 0,
+          // A tool cmd.exe could not find is missing, not "exited 1" — callers
+          // key their message off this.
+          code: missing ? "ENOENT" : (err?.code ?? 0),
           killed: Boolean(err?.killed),
           stdout: String(stdout ?? ""),
           stderr: String(stderr ?? ""),
@@ -191,7 +216,19 @@ export function runInteractive(cmd, args, { timeout = 300_000, maxOutput = 256 <
     const keep = (buf, text) => (buf + text).slice(-maxOutput);
     child.stdout?.on("data", (d) => { const t = String(d); stdout = keep(stdout, t); emitLines(t); });
     child.stderr?.on("data", (d) => { const t = String(d); stderr = keep(stderr, t); emitLines(t); });
-    child.on("close", (code) => finish(code ?? -1, null));
+    child.on("close", (code) => {
+      // Same cmd.exe case as in `run`: exit 1 with "is not recognized" means
+      // this spelling does not exist, not that the tool failed.
+      if (code !== 0 && looksMissing(`${stderr}\n${stdout}`)) {
+        if (i + 1 < tries.length) {
+          stdout = ""; stderr = ""; pending = "";
+          child = null;
+          return attempt(i + 1);
+        }
+        return finish(-1, { code: "ENOENT" });
+      }
+      finish(code ?? -1, null);
+    });
   };
   attempt(0);