squadrant 0.25.0 → 0.25.2

package/dist/squadrantd.js

@@ -114,13 +114,8 @@ function getDefaultConfig() {
         captain: "auto",
         crew: "auto"
       },
-      models: {
-        command: "opus",
-        captain: "opus",
-        crew: "sonnet",
-        exploration: "haiku",
-        review: "opus"
-      },
+      // #874: no `models` here — it's deprecated (superseded by `roles`), so a
+      // fresh init wrote a key the drift check immediately flagged.
       roles: {
         command: { agent: "claude", model: "opus" },
         captain: { agent: "claude", model: "opus" },
@@ -2449,6 +2444,10 @@ function sanitizePathForPlist(path24) {
       continue;
     if (p.includes("/.claude/plugins/"))
       continue;
+    if (p.includes("/.cmuxterm/cmux-cli-shims/"))
+      continue;
+    if (p.includes("/fnm_multishells/"))
+      continue;
     if (seen.has(p))
       continue;
     seen.add(p);
@@ -2476,18 +2475,7 @@ function resolveAgentBinDirs() {
   });
 }
 function buildDaemonPath(shellPath) {
-  const agentDirs = resolveAgentBinDirs();
-  const sanitized = sanitizePathForPlist(shellPath);
-  if (agentDirs.length === 0)
-    return sanitized;
-  const parts = [...agentDirs, ...sanitized.split(":")];
-  const seen = /* @__PURE__ */ new Set();
-  return parts.filter((p) => {
-    if (!p || seen.has(p))
-      return false;
-    seen.add(p);
-    return true;
-  }).join(":");
+  return sanitizePathForPlist([...resolveAgentBinDirs(), shellPath].join(":"));
 }
 function renderPlist(nodeBin, daemonEntry, pathEnv = "") {
   const logPath2 = join8(homedir5(), ".config", "squadrant", "squadrantd.log");
@@ -9448,6 +9436,7 @@ init_dist2();
 init_dist2();
 init_dist2();
 init_dist2();
+init_dist2();
 import { join as join27, dirname as dirname6, resolve as resolve3 } from "path";
 import { homedir as homedir14 } from "os";
 import { fileURLToPath as fileURLToPath3 } from "url";
@@ -11739,7 +11728,8 @@ var RuntimeRegistry = class {
 };
 
 // packages/workspaces/dist/notifiers/cmux.js
-import { execFile as execFileCb, execSync as execSync7 } from "child_process";
+init_dist();
+import { execFile as execFileCb, execFileSync as execFileSync7 } from "child_process";
 import { promisify as promisify2 } from "util";
 var execFile3 = promisify2(execFileCb);
 function createCmuxNotifier(_scope) {
@@ -11747,7 +11737,7 @@ function createCmuxNotifier(_scope) {
     name: "cmux",
     async probe() {
       try {
-        execSync7("squadrant runtime status --command", { encoding: "utf-8", stdio: "pipe" });
+        execFileSync7(resolveCmuxBin(), ["capabilities"], { encoding: "utf-8", stdio: "pipe", timeout: CMUX_TIMEOUT });
         return { installed: true, reachable: true };
       } catch (err) {
         const code = err.code;
@@ -11957,9 +11947,9 @@ import { homedir as homedir11 } from "os";
 // packages/workspaces/dist/cmux-daemon/store-fingerprint.js
 init_dist();
 init_dist2();
-import { execFileSync as execFileSync7 } from "child_process";
+import { execFileSync as execFileSync8 } from "child_process";
 function defaultExecPs(pid) {
-  return execFileSync7("ps", ["-o", "command=", "-p", String(pid)], {
+  return execFileSync8("ps", ["-o", "command=", "-p", String(pid)], {
     encoding: "utf-8",
     stdio: ["ignore", "pipe", "ignore"]
   });
@@ -12129,6 +12119,7 @@ var CmuxStoreSource = class {
   debounceMs;
   lockRetryMs;
   maxLockRetries;
+  rewatchMs;
   isPidAlive;
   listFiles;
   readFile;
@@ -12140,6 +12131,7 @@ var CmuxStoreSource = class {
   deps;
   stopWatcher;
   debounceTimer;
+  rewatchTimer;
   /** filename → pending lock-retry timer (one per locked file). */
   lockRetryTimers = /* @__PURE__ */ new Map();
   /** filename → re-scan attempts used in the current lock episode. */
@@ -12153,6 +12145,7 @@ var CmuxStoreSource = class {
     this.debounceMs = opts.debounceMs ?? 50;
     this.lockRetryMs = opts.lockRetryMs ?? 50;
     this.maxLockRetries = opts.maxLockRetries ?? 3;
+    this.rewatchMs = opts.rewatchMs ?? 5e3;
     this.isPidAlive = opts.isPidAlive ?? defaultIsPidAlive2;
     this.listFiles = opts.listFiles ?? defaultListFiles;
     this.readFile = opts.readFile ?? defaultReadFile;
@@ -12168,18 +12161,17 @@ var CmuxStoreSource = class {
     this.active = true;
     this.lastError = null;
     this.scan();
-    try {
-      this.stopWatcher = this.watchDir(this.stateDir, () => this.scheduleDebounced());
-    } catch (e) {
-      this.lastError = e.message;
-      this.log(`cmux-store: failed to watch ${this.stateDir}: ${e.message}`);
-    }
+    this.armWatcher();
   }
   stop() {
     if (this.debounceTimer !== void 0) {
       this.cancelTimer(this.debounceTimer);
       this.debounceTimer = void 0;
     }
+    if (this.rewatchTimer !== void 0) {
+      this.cancelTimer(this.rewatchTimer);
+      this.rewatchTimer = void 0;
+    }
     for (const timer of this.lockRetryTimers.values()) {
       this.cancelTimer(timer);
     }
@@ -12200,6 +12192,36 @@ var CmuxStoreSource = class {
     return { active: this.active, error: this.lastError };
   }
   // ── private ─────────────────────────────────────────────────────────────────
+  /** Watch for subsequent changes, debounced. */
+  armWatcher() {
+    try {
+      this.stopWatcher = this.watchDir(this.stateDir, () => this.scheduleDebounced(), (err) => this.onWatchError(err));
+    } catch (e) {
+      this.lastError = e.message;
+      this.log(`cmux-store: failed to watch ${this.stateDir}: ${e.message}`);
+    }
+  }
+  /**
+   * The watcher failed after starting (macOS: a refused FSEventStreamStart()
+   * surfaces as EMFILE). Drop it and re-arm later instead of letting the error
+   * escape as an uncaughtException that kills the daemon.
+   */
+  onWatchError(err) {
+    this.lastError = err.message;
+    this.log(`cmux-store: watcher error on ${this.stateDir}: ${err.message} \u2014 re-arming in ${this.rewatchMs}ms`);
+    this.stopWatcher?.();
+    this.stopWatcher = void 0;
+    if (!this.active || this.rewatchTimer !== void 0)
+      return;
+    this.rewatchTimer = this.scheduleTimer(() => {
+      this.rewatchTimer = void 0;
+      if (!this.active)
+        return;
+      this.lastError = null;
+      this.scan();
+      this.armWatcher();
+    }, this.rewatchMs);
+  }
   scheduleDebounced() {
     if (this.debounceTimer !== void 0) {
       this.cancelTimer(this.debounceTimer);
@@ -12322,12 +12344,13 @@ function defaultReadFile(path24) {
     return void 0;
   }
 }
-function defaultWatchDir(dir, cb) {
+function defaultWatchDir(dir, cb, onError) {
   const w = watch(dir, (_event, filename) => {
     if (typeof filename === "string" && filename.endsWith("-hook-sessions.json")) {
       cb();
     }
   });
+  w.on("error", onError);
   return () => w.close();
 }
 
@@ -12350,10 +12373,36 @@ var CLAUDE_HOOK_EVENTS = [
   // this at all; without it the watchdog reports a plain stall (wrong story).
   ["StopFailure", "stop-failure"]
 ];
-var DEFAULT_HOOK_CMD = "squadrant hooks";
-var GATE_HOOK_CMD = "squadrant gate";
-function hookCommandFor(eventName, sub, hookCmd) {
-  return eventName === "PermissionRequest" ? `${GATE_HOOK_CMD} claude ${sub}` : `${hookCmd} claude ${sub}`;
+var DEFAULT_CLI_CMD = "squadrant";
+function hookCommandFor(eventName, sub, hookCmd, gateCmd) {
+  return eventName === "PermissionRequest" ? `${gateCmd} claude ${sub}` : `${hookCmd} claude ${sub}`;
+}
+function isSquadrantOwnedCommand(command, sub) {
+  if (typeof command !== "string")
+    return false;
+  const m = command.match(/^(.*) (?:hooks|gate) claude (\S+)$/);
+  if (!m || m[2] !== sub)
+    return false;
+  const prefix = m[1];
+  return prefix === DEFAULT_CLI_CMD || /squadrant\/dist\/index\.js'?$/.test(prefix);
+}
+function removeStaleOwnedHandlers(entries, sub, keep) {
+  let removed = false;
+  for (let i = entries.length - 1; i >= 0; i--) {
+    const entry = entries[i];
+    if (!Array.isArray(entry?.hooks))
+      continue;
+    const before = entry.hooks.length;
+    entry.hooks = entry.hooks.filter((h) => {
+      const cmd = h?.command;
+      return cmd === keep || !isSquadrantOwnedCommand(cmd, sub);
+    });
+    if (entry.hooks.length !== before)
+      removed = true;
+    if (entry.hooks.length === 0)
+      entries.splice(i, 1);
+  }
+  return removed;
 }
 function removeCommandHandlers(entries, command) {
   let removed = false;
@@ -12414,7 +12463,9 @@ function removeForeignGateHandlers(entries) {
 }
 function installClaudeHooks(opts = {}) {
   const settingsPath = opts.settingsPath ?? join25(homedir13(), ".claude", "settings.json");
-  const hookCmd = opts.hookCmd ?? DEFAULT_HOOK_CMD;
+  const cliCmd = opts.cliCmd ?? DEFAULT_CLI_CMD;
+  const hookCmd = opts.hookCmd ?? `${cliCmd} hooks`;
+  const gateCmd = `${cliCmd} gate`;
   const readFile7 = opts.readFile ?? defaultReadFile2;
   const writeFile6 = opts.writeFile ?? defaultWriteFile;
   const log = opts.log ?? (() => {
@@ -12436,12 +12487,13 @@ function installClaudeHooks(opts = {}) {
   let changed = false;
   const repaired = [];
   const migrated = [];
+  const repointed = [];
   for (const [eventName, sub, matcher] of CLAUDE_HOOK_EVENTS) {
     if (!Array.isArray(hooks[eventName])) {
       hooks[eventName] = [];
     }
     const entries = hooks[eventName];
-    const command = hookCommandFor(eventName, sub, hookCmd);
+    const command = hookCommandFor(eventName, sub, hookCmd, gateCmd);
     const hookMatcher = matcher ?? "";
     if (eventName === "PermissionRequest") {
       const legacy = `${hookCmd} claude ${sub}`;
@@ -12467,11 +12519,14 @@ function installClaudeHooks(opts = {}) {
         }
       }
     }
+    const wasRepointed = removeStaleOwnedHandlers(entries, sub, command);
+    if (wasRepointed)
+      changed = true;
     const alreadyPresent = entries.some((m) => Array.isArray(m.hooks) && m.hooks.some((h) => typeof h.command === "string" && h.command === command));
     if (!alreadyPresent) {
       entries.push({ matcher: hookMatcher, hooks: [{ type: "command", command, timeout: 10 }] });
       changed = true;
-      repaired.push(`${eventName}/${sub}`);
+      (wasRepointed ? repointed : repaired).push(`${eventName}/${sub}`);
     }
   }
   if (repaired.length > 0 && hadExistingSettings) {
@@ -12480,6 +12535,9 @@ function installClaudeHooks(opts = {}) {
   if (migrated.length > 0) {
     log(`native-hook: migrated ${migrated.length} PermissionRequest hook(s) to the U7 permission gate in ${settingsPath} [${migrated.join(", ")}]`);
   }
+  if (repointed.length > 0) {
+    log(`native-hook: repointed ${repointed.length} squadrant hook(s) to ${cliCmd} in ${settingsPath} [${repointed.join(", ")}]`);
+  }
   if (opts.claudeEnv && Object.keys(opts.claudeEnv).length > 0) {
     if (typeof settings.env !== "object" || settings.env === null || Array.isArray(settings.env)) {
       settings.env = {};
@@ -13129,6 +13187,9 @@ function startSquadrantd(opts = {}) {
   const nativeHookSource = new NativeHookSource({
     log,
     hookInstall: {
+      // #872: absolute node + CLI paths — Claude runs hooks via /bin/sh with its
+      // own PATH, which often lacks a version-managed Node's global bin.
+      cliCmd: `${shellQuote(process.execPath)} ${shellQuote(CLI_BIN)}`,
       claudeEnv: loadConfig().defaults.claudeEnv,
       // #P6 (§15#5): only an explicit gate mode "on" lets squadrant remove a
       // foreign auto-gate PermissionRequest handler; auto/absent leaves it alone.