squadrant 0.21.0 → 0.21.1

package/dist/index.js

@@ -4237,6 +4237,11 @@ function assertBackendUsable(o) {
 function shouldBuildRouterService(router, isVitest) {
   return !!router && !isVitest;
 }
+function claudeEnvShadowsRouter(claudeEnv) {
+  if (!claudeEnv)
+    return [];
+  return Object.keys(claudeEnv).filter((key) => key.startsWith("ANTHROPIC_"));
+}
 var init_router_resolution = __esm({
   "packages/core/dist/router-resolution.js"() {
     init_dist();
@@ -4263,6 +4268,14 @@ function buildRouterEnv(creds, model) {
     env.ANTHROPIC_MODEL = model;
   return env;
 }
+function mergeClaudeEnvRouterSettings(routerEnv, claudeEnv) {
+  const merged = { ...routerEnv };
+  for (const [key, value] of Object.entries(claudeEnv ?? {})) {
+    if (!key.startsWith("ANTHROPIC_"))
+      merged[key] = value;
+  }
+  return merged;
+}
 function formatCustomHeaders(headers) {
   const entries = Object.entries(headers ?? {});
   if (entries.length === 0)
@@ -4576,10 +4589,18 @@ async function runCrewSpawn(input, config, deps) {
   if (agentName === "claude") {
     let routerEnv = {};
     if (backend !== "native") {
+      if (!deps.writeRouterSettings) {
+        throw new Error(`backend '${backend}' requires a per-spawn --settings writer to outrank defaults.claudeEnv, but the spawn path has none \u2014 refusing to launch a routed session that would silently bypass the router shim`);
+      }
       if (!deps.routerCredentials) {
         throw new Error(`backend '${backend}' requires router credentials, but the spawn path has no daemon credentials provider`);
       }
       routerEnv = buildRouterEnv(await deps.routerCredentials({ project: input.project, backend }), crewModel);
+      const shadowed = claudeEnvShadowsRouter(config.defaults.claudeEnv);
+      if (shadowed.length > 0) {
+        process.stderr.write(`\u26A0\uFE0F  backend '${backend}' selected but defaults.claudeEnv sets ${shadowed.join(", ")} \u2014 these would shadow the router shim. Overriding via a per-spawn --settings env block (outranks ~/.claude/settings.json).
+`);
+      }
     }
     ensureSocksDir();
     const messagingSocketPath = path9.join(CC_SOCKS_DIR, `squadrant-${randomUUID3()}.sock`);
@@ -4592,6 +4613,12 @@ async function runCrewSpawn(input, config, deps) {
       name,
       messagingSocketPath
     });
+    const routerSettingsPath = Object.keys(routerEnv).length > 0 ? deps.writeRouterSettings({
+      stateRoot: STATE_ROOT,
+      project: input.project,
+      taskId: rec.id,
+      env: mergeClaudeEnvRouterSettings(routerEnv, config.defaults.claudeEnv)
+    }) : void 0;
     let hooksInstalled = false;
     try {
       deps.writeSettingsLocal(spawnCwd);
@@ -4607,18 +4634,25 @@ async function runCrewSpawn(input, config, deps) {
       messagingSocketPath,
       // Permission mode is config-driven so squadrant can default crews to 'auto'
       // or keep the semi-automatic 'acceptEdits' gate. Falls back to 'acceptEdits'.
-      permissionMode: config.defaults.permissions?.crew ?? "acceptEdits",
+      // #772: a router-backed crew MUST use 'default' — 'auto' makes the built-in
+      // Sonnet-5 classifier own PermissionRequest and the gate yields, which is
+      // exactly the fail-closed dead end U7 exists to fix. The rubric owns the
+      // permission mode for a routed spawn; the operator's config cannot override
+      // it back into the broken path.
+      permissionMode: backend !== "native" ? "default" : config.defaults.permissions?.crew ?? "acceptEdits",
       // #708: self-describing name so ListAgents/the registry can tell this
       // crew apart from an unrelated session instead of an auto-derived cwd
       // basename (only the claude driver reads this — other agents ignore it).
       sessionName: crewSessionName(input.project, name),
       ...crewModel ? { model: crewModel } : {},
-      ...crewThinking ? { thinking: crewThinking } : {}
+      ...crewThinking ? { thinking: crewThinking } : {},
+      ...routerSettingsPath ? { settingsPath: routerSettingsPath } : {}
     });
     const direction2 = input.direction ?? "tab";
     const title2 = titleFor(input.project, name);
     const pane2 = await deps.runtime.newPane({ workspaceId: captain.id, direction: direction2, title: title2 });
-    const envPrefix = `SQUADRANT_CREW_TASK_ID=${rec.id} SQUADRANT_CREW_PROJECT=${input.project}`;
+    const gateEnv = backend !== "native" ? " SQUADRANT_GATE=on" : "";
+    const envPrefix = `SQUADRANT_CREW_TASK_ID=${rec.id} SQUADRANT_CREW_PROJECT=${input.project}${gateEnv}`;
     const routerPrefix = Object.keys(routerEnv).length > 0 ? ` ${renderEnvAssignments(routerEnv)}` : "";
     await deps.runtime.sendToPane(pane2, `cd ${shellQuote(spawnCwd)} && ${envPrefix}${routerPrefix} ${niceCrewCommand(cliCommand2)}`);
     const preLaunchScreen = await deps.runtime.readPaneScreen(pane2) ?? "";
@@ -7526,6 +7560,26 @@ function writeJson(res, status, body) {
   res.writeHead(status, { "content-type": "application/json" });
   res.end(JSON.stringify(body));
 }
+function pathnameOf(url) {
+  if (!url)
+    return "";
+  const q = url.indexOf("?");
+  return q === -1 ? url : url.slice(0, q);
+}
+function modelsList(ids) {
+  const data = ids.map((id) => ({
+    type: "model",
+    id,
+    display_name: id,
+    created_at: "1970-01-01T00:00:00Z"
+  }));
+  return {
+    data,
+    has_more: false,
+    first_id: ids[0] ?? null,
+    last_id: ids[ids.length - 1] ?? null
+  };
+}
 function buildUpstreamHeaders(req, upstream, stream) {
   const headers = {
     "content-type": "application/json",
@@ -7554,6 +7608,7 @@ function createRouterShim(opts) {
   let lastError;
   let upstreamReachable = true;
   const upstreamUrl = joinUrl(opts.upstream.baseUrl, "/v1/messages");
+  const advertisedModels = new Set(opts.models ?? []);
   function emitUsage(u) {
     try {
       opts.onUsage?.(u);
@@ -7583,6 +7638,8 @@ function createRouterShim(opts) {
     const body = parsed;
     const wantsStream = body.stream === true;
     const model = typeof body.model === "string" ? body.model : void 0;
+    if (model)
+      advertisedModels.add(model);
     const sanitized = sanitizeRequest(body, opts.upstream);
     let upstreamRes;
     try {
@@ -7655,8 +7712,20 @@ function createRouterShim(opts) {
       emitUsage(usage2);
     writeJson(res, upstreamRes.status, upstreamBody);
   }
+  async function handleCountTokens(req, res) {
+    let text;
+    try {
+      text = await readBody(req);
+    } catch {
+      const e = anthropicError(400, "invalid_request_error", "malformed request body");
+      writeJson(res, e.status, e.body);
+      return;
+    }
+    writeJson(res, 200, { input_tokens: Math.max(1, Math.ceil(text.length / 4)) });
+  }
   function handler(req, res) {
-    if (req.method === "POST" && req.url === "/v1/messages") {
+    const path39 = pathnameOf(req.url);
+    if (req.method === "POST" && path39 === "/v1/messages") {
       void handleMessages(req, res).catch((err) => {
         log(`router internal error: ${err instanceof Error ? err.message : String(err)}`);
         if (!res.headersSent) {
@@ -7668,7 +7737,18 @@ function createRouterShim(opts) {
       });
       return;
     }
-    if (req.method === "GET" && req.url === "/healthz") {
+    if (req.method === "POST" && path39 === "/v1/messages/count_tokens") {
+      void handleCountTokens(req, res).catch(() => {
+        if (!res.headersSent)
+          writeJson(res, 502, anthropicError(502, "api_error", "router internal error").body);
+      });
+      return;
+    }
+    if (req.method === "GET" && path39 === "/v1/models") {
+      writeJson(res, 200, modelsList([...advertisedModels]));
+      return;
+    }
+    if (req.method === "GET" && path39 === "/healthz") {
       writeJson(res, 200, { ready: server?.listening === true, upstreamReachable, lastError });
       return;
     }
@@ -7793,12 +7873,17 @@ function createRouterService(router, projects, deps = {}) {
     tokenByProject.set(p, t);
     projectTokens.set(t, p);
   }
+  const models = [
+    ...deps.models ?? [],
+    ...Object.values(router.models ?? {}).map((m) => m.upstream)
+  ];
   const ledger = createUsageLedger();
   const shim = createRouterShim({
     upstream,
     projectTokens,
     port: router.port ?? 0,
     log,
+    models,
     onUsage: (u) => ledger.record(u),
     ...deps.fetch ? { fetch: deps.fetch } : {}
   });
@@ -7861,12 +7946,53 @@ var init_router = __esm({
   }
 });
 
+// packages/core/dist/captain-router.js
+async function prepareCaptainRoute(o) {
+  assertBackendUsable({ backend: o.backend, agent: o.agentName, router: o.config.defaults.router });
+  if (o.backend === "native") {
+    return { backend: "native", model: o.model, permissionMode: o.configuredPermissionMode, env: {} };
+  }
+  if (!o.deps.routerCredentials) {
+    throw new Error(`captain launch: backend '${o.backend}' requires router credentials from the daemon, but this launch path has no credentials provider`);
+  }
+  if (!o.deps.writeRouterSettings) {
+    throw new Error(`captain launch: backend '${o.backend}' requires a per-spawn --settings writer to outrank defaults.claudeEnv, but this launch path has none \u2014 refusing to launch a routed captain that would silently bypass the router shim`);
+  }
+  const model = resolveRouterModel(o.model, o.agentName, o.config.defaults.router);
+  const creds = await o.deps.routerCredentials({ project: o.project, backend: o.backend });
+  const routerEnv = buildRouterEnv(creds, model);
+  const shadowed = claudeEnvShadowsRouter(o.config.defaults.claudeEnv);
+  if (shadowed.length > 0) {
+    o.warn?.(`backend '${o.backend}' selected but defaults.claudeEnv sets ${shadowed.join(", ")} \u2014 these would shadow the router shim. Overriding via a per-spawn --settings env block (outranks ~/.claude/settings.json).`);
+  }
+  const settingsPath = o.deps.writeRouterSettings({
+    stateRoot: o.stateRoot,
+    project: o.project,
+    taskId: "captain",
+    env: mergeClaudeEnvRouterSettings(routerEnv, o.config.defaults.claudeEnv)
+  });
+  return {
+    backend: o.backend,
+    model,
+    permissionMode: "default",
+    env: { ...routerEnv, SQUADRANT_GATE: "on" },
+    settingsPath
+  };
+}
+var init_captain_router = __esm({
+  "packages/core/dist/captain-router.js"() {
+    init_dist();
+    init_router_resolution();
+    init_env();
+  }
+});
+
 // packages/core/dist/permission-gate.js
 import { createHash } from "crypto";
 import { mkdirSync as mkdirSync7, readFileSync as readFileSync11, renameSync as renameSync4, writeFileSync as writeFileSync10, unlinkSync as unlinkSync4 } from "fs";
 import { dirname as dirname5, join as join15 } from "path";
 function isGateSession(env) {
-  return Boolean(env.SQUADRANT_CREW_TASK_ID) || env[SIDE_SESSION_ENV] === "1";
+  return Boolean(env.SQUADRANT_CREW_TASK_ID) || env[SIDE_SESSION_ENV] === "1" || env.SQUADRANT_ROLE === "captain";
 }
 function resolveGateMode(env, gate) {
   const fromEnv = env.SQUADRANT_GATE;
@@ -8062,7 +8188,15 @@ async function callClassifier(o) {
       return "ask";
     }
     const data = await res.json();
+    if (data?.stop_reason === "max_tokens") {
+      o.log?.("gate: classifier exhausted max_tokens before a verdict \u2014 asking");
+      return "ask";
+    }
     const text = Array.isArray(data?.content) ? data.content.filter((b) => b?.type === "text" && typeof b.text === "string").map((b) => b.text).join(" ") : "";
+    if (!text.trim()) {
+      o.log?.("gate: classifier returned no text verdict \u2014 asking");
+      return "ask";
+    }
     return parseClassifierVerdict(text);
   } catch (e) {
     o.log?.(`gate: classifier unavailable (${e.message}) \u2014 asking`);
@@ -8081,7 +8215,7 @@ ${toolPayload}`).digest("hex");
 }
 async function evaluatePermissionRequest(input) {
   if (!isGateSession(input.env)) {
-    return { decision: "yield", reason: "not a squadrant crew/side session" };
+    return { decision: "yield", reason: "not a squadrant crew/side/captain session" };
   }
   const gate = input.config.defaults.gate;
   const mode = resolveGateMode(input.env, gate);
@@ -8167,7 +8301,7 @@ var init_permission_gate = __esm({
     DEFAULT_CACHE_TTL_MS = 10 * 60 * 1e3;
     DEFAULT_CACHE_MAX_ENTRIES = 500;
     DEFAULT_CLASSIFIER_TIMEOUT_MS = 5e3;
-    CLASSIFIER_MAX_TOKENS = 8;
+    CLASSIFIER_MAX_TOKENS = 256;
     MAX_PAYLOAD_CHARS = 2e3;
     DEFAULT_GATE_DENY_RULES = [
       // Flag-order-agnostic: both recursive and force must be present, in any order,
@@ -9094,6 +9228,7 @@ __export(dist_exports2, {
   captainSocketPath: () => captainSocketPath,
   checkFact: () => checkFact,
   classifyHealth: () => classifyHealth,
+  claudeEnvShadowsRouter: () => claudeEnvShadowsRouter,
   closeWorkItem: () => closeWorkItem,
   computeTemplateHash: () => computeTemplateHash,
   consumeExitMarker: () => consumeExitMarker,
@@ -9194,6 +9329,7 @@ __export(dist_exports2, {
   makeGate: () => makeGate,
   maskToken: () => maskToken,
   matchTier1Deny: () => matchTier1Deny,
+  mergeClaudeEnvRouterSettings: () => mergeClaudeEnvRouterSettings,
   mintToken: () => mintToken,
   nameFromTitle: () => nameFromTitle,
   newestSessionInDirectory: () => newestSessionInDirectory,
@@ -9208,6 +9344,7 @@ __export(dist_exports2, {
   parseProgramArgs: () => parseProgramArgs,
   plistPath: () => plistPath,
   pollNewestSessionInDirectory: () => pollNewestSessionInDirectory,
+  prepareCaptainRoute: () => prepareCaptainRoute,
   printForeignInstallError: () => printForeignInstallError,
   printVersionUpgradeNotice: () => printVersionUpgradeNotice,
   probeCaptainChannel: () => probeCaptainChannel,
@@ -9340,6 +9477,7 @@ var init_dist2 = __esm({
     init_router();
     init_crew_routing();
     init_router_resolution();
+    init_captain_router();
     init_permission_gate();
     init_restart_daemon();
     init_group_dispatch();
@@ -9868,7 +10006,7 @@ var init_registry2 = __esm({
 // packages/agents/dist/drivers/launch-cmd.js
 import fs14 from "fs";
 import path13 from "path";
-function buildAgentCmd(agentName, registry, role, fresh, permissionMode, model, templatesDir, messagingSocketPath, sessionName, thinking, captainBoot) {
+function buildAgentCmd(agentName, registry, role, fresh, permissionMode, model, templatesDir, messagingSocketPath, sessionName, thinking, captainBoot, settingsPath) {
   const driver = registry.getDriver(agentName);
   if (driver.name === "claude") {
     let cmd = fresh ? "claude" : "claude -c";
@@ -9881,6 +10019,8 @@ function buildAgentCmd(agentName, registry, role, fresh, permissionMode, model,
       cmd += " --permission-mode auto";
     } else if (permissionMode === "bypassPermissions") {
       cmd += " --dangerously-skip-permissions";
+    } else if (permissionMode === "default") {
+      cmd += " --permission-mode default";
     }
     if (model) {
       cmd += ` --model ${model}`;
@@ -9888,6 +10028,9 @@ function buildAgentCmd(agentName, registry, role, fresh, permissionMode, model,
     if (thinking) {
       cmd += ` --effort ${thinking}`;
     }
+    if (settingsPath) {
+      cmd += ` --settings ${settingsPath}`;
+    }
     if (templatesDir) {
       const roleFile2 = path13.join(templatesDir, `${role}.claude.md`);
       const legacyRoleFile = path13.join(templatesDir, `${role}.CLAUDE.md`);
@@ -15140,6 +15283,13 @@ function mergeCrewPermissions(settings) {
   permissions.allow = [.../* @__PURE__ */ new Set([...existing, ...CREW_PERMISSION_ALLOWLIST])];
   return next;
 }
+function writeRouterSettings(o) {
+  const dir = join26(o.stateRoot, o.project, o.taskId);
+  mkdirSync9(dir, { recursive: true });
+  const file = join26(dir, "router-settings.json");
+  writeFileSync12(file, JSON.stringify({ env: o.env }, null, 2));
+  return file;
+}
 function writePerCrewSettingsLocal(o) {
   const dir = join26(o.projectCwd, ".claude");
   mkdirSync9(dir, { recursive: true });
@@ -16533,6 +16683,7 @@ async function runCrewSpawn2(input) {
     },
     writeSettingsLocal: (cwd) => writePerCrewSettingsLocal({ projectCwd: cwd }),
     writeOpencodeConfig: writePerCrewOpencodeConfig,
+    writeRouterSettings,
     sendFirstTurn: (pane, firstTurn, preLaunchScreen, opts) => sendFirstTurnWhenReady(runtime, pane, firstTurn, preLaunchScreen, opts),
     getFreePort,
     sendCodexFirstTurn,
@@ -18528,6 +18679,10 @@ function resolveLaunchAgent(overrides, roleConfig, roleModelDefault) {
     thinking: overrides.thinking ?? roleConfig?.thinking
   };
 }
+function resolveLaunchBackend(o) {
+  const roleBackend = o.agentName === "claude" ? o.roleConfig?.backend : void 0;
+  return o.backendOverride ?? roleBackend ?? "native";
+}
 
 // packages/cli/src/commands/launch.ts
 init_dist2();
@@ -18575,11 +18730,18 @@ function ensureCmuxReady(headless) {
 }
 var launchCommand = new Command14("launch").description(
   "Launch a project captain (with project arg) or all captains (--all). Use `squadrant command` for one-shot Command tasks."
-).argument("[project]", "Project name to launch captain for").option("--fresh", "Start a new session instead of resuming the last one").option("--keep", "Resume the latest session even on a new day / after a template change").option("--all", "Launch all captain workspaces").option("--headless", "Skip the interactive cmux-app requirement (used by the daemon to boot captains without a terminal)").option("--agent <name>", "Override captain agent for this launch (claude|codex|gemini|opencode); takes precedence over defaults.roles.captain.agent").option("--model <name>", "Override captain model for this launch; takes precedence over defaults.roles.captain.model").option("--thinking <level>", `Override captain thinking level for this launch (${THINKING_LEVELS.join("|")}) \u2192 claude --effort; takes precedence over defaults.roles.captain.thinking`).action(async (project, opts) => {
+).argument("[project]", "Project name to launch captain for").option("--fresh", "Start a new session instead of resuming the last one").option("--keep", "Resume the latest session even on a new day / after a template change").option("--all", "Launch all captain workspaces").option("--headless", "Skip the interactive cmux-app requirement (used by the daemon to boot captains without a terminal)").option("--agent <name>", "Override captain agent for this launch (claude|codex|gemini|opencode); takes precedence over defaults.roles.captain.agent").option("--model <name>", "Override captain model for this launch; takes precedence over defaults.roles.captain.model").option("--thinking <level>", `Override captain thinking level for this launch (${THINKING_LEVELS.join("|")}) \u2192 claude --effort; takes precedence over defaults.roles.captain.thinking`).option("--backend <mode>", "Override captain backend for this launch (native|direct|proxy); takes precedence over defaults.roles.captain.backend").action(async (project, opts) => {
   if (opts.fresh && opts.keep) {
     console.error(chalk15.red("\n  \u2718 --fresh and --keep are mutually exclusive\n"));
     process.exit(1);
   }
+  if (opts.backend !== void 0 && !isBackendMode(opts.backend)) {
+    console.error(chalk15.red(`
+  \u2718 Invalid --backend value '${opts.backend}'. Valid values: native, direct, proxy
+`));
+    process.exit(1);
+  }
+  const backendOverride = opts.backend;
   let thinkingOverride;
   try {
     thinkingOverride = opts.thinking ? parseThinkingLevel(opts.thinking) : void 0;
@@ -18606,6 +18768,7 @@ var launchCommand = new Command14("launch").description(
       roleConfig,
       config.defaults.models?.[role]
     );
+    const backend = resolveLaunchBackend({ backendOverride, agentName, roleConfig });
     const refusal = resolveAnthropicRefusal(role, workspaceName, agentName, model);
     if (refusal) {
       console.error(chalk15.red(`
@@ -18635,6 +18798,29 @@ var launchCommand = new Command14("launch").description(
     if (isOpencodeCaptain && projectName) {
       captainOpencodeConfigPath = writePerCrewOpencodeConfig({ stateRoot, project: projectName, taskId: "captain" });
     }
+    let route;
+    if (role === "captain") {
+      try {
+        route = await prepareCaptainRoute({
+          backend,
+          agentName,
+          configuredPermissionMode: permissionMode,
+          project: projectName ?? "",
+          model,
+          stateRoot,
+          config,
+          deps: {
+            routerCredentials: (o) => fetchRouterCredentials(o.project, o.backend, { call: squadrantdCall }),
+            writeRouterSettings
+          },
+          warn: (m) => console.error(chalk15.yellow(`  \u26A0 ${m}`))
+        });
+      } catch (err) {
+        console.error(chalk15.red(`  \u2718 ${err.message}`));
+        hadFailure = true;
+        return;
+      }
+    }
     const priorRecord = projectName ? readCaptainAddress(stateRoot, projectName) : null;
     const captainPort = isOpencodeCaptain ? await getFreePort() : void 0;
     let opencodeResumeSessionId;
@@ -18660,15 +18846,18 @@ var launchCommand = new Command14("launch").description(
             registry,
             role,
             forceFresh,
-            permissionMode,
-            model,
+            route?.permissionMode ?? permissionMode,
+            route?.model ?? model,
             TEMPLATES_DIR4,
             resolveCaptainSocketPath(captainChannelEnabled, projectName, workspaceName),
             resolveCaptainSessionName(agentName, projectName),
             thinking,
-            captainBoot
+            captainBoot,
+            route?.settingsPath
           );
-          return captainOpencodeConfigPath ? `OPENCODE_CONFIG=${captainOpencodeConfigPath} ${baseCmd}` : baseCmd;
+          const gatePrefix = route && Object.keys(route.env).length > 0 ? `${renderEnvAssignments(route.env)} ` : "";
+          const cmd = `${gatePrefix}${baseCmd}`;
+          return captainOpencodeConfigPath ? `OPENCODE_CONFIG=${captainOpencodeConfigPath} ${cmd}` : cmd;
         },
         initialPrompt,
         runtime,
@@ -21110,9 +21299,8 @@ async function runGatePermissionRequest(deps) {
   const p = payload;
   const taskId = env.SQUADRANT_CREW_TASK_ID;
   const project = env.SQUADRANT_CREW_PROJECT;
-  const isSide = env[SIDE_SESSION_ENV] === "1";
-  if (!taskId && !isSide) {
-    return { decision: "yield", reason: "not a squadrant crew/side session" };
+  if (!isGateSession(env)) {
+    return { decision: "yield", reason: "not a squadrant crew/side/captain session" };
   }
   const stdout = deps.stdout ?? (() => {
   });