@jini-ai/agent-runtime 0.3.0 → 0.3.2

package/dist/defs/antigravity.js

@@ -1,146 +1,32 @@
 /** Ported verbatim from OD's `apps/daemon/src/runtimes/defs/antigravity.ts` (import path adjusted only). See `source-map.md`. */
-import { existsSync, mkdirSync, readFileSync, writeFileSync, } from 'node:fs';
-import { readFile as fsReadFile } from 'node:fs/promises';
-import { homedir } from 'node:os';
-import { dirname, join } from 'node:path';
 import { DEFAULT_MODEL_OPTION } from './shared.js';
-// `agy` v1.0.3 still has no `--model` flag (upstream issue #35), but the
-// TUI's Switch-Model picker writes the choice to its settings.json, and
-// every `agy -p` invocation re-reads that file on startup — verified by
-// capturing the `--log-file` line `Propagating selected model override to
-// backend: label="<model>"`. So we can route OD's model picker through
-// settings.json: when the user picks a concrete model in Settings, the
-// daemon writes the label into agy's settings.json right before spawn,
-// and the resulting print-mode run uses that model.
+// `agy` v1.1.24 has a real `--model <id>` flag (`agy --help`: "Model for the current CLI
+// session") plus a machine-readable `agy models` subcommand that lists every selectable model as
+// a stable `<slug>\t<label>` pair — both verified live, neither true of the v1.0.3 this file used
+// to target (upstream issue #35, closed by the flag's addition). That retires the
+// settings.json-write-then-poll-the-log workaround this file used to carry (see git history for
+// `writeAntigravityModelSelection`/`antigravityModelLock`/`waitForAgyToReadModel`, and the
+// process-global race across concurrent runs it existed to serialize): the model rides argv on
+// `buildArgs` below instead, exactly like every other flag this def emits, and there is nothing
+// left to lock.
 //
-// Two ids the picker exposes are special:
-//   - 'default'         : leave settings.json untouched, so agy keeps
-//                         whatever the user last picked in its own TUI.
-//                         (Respects user choice when they switch models
-//                         from `agy` directly.)
-//   - any other id      : the literal display label agy expects (e.g.
-//                         "Gemini 3.1 Pro (High)", "Claude Sonnet 4.6
-//                         (Thinking)"). We persist it before spawn.
+// Two cases `buildArgs` treats specially:
+//   - `DEFAULT_MODEL_OPTION.id` ('default') or no model at all: omit `--model` entirely, so agy
+//     keeps whatever it would otherwise default to (its own TUI's last pick, or its own default).
+//   - any other id: one of the stable slugs below (e.g. `gemini-3.1-pro-high`), passed verbatim as
+//     `--model`'s value.
 //
-// `supportsCustomModel: false` because the label set is a server-side
-// enum — a typed id agy doesn't recognise resolves to a silent
-// `availableModels` cache miss + empty print-mode output, which surfaces
-// to the user as a generic "empty response" error.
+// `supportsCustomModel: false` because the model set is still a server-side enum, not free text —
+// but the failure mode for an id outside it changed for the better: `agy --model <bogus> -p ...`
+// now prints a loud `Error: invalid model selection ...` plus the full list of valid models
+// (verified live), rather than the old settings.json path's silent `availableModels` cache miss +
+// empty print-mode output. Kept `false` anyway: nothing here validates a typed id before spawn, so
+// letting a UI send arbitrary text would just move that same failure into production instead of
+// preventing it — `isKnownModel` (`../models.ts`) is what actually gates a caller-supplied id
+// against this list before it ever reaches `buildArgs`.
 //
