catherd-cli 1.5.0 → 2.0.0-beta.20261022113309

package/src/services/admission.ts

@@ -4,11 +4,12 @@ import { join } from "node:path";
 import type { BackendAdapter } from "../adapters/backend.ts";
 import { budgetStatus, formatBudget } from "../domain/budget.ts";
 import { CatherdError, errorMessage } from "../domain/errors.ts";
-import { assertId, formatRung, newDispatchId, parseRung } from "../domain/ids.ts";
+import { assertId, formatRung, headlessRung, newDispatchId, parseRung } from "../domain/ids.ts";
 import { assertLaneHeader, overlaps } from "../domain/lane.ts";
 import { roleTimeouts } from "../domain/profile.ts";
 import type { RunRecord } from "../domain/record.ts";
 import { composeBrief } from "../domain/brief.ts";
+import { rulesBlock } from "../domain/rules.ts";
 import { briefOwns, DOCS_OWNS } from "../domain/changes.ts";
 import { grantsScratch, ROLE_SERVER_BACKENDS } from "../domain/role-tools.ts";
 import type { Role } from "../domain/roles.ts";
@@ -22,6 +23,7 @@ import { log } from "../infra/log.ts";
 import { processStartTime } from "../infra/proc.ts";
 import { ensurePrivateDir, PRIVATE_FILE, writeJsonAtomic, writeTextAtomic } from "../infra/store.ts";
 import { readyAdapter, standInFor } from "./backends.ts";
