@sagentlab/navarch-runtime 0.1.107 → 0.1.112

package/dist/adapters/gemini.cjs

@@ -2,329 +2,14 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.geminiAdapter = void 0;
 exports.runGeminiAdapter = runGeminiAdapter;
-const node_child_process_1 = require("node:child_process");
-const node_fs_1 = require("node:fs");
-const kill_agent_cjs_1 = require("../kill-agent.cjs");
-/**
- * Headless Google Gemini CLI adapter. Gemini's `stream-json` output gives the
- * same normalized boundary as the Claude and Codex adapters: raw process
- * signals plus an optional final report and token counts. Gemini CLI does not
- * report USD cost, so costUsd remains absent.
- *
- * The CLI reads MCP servers from settings rather than accepting Claude's
- * `--mcp-config` flag. The adapter converts the lease-scoped config into a
- * temporary system-settings file and restricts the run to those server names.
- *
- * The prompt arrives on stdin rather than `--prompt`: Gemini runs headlessly
- * whenever stdin is not a TTY and uses the piped text as the prompt. Its
- * native sandbox puts stdin back into argv, so that path still has an argv
- * limit: Linux's 128 KiB per-string limit for container sandboxes and Linux
- * hosts, or macOS's 1 MiB total for sandbox-exec. Gemini also caps stdin at
- * 8 MiB.
- */
+/** Tombstone for stale claims. Provider IDs and credentials are never aliased. */
 async function runGeminiAdapter(options) {
-    if (options.signal?.aborted) {
-        return { exitCode: null, timedOut: false, killedByLeaseLoss: true, stdout: "", stderr: "" };
-    }
-    const promptBytes = Buffer.byteLength(options.prompt, "utf8");
-    // Gemini's readStdin() silently truncates at 8 MiB. Reject before any
-    // settings writes or process launch rather than execute a partial task.
-    if (promptBytes > 8 * 1024 * 1024) {
-        return inputFailure(`Gemini CLI stdin is limited to 8 MiB; the task prompt is ${promptBytes} bytes. Reduce the context bundle or select another runtime.`);
-    }
-    const args = [];
-    const env = { ...options.env };
-    if (!hasArg(options.extraArgs, "--output-format", "-o")) {
-        args.push("--output-format", "stream-json");
-    }
-    if (!hasArg(options.extraArgs, "--skip-trust")) {
-        args.push("--skip-trust");
-    }
-    if (!hasExplicitApprovalMode(options.extraArgs)) {
-        // Navarch sessions have no interactive operator. Host sessions still use
-        // Gemini's sandbox below when the worktree guard is enabled.
-        args.push("--approval-mode", "yolo");
-    }
-    const sandboxMounts = [...(options.geminiSandboxMounts ?? [])];
-    if (options.mcpConfigPath) {
-        const mcp = await prepareGeminiMcpSettings(options.mcpConfigPath, env);
-        env.GEMINI_CLI_SYSTEM_SETTINGS_PATH = mcp.settingsPath;
-        sandboxMounts.push(`${mcp.settingsPath}:${mcp.settingsPath}:ro`);
-        if (mcp.serverNames.length > 0 && !hasArg(options.extraArgs, "--allowed-mcp-server-names")) {
-            args.push("--allowed-mcp-server-names", mcp.serverNames.join(","));
-        }
-    }
-    if (!hasArg(options.extraArgs, "--sandbox", "-s")) {
-        if (options.geminiSandboxMounts) {
-            args.push("--sandbox");
-            env.SANDBOX_MOUNTS = sandboxMounts.join(",");
-        }
-        else {
-            // YOLO mode enables Gemini's own sandbox implicitly. Disable that
-            // nested sandbox when Navarch already supplied Docker isolation, or
-            // when an operator explicitly disabled the host worktree guard.
-            args.push("--sandbox=false");
-        }
-    }
-    args.push(...options.extraArgs);
-    if (options.model)
-        args.push("--model", options.model);
-    // Gemini's sandbox launcher reads stdin and injects it back into --prompt
-    // for its child process (packages/cli/src/gemini.tsx injectStdinIntoArgs).
-    // Moving our first spawn's prompt to stdin cannot fix that second spawn.
-    // Check the effective sandbox, including operator overrides, without
-    // disabling the worktree guard. Even on macOS a Docker sandbox may launch on
-    // Linux, while macOS sandbox-exec re-quotes the prompt into one `sh -c`
-    // string that only the 1 MiB total ARG_MAX bounds.
-    const platform = options.dockerExec ? "linux" : process.platform;
-    const sandboxCommand = geminiSandboxCommand(args, geminiProcessEnv(options, env), platform);
-    if (sandboxCommand === "sandbox-exec" && platform === "darwin") {
-        // shell-quote backslash-escapes these inside the double-quoted prompt.
-        // Leave the rest of ARG_MAX for the environment and Gemini's own args.
-        const quotedBytes = promptBytes + (options.prompt.match(/["\\$`!]/g)?.length ?? 0);
-        if (quotedBytes > 900 * 1024) {
-            return inputFailure(`Gemini CLI re-encodes stdin as --prompt when launching its macOS sandbox-exec sandbox; the ${promptBytes}-byte task prompt exceeds macOS's 1 MiB argv limit. Reduce the context bundle or select another runtime that supports large prompts in its sandbox.`);
-        }
-    }
-    else if (sandboxCommand && promptBytes >= 128 * 1024) {
-        return inputFailure(`Gemini CLI re-encodes stdin as --prompt when launching its native sandbox; the ${promptBytes}-byte task prompt exceeds Linux's argv limit. Reduce the context bundle or select another runtime that supports large prompts in its sandbox.`);
-    }
-    const runOptions = { ...options, env };
-    const raw = runOptions.dockerExec
-        ? await runViaDocker(runOptions, args)
-        : await runOnHost(runOptions, args);
-    return attachGeminiOutput(raw);
-}
-function inputFailure(stderr) {
-    return { exitCode: 1, timedOut: false, killedByLeaseLoss: false, stdout: "", stderr };
-}
-function geminiProcessEnv(options, env) {
-    // Docker exec forwards only the session env names into the container.
-    return options.dockerExec ? env : { ...process.env, ...env };
-}
-/**
- * Mirrors Gemini's getSandboxCommand (packages/cli/src/config/sandboxConfig.ts):
- * GEMINI_SANDBOX overrides the --sandbox flag and may name the command;
- * otherwise an enabled sandbox is sandbox-exec on macOS and a container
- * (docker or podman) elsewhere. Returns null when no sandbox relaunch occurs.
- */
-function geminiSandboxCommand(args, env, platform) {
-    const configured = env.GEMINI_SANDBOX?.toLowerCase().trim() ?? "";
-    let sandbox = configured.length > 0 ? configured : geminiSandboxFlag(args);
-    if (sandbox === "1" || sandbox === "true")
-        sandbox = true;
-    else if (sandbox === "0" || sandbox === "false" || !sandbox)
-        sandbox = false;
-    if (sandbox === false)
-        return null;
-    if (typeof sandbox === "string")
-        return sandbox;
-    return platform === "darwin" ? "sandbox-exec" : "docker";
-}
-function geminiSandboxFlag(args) {
-    // There is always a generated --sandbox flag unless extraArgs supplies one.
-    // Like yargs, later explicit values override earlier ones.
-    let enabled = false;
-    for (let index = 0; index < args.length; index++) {
-        const arg = args[index];
-        if (arg === "--sandbox" || arg === "-s") {
-            enabled = args[index + 1] !== "false";
-        }
-        else if (arg.startsWith("--sandbox=") || arg.startsWith("-s=")) {
-            enabled = arg.slice(arg.indexOf("=") + 1) !== "false";
-        }
-        else if (arg === "--no-sandbox") {
-            enabled = false;
-        }
-    }
-    return enabled;
-}
-function hasArg(args, ...flags) {
-    return args.some((arg) => flags.some((flag) => arg === flag || arg.startsWith(`${flag}=`)));
-}
-function hasExplicitApprovalMode(args) {
-    return hasArg(args, "--approval-mode", "--yolo", "-y");
-}
-async function prepareGeminiMcpSettings(mcpConfigPath, env) {
-    const parsed = JSON.parse(await node_fs_1.promises.readFile(mcpConfigPath, "utf8"));
-    const mcpServers = {};
-    for (const [name, server] of Object.entries(parsed.mcpServers ?? {})) {
-        const httpUrl = server.httpUrl ?? (server.type === "http" ? server.url : undefined);
-        if (!httpUrl && !server.url)
-            continue;
-        const headers = {};
-        let headerIndex = 0;
-        for (const [header, value] of Object.entries(server.headers ?? {})) {
-            const envName = `NAVARCH_GEMINI_MCP_${safeEnvSegment(name)}_${headerIndex++}`;
-            env[envName] = value;
-            headers[header] = `\${${envName}}`;
-        }
-        mcpServers[name] = {
-            ...(httpUrl ? { httpUrl } : { url: server.url }),
-            ...(Object.keys(headers).length > 0 ? { headers } : {}),
-        };
-    }
-    const settingsPath = `${mcpConfigPath}.gemini-settings.json`;
-    await node_fs_1.promises.writeFile(settingsPath, JSON.stringify({ mcpServers }, null, 2), { mode: 0o600 });
-    await node_fs_1.promises.chmod(settingsPath, 0o600);
-    return { settingsPath, serverNames: Object.keys(mcpServers) };
-}
-function safeEnvSegment(value) {
-    return value.toUpperCase().replace(/[^A-Z0-9_]/g, "_");
-}
-function parseGeminiStream(stdout) {
-    const events = [];
-    for (const line of stdout.split(/\r?\n/)) {
-        if (!line.trim())
-            continue;
-        try {
-            const event = JSON.parse(line);
-            if (event && typeof event === "object")
-                events.push(event);
-        }
-        catch {
-            // Parser drift must not turn a successfully completed CLI run into a
-            // runtime crash. Unknown lines remain available in the transcript.
-        }
-    }
-    return events;
-}
-function attachGeminiOutput(result) {
-    const events = parseGeminiStream(result.stdout);
-    if (events.length === 0)
-        return result;
-    let reportText = "";
-    let tokensIn;
-    let tokensOut;
-    for (const event of events) {
-        if (event.type === "tool_use") {
-            // Gemini emits pre-tool assistant text as message deltas. Only retain
-            // the answer produced after the last tool call as the completion report.
-            reportText = "";
-        }
-        else if (event.type === "message" &&
-            event.role === "assistant" &&
-            typeof event.content === "string") {
-            reportText = event.delta === false ? event.content : reportText + event.content;
-        }
-        else if (event.type === "result" && event.stats) {
-            const reportedInput = nonNegativeMetric(event.stats.input_tokens);
-            const reportedOutput = nonNegativeMetric(event.stats.output_tokens);
-            if (reportedInput !== undefined)
-                tokensIn = reportedInput;
-            if (reportedOutput !== undefined)
-                tokensOut = reportedOutput;
-        }
-    }
     return {
-        ...result,
-        ...(tokensIn !== undefined ? { tokensIn } : {}),
-        ...(tokensOut !== undefined ? { tokensOut } : {}),
-        ...(reportText.trim() ? { reportText: reportText.trim() } : {}),
+        exitCode: options.signal?.aborted ? null : 1,
+        timedOut: false,
+        killedByLeaseLoss: options.signal?.aborted ?? false,
+        stdout: "",
+        stderr: "Gemini CLI is retired. Explicitly install and authenticate Antigravity, select antigravity, and update the task's runtime pin. No Gemini credentials or conversation IDs are transferred.",
     };
 }
-function nonNegativeMetric(value) {
-    return typeof value === "number" && Number.isFinite(value) && value >= 0 ? value : undefined;
-}
-async function runOnHost(options, args) {
-    return new Promise((resolve) => {
-        let stdout = "";
-        let stderr = "";
-        let timedOut = false;
-        let killedByLeaseLoss = false;
-        const child = (0, node_child_process_1.spawn)(options.bin, args, {
-            detached: process.platform !== "win32",
-            cwd: options.cwd,
-            env: { ...process.env, ...options.env },
-        });
-        // Ignore EPIPE from a child that exits before reading; `close` reports it.
-        child.stdin?.on("error", () => undefined);
-        child.stdin?.end(options.prompt);
-        options.onProcessStarted?.(child.pid);
-        const timer = options.timeoutMs > 0 ? setTimeout(() => {
-            timedOut = true;
-            (0, kill_agent_cjs_1.killAgent)(child);
-        }, options.timeoutMs) : undefined;
-        const onAbort = () => {
-            killedByLeaseLoss = true;
-            (0, kill_agent_cjs_1.killAgent)(child);
-        };
-        options.signal?.addEventListener("abort", onAbort, { once: true });
-        if (options.signal?.aborted)
-            onAbort();
-        child.stdout.on("data", (data) => {
-            options.onActivity?.();
-            const text = data.toString();
-            stdout += text;
-            options.onOutput?.("stdout", text);
-        });
-        child.stderr.on("data", (data) => {
-            options.onActivity?.();
-            const text = data.toString();
-            stderr += text;
-            options.onOutput?.("stderr", text);
-        });
-        child.on("error", (err) => {
-            clearTimeout(timer);
-            options.signal?.removeEventListener("abort", onAbort);
-            stderr += `\n${String(err)}`;
-            resolve({ exitCode: null, timedOut, killedByLeaseLoss, stdout, stderr });
-        });
-        child.on("close", (code) => {
-            clearTimeout(timer);
-            options.signal?.removeEventListener("abort", onAbort);
-            resolve({ exitCode: code, timedOut, killedByLeaseLoss, stdout, stderr });
-        });
-    });
-}
-async function runViaDocker(options, args) {
-    const { containerName, runner } = options.dockerExec;
-    const command = `[ -f /tmp/session.env ] && . /tmp/session.env; cd repo 2>/dev/null; ${[
-        options.bin,
-        ...args,
-    ].map(shellQuote).join(" ")}`;
-    let killedByLeaseLoss = false;
-    const onAbort = () => {
-        killedByLeaseLoss = true;
-        runner.run("docker", ["kill", containerName], { timeoutMs: 10_000 }).catch(() => undefined);
-    };
-    options.signal?.addEventListener("abort", onAbort, { once: true });
-    if (options.signal?.aborted)
-        onAbort();
-    try {
-        const forwardedEnv = Object.keys(options.env).flatMap((name) => ["--env", name]);
-        const result = await runner.run("docker", ["exec", "-i", ...forwardedEnv, containerName, "sh", "-c", command], { input: options.prompt,
-            timeoutMs: options.timeoutMs,
-            onActivity: options.onActivity,
-            onStdout: (chunk) => options.onOutput?.("stdout", chunk),
-            onStderr: (chunk) => options.onOutput?.("stderr", chunk),
-            signal: options.signal,
-            env: { ...process.env, ...options.env }, });
-        return {
-            exitCode: result.code,
-            timedOut: false,
-            killedByLeaseLoss,
-            stdout: result.stdout,
-            stderr: result.stderr,
-        };
-    }
-    catch (err) {
-        return {
-            exitCode: null,
-            timedOut: false,
-            killedByLeaseLoss,
-            stdout: "",
-            stderr: String(err),
-        };
-    }
-    finally {
-        options.signal?.removeEventListener("abort", onAbort);
-    }
-}
-function shellQuote(value) {
-    return `'${value.replace(/'/g, `'\\''`)}'`;
-}
-exports.geminiAdapter = {
-    agentType: "gemini",
-    run: runGeminiAdapter,
-};
+exports.geminiAdapter = { agentType: "gemini", run: runGeminiAdapter };

package/dist/adapters/index.cjs

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.runQoderAdapter = exports.qoderAdapter = exports.runAcpAdapter = exports.acpAdapter = exports.runPiAdapter = exports.piAdapter = exports.runLocalPiAdapter = exports.localPiAdapter = exports.runOpenCodeAdapter = exports.openCodeAdapter = exports.runGeminiAdapter = exports.geminiAdapter = exports.runCodexAdapter = exports.codexAdapter = exports.runClaudeCodeAdapter = exports.claudeCodeAdapter = void 0;
+exports.runQoderAdapter = exports.qoderAdapter = exports.runAcpAdapter = exports.acpAdapter = exports.runPiAdapter = exports.piAdapter = exports.runLocalPiAdapter = exports.localPiAdapter = exports.runOpenCodeAdapter = exports.openCodeAdapter = exports.runGeminiAdapter = exports.geminiAdapter = exports.runAntigravityAdapter = exports.antigravityAdapter = exports.runCodexAdapter = exports.codexAdapter = exports.runClaudeCodeAdapter = exports.claudeCodeAdapter = void 0;
 exports.selectAdapter = selectAdapter;
 const claude_cjs_1 = require("./claude.cjs");
 Object.defineProperty(exports, "claudeCodeAdapter", { enumerable: true, get: function () { return claude_cjs_1.claudeCodeAdapter; } });
@@ -8,6 +8,9 @@ Object.defineProperty(exports, "runClaudeCodeAdapter", { enumerable: true, get:
 const codex_cjs_1 = require("./codex.cjs");
 Object.defineProperty(exports, "codexAdapter", { enumerable: true, get: function () { return codex_cjs_1.codexAdapter; } });
 Object.defineProperty(exports, "runCodexAdapter", { enumerable: true, get: function () { return codex_cjs_1.runCodexAdapter; } });
+const antigravity_cjs_1 = require("./antigravity.cjs");
+Object.defineProperty(exports, "antigravityAdapter", { enumerable: true, get: function () { return antigravity_cjs_1.antigravityAdapter; } });
+Object.defineProperty(exports, "runAntigravityAdapter", { enumerable: true, get: function () { return antigravity_cjs_1.runAntigravityAdapter; } });
 const gemini_cjs_1 = require("./gemini.cjs");
 Object.defineProperty(exports, "geminiAdapter", { enumerable: true, get: function () { return gemini_cjs_1.geminiAdapter; } });
 Object.defineProperty(exports, "runGeminiAdapter", { enumerable: true, get: function () { return gemini_cjs_1.runGeminiAdapter; } });
@@ -37,6 +40,8 @@ function selectAdapter(agentType) {
     switch (agentType) {
         case "codex":
             return codex_cjs_1.codexAdapter;
+        case "antigravity":
+            return antigravity_cjs_1.antigravityAdapter;
         case "gemini":
             return gemini_cjs_1.geminiAdapter;
         case "opencode":

package/dist/agent-auth.cjs

@@ -43,6 +43,8 @@ function matchingLine(text) {
 function detectAgentAuthFailure(result) {
     if (result.killedByLeaseLoss || result.timedOut || result.capacityError)
         return null;
+    if (result.authError)
+        return { detail: result.authError };
     const claude = (0, exit_conditions_cjs_1.parseClaudeJsonResult)(result.stdout) ?? (0, exit_conditions_cjs_1.parseClaudeJsonResult)(result.stderr);
     if (claude) {
         if (!claude.is_error && result.exitCode === 0)

package/dist/config.cjs

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.OPENCODE_HOST_GUARD_MESSAGE = exports.RUNTIME_AGENT_TYPES = exports.DEFAULT_SANDBOX_IMAGE = void 0;
+exports.OPENCODE_HOST_GUARD_MESSAGE = exports.ANTIGRAVITY_HOST_GUARD_MESSAGE = exports.RUNTIME_AGENT_TYPES = exports.DEFAULT_SANDBOX_IMAGE = void 0;
 exports.isRuntimeAgentType = isRuntimeAgentType;
 exports.unknownRuntimeIds = unknownRuntimeIds;
 exports.opencodeBlockedOnHost = opencodeBlockedOnHost;
@@ -21,7 +21,7 @@ exports.DEFAULT_SANDBOX_IMAGE = "ghcr.io/sagentlab/navarch-sandbox-agent:0.1.0";
 exports.RUNTIME_AGENT_TYPES = [
     "claude-code",
     "codex",
-    "gemini",
+    "antigravity",
     "opencode",
     "acp",
     "qoder",
@@ -77,6 +77,9 @@ function envList(env, name, fallback) {
 function opencodeBlockedOnHost(sandboxMode, worktreeGuard) {
     return sandboxMode === "host" && worktreeGuard;
 }
+exports.ANTIGRAVITY_HOST_GUARD_MESSAGE = "Antigravity cannot enforce Navarch's host worktree boundary or read-only Navi mode. " +
+    "Use an isolated Docker image with agy and Node installed, or explicitly set NAVARCH_WORKTREE_GUARD=off " +
+    "only on a dedicated trusted machine. Antigravity inherits that machine's global configuration.";
 exports.OPENCODE_HOST_GUARD_MESSAGE = "OpenCode cannot enforce Navarch's host worktree boundary for shell side effects. " +
     "Use NAVARCH_SANDBOX_MODE=docker, or explicitly set NAVARCH_WORKTREE_GUARD=off " +
     "only on an otherwise isolated machine.";
@@ -86,6 +89,9 @@ exports.OPENCODE_HOST_GUARD_MESSAGE = "OpenCode cannot enforce Navarch's host wo
  * it is trivially unit-testable without mutating global state.
  */
 function loadRuntimeConfig(env = process.env) {
+    if (env.NAVARCH_AGENT === "gemini" || envList(env, "NAVARCH_RUNTIMES", []).includes("gemini")) {
+        throw new Error("Gemini CLI is retired. Install and authenticate Antigravity separately, then explicitly select NAVARCH_AGENT=antigravity (or --agent antigravity) and update NAVARCH_RUNTIMES. Existing Gemini config, credentials and sessions are not migrated.");
+    }
     const configDir = env.NAVARCH_CONFIG_DIR ?? node_path_1.default.join(node_os_1.default.homedir(), ".navarch");
     const leaseHeartbeatIntervalMs = envInt(env, "NAVARCH_LEASE_HEARTBEAT_INTERVAL_MS", 5 * 60 * 1000);
     // Run the agent with the resources already available on its machine by
@@ -108,10 +114,17 @@ function loadRuntimeConfig(env = process.env) {
     // time; keep it out of the claim instead of discovering this per session.
     const runnableRuntimes = requestedRuntimes.filter((runtime) => runtime === "pi-local"
         ? sandboxMode === "host" && !worktreeGuard
-        : runtime !== "opencode" || !opencodeBlockedOnHost(sandboxMode, worktreeGuard));
+        : runtime === "antigravity"
+            ? process.platform !== "win32" && !opencodeBlockedOnHost(sandboxMode, worktreeGuard)
+            : runtime !== "opencode" || !opencodeBlockedOnHost(sandboxMode, worktreeGuard));
     if (requestedRuntimes.includes("pi-local") && runnableRuntimes.length === 0) {
         throw new Error("Pi (local) requires NAVARCH_SANDBOX_MODE=host and NAVARCH_WORKTREE_GUARD=off");
     }
+    if (requestedRuntimes.includes("antigravity") && runnableRuntimes.length === 0) {
+        if (process.platform === "win32")
+            throw new Error("Antigravity's private lease MCP relay requires a Linux or macOS worker; Windows is unsupported.");
+        throw new Error(exports.ANTIGRAVITY_HOST_GUARD_MESSAGE);
+    }
     if (requestedRuntimes.includes("opencode") && runnableRuntimes.length === 0) {
         throw new Error(exports.OPENCODE_HOST_GUARD_MESSAGE);
     }
@@ -143,6 +156,8 @@ function loadRuntimeConfig(env = process.env) {
         claudeExtraArgs: envList(env, "NAVARCH_CLAUDE_EXTRA_ARGS", []),
         codexBin: env.NAVARCH_CODEX_BIN ?? "codex",
         codexExtraArgs: envList(env, "NAVARCH_CODEX_EXTRA_ARGS", []),
+        antigravityBin: env.NAVARCH_ANTIGRAVITY_BIN ?? "agy",
+        antigravityExtraArgs: envList(env, "NAVARCH_ANTIGRAVITY_EXTRA_ARGS", []),
         geminiBin: env.NAVARCH_GEMINI_BIN ?? "gemini",
         geminiExtraArgs: envList(env, "NAVARCH_GEMINI_EXTRA_ARGS", []),
         opencodeBin: env.NAVARCH_OPENCODE_BIN ?? "opencode",

package/dist/conversation/capability.cjs

@@ -40,7 +40,7 @@ function conversationCapability(config) {
 }
 /** Per-adapter support table for docs and diagnostics (host sandbox, guard on, feature enabled). */
 function conversationSupportMatrix() {
-    const agents = ["claude-code", "codex", "gemini", "opencode", "acp", "qoder", "pi-local", "pi"];
+    const agents = ["claude-code", "codex", "gemini", "antigravity", "opencode", "acp", "qoder", "pi-local", "pi"];
     return agents.map((agentType) => ({
         agentType,
         capability: conversationCapability({

package/dist/conversation/loop.cjs

@@ -209,9 +209,9 @@ class ConversationLoop {
             ...(shutdownSignal ? { signal: shutdownSignal } : {}),
             ...this.options.turnOverrides,
             log: this.log,
-            prepareWorkspace: async ({ conversationId, repositoryUrl, mode, signal }) => {
+            prepareWorkspace: async ({ conversationId, repositoryUrl, workingBranch, mode, signal }) => {
                 const workspace = await (0, workspace_cjs_1.prepareConversationWorkspace)({
-                    workspaceRoot: config.workspaceRoot, conversationId, repositoryUrl, env, signal, mode,
+                    workspaceRoot: config.workspaceRoot, conversationId, repositoryUrl, workingBranch, env, signal, mode,
                     ...(this.options.gitRunner ? { runner: this.options.gitRunner } : {}),
                 });
                 const guard = await (0, worktree_guard_cjs_1.prepareWorktreeGuard)({

package/dist/conversation/turn-runner.cjs

@@ -298,7 +298,9 @@ async function runConversationTurn(deps, conversationId, turnId) {
             if (snapshot.mode === "workspace" && !deps.workspaceEnabled)
                 throw new Error("Workspace chat is disabled on this machine");
             prompt = (0, prompt_cjs_1.buildConversationPrompt)(snapshot, journal.turnId);
-            prepared = await deps.prepareWorkspace({ conversationId, repositoryUrl, mode: snapshot.mode ?? "read_only", signal: controller.signal });
+            // Older servers omit the working branch: the checkout stays on the default branch.
+            const workingBranch = (0, workspace_cjs_1.validWorkingBranch)(claim.workingBranch);
+            prepared = await deps.prepareWorkspace({ conversationId, repositoryUrl, workingBranch, mode: snapshot.mode ?? "read_only", signal: controller.signal });
         }
         catch (error) {
             if (!run.lost)

package/dist/conversation/workspace.cjs

@@ -5,6 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.conversationEnv = conversationEnv;
 exports.validRepositoryUrl = validRepositoryUrl;
+exports.validWorkingBranch = validWorkingBranch;
 exports.conversationRoot = conversationRoot;
 exports.prepareConversationWorkspace = prepareConversationWorkspace;
 exports.removeConversationWorkspace = removeConversationWorkspace;
@@ -50,6 +51,22 @@ function validRepositoryUrl(value) {
         return null;
     return `https://github.com/${fullName}.git`;
 }
+/**
+ * The project's working branch from the claim, checked as strictly as the
+ * hosted path's `buildWorkingBranchCheckoutCommand`
+ * (worker/hosted-agent/delivery.ts): a plain ref name that cannot be read as a
+ * git option. Absent (an older server, or no working branch) is null; anything
+ * else that is not a plain name throws, so the turn never runs on a branch it
+ * was not given.
+ */
+function validWorkingBranch(value) {
+    if (value === undefined || value === null)
+        return null;
+    if (typeof value !== "string" || value.length > 255 || !/^[A-Za-z0-9][A-Za-z0-9._/-]*$/.test(value) || value.includes("..")) {
+        throw new Error("working branch is not a valid branch name");
+    }
+    return value;
+}
 function conversationRoot(workspaceRoot, conversationId) {
     return node_path_1.default.join(workspaceRoot, "conversations", (0, journal_cjs_1.assertUuid)(conversationId, "conversation id"));
 }
@@ -67,6 +84,11 @@ async function prepareConversationWorkspace(options) {
     const url = validRepositoryUrl(options.repositoryUrl);
     if (!url)
         throw new Error("repository URL is not a plain https URL");
+    const branch = validWorkingBranch(options.workingBranch);
+    // The marker records what the checkout was cloned from, so a changed
+    // repository or working branch is noticed. Default-branch checkouts keep the
+    // bare URL that earlier runtimes wrote.
+    const identity = branch ? `${url}\nbranch=${branch}` : url;
     const runner = options.runner ?? sandbox_cjs_1.nodeCommandRunner;
     const root = options.mode === "workspace"
         ? node_path_1.default.join(options.workspaceRoot, "chat-workspaces", (0, journal_cjs_1.assertUuid)(options.conversationId, "conversation id"))
@@ -83,7 +105,7 @@ async function prepareConversationWorkspace(options) {
     if (options.mode === "workspace") {
         await node_fs_1.promises.writeFile(node_path_1.default.join(workspace.metaDir, "preserve-workspace"), "Workspace chat: retain until the operator removes it.\n", { mode: 0o600 });
     }
-    if (hasCheckout && recorded === url)
+    if (hasCheckout && recorded === identity)
         return workspace;
     if (options.mode === "workspace") {
         const exists = await node_fs_1.promises.lstat(workspace.checkout).then(() => true, (error) => {
@@ -94,7 +116,7 @@ async function prepareConversationWorkspace(options) {
         if (exists)
             throw new Error("Checkout identity changed; preserving the existing workspace. Start a new conversation.");
     }
-    // New conversation, a changed repository URL, or an interrupted clone.
+    // New conversation, a changed repository URL or working branch, or an interrupted clone.
     await node_fs_1.promises.rm(workspace.checkout, { recursive: true, force: true });
     const env = {
         ...options.env,
@@ -104,12 +126,12 @@ async function prepareConversationWorkspace(options) {
         GIT_CONFIG_KEY_0: "core.hooksPath",
         GIT_CONFIG_VALUE_0: process.platform === "win32" ? "NUL" : "/dev/null",
     };
-    const result = await runner.run("git", ["clone", "--quiet", "--filter=blob:none", "--no-tags", "--", url, workspace.checkout], { cwd: root, env, timeoutMs: CLONE_TIMEOUT_MS, signal: options.signal });
+    const result = await runner.run("git", ["clone", "--quiet", "--filter=blob:none", "--no-tags", ...(branch ? ["--branch", branch] : []), "--", url, workspace.checkout], { cwd: root, env, timeoutMs: CLONE_TIMEOUT_MS, signal: options.signal });
     if (result.code !== 0) {
         await node_fs_1.promises.rm(workspace.checkout, { recursive: true, force: true }).catch(() => undefined);
         throw new Error(`git clone failed with exit ${result.code}: ${result.stderr.slice(-500)}`);
     }
-    await node_fs_1.promises.writeFile(marker, url, { encoding: "utf8", mode: 0o600 });
+    await node_fs_1.promises.writeFile(marker, identity, { encoding: "utf8", mode: 0o600 });
     return workspace;
 }
 async function removeConversationWorkspace(workspaceRoot, conversationId) {

package/dist/exit-conditions.cjs

@@ -22,7 +22,7 @@ exports.mapExitCondition = mapExitCondition;
 exports.AGENT_AUTH_FAILURE_PREFIX = "Coding agent authentication failed";
 function agentAuthFailureReport(detail) {
     return `${exports.AGENT_AUTH_FAILURE_PREFIX}: ${detail} ` +
-        "Log the coding agent in again on this machine (`claude /login` or `codex login`), then resume the agent.";
+        "Log the coding agent in again on this machine (`claude /login`, `codex login`, or an interactive `agy` session), then resume the agent.";
 }
 /**
  * Best-effort parse of `claude -p --output-format json` (or `stream-json`,