-// The 8 model labels mirror what `Switch Model` in agy's TUI lists for
-// consumer-tier accounts as of 2026-05-28. The set is small and stable
-// enough to ship statically until upstream adds a programmatic
-// `agy models` subcommand (also tracked under issue #35).
-const ANTIGRAVITY_SETTINGS_PATH = join(homedir(), '.gemini', 'antigravity-cli', 'settings.json');
-export function writeAntigravityModelSelection(label, settingsPath = ANTIGRAVITY_SETTINGS_PATH) {
-    let existing = {};
-    if (existsSync(settingsPath)) {
-        try {
-            const parsed = JSON.parse(readFileSync(settingsPath, 'utf8'));
-            if (parsed && typeof parsed === 'object' && !Array.isArray(parsed)) {
-                existing = parsed;
-            }
-        }
-        catch {
-            // Corrupt JSON — fall through and rewrite the file from scratch so
-            // the next spawn starts from a known-good state.
-        }
-    }
-    existing.model = label;
-    mkdirSync(dirname(settingsPath), { recursive: true });
-    writeFileSync(settingsPath, `${JSON.stringify(existing, null, 2)}\n`);
-}
-// Per-process serialization for write-settings → spawn → agy-reads
-// cycles on antigravity. `~/.gemini/antigravity-cli/settings.json` is
-// process-global, so two OD runs that both pick concrete (non-default)
-// models can race: run A writes model A, spawn A starts, run B writes
-// model B before A's agy has read settings.json — A then executes on
-// model B. The daemon serialises non-default antigravity spawns
-// through this chain: each acquire awaits the previous release, and
-// each release fires only after the spawned agy actually emits
-// `Propagating selected model override to backend: label="<X>"` in
-// its `--log-file` (which is the upstream signal that settings.json
-// has been read).
-let antigravityLockChain = Promise.resolve();
-export async function acquireAntigravityModelLock() {
-    const previous = antigravityLockChain;
-    // Definite-assignment assertion (`!`), not a `() => {}` fallback default:
-    // the ECMAScript spec guarantees a `Promise` executor runs synchronously,
-    // immediately, during construction — `release = resolve` below has
-    // already run by the time `new Promise(...)` returns, so a fallback
-    // no-op default would be assigned, coverage-instrumented, and never once
-    // invoked. Removing it drops that dead function instead of padding a
-    // test around code that cannot execute.
-    let release;
-    antigravityLockChain = new Promise((resolve) => {
-        release = resolve;
-    });
-    await previous;
-    return release;
-}
-// Visible for tests. Resets the module-level lock chain so a test that
-// installed a hanging acquirer can release it without leaking state to
-// subsequent test cases. Production code never calls this.
-export function _resetAntigravityModelLockForTests() {
-    antigravityLockChain = Promise.resolve();
-}
-// Polls agy's `--log-file` for the line
-//   `Propagating selected model override to backend: label="<expectedModel>"`
-// which `model_config_manager.go` emits once agy has finished reading
-// `~/.gemini/antigravity-cli/settings.json` and sent the model
-// override to the upstream backend. Returns true on observed signal,
-// false on timeout OR abort. Never throws — a missing log file is
-// treated as "not yet seen" so the polling loop keeps retrying until
-// either the deadline or the abort signal fires.
-//
-// IMPORTANT: callers MUST NOT use a `false` return as a "go ahead and
-// release the settings.json lock" signal — false means "I gave up
-// polling," not "agy definitely didn't read this." Release the lock
-// only on (a) a `true` return, OR (b) child exit. See server.ts for
-// the wiring.
-export async function waitForAgyToReadModel(logFilePath, expectedModel, options = {}) {
-    const timeoutMs = options.timeoutMs ?? 15_000;
-    const pollIntervalMs = options.pollIntervalMs ?? 250;
-    const readFile = options.readFile ?? ((path) => fsReadFile(path, 'utf8'));
-    const now = options.now ?? Date.now;
-    const abortSignal = options.abortSignal;
-    if (abortSignal?.aborted)
-        return false;
-    const escaped = expectedModel.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
-    const pattern = new RegExp(`Propagating selected model override to backend: label="${escaped}"`);
-    const deadline = now() + timeoutMs;
-    while (now() < deadline) {
-        if (abortSignal?.aborted)
-            return false;
-        try {
-            const content = await readFile(logFilePath);
-            if (pattern.test(content))
-                return true;
-        }
-        catch {
-            // Log file may not have appeared yet; keep polling.
-        }
-        if (now() >= deadline)
-            break;
-        await new Promise((resolve) => {
-            const onAbort = () => {
-                clearTimeout(timer);
-                resolve();
-            };
-            // `{ once: true }` only detaches the listener on the abort path. When the
-            // timer wins instead — the common case, once per poll — the listener would
-            // stay attached to a signal that outlives this iteration, so a default
-            // 15s/250ms run accumulates ~60 of them on the same AbortSignal before the
-            // process exits. Detach explicitly on the timer path too.
-            const timer = setTimeout(() => {
-                abortSignal?.removeEventListener('abort', onAbort);
-                resolve();
-            }, pollIntervalMs);
-            abortSignal?.addEventListener('abort', onAbort, { once: true });
-        });
-    }
-    return false;
-}
+// The 14 slugs/labels below are `agy models`' full live output as of agy v1.1.24 (2026-09-02), not
+// a hand-maintained guess — re-run `agy models` to refresh if upstream's catalog changes.
 // `agy -p` prints an interactive OAuth sign-in URL to **stdout** and then
 // exits **0** when the keyring entry is missing or expired, so a driver that
 // streams stdout live shows that URL to the user as if it were the model's
