squadrant 0.22.0 → 0.23.0

package/dist/squadrantd.js

@@ -94,6 +94,9 @@ function isGateMode(v2) {
 function isGatePolicy(v2) {
   return GATE_POLICIES.includes(v2);
 }
+function isGateEngine(v2) {
+  return GATE_ENGINES.includes(v2);
+}
 function getDefaultConfig() {
   return {
     commandName: "\u{1F3DB}\uFE0F command",
@@ -177,12 +180,13 @@ function saveConfig(config, configPath = DEFAULT_CONFIG_PATH) {
 function resolveHome(p) {
   return p.startsWith("~") ? p.replace("~", os.homedir()) : p;
 }
-var GATE_MODES, GATE_POLICIES, DEFAULT_CONFIG_PATH, CONFIG_DIR, DAEMON_SOCK_PATH, DEFAULT_CREW_ROUTING_RULES;
+var GATE_MODES, GATE_POLICIES, GATE_ENGINES, DEFAULT_CONFIG_PATH, CONFIG_DIR, DAEMON_SOCK_PATH, DEFAULT_CREW_ROUTING_RULES;
 var init_config = __esm({
   "packages/shared/dist/config.js"() {
     init_config_io();
     GATE_MODES = ["on", "off", "auto"];
     GATE_POLICIES = ["deny-dangerous", "ask-on-doubt"];
+    GATE_ENGINES = ["router", "auto-gate"];
     DEFAULT_CONFIG_PATH = process.env.SQUADRANT_CONFIG || path2.join(os.homedir(), ".config", "squadrant", "config.json");
     CONFIG_DIR = path2.dirname(DEFAULT_CONFIG_PATH);
     DAEMON_SOCK_PATH = path2.join(CONFIG_DIR, "squadrant.sock");
@@ -1070,10 +1074,11 @@ function formatDelegationReport(rec, originProject, targetProject) {
       return null;
   }
 }
-function firePush(deps, project, prev, next, event, lastCaptainTurnAt) {
+function firePush(deps, project, prev, next, event, lastCaptainTurnAt, prevRec) {
   if (!deps.notify)
     return;
-  if (prev === next.state)
+  const questionChanged = prev === "blocked" && next.state === "blocked" && prevRec != null && (prevRec.question ?? "").trim() !== (next.question ?? "").trim();
+  if (prev === next.state && !questionChanged)
     return;
   if (!ATTENTION_STATES.has(next.state))
     return;
@@ -1111,6 +1116,7 @@ function createDaemon(deps) {
   const { store, now } = deps;
   const lastCaptainTurnAt = /* @__PURE__ */ new Map();
   const quietNotifiedAt = /* @__PURE__ */ new Map();
+  const blockedRenudgedFor = /* @__PURE__ */ new Map();
   const resendAttemptedAt = /* @__PURE__ */ new Map();
   const firstTurnUndeliveredBudgetMs = deps.firstTurnUndeliveredBudgetMs ?? DEFAULT_FIRST_TURN_UNDELIVERED_BUDGET_MS;
   const firstTurnResendCooldownMs = deps.firstTurnResendCooldownMs ?? DEFAULT_FIRST_TURN_RESEND_COOLDOWN_MS;
@@ -1131,7 +1137,7 @@ function createDaemon(deps) {
     const next = reduce(cur, event, now());
     if (next !== cur) {
       store.put(next);
-      firePush(deps, project, cur.state, next, event, lastCaptainTurnAt.get(next.id));
+      firePush(deps, project, cur.state, next, event, lastCaptainTurnAt.get(next.id), cur);
     }
     return next;
   }
@@ -1283,6 +1289,8 @@ function createDaemon(deps) {
       }
       const recoveryPromises = [];
       for (const r of store.listAll()) {
+        if (r.state !== "blocked")
+          blockedRenudgedFor.delete(r.id);
         if (TERMINAL_STATES.has(r.state) && t - r.lastHeartbeat > TERMINAL_RECORD_TTL_MS) {
           store.delete(r.project, r.id);
           continue;
@@ -1345,6 +1353,27 @@ function createDaemon(deps) {
             continue;
           }
         }
+        if (r.state === "blocked" && !r.operatorHold) {
+          const threshold = deps.blockedRenudgeMs ?? DEFAULT_BLOCKED_RENUDGE_MS;
+          const blockedFor = t - r.lastHeartbeat;
+          const episodeKey = r.question ?? "";
+          if (blockedFor > threshold && blockedRenudgedFor.get(r.id) !== episodeKey) {
+            blockedRenudgedFor.set(r.id, episodeKey);
+            if (deps.notify) {
+              const tag = crewTag(r);
+              const mins = Math.max(1, Math.round(blockedFor / 6e4));
+              const message = `CREW BLOCKED REMINDER ${tag}: still blocked ~${mins}min (reminder \u2014 same question, not a new one): ${(r.question ?? "(no question)").trim()}`;
+              const synthEvent = { type: "task.blocked", id: r.id, reason: "renudge", question: r.question ?? "" };
+              try {
+                const p = deps.notify({ project: r.project, message, record: r, event: synthEvent });
+                if (p && typeof p.catch === "function")
+                  p.catch(() => {
+                  });
+              } catch {
+              }
+            }
+          }
+        }
         if (r.mode === "interactive" && r.state === "submitted" && !r.firstTurnConfirmedAt) {
           const undeliveredMs = t - r.createdAt;
           if (undeliveredMs > firstTurnUndeliveredBudgetMs) {
@@ -1434,7 +1463,7 @@ function createDaemon(deps) {
     }
   };
 }
-var DEFAULT_FIRST_TURN_UNDELIVERED_BUDGET_MS, DEFAULT_FIRST_TURN_RESEND_COOLDOWN_MS, DEFAULT_TASK_TIMEOUT_MS, TERMINAL_RECORD_TTL_MS, TERMINAL_RECORD_KEEP_PER_PROJECT, ATTENTION_STATES, REAPABLE_SURFACE_STATES, IDLE_DEBOUNCE_MS, KNOWN_EVENT_TYPES;
+var DEFAULT_FIRST_TURN_UNDELIVERED_BUDGET_MS, DEFAULT_FIRST_TURN_RESEND_COOLDOWN_MS, DEFAULT_BLOCKED_RENUDGE_MS, DEFAULT_TASK_TIMEOUT_MS, TERMINAL_RECORD_TTL_MS, TERMINAL_RECORD_KEEP_PER_PROJECT, ATTENTION_STATES, REAPABLE_SURFACE_STATES, IDLE_DEBOUNCE_MS, KNOWN_EVENT_TYPES;
 var init_reduce = __esm({
   "packages/core/dist/daemon/reduce.js"() {
     init_dist();
@@ -1442,6 +1471,7 @@ var init_reduce = __esm({
     init_watchdog();
     DEFAULT_FIRST_TURN_UNDELIVERED_BUDGET_MS = 12e4;
     DEFAULT_FIRST_TURN_RESEND_COOLDOWN_MS = 6e4;
+    DEFAULT_BLOCKED_RENUDGE_MS = 30 * 60 * 1e3;
     DEFAULT_TASK_TIMEOUT_MS = 8 * 60 * 60 * 1e3;
     TERMINAL_RECORD_TTL_MS = 7 * 24 * 60 * 60 * 1e3;
     TERMINAL_RECORD_KEEP_PER_PROJECT = 20;
@@ -3572,8 +3602,11 @@ function buildRouterEnv(creds, model) {
     if (headers)
       env.ANTHROPIC_CUSTOM_HEADERS = headers;
   }
-  if (model)
+  if (model) {
     env.ANTHROPIC_MODEL = model;
+    env.CLAUDE_CODE_SUBAGENT_MODEL = model;
+    env.ANTHROPIC_SMALL_FAST_MODEL = model;
+  }
   return env;
 }
 function mergeClaudeEnvRouterSettings(routerEnv, claudeEnv) {
@@ -7736,6 +7769,12 @@ function resolveGateMode(env, gate) {
     return fromEnv;
   return gate?.mode && isGateMode(gate.mode) ? gate.mode : "auto";
 }
+function resolveGateEngine(env, gate) {
+  const fromEnv = env.SQUADRANT_GATE_ENGINE;
+  if (fromEnv !== void 0 && isGateEngine(fromEnv))
+    return fromEnv;
+  return gate?.engine && isGateEngine(gate.engine) ? gate.engine : "router";
+}
 function resolveGatePolicy(env, gate) {
   const fromEnv = env.SQUADRANT_GATE_POLICY;
   if (fromEnv !== void 0 && isGatePolicy(fromEnv))
@@ -8120,6 +8159,59 @@ var init_permission_gate = __esm({
   }
 });
 
+// packages/core/dist/auto-gate.js
+import { createAutoGate, projectGateConfig } from "@squadrant-ai/auto-gate";
+function gateForProjection(config) {
+  const gate = config.defaults.gate;
+  if (!gate)
+    return {};
+  const out = {};
+  if (gate.mode)
+    out.mode = gate.mode;
+  if (gate.tools)
+    out.tools = gate.tools;
+  if (gate.deny)
+    out.deny = gate.deny;
+  return out;
+}
+function createSquadrantAutoGate(deps) {
+  const env = deps.env ?? process.env;
+  const taskId = env.SQUADRANT_CREW_TASK_ID;
+  const project = deps.project ?? env.SQUADRANT_CREW_PROJECT;
+  const mode = resolveGateMode(env, deps.config.defaults.gate);
+  const projected = projectGateConfig({ gate: { ...gateForProjection(deps.config), mode } });
+  const enabled = mode === "on";
+  const blockedSignal = async (ctx) => {
+    if (!taskId || !project || !deps.sendBlocked)
+      return;
+    const event = {
+      type: "task.blocked",
+      id: taskId,
+      reason: ctx.reason,
+      question: `crew needs permission to run ${ctx.tool}`
+    };
+    await deps.sendBlocked(project, event);
+  };
+  const host = createAutoGate({
+    config: projected,
+    readIntent: (p) => readUserIntent(p) ?? void 0,
+    blockedSignal,
+    ...deps.decide ? { decide: deps.decide } : {},
+    ...project ? { project } : {},
+    env,
+    log: deps.log
+  });
+  if (!enabled) {
+    return { config: host.config, decideClaudeHookPayload: async () => void 0 };
+  }
+  return host;
+}
+var init_auto_gate = __esm({
+  "packages/core/dist/auto-gate.js"() {
+    init_permission_gate();
+  }
+});
+
 // packages/core/dist/group-dispatch.js
 import { randomUUID as randomUUID4 } from "crypto";
 import { createConnection as createConnection2 } from "net";
@@ -8526,10 +8618,11 @@ async function runCrewAnswer(project, name, option, runtime, workspaceId, deps,
   if (!crew) {
     throw new Error(`Crew '${name}' not found for ${project}. Run 'squadrant crew list ${project}'.`);
   }
-  const options = await deps.readModalOptions(crew);
-  if (!options) {
+  const modal = await deps.readModalOptions(crew);
+  if (!modal || modal.options.length === 0) {
     throw new Error(`Crew '${name}' has no interactive option prompt visible right now \u2014 nothing to answer. Read its screen with 'squadrant crew read ${project} ${name}' to check its state.`);
   }
+  const options = modal.options;
   const target = resolveOption(options, option);
   if (opts?.expect && !target.label.toLowerCase().includes(opts.expect.toLowerCase())) {
     throw new Error(`Refusing: option ${target.index} is "${target.label}", which does not contain expected text "${opts.expect}". Option order is model-generated and can shift between renders \u2014 re-check with 'squadrant crew read ${project} ${name}'.
@@ -8541,7 +8634,9 @@ ${describeOptions(options)}`);
   log(`\u2192 selecting ${target.index}. "${target.label}"`);
   const current = options.find((o) => o.highlighted) ?? options[0];
   const steps = target.index - current.index;
-  const key = steps >= 0 ? "Down" : "Up";
+  const forwardKey = modal.axis === "horizontal" ? "Right" : "Down";
+  const backwardKey = modal.axis === "horizontal" ? "Left" : "Up";
+  const key = steps >= 0 ? forwardKey : backwardKey;
   for (let i = 0; i < Math.abs(steps); i++) {
     await runtime.sendKeyToPane(crew, key);
   }
@@ -8913,6 +9008,7 @@ __export(dist_exports, {
   CREW_GONE_MS: () => CREW_GONE_MS,
   CREW_STALE_MS: () => CREW_STALE_MS,
   CaptainDelivery: () => CaptainDelivery,
+  DEFAULT_BLOCKED_RENUDGE_MS: () => DEFAULT_BLOCKED_RENUDGE_MS,
   DEFAULT_FIRST_TURN_RESEND_COOLDOWN_MS: () => DEFAULT_FIRST_TURN_RESEND_COOLDOWN_MS,
   DEFAULT_FIRST_TURN_UNDELIVERED_BUDGET_MS: () => DEFAULT_FIRST_TURN_UNDELIVERED_BUDGET_MS,
   DEFAULT_GATE_DENY_RULES: () => DEFAULT_GATE_DENY_RULES,
@@ -8995,6 +9091,7 @@ __export(dist_exports, {
   createRouterService: () => createRouterService,
   createRouterShim: () => createRouterShim,
   createRunCommand: () => createRunCommand,
+  createSquadrantAutoGate: () => createSquadrantAutoGate,
   createStore: () => createStore,
   createSurfaceLivenessProbe: () => createSurfaceLivenessProbe,
   createTelegramBridge: () => createTelegramBridge,
@@ -9136,6 +9233,7 @@ __export(dist_exports, {
   resolveCurrentProject: () => resolveCurrentProject,
   resolveGate: () => resolveGate,
   resolveGateDenyRules: () => resolveGateDenyRules,
+  resolveGateEngine: () => resolveGateEngine,
   resolveGateMode: () => resolveGateMode,
   resolveGatePolicy: () => resolveGatePolicy,
   resolveGateTools: () => resolveGateTools,
@@ -9241,6 +9339,7 @@ var init_dist2 = __esm({
     init_router_resolution();
     init_captain_router();
     init_permission_gate();
+    init_auto_gate();
     init_restart_daemon();
     init_group_dispatch();
     init_launch_workspace();
@@ -12149,6 +12248,48 @@ function removeCommandHandlers(entries, command) {
   }
   return removed;
 }
+var FOREIGN_AUTO_GATE_MARKER = "auto-gate-managed";
+function isForeignAutoGateCommand(command) {
+  if (typeof command !== "string")
+    return false;
+  if (command.includes(FOREIGN_AUTO_GATE_MARKER))
+    return true;
+  const first = command.trim().split(/\s+/)[0] ?? "";
+  return /(^|[/\\])auto-gate$/.test(first);
+}
+function findForeignGateHandlers(entries) {
+  const found = [];
+  for (const entry of entries) {
+    const hooks = entry?.hooks;
+    if (!Array.isArray(hooks))
+      continue;
+    for (const h of hooks) {
+      const cmd = h?.command;
+      if (isForeignAutoGateCommand(cmd))
+        found.push(cmd);
+    }
+  }
+  return found;
+}
+function removeForeignGateHandlers(entries) {
+  const removed = [];
+  for (let i = entries.length - 1; i >= 0; i--) {
+    const entry = entries[i];
+    if (!Array.isArray(entry?.hooks))
+      continue;
+    entry.hooks = entry.hooks.filter((h) => {
+      const cmd = h?.command;
+      if (isForeignAutoGateCommand(cmd)) {
+        removed.push(cmd);
+        return false;
+      }
+      return true;
+    });
+    if (entry.hooks.length === 0)
+      entries.splice(i, 1);
+  }
+  return removed;
+}
 function installClaudeHooks(opts = {}) {
   const settingsPath = opts.settingsPath ?? join25(homedir13(), ".claude", "settings.json");
   const hookCmd = opts.hookCmd ?? DEFAULT_HOOK_CMD;
@@ -12186,6 +12327,23 @@ function installClaudeHooks(opts = {}) {
         changed = true;
         migrated.push(`${eventName}/${sub}`);
       }
+      const foreign = findForeignGateHandlers(entries);
+      if (foreign.length > 0) {
+        if (opts.gateMode === "on") {
+          const removed = removeForeignGateHandlers(entries);
+          if (removed.length > 0)
+            changed = true;
+          for (const command2 of removed) {
+            log(`native-hook: removed foreign auto-gate PermissionRequest handler in ${settingsPath} [#P6 \xA715#5]: ${command2}`);
+            opts.recordGateAction?.({ action: "removed-foreign-gate", command: command2 });
+          }
+        } else {
+          for (const command2 of foreign) {
+            log(`native-hook: foreign auto-gate PermissionRequest handler present in ${settingsPath} but squadrant's gate is '${opts.gateMode ?? "auto"}' (not 'on') \u2014 foreign entry left untouched [#P6 \xA715#5]: ${command2}`);
+            opts.recordGateAction?.({ action: "left-foreign-gate", command: command2 });
+          }
+        }
+      }
     }
     const alreadyPresent = entries.some((m) => Array.isArray(m.hooks) && m.hooks.some((h) => typeof h.command === "string" && h.command === command));
     if (!alreadyPresent) {
@@ -12216,11 +12374,57 @@ function installClaudeHooks(opts = {}) {
       changed = true;
     }
   }
+  if (typeof settings.env === "object" && settings.env !== null && !Array.isArray(settings.env)) {
+    if (reconcileSubagentModels(settings.env, log))
+      changed = true;
+  }
   if (changed) {
     writeFile6(settingsPath, JSON.stringify(settings, null, 2));
   }
   return settingsPath;
 }
+var SUBAGENT_MODEL_KEY = "CLAUDE_CODE_SUBAGENT_MODEL";
+var SMALL_FAST_MODEL_KEY = "ANTHROPIC_SMALL_FAST_MODEL";
+function isCustomUpstream(baseUrl) {
+  if (typeof baseUrl !== "string" || baseUrl.length === 0)
+    return false;
+  try {
+    return new URL(baseUrl).hostname.toLowerCase() !== "api.anthropic.com";
+  } catch {
+    return false;
+  }
+}
+function isAnthropicModelId(value) {
+  if (typeof value !== "string")
+    return false;
+  const v2 = value.trim().toLowerCase();
+  return v2 === "sonnet" || v2 === "opus" || v2 === "haiku" || v2.startsWith("claude-");
+}
+function reconcileSubagentModels(env, log) {
+  if (!isCustomUpstream(env.ANTHROPIC_BASE_URL))
+    return false;
+  const model = env.ANTHROPIC_MODEL;
+  if (typeof model !== "string" || model.length === 0)
+    return false;
+  let changed = false;
+  for (const key of [SUBAGENT_MODEL_KEY, SMALL_FAST_MODEL_KEY]) {
+    const current = env[key];
+    if (current === void 0) {
+      env[key] = model;
+      changed = true;
+      log(`native-hook: set ${key}='${model}' to match ANTHROPIC_MODEL on a custom upstream`);
+    } else if (isAnthropicModelId(current)) {
+      if (current !== model) {
+        env[key] = model;
+        changed = true;
+        log(`native-hook: aligned ${key} '${String(current)}' \u2192 '${model}' for a custom upstream`);
+      }
+    } else {
+      log(`native-hook: ${key} '${String(current)}' is a custom model id \u2014 left untouched`);
+    }
+  }
+  return changed;
+}
 function mapSubToLifecycle(sub) {
   switch (sub) {
     case "session-start":
@@ -12786,7 +12990,15 @@ function startSquadrantd(opts = {}) {
     log
   });
   const cmuxStoreSource = new CmuxStoreSource({ log });
-  const nativeHookSource = new NativeHookSource({ log, hookInstall: { claudeEnv: loadConfig().defaults.claudeEnv } });
+  const nativeHookSource = new NativeHookSource({
+    log,
+    hookInstall: {
+      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.
+      gateMode: loadConfig().defaults.gate?.mode
+    }
+  });
   ctx.codexDriver = codexDriver;
   ctx.opencodeBridge = opencodeBridge;
   ctx.cmuxEventsBridge = cmuxEventsBridge;