+import { failoverBackends } from "./failover-rungs.ts";
 import { spendOf } from "./budget.ts";
 import {
   type Admit,
@@ -39,6 +41,8 @@ import { finalizeDispatch } from "./finalize.ts";
 import { gateEnvParts, readGateEnv } from "./gate-env.ts";
 import { assertNotPaused } from "./pause.ts";
 import { currentOwns } from "./lane-edit.ts";
+import { planContext } from "./plan-input.ts";
+import { standingRules } from "./run-service.ts";
 import { unfinishedAfter } from "./protocol.ts";
 import { runProfile } from "./run-pin.ts";
 import type { Deps } from "./ports.ts";
@@ -60,6 +64,8 @@ export interface AdmitInput {
   /** the dispatching session (spec §3.3); absent means the session this process serves */
   sessionId?: string | null;
   host?: KnownHost;
+  /** plan 35: where the role works (its milestone's worktree in a base run); absent means the run's repo */
+  cwd?: string;
 }
 
 /** Spec §3.3: SIGTERM, then SIGKILL this long after. */
@@ -181,11 +187,15 @@ export async function admit(
     throw new CatherdError("E_ADMIT_RUNG", `${i.rung} is a native Claude rung`, {
       fix: `run it as Agent(subagent_type: "${deps.profiles.agentFor(run.meta.repo, i.role, i.rung)}"), then record_agent_run`,
     });
-  const allowed = new Set([
+  const ladder = [
     ...rc.rungs,
     ...rc.rungs.flatMap((r) => standInFor(profile.failover, r, run.meta.repo) ?? []),
-  ]);
-  if (!allowed.has(formatRung(rung)))
+  ];
+  // the daemon runs every role headless (spec 2.0 decision 12): a native rung's headless twin is on its ladder too
+  const allowed = new Set([...ladder, ...ladder.map(headlessRung)]);
+  // a rung the daemon failed a limit over to may be on any configured backend (spec 2.0 decision 6)
+  const failedOver = i.failoverFrom !== null && failoverBackends(profile).has(rung.backend);
+  if (!allowed.has(formatRung(rung)) && !failedOver)
     throw new CatherdError(
       "E_ADMIT_RUNG",
       `${i.rung} is not on the ${i.role} ladder of profile ${profile.name}`,
@@ -208,7 +218,7 @@ export async function admit(
       `${adapter.id} keeps the access a thread started with: ${i.thread} ran ${started.access}, and the ${i.role} role runs ${rc.access}`,
       { fix: "dispatch a fresh thread (omit `thread`)" },
     );
-  // and the network grant: grok keeps a session's sandbox profile, agy's isolated homes differ by it.
+  // and the network grant: a CLI that keeps a session's sandbox profile keeps it.
   // A record from before 1.3 carries no grant to compare.
   if (started?.network !== undefined && adapter.resume.sameAccessOnly && started.network !== network)
     throw new CatherdError(
@@ -234,11 +244,12 @@ export async function admit(
   // spec 1.5 plan 21 (#42 findings 1, 2): the role server goes in whether the harness is isolated or not, so no
   // role is refused for isolation, and a thread an isolated run started resumes as it started
   const roleServer = ROLE_SERVER_BACKENDS.includes(rung.backend);
+  const cwd = i.cwd ?? run.meta.repo;
   await prepared(adapter, {
     rung,
     access: rc.access,
     isolated,
-    repo: run.meta.repo,
+    repo: cwd,
     network,
   });
 
@@ -255,7 +266,7 @@ export async function admit(
       network,
       thread: i.thread,
       isolated,
-      repo: run.meta.repo,
+      repo: cwd,
       briefPath: p.brief,
       replyPath: p.reply,
       dispatchDir: dir,
@@ -302,7 +313,7 @@ export async function admit(
       throw new CatherdError("E_RUN_BUDGET", `the run budget is spent: ${formatBudget(budget)}`, {
         fix: "ask the user to raise profile.budget, or finish the run with what landed",
       });
-    const before = await statusSnapshot(run.meta.repo);
+    const before = await statusSnapshot(cwd);
     const session = currentSession(deps);
     const sessionId = i.sessionId !== undefined ? i.sessionId : (session?.sessionId ?? null);
     const admitted: Admit = {
@@ -325,11 +336,13 @@ export async function admit(
       network,
       cliVersion: probe.version,
       admittedAt: new Date(deps.now()).toISOString(),
-      repo: run.meta.repo,
+      repo: cwd,
       before,
       ...(sessionId ? { sessionId, host: i.host ?? session?.host ?? "claude-code" } : {}),
     };
     ensurePrivateDir(dir);
+    // plan 34: the repo's standing rules for this role; a knowledge file that cannot be read adds nothing
+    const rules = await standingRules(run.meta.repo, i.role).catch(() => "");
     // plan 23: the verifier runs with the repo's gate environment (DOCKER_HOST, a proxy, …)
     const gate =
       i.role === "verifier" ? gateEnvParts(await readGateEnv(run.meta.repo)) : { values: {}, refs: {} };
@@ -345,6 +358,8 @@ export async function admit(
         lane: i.lane === null ? null : { id: i.lane, text: readFileSync(laneFile(run, i.lane), "utf8") },
         scratch,
         roleServer,
+        version: deps.version,
+        context: [planContext(run, i.role), rulesBlock(rules, i.role)].filter(Boolean).join("\n\n") || null,
       }),
     );
     // Spec §10.4: the adapter's overrides only; the supervisor adds its own inherited env at spawn

package/src/services/backends.ts

@@ -5,7 +5,6 @@ import { adapterFor } from "../adapters/registry.ts";
 import "../adapters/all.ts";
 import { CatherdError } from "../domain/errors.ts";
 import { formatRung, tryParseRung } from "../domain/ids.ts";
-import { PAIRED_FAILOVER } from "../domain/profile.ts";
 
 const READY_TTL_MS = 10 * 60_000;
 const ready = new Map<string, { at: number; probe: Probe }>();
@@ -17,7 +16,7 @@ export const resetReadiness = (): void => ready.clear();
 function execFormatError(e: unknown): string | null {
   if (!(e instanceof Error)) return null;
   if ((e as { code?: unknown }).code !== "ENOEXEC" && !/exec format error/i.test(e.message)) return null;
-  // macOS names the path (posix_spawn '/…/grok'), Linux only the command (uv_spawn 'grok')
+  // macOS names the path (posix_spawn '/…/bin'), Linux only the command (uv_spawn 'bin')
   const bin = /spawn '([^']+)'/.exec(e.message)?.[1];
   return bin ? (Bun.which(bin, { PATH: process.env.PATH ?? "" }) ?? bin) : "exec format error";
 }
@@ -64,18 +63,17 @@ export async function readyAdapter(backend: string): Promise<{ adapter: BackendA
   const probe = await probeBackend(adapter);
   const problem = probe.problems[0];
   // spec 1.3 §3.3: a probe that finds the CLI logged out lists E_BACKEND_NOT_LOGGED_IN, so a dispatch never
-  // reaches it (agy opens a browser and waits); logged out alone is no problem where a CLI runs without a login
+  // reaches it (it may open a browser and wait); logged out alone is no problem where a CLI runs without a login
   if (problem) throw new CatherdError(problem.code, problem.message, { fix: problem.fix });
   ready.set(backend, { at: now, probe });
   return { adapter, probe };
 }
 
 /**
- * Spec §4.5: a rung's stand-in on a usage limit: the profile's, else the same model on its paired backend
- * (spec 1.3 §7.3), else its backend's default (for `repo`, when given), else none.
+ * Spec §4.5: a rung's stand-in on a usage limit: the profile's, else its backend's default (for `repo`, when given), else none.
  */
 export function standInFor(failover: Record<string, string>, rung: string, repo?: string): string | null {
-  const own = failover[rung] ?? PAIRED_FAILOVER[rung];
+  const own = failover[rung];
   if (own) return own;
   const r = tryParseRung(rung);
   if (!r) return null;

package/src/services/capture.ts

@@ -37,11 +37,6 @@ const HAIKU = "claude-code:claude-haiku-4-5-20251001#default";
 /** spec 1.3 §4.6: `auto` has no family; only the live kit and the capture run it */
 const AUTO = "cursor:auto#default";
 const BUNNY = "opencode:opencode/space-bunny-free#default";
-/** spec 1.3 §5.6: grok 1.0.44's default model (research §3.4) at its cheapest effort */
-const GROK = "grok:grok-4.6#low";
-/** spec 1.3 §6.6: the cheapest Gemini effort; capture runs isolated, on GEMINI_API_KEY */
-const FLASH_LOW = "antigravity:gemini-3.8-flash#low";
-
 /** Spec §11.7–8: one cheap run per backend, plus a read-only role trying to write where enforcement is advisory. */
 const CAPTURE_CASES: CaptureCase[] = [
   { backend: "codex", name: "ok", rung: "codex:gpt-6-luna#low", access: "read-only", brief: SAY_HELLO },
@@ -53,22 +48,6 @@ const CAPTURE_CASES: CaptureCase[] = [
   { backend: "cursor", name: "ok", rung: AUTO, access: "workspace-write", brief: WORK },
   { backend: "cursor", name: "resume", rung: AUTO, access: "read-only", brief: SAY_HELLO, resume: RECALL },
   { backend: "cursor", name: "read-only-write", rung: AUTO, access: "read-only", brief: TRY_WRITE },
-  // spec 1.3 §5.6: the same three on grok; its read-only is the kernel profile, or the read tools on a Mac
-  // with a symlinked docker socket
-  { backend: "grok", name: "ok", rung: GROK, access: "workspace-write", brief: WORK },
-  { backend: "grok", name: "resume", rung: GROK, access: "read-only", brief: SAY_HELLO, resume: RECALL },
-  { backend: "grok", name: "read-only-write", rung: GROK, access: "read-only", brief: TRY_WRITE },
-  // spec 1.3 §6.6: the same three on agy; read-only runs under catherd's deny rules (research §8 agy 2, 5, 6)
-  { backend: "antigravity", name: "ok", rung: FLASH_LOW, access: "workspace-write", brief: WORK },
-  {
-    backend: "antigravity",
-    name: "resume",
-    rung: FLASH_LOW,
-    access: "read-only",
-    brief: SAY_HELLO,
-    resume: RECALL,
-  },
-  { backend: "antigravity", name: "read-only-write", rung: FLASH_LOW, access: "read-only", brief: TRY_WRITE },
 ];
 export const CAPTURE_BACKENDS = [...new Set(CAPTURE_CASES.map((c) => c.backend))];
 
@@ -122,7 +101,7 @@ async function runOnce(
   const p = Bun.spawn([plan.cmd, ...plan.args], {
     cwd: plan.cwd,
     env: workerEnv(process.env, plan.env, plan.cwd),
-    // spec 1.3 §3.3: the brief goes on stdin only to a CLI whose plan reads it there (grok reads a file)
+    // spec 1.3 §3.3: the brief goes on stdin only to a CLI whose plan reads it there (one reads a file)
     stdin: plan.stdinPath ? Bun.file(plan.stdinPath) : "ignore",
     stdout: "pipe",
     stderr: "pipe",