@@ -193,86 +79,95 @@ export function redactAntigravityAuthUrls(fullText) {
     return fullText.replace(OAUTH_URL_PATTERN, OAUTH_URL_PLACEHOLDER);
 }
 /**
- * Resolves when `signal` aborts (immediately if it already has). Used instead
- * of a never-settling `new Promise(() => {})` so a long-lived caller does not
- * accumulate one permanently-pending promise, plus its captured closure, per
- * run.
- */
-function waitUntilAborted(signal) {
-    if (signal.aborted)
-        return Promise.resolve();
-    return new Promise((resolve) => {
-        signal.addEventListener('abort', () => resolve(), { once: true });
-    });
-}
-/**
- * Adapts the module-level `acquireAntigravityModelLock` /
- * `waitForAgyToReadModel` pair to the caller-facing {@link RuntimeLock}
- * contract. A thin adapter, deliberately: the mutex and the log-polling
- * handoff detector are the existing, separately-tested functions above, and
- * this adds no serialization logic of its own.
+ * Parses `agy models`' stdout into the shared `RuntimeModelOption[]` shape.
  *
- * The one policy decision it does make — skipping the lock entirely when no
- * concrete model was selected — mirrors `buildArgs`'s own
- * `options.model && options.model !== DEFAULT_MODEL_OPTION.id` guard exactly.
- * The lock guards the `settings.json` write, so when that write will not
- * happen there is nothing to serialize, and holding the chain anyway would
- * make a `'default'`-model run queue behind an unrelated one for no benefit.
+ * The CLI's real output (agy v1.1.24, verified live — see this file's header
+ * comment for the exact captured transcript) is one `Fetching available
+ * models...` progress line followed by one `<slug>\t<label>` pair per line.
+ * Each data line is split on the FIRST tab only, so a label that itself
+ * contains a tab or extra whitespace never bleeds into the id.
+ *
+ * @param stdout - Raw stdout from `agy models`.
+ * @returns The synthetic default option prepended to every parsed entry, or
+ * `null` when no real entry was found (empty stdout, or only the progress
+ * line survives filtering) — mirrors `parseCursorAgentModels`'s same-shape
+ * null contract, which `detection.ts#fetchModels` already treats the same
+ * as an empty array: fall back to `fallbackModels`.
+ * @complexity O(n) in the stdout length.
  */
-export const antigravityModelLock = {
-    acquire: async ({ model }) => {
-        if (!model || model === DEFAULT_MODEL_OPTION.id) {
-            // No settings.json write this spawn — hand back an inert hold rather
-            // than joining the chain. `release` must still exist and still be
-            // idempotent: the caller calls it on both handoff and process exit
-            // without knowing which kind of hold it got.
-            return { release: () => { } };
-        }
-        const release = await acquireAntigravityModelLock();
-        return {
-            release,
-            waitForHandoff: async ({ logFilePath, processExited }) => {
-                if (logFilePath !== undefined) {
-                    const observed = await waitForAgyToReadModel(logFilePath, model, {
-                        abortSignal: processExited,
-                    });
-                    if (observed)
-                        return;
-                }
-                // Reached when either there is no `--log-file` to watch (no
-                // observable propagation signal exists at all), or the watcher
-                // stopped without seeing the line. Neither is evidence that agy
-                // failed to read settings.json — `waitForAgyToReadModel`'s `false`
-                // means "stopped polling" (see its own doc). Resolving here would
-                // release the lock while a cold-starting agy may still be about to
-                // read the file, reopening exactly the race this lock closes. So
-                // hand the release decision back to process exit, the only event
-                // that proves agy can no longer read it.
-                await waitUntilAborted(processExited);
-            },
-        };
-    },
-};
+export function parseAgyModels(stdout) {
+    const lines = String(stdout || '')
+        .split('\n')
+        .map((line) => line.trim())
+        .filter((line) => line.length > 0);
+    if (lines.length === 0)
+        return null;
+    const out = [DEFAULT_MODEL_OPTION];
+    const seen = new Set([DEFAULT_MODEL_OPTION.id]);
+    for (const line of lines) {
+        if (/^fetching available models\.\.\.$/i.test(line))
+            continue;
+        const tabIndex = line.indexOf('\t');
+        if (tabIndex === -1)
+            continue;
+        const id = line.slice(0, tabIndex).trim();
+        if (!id || seen.has(id))
+            continue;
+        seen.add(id);
+        const label = line.slice(tabIndex + 1).trim();
+        out.push({ id, label: label || id });
+    }
+    return out.length > 1 ? out : null;
+}
 export const antigravityAgentDef = {
     id: 'antigravity',
     name: 'Antigravity',
     bin: 'agy',
     versionArgs: ['--version'],
+    // `agy models` does a real network fetch (its own stdout says "Fetching
+    // available models..."), so this gets a longer budget than codex's 5s
+    // local-cache read — 10s to absorb ordinary network latency without
+    // making every detection pass wait needlessly long on a slow/offline run
+    // (`detection.ts#fetchModels` falls back to `fallbackModels` on timeout).
+    listModels: {
+        args: ['models'],
+        parse: parseAgyModels,
+        timeoutMs: 10_000,
+    },
     fallbackModels: [
         DEFAULT_MODEL_OPTION,
-        { id: 'Gemini 3.1 Pro (High)', label: 'Gemini 3.1 Pro (High)' },
-        { id: 'Gemini 3.1 Pro (Low)', label: 'Gemini 3.1 Pro (Low)' },
-        { id: 'Gemini 3.5 Flash (High)', label: 'Gemini 3.5 Flash (High)' },
-        { id: 'Gemini 3.5 Flash (Medium)', label: 'Gemini 3.5 Flash (Medium)' },
-        { id: 'Gemini 3.5 Flash (Low)', label: 'Gemini 3.5 Flash (Low)' },
-        {
-            id: 'Claude Sonnet 4.6 (Thinking)',
-            label: 'Claude Sonnet 4.6 (Thinking)',
-        },
-        { id: 'Claude Opus 4.6 (Thinking)', label: 'Claude Opus 4.6 (Thinking)' },
-        { id: 'GPT-OSS 120B (Medium)', label: 'GPT-OSS 120B (Medium)' },
+        { id: 'gemini-3.8-flash-high', label: 'Gemini 3.8 Flash (High)' },
+        { id: 'gemini-3.8-flash-medium', label: 'Gemini 3.8 Flash (Medium)' },
+        { id: 'gemini-3.8-flash-low', label: 'Gemini 3.8 Flash (Low)' },
+        { id: 'gemini-3.7-flash-high', label: 'Gemini 3.7 Flash (High)' },
+        { id: 'gemini-3.7-flash-medium', label: 'Gemini 3.7 Flash (Medium)' },
+        { id: 'gemini-3.7-flash-low', label: 'Gemini 3.7 Flash (Low)' },
+        { id: 'gemini-3.6-flash-high', label: 'Gemini 3.6 Flash (High)' },
+        { id: 'gemini-3.6-flash-medium', label: 'Gemini 3.6 Flash (Medium)' },
+        { id: 'gemini-3.6-flash-low', label: 'Gemini 3.6 Flash (Low)' },
+        { id: 'gemini-3.1-pro-high', label: 'Gemini 3.1 Pro (High)' },
+        { id: 'gemini-3.1-pro-low', label: 'Gemini 3.1 Pro (Low)' },
+        { id: 'claude-sonnet-4-6', label: 'Claude Sonnet 4.6 (Thinking)' },
+        { id: 'claude-opus-4-6-thinking', label: 'Claude Opus 4.6 (Thinking)' },
+        { id: 'gpt-oss-120b-medium', label: 'GPT-OSS 120B (Medium)' },
     ],
     supportsCustomModel: false,
+    // agy has no `--effort`-shaped flag: reasoning effort is a trailing `-high`/
+    // `-medium`/`-low` on the model slug `--model` already carries (see the
+    // `fallbackModels` list above, which is `agy models`' real output). So this
+    // def declares the suffix VOCABULARY only — see `types.ts`'s
+    // `RuntimeReasoningInModelId` for why the per-base-model availability is
+    // derived from the model list instead of enumerated here, and why
+    // `-thinking` on `claude-opus-4-6-thinking` must not be read as a level.
+    // `buildArgs` below is deliberately unchanged: the effort is already inside
+    // `--model`'s value, so there is no second argv to emit.
+    reasoningInModelId: {
+        levels: [
+            { id: 'high', label: 'High' },
+            { id: 'medium', label: 'Medium' },
+            { id: 'low', label: 'Low' },
+        ],
+    },
     // We deliberately do NOT opt into `resumesSessionViaCli` / agy's `-c`
     // resume flag on follow-up turns. Tested both shapes; `-c` activates
     // agy's internal agentic loop (multi-step model retries, tool calls,
@@ -290,9 +185,6 @@ export const antigravityAgentDef = {
     // composed in server.ts gives a second line of defense for weak
     // plain-stream models like Gemini 3.5 Flash.
     buildArgs: (prompt, _imagePaths, _extra = [], options = {}, runtimeContext = {}) => {
-        if (options.model && options.model !== DEFAULT_MODEL_OPTION.id) {
-            writeAntigravityModelSelection(options.model, runtimeContext.antigravitySettingsPath);
-        }
         // `-p` is a Go `flag`-package flag that TAKES THE PROMPT AS ITS VALUE,
         // not a boolean switch followed by a positional prompt, and agy has no
         // stdin sentinel under the default `--input-format text`. Verified
@@ -306,18 +198,23 @@ export const antigravityAgentDef = {
         // So the prompt rides argv as `-p`'s value. That is also why this def is
         // argv-budgeted (`maxPromptArgBytes` below) rather than `promptViaStdin`.
         const args = [];
+        // `--model` is the same kind of Go flag as `--log-file`/`-p`: its value is
+        // whatever argv token immediately follows it, so it too must be pushed
+        // before `-p` (always last — see below). Verified live against agy
+        // v1.1.24: `agy --model <slug> -p '<prompt>'` runs that one print-mode
+        // turn on the named model, and combining it with `--log-file` works the
+        // same way — relative order between `--model` and `--log-file` doesn't
+        // matter (each independently consumes exactly the one token after it),
+        // only that both precede `-p`.
+        if (options.model && options.model !== DEFAULT_MODEL_OPTION.id) {
+            args.push('--model', options.model);
+        }
         // Always opt into `--log-file` when the daemon supplied a path so
         // it can post-exit grep for the actual upstream failure shape
         // (auth missing vs quota reached vs upstream error) — without it
         // the chat surfaces a generic "empty response" because print mode
         // never echoes those errors on stdout. See server.ts empty-output
         // guard for the consumer.
-        //
-        // Flag order is load-bearing: `--log-file` must precede `-p`, since
-        // everything after `-p` is consumed as its value. `agy --log-file /tmp/x
-        // -p '<prompt>'` captures the diagnostic log, including `Propagating
-        // selected model override to backend: label="<model>"` and auth/quota
-        // failures.
         if (runtimeContext.agentLogFilePath) {
             args.push('--log-file', runtimeContext.agentLogFilePath);
         }
@@ -331,13 +228,10 @@ export const antigravityAgentDef = {
     maxPromptArgBytes: 30_000,
     streamFormat: 'plain',
     // `buildArgs` above already consumes `runtimeContext.agentLogFilePath` when
-    // the caller supplies one; this is what asks it to. Two distinct things
-    // depend on the log file, which is why it is not merely a diagnostic nicety
-    // for this adapter:
-    //   - `runtimeLock`'s handoff detector polls it for agy's own
-    //     "Propagating selected model override to backend" line;
-    //   - print mode never echoes auth/quota failures on stdout, so post-exit
-    //     log inspection is the only way to tell those two apart.
+    // the caller supplies one; this is what asks it to. Print mode never
+    // echoes auth/quota failures on stdout, so post-exit log inspection is the
+    // only way to tell those two apart — see server.ts's empty-output guard
+    // for the consumer.
     needsAgentLogFile: true,
     // The one adapter in this package that must not stream live — see
     // `redactAntigravityAuthUrls`'s comment for the OAuth-URL-on-stdout-plus-
@@ -346,13 +240,36 @@ export const antigravityAgentDef = {
     // and keeps streaming per chunk; aider's and deepseek's own comments call
     // that live cadence out as deliberate.
     stdoutPolicy: { buffering: 'until-close', sanitize: redactAntigravityAuthUrls },
-    runtimeLock: antigravityModelLock,
     installUrl: 'https://antigravity.google/cli',
     docsUrl: 'https://antigravity.google/docs/cli-overview',
-    // Deliberately left with no `externalMcpInjection` — investigated for a Codex-style relocation
-    // strategy (see `codex.ts`'s `'codex-toml'`) and rejected for lack of a safe, run-scoped delivery
-    // mechanism, not for lack of trying. Evidence, gathered live against the installed CLI (`agy`
-    // v1.1.22), not from docs alone:
+    // `externalMcpInjection: 'env-passthrough'` — the prior verdict here ("no safe, run-scoped
+    // delivery mechanism exists") stood as long as the only candidates were a per-run config
+    // flag/relocatable home dir, neither of which `agy` has (see the probes below, still accurate).
+    // What flips the verdict is a THIRD property, verified live and not previously tested: `agy`
+    // passes its own parent process environment through to the stdio MCP server children it spawns
+    // for servers already sitting in its persistent global registry.
+    //
+    //   - Proven with a probe MCP server registered under a relocated `HOME`'s
+    //     `.gemini/config/mcp_config.json`: booted under `agy -p`, it read a marker variable
+    //     (`TOVU_ENV_PASSTHROUGH_PROBE`) straight out of its own `process.env` — no config field, no
+    //     argv, nothing but inherited environment. Full MCP handshake observed on the same run:
+    //     `server/discover` → `initialize` → `notifications/initialized` → `tools/list`
+    //     (protocolVersion `2025-11-25`, clientInfo `antigravity-client`).
+    //   - That makes the registration itself a STATIC, one-time operation — the operator adds one
+    //     `tovu` entry to their real `~/.gemini/config/mcp_config.json` (confirmed still the one real
+    //     mechanism; see the probes below) with a bare, env-free `command` pointing at this package's
+    //     own `jini-mcp` bin, resolving its credential from the environment at spawn time instead of
+    //     a baked-in value. No per-spawn config mutation, no lock, no restore discipline — the exact
+    //     "safe, run-scoped delivery" gap the old verdict cited is closed by inheritance, not by
+    //     relocation.
+    //   - So this def's job shrinks to exactly what `'env-passthrough'` describes in `types.ts`: put
+    //     the bridge entry's `JINI_RUN_ID`/`JINI_DAEMON_URL`/`JINI_DAEMON_TOKEN` onto `agy`'s OWN
+    //     spawn env (done centrally by `@jini-ai/daemon`'s `computeChildEnv`, not by this def's
+    //     `buildArgs`), and `agy` carries them the rest of the way to the already-registered server on
+    //     its own.
+    //
+    // The prior probes into a per-run/relocatable mechanism remain accurate and are kept as the
+    // record of what does NOT work, so a future reader does not re-walk the same dead ends:
     //
     //   - No per-run config-path flag. `agy --help` and `agy mcp add --help` were read in full: `mcp
     //     add/remove/list/enable/disable` only mutate the PERSISTENT global registry — there is no
@@ -361,7 +278,9 @@ export const antigravityAgentDef = {
     //     every all-caps `*HOME*`/`*_DIR`/`*_PATH`/`XDG_*` token found nothing naming a relocatable
     //     config/data root for Antigravity or Gemini specifically — only the generic `HOME` (relocating
     //     that would redirect the ENTIRE user profile for the child, not a scoped config dir, and is not
-    //     an "explicit, run-scoped delivery" by any reasonable reading).
+    //     an "explicit, run-scoped delivery" by any reasonable reading). Also why the passthrough probe
+    //     above used a relocated `HOME` only to prove inheritance in isolation — production spawns
+    //     always use the operator's real `HOME`, since relocating it breaks `agy`'s own auth.
     //   - The workspace-relative `.agents/mcp_config.json` this comment used to cite as unverified is
     //     now verified NOT to be what it looked like: a project dir was seeded with a real
     //     `.agents/mcp_config.json` entry, then `agy mcp list` (run from that cwd) showed only the
@@ -372,21 +291,17 @@ export const antigravityAgentDef = {
     //     distinct project. Best read: `.agents/mcp_config.json` belongs to the Antigravity IDE
     //     extension's own project layer, a different consumer than the bare `agy` CLI binary this
     //     daemon actually spawns — not a mechanism reachable from a plain `agy -p` invocation at all.
-    //   - The one mechanism that IS real — `~/.gemini/config/mcp_config.json` (global, JSON,
-    //     `{"mcpServers":{"<name>":{"command":...}}}`, confirmed by reading the operator's own file
-    //     read-only after backing it up) — has no relocation path, so using it means mutating the
-    //     operator's real shared config on every spawn. That is the exact class of side effect
-    //     `codex.ts`'s doc rejected the `-c`-override approach for, made concretely worse here: this
-    //     def already fights a real cross-run race on `settings.json` for model selection
-    //     (`antigravityModelLock` above), and a second shared-file race for MCP config would need its
-    //     own serialization/merge/restore discipline with its own live verification — not a strategy
-    //     bolted onto this one on a guess. Also relevant: this same `agy -p` run, on the SAME machine,
-    //     left `~/.gemini/trustedFolders.json` and `~/.gemini/projects.json` byte-identical
-    //     before/after (unlike Codex's `config.toml`, which does grow a project-tracking entry per
-    //     run) — headless print mode does not even register the folder as a project, reinforcing that
-    //     nothing here is scoped per-invocation the way `CODEX_HOME` is.
+    //     Confirmed independently upstream: antigravity-cli issue #60 (open, no maintainer response)
+    //     reports the identical "project-local mcp_config.json is read but ignored" symptom.
+    //   - `~/.gemini/config/mcp_config.json` (global, JSON, `{"mcpServers":{"<name>":{"command":...}}}`,
+    //     confirmed by reading the operator's own file read-only after backing it up) has no relocation
+    //     path — but per the passthrough finding above, this def never needs to write to it at all
+    //     outside the one-time operator registration, so the shared-file race a prior version of this
+    //     comment warned about (a second race alongside the now-deleted settings.json model lock) never
+    //     materializes: nothing here mutates that file per run.
     //
     // No hang was observed on any of these probes (all completed in well under `--print-timeout`'s
-    // default 5m), so the blocker is "no safe delivery mechanism exists", not "the mechanism hangs".
+    // default 5m).
+    externalMcpInjection: 'env-passthrough',
 };
 //# sourceMappingURL=antigravity.js.map

package/dist/defs/antigravity.js.map

@@ -1 +1 @@
-{"version":3,"file":"antigravity.js","sourceRoot":"","sources":["../../src/defs/antigravity.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"antigravity.js","sourceRoot":"","sources":["../../src/defs/antigravity.ts"],"names":[],"mappings":"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"}

package/dist/defs/claude.d.ts

@@ -26,6 +26,11 @@ export declare const claudeAgentDef: {
     promptInputFormat: "stream-json";
     streamFormat: string;
     externalMcpInjection: "claude-mcp-json";
+    systemPromptDelivery: {
+        strategy: "append-flag";
+        flag: string;
+        capabilityKey: string;
+    };
     resumesSessionViaCli: true;
     imageDelivery: "prompt-path";
 };

package/dist/defs/claude.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"claude.d.ts","sourceRoot":"","sources":["../../src/defs/claude.ts"],"names":[],"mappings":"AA6DA,eAAO,MAAM,cAAc;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAuIA,CAAC"}
+{"version":3,"file":"claude.d.ts","sourceRoot":"","sources":["../../src/defs/claude.ts"],"names":[],"mappings":"AA6DA,eAAO,MAAM,cAAc;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAwIA,CAAC"}

package/dist/defs/claude.js

@@ -139,15 +139,13 @@ export const claudeAgentDef = {
         if (dirs.length > 0 && caps.addDir !== false) {
             args.push('--add-dir', ...dirs);
         }
-        // Appended, never replaces the CLI's own default system prompt — see
-        // `RuntimeBuildOptions.systemPromptOverlay`'s doc. Same probe-gate reasoning as
-        // `--include-partial-messages`/`--effort` above: an older build rejects an unknown option
-        // with exit 1, which kills the chat rather than degrading it.
-        if (caps.appendSystemPrompt !== false
-            && typeof options.systemPromptOverlay === 'string'
-            && options.systemPromptOverlay.length > 0) {
-            args.push('--append-system-prompt', options.systemPromptOverlay);
-        }
+        // `--append-system-prompt` delivery now lives outside this function — see
+        // `systemPromptDelivery` below and `@jini-ai/daemon`'s `resolveSystemPromptOverlayDelivery`
+        // (the single dispatch point for every def, not just this one). The probe-gate reasoning
+        // (an older build rejects an unknown option with exit 1, which kills the chat rather than
+        // degrading it) is preserved there via `capabilityKey: 'appendSystemPrompt'`, read from the
+        // same `capabilityFlags` probe above — moving the *call site* changed nothing about the gate
+        // itself.
         // Continue Claude's own CLI session across turns so it keeps its
         // working memory (files read, edits made, tool history) instead of
         // re-deriving everything from the rendered transcript each turn.
@@ -179,6 +177,11 @@ export const claudeAgentDef = {
     // so the daemon writes the user's external MCP servers there before
     // launching (server.ts handles the cwd guard).
     externalMcpInjection: 'claude-mcp-json',
+    // Formerly inline in `buildArgs` above (see the comment there) — moved to the declarative
+    // shape every def now uses to receive `RuntimeBuildOptions.systemPromptOverlay`. Same flag,
+    // same probe gate (`capabilityFlags['--append-system-prompt']` above), same "append, never
+    // replace" behavior as before this moved.
+    systemPromptDelivery: { strategy: 'append-flag', flag: '--append-system-prompt', capabilityKey: 'appendSystemPrompt' },
     resumesSessionViaCli: true,
     // See this file's module doc's "Image delivery" section — the CLI reads
     // a local file once its path is named in the prompt, so the daemon