@oddessentials/agent-guild 0.10.0 → 0.12.0

package/README.md

@@ -11,7 +11,7 @@
   <a href="https://www.youtube.com/watch?v=ziT62WtXQ1M"><img src="https://img.shields.io/badge/trailer-watch%20on%20YouTube-e5534b?logo=youtube&logoColor=white" alt="Watch the Agent Guild trailer on YouTube"></a>
 </p>
 
-**Agent Guild** runs Claude Code, Codex CLI, Gemini CLI, Grok Build and your
+**Agent Guild** runs Claude Code, Codex CLI, Antigravity CLI, Grok Build and your
 own shell side by side, in real terminals, from one local web page. Each
 session is a card that shows what the tool is doing, which model it runs and
 which helper agents it has summoned. Close the page whenever you like; the
@@ -41,9 +41,10 @@ compiler and no WSL are needed.
 
 ## Features
 
-**Every major coding CLI, one place.** Claude Code, Codex CLI, Gemini CLI,
+**Every major coding CLI, one place.** Claude Code, Codex CLI, Antigravity CLI,
 Grok Build and a plain shell each get a card. A tool that is missing shows
-**Install**, which runs the install in a session you can watch. An installed
+**Install**, which runs the install in a session you can watch, or the
+vendor's install command for a tool not published on npm. An installed
 tool shows its version and offers **Update** when a newer one is out, using
 the same installer that put it there: npm, Homebrew, WinGet or the vendor's
 own.
@@ -64,7 +65,7 @@ with every hour it runs.
 one and switch with a chip on the card. Each account keeps its own sign-in,
 usage meters and sessions. See [Accounts](docs/configuration.md#accounts).
 
-**See what is left of your limits.** Claude Code, Codex CLI and Gemini CLI
+**See what is left of your limits.** Claude Code and Codex CLI
 cards show a meter for each rate-limit window, such as 5-hour and 7-day, with
 the time until it resets. They also show your plan, Claude's extra-usage
 spend and Codex's credit balance when the account has them. Any other tool
@@ -140,20 +141,19 @@ The full reference, including every field and environment variable, is in
 
 ## Show agents and models
 
-Agents are reported by the coding tool, not guessed from its output. To see
-them, add the hooks from the matching file in [examples/](examples/) to
-Claude Code, Codex CLI, Gemini CLI or Grok Build. Each helper agent then
-appears on the card while it runs, and the card shows the model in use.
-Without hooks, the card still names the model when it is given with
-`--model` or shown on the tool's screen.
+Agents are reported by the coding tool's hooks, not guessed from its output.
+Each helper agent appears on the card while it runs. Agent Guild gives every
+Claude Code and Codex CLI session its reporting hooks for that session only,
+without changing the tool's own settings. Antigravity CLI has no such option:
+turn on **Agent reporting** on its card once, which installs an Agent Guild
+plugin into Antigravity. It reports the model and the conversation, but no
+helper agents or shell commands. Grok Build cannot take hooks for one session yet; add the hooks
+from [examples/grok-hooks.json](examples/grok-hooks.json) to see its agents.
+When a tool's hooks do not run, because hooks are turned off, restricted by
+an administrator or not trusted for the folder, the card says so.
 
-The hooks call `agent-guild-report`, which the manager puts on the PATH of
-every session, so nothing else needs installing. Two tools need a one-time
-approval:
-
-* Codex CLI runs no hook until you trust it: choose "Trust all and continue"
-  when it starts, or run `/hooks`.
-* Claude Code runs none until you accept its workspace-trust prompt.
+The card also names the model, from the hooks, from `--model` or from the
+tool's screen.
 
 Any other tool or script can report agents and its model too. See
 [docs/agent-reporting.md](docs/agent-reporting.md).
@@ -174,8 +174,7 @@ Any other tool or script can report agents and its model too. See
   own `~/.ssh` and Git configuration are not read or changed.
 * Usage meters are fetched by the manager with each tool's own sign-in. The
   page only receives percentages. On macOS the first lookup may ask for
-  keychain access to the "Claude Code-credentials" and "gemini-cli-oauth"
-  items; choose Always Allow.
+  keychain access to the "Claude Code-credentials" item; choose Always Allow.
 
 The manager makes these outbound requests, and none of them carry your code
 or prompts:
@@ -183,7 +182,7 @@ or prompts:
 | To | For | How often |
 | --- | --- | --- |
 | npm registry | Tool and Agent Guild version checks | About hourly; `AGENT_GUILD_NO_UPDATE_CHECK=1` turns them off |
-| Anthropic, OpenAI and Google usage endpoints | Usage meters, with the tool's own sign-in | Every minute while the page is open |
+| Anthropic and OpenAI usage endpoints | Usage meters, with the tool's own sign-in | Every minute while the page is open |
 | OpenRouter's public model list | Benchmarks | Every 6 hours |
 | Public news feeds, Hacker News, arXiv and GitHub | The newsfeed | Every 30 minutes while the page is open |
 | GitHub's releases API | What's new | Hourly |
@@ -226,12 +225,9 @@ npm test
 ## Current limits
 
 * Sessions end when the manager stops or the computer restarts.
-* Grok Build has no usage meter.
-* Gemini CLI usage meters read its sign-in where Gemini CLI keeps it:
-  `oauth_creds.json`, or with `GEMINI_FORCE_ENCRYPTED_FILE_STORAGE=true` the
-  OS keychain (macOS, or Linux with `secret-tool`) or its encrypted
-  credentials file. A sign-in kept in the Windows Credential Manager cannot
-  be read.
+* Antigravity CLI and Grok Build have no usage meter.
+* Antigravity CLI has one account per computer user: it keeps its sign-in in
+  the system keychain and has no setting for another home folder.
 
 ## License
 

package/bin/agent-guild-report.mjs

@@ -10,26 +10,31 @@
 //                      [--detail TEXT] [--kind KIND] [--remove]
 //   agent-guild-report --model NAME [--display-name TEXT]
 //   agent-guild-report --session ID          (the tool's own session id, for resuming it later)
-//   agent-guild-report --hook                (reads a hook event as JSON on stdin:
-//                                             Claude Code, Codex CLI, Gemini CLI, Grok Build)
+//   agent-guild-report --hook [--event NAME] (reads a hook event as JSON on stdin:
+//                                             Claude Code, Codex CLI, Antigravity CLI, Grok Build;
+//                                             --event names one that does not name itself)
 //   agent-guild-report --claude-statusline [--passthrough]
 //                      (reads Claude Code status line JSON on stdin; prints a
 //                       status line, or the JSON itself with --passthrough)
 
-import { hookToReports, claudeStatuslineToReport, formatStatusLine } from '../src/report/hooks.mjs';
+import fs from 'node:fs';
+import { createRequire } from 'node:module';
+import { hookToReports, claudeStatuslineToReport, formatStatusLine, antigravityUserConversation } from '../src/report/hooks.mjs';
 
+// Importing node:http as an ES module costs a hook about 50 ms more than requiring it.
+const http = createRequire(import.meta.url)('node:http');
 const env = process.env;
-const inSession = env.AGENT_GUILD_URL && env.AGENT_GUILD_SESSION_ID && env.AGENT_GUILD_REPORT_TOKEN;
-// Gemini CLI's optional environment redaction removes every variable whose
-// name contains TOKEN before it runs a hook. Say so instead of staying silent.
-if (!inSession && env.AGENT_GUILD_SESSION_ID && !env.AGENT_GUILD_REPORT_TOKEN) {
-  console.error('agent-guild-report: AGENT_GUILD_REPORT_TOKEN is missing from the environment; the tool may be redacting variables named *TOKEN*');
+
+const token = env.AGENT_GUILD_URL && env.AGENT_GUILD_SESSION_ID ? env.AGENT_GUILD_REPORT_TOKEN || null : null;
+const inSession = Boolean(token);
+if (!inSession && env.AGENT_GUILD_SESSION_ID) {
+  console.error('agent-guild-report: the session report token is missing; the tool may have removed AGENT_GUILD_REPORT_TOKEN from the environment');
 }
 
 const USAGE = `Usage: agent-guild-report <agent-id> [--name N] [--status working|waiting|idle|done] [--detail TEXT] [--kind KIND] [--remove]
        agent-guild-report --model NAME [--display-name TEXT]
        agent-guild-report --session ID                     (the tool's own session id)
-       agent-guild-report --hook                           (reads a coding tool's hook event JSON from stdin)
+       agent-guild-report --hook [--event NAME]            (reads a coding tool's hook event JSON from stdin)
        agent-guild-report --claude-statusline [--passthrough]  (reads Claude Code status line JSON from stdin)`;
 
 function parseArgs(argv) {
@@ -61,28 +66,62 @@ function readStdin() {
   });
 }
 
-async function send(report) {
-  const kind = report.agentId !== undefined || report.finishForeground === true ? 'agents'
+function send(report) {
+  const kind = report.shell !== undefined ? 'shells'
+    : report.agentId !== undefined || report.finishForeground === true ? 'agents'
+    : report.hello === true ? 'reporting'
     : report.toolSessionId !== undefined ? 'tool-session' : 'model';
-  const url = `${env.AGENT_GUILD_URL}/api/v1/sessions/${env.AGENT_GUILD_SESSION_ID}/${kind}`;
-  const res = await fetch(url, {
-    method: 'POST',
-    headers: {
-      'Content-Type': 'application/json',
-      'X-Agent-Guild-Report-Token': env.AGENT_GUILD_REPORT_TOKEN,
-    },
-    body: JSON.stringify(report),
-    signal: AbortSignal.timeout(3000),
+  const body = JSON.stringify(report);
+  return new Promise((resolve, reject) => {
+    const req = http.request(`${env.AGENT_GUILD_URL}/api/v1/sessions/${env.AGENT_GUILD_SESSION_ID}/${kind}`, {
+      method: 'POST',
+      headers: {
+        'Content-Type': 'application/json',
+        'Content-Length': Buffer.byteLength(body),
+        'X-Agent-Guild-Report-Token': token,
+      },
+      timeout: 3000,
+    }, (res) => {
+      let text = '';
+      res.setEncoding('utf8');
+      res.on('data', (chunk) => { text += chunk; });
+      res.on('end', () => (res.statusCode >= 200 && res.statusCode < 300 ? resolve() : reject(new Error(`HTTP ${res.statusCode}: ${text}`))));
+    });
+    req.on('timeout', () => req.destroy(new Error('the manager did not answer in time')));
+    req.on('error', reject);
+    req.end(body);
   });
-  if (!res.ok) {
-    const body = await res.text();
-    throw new Error(`HTTP ${res.status}: ${body}`);
-  }
 }
 
 /** A hook must never break the coding tool, so report failures quietly. */
 const sendQuietly = (report) => send(report).catch((err) => console.error(`agent-guild-report: ${err.message}`));
 
+const MAX_FIRST_LINE = 1024 * 1024;
+
+/** The first JSON record of a JSONL file, or null. */
+function firstRecord(file) {
+  if (typeof file !== 'string') return null;
+  let fd;
+  try {
+    fd = fs.openSync(file, 'r');
+    const chunks = [];
+    const buffer = Buffer.alloc(64 * 1024);
+    for (let total = 0; total < MAX_FIRST_LINE;) {
+      const n = fs.readSync(fd, buffer, 0, buffer.length, null);
+      if (n === 0) break;
+      const end = buffer.subarray(0, n).indexOf(10);
+      chunks.push(Buffer.from(buffer.subarray(0, end === -1 ? n : end)));
+      if (end !== -1) break;
+      total += n;
+    }
+    return JSON.parse(Buffer.concat(chunks).toString('utf8'));
+  } catch {
+    return null;
+  } finally {
+    if (fd !== undefined) fs.closeSync(fd);
+  }
+}
+
 function parseJson(raw) {
   try { return JSON.parse(raw); } catch { return null; }
 }
@@ -95,7 +134,10 @@ async function main() {
   }
   if (args.hook) {
     const input = parseJson(await readStdin());
-    if (!inSession || !input) return;
+    if (!inSession || !input || typeof input !== 'object') return;
+    if (args.event && input.hook_event_name === undefined) input.hook_event_name = args.event;
+    // Antigravity CLI runs the hook in its sub-agents too, each a conversation of its own.
+    if (typeof input.conversationId === 'string' && !antigravityUserConversation(firstRecord(input.transcriptPath))) return;
     for (const report of hookToReports(input)) await sendQuietly(report);
     return;
   }

package/config/providers.default.json

@@ -9,6 +9,7 @@
       "versionArgs": ["--version"],
       "usage": "claude",
       "history": "claude",
+      "reporting": "claude",
       "homeVar": "CLAUDE_CONFIG_DIR",
       "accountEnv": { "CLAUDE_SECURESTORAGE_CONFIG_DIR": "{dir}" },
       "hooks": { "path": "settings.json", "example": "claude-code-settings.json" },
@@ -46,6 +47,7 @@
       "versionArgs": ["--version"],
       "usage": "codex",
       "history": "codex",
+      "reporting": "codex",
       "homeVar": "CODEX_HOME",
       "hooks": { "path": "hooks.json", "example": "codex-hooks.json" },
       "modelPattern": "\\bgpt-\\d[a-z0-9.-]*",
@@ -74,27 +76,28 @@
     {
       "id": "google",
       "vendor": "Google",
-      "tool": "Gemini CLI",
-      "command": "gemini",
-      "package": "@google/gemini-cli",
+      "tool": "Antigravity CLI",
+      "command": "agy",
       "versionArgs": ["--version"],
-      "usage": "gemini",
-      "history": "gemini",
-      "homeVar": "GEMINI_CLI_HOME",
-      "accountEnv": { "GEMINI_FORCE_FILE_STORAGE": "true" },
-      "hooks": { "path": ".gemini/settings.json", "example": "gemini-settings.json" },
+      "history": "antigravity",
+      "reporting": "antigravity",
       "modelPattern": "\\bgemini-\\d[a-z0-9.-]*",
       "args": [],
-      "resumeArgs": ["--resume", "{id}"],
+      "resumeArgs": ["--conversation", "{id}"],
       "color": "#4285F4",
       "monogram": "G",
-      "install": "npm install -g @google/gemini-cli",
+      "install": "curl -fsSL https://antigravity.google/cli/install.sh | bash",
       "channels": {
-        "brew": { "names": ["gemini-cli"] }
+        "native": { "paths": ["~/.local/bin/agy"], "update": ["update"], "uninstall": "rm -f ~/.local/bin/agy" }
       },
-      "docs": "https://github.com/google-gemini/gemini-cli",
-      "usageUrl": "https://aistudio.google.com/usage",
-      "billingUrl": "https://one.google.com/settings"
+      "docs": "https://antigravity.google/docs/cli/install",
+      "billingUrl": "https://one.google.com/settings",
+      "win32": {
+        "install": "irm https://antigravity.google/cli/install.ps1 | iex",
+        "channels": {
+          "native": { "paths": ["~/AppData/Local/agy/bin"], "update": ["update"], "uninstall": "Remove-Item -Path \"$env:LOCALAPPDATA\\agy\" -Recurse -Force" }
+        }
+      }
     },
     {
       "id": "xai",
@@ -104,6 +107,7 @@
       "package": "@xai-official/grok",
       "versionArgs": ["--version"],
       "history": "grok",
+      "reporting": "grok",
       "homeVar": "GROK_HOME",
       "hooks": { "path": "hooks/agent-guild.json", "example": "grok-hooks.json" },
       "modelPattern": "\\bgrok-(?:build|\\d)[a-z0-9.-]*",

package/examples/grok-hooks.json

@@ -50,6 +50,49 @@
           }
         ]
       }
+    ],
+    "PreToolUse": [
+      {
+        "matcher": "run_terminal_command",
+        "hooks": [
+          {
+            "type": "command",
+            "command": "agent-guild-report --hook"
+          }
+        ]
+      }
+    ],
+    "PostToolUse": [
+      {
+        "matcher": "run_terminal_command",
+        "hooks": [
+          {
+            "type": "command",
+            "command": "agent-guild-report --hook"
+          }
+        ]
+      }
+    ],
+    "PostToolUseFailure": [
+      {
+        "matcher": "run_terminal_command",
+        "hooks": [
+          {
+            "type": "command",
+            "command": "agent-guild-report --hook"
+          }
+        ]
+      }
+    ],
+    "Stop": [
+      {
+        "hooks": [
+          {
+            "type": "command",
+            "command": "agent-guild-report --hook"
+          }
+        ]
+      }
     ]
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@oddessentials/agent-guild",
-  "version": "0.10.0",
+  "version": "0.12.0",
   "description": "Launch and watch AI coding-assistant terminal sessions from one local web page. A bundled session manager owns the terminals so the page can close and reconnect.",
   "license": "MIT",
   "repository": {

package/src/manager/command-resolver.mjs

@@ -83,6 +83,10 @@ export function resolveAllCommands(command, env = process.env, platform = proces
   return hits;
 }
 
+export function killWindowsTree(pid, done = () => {}) {
+  execFile('taskkill', ['/PID', String(pid), '/T', '/F'], { windowsHide: true, timeout: 5000 }, (err) => done(err));
+}
+
 /** Quote one argument for a cmd.exe command line. */
 export function quoteForCmd(arg) {
   const s = String(arg);
@@ -120,9 +124,9 @@ export function buildSpawnSpec(resolvedPath, args = [], env = process.env, platf
  * Run a spawn spec to completion without a terminal. Resolves with its
  * output; rejects with the error carrying stdout and stderr.
  */
-export function runSpec(spec, { env, timeoutMs = 15000 } = {}) {
+export function runSpec(spec, { env, timeoutMs = 15000, cwd } = {}) {
   return new Promise((resolve, reject) => {
-    const opts = { env, timeout: timeoutMs, windowsHide: true, maxBuffer: 1024 * 1024 };
+    const opts = { env, cwd, timeout: timeoutMs, windowsHide: true, maxBuffer: 1024 * 1024 };
     let args = spec.args;
     if (typeof args === 'string') {
       opts.windowsVerbatimArguments = true;

package/src/manager/config.mjs

@@ -47,6 +47,7 @@ export const paths = {
   get log() { return path.join(dataDir(), 'manager.log'); },
   /** Launchers for agent-guild-report, put first on every session's PATH. */
   get shims() { return path.join(dataDir(), 'bin'); },
+  get reporting() { return path.join(dataDir(), 'reporting'); },
 };
 
 function writePrivate(file, contents) {

package/src/manager/install-channels.mjs

@@ -122,6 +122,13 @@ function wingetOwner({ realPath, id, platform }) {
   return folder.startsWith(`${id.toLowerCase()}_`) ? { id } : null;
 }
 
+/** Whether `<tool> <update args> --help` shows the update command. Go programs exit 2 after their help; a failure that reports an error does not count. */
+export function updateHelpAccepted({ stdout = '', stderr = '' }, args, { failed = false } = {}) {
+  const text = `${stdout}\n${stderr}`;
+  if (failed && /\b(?:error|unknown|unrecogni[sz]ed|invalid)\b/i.test(text)) return false;
+  return helpDescribes(text, args);
+}
+
 export function helpDescribes(text, args) {
   const words = args.map((a) => a.replace(/[.*+?^${}()|[\]\\]/g, '\\$&'));
   const named = new RegExp(`(?<![\\w-])${words.join('(?![\\w-]).*(?<![\\w-])')}(?![\\w-])`, 'i');

package/src/manager/main.mjs

@@ -16,6 +16,7 @@ import { createManagerServer } from './server.mjs';
 import { SelfUpdate } from './self-update.mjs';
 import { resolveBaseEnv, pathReader } from './shell-env.mjs';
 import { writeReportShims } from './report-shims.mjs';
+import { SessionHooks } from './session-hooks.mjs';
 import { launcherPath, spawnManager } from './launch.mjs';
 import {
   DEFAULT_HOST,
@@ -62,7 +63,12 @@ export async function startManager({ port = resolvePort(), host = DEFAULT_HOST,
   let api;
   const selfUpdate = new SelfUpdate({ pkg: PACKAGE_NAME, version, packageFile, registry });
   const github = new GitHub({ dir: paths.github, registry, ...githubOptions });
-  const manager = new SessionManager({ registry, baseEnv, getApiUrl: () => api.url, sessionDefaults, shimDir, selfUpdate, github });
+  const sessionHooks = new SessionHooks({ registry, dir: paths.reporting, version });
+  registry.reportingEnabled = (provider) => sessionHooks.enabled(provider);
+  sessionHooks.warm();
+  const manager = new SessionManager({
+    registry, baseEnv, getApiUrl: () => api.url, sessionDefaults, shimDir, selfUpdate, github, sessionHooks,
+  });
   const usage = new UsageMonitor({ registry, env: baseEnv });
   const history = new SessionHistory({ registry, env: baseEnv });
   const modelStats = new ModelStats({ registry });
@@ -71,7 +77,7 @@ export async function startManager({ port = resolvePort(), host = DEFAULT_HOST,
   let closing = null;
 
   const refreshVersions = () => {
-    registry.refreshVersions().catch(() => {});
+    registry.refreshVersions().then(() => sessionHooks.warm(), () => {});
     selfUpdate.refresh().catch(() => {});
   };
   const versionTimer = setInterval(refreshVersions, VERSION_REFRESH_MS);

package/src/manager/news.mjs

@@ -30,7 +30,7 @@ export const FEEDS = [
   { id: 'ollama-blog', name: 'Ollama', category: 'news', url: 'https://ollama.com/blog/rss.xml' },
   latestRelease('claude-code', 'Claude Code', 'anthropics/claude-code', 'anthropic'),
   latestRelease('codex-cli', 'Codex CLI', 'openai/codex', 'openai'),
-  latestRelease('gemini-cli', 'Gemini CLI', 'google-gemini/gemini-cli', 'google'),
+  latestRelease('antigravity-cli', 'Antigravity CLI', 'google-antigravity/antigravity-cli', 'google'),
   { id: 'ollama', name: 'Ollama', category: 'releases', url: 'https://github.com/ollama/ollama/releases.atom' },
   { id: 'llama-cpp', name: 'llama.cpp', category: 'releases', url: 'https://github.com/ggml-org/llama.cpp/releases.atom' },
   { id: 'transformers', name: 'Transformers', category: 'releases', url: 'https://github.com/huggingface/transformers/releases.atom' },

package/src/manager/providers.mjs

@@ -11,7 +11,7 @@ import { EventEmitter } from 'node:events';
 import { fileURLToPath } from 'node:url';
 import { resolveCommand, resolveAllCommands, pathKey, buildSpawnSpec, runSpec } from './command-resolver.mjs';
 import { compareVersions, probeVersion, fetchManifest, latestVersion, DEFAULT_NPM_REGISTRY } from './versions.mjs';
-import { CHANNEL_LABELS, classifyInstall, expandHome, formatCommand, helpDescribes, knownLaunchers, listInstallations, platformDependency } from './install-channels.mjs';
+import { CHANNEL_LABELS, classifyInstall, expandHome, formatCommand, knownLaunchers, listInstallations, platformDependency, updateHelpAccepted } from './install-channels.mjs';
 import { weavePaths } from './shell-env.mjs';
 import { paths } from './config.mjs';
 
@@ -19,6 +19,7 @@ const here = path.dirname(fileURLToPath(import.meta.url));
 export const DEFAULTS_FILE = path.resolve(here, '../../config/providers.default.json');
 const ID_RE = /^[a-z0-9][a-z0-9_-]{0,31}$/;
 const PLATFORM_KEYS = ['win32', 'darwin', 'linux'];
+const REPORTING_MODES = new Set(['claude', 'codex', 'antigravity', 'grok']);
 const VERSION_TTL_MS = 60 * 60 * 1000;
 const FAILED_PROBE_TTL_MS = 5 * 60 * 1000;
 const PATH_REFRESH_MS = 60 * 1000;
@@ -51,18 +52,18 @@ function normalizeEnv(env) {
   return out;
 }
 
-/** "claude", "codex", "gemini", a { command, args } that prints usage JSON, or null. */
+/** "claude", "codex", a { command, args } that prints usage JSON, or null. */
 function normalizeUsage(usage) {
-  if (usage === 'claude' || usage === 'codex' || usage === 'gemini') return usage;
+  if (usage === 'claude' || usage === 'codex') return usage;
   if (usage && typeof usage === 'object' && typeof usage.command === 'string' && usage.command) {
     return { command: usage.command, args: Array.isArray(usage.args) ? usage.args.map(String) : [] };
   }
   return null;
 }
 
-/** "claude", "codex", "gemini", "grok", a { command, args } that prints past sessions as JSON, or null. */
+/** "claude", "codex", "antigravity", "grok", a { command, args } that prints past sessions as JSON, or null. */
 function normalizeHistory(history) {
-  if (['claude', 'codex', 'gemini', 'grok'].includes(history)) return history;
+  if (['claude', 'codex', 'antigravity', 'grok'].includes(history)) return history;
   if (history && typeof history === 'object' && typeof history.command === 'string' && history.command) {
     return { command: history.command, args: Array.isArray(history.args) ? history.args.map(String) : [] };
   }
@@ -163,6 +164,7 @@ function normalize(raw, platform, warnings) {
     versionArgs: Array.isArray(merged.versionArgs) && merged.versionArgs.length ? merged.versionArgs.map(String) : null,
     usage: normalizeUsage(merged.usage),
     history: normalizeHistory(merged.history),
+    reporting: REPORTING_MODES.has(merged.reporting) ? merged.reporting : null,
     modelPattern: merged.modelPattern ? String(merged.modelPattern) : null,
     args: Array.isArray(merged.args) ? merged.args.map(String) : [],
     resumeArgs: Array.isArray(merged.resumeArgs) ? merged.resumeArgs.map(String) : [],
@@ -251,6 +253,7 @@ export class ProviderRegistry extends EventEmitter {
     this.versions = new Map();
     this._refreshing = null;
     this._npmRegistry = null;
+    this.reportingEnabled = null;
     this.reload();
   }
 
@@ -346,7 +349,7 @@ export class ProviderRegistry extends EventEmitter {
         if (force || entry.probePath !== found || entry.probeMtime !== mtime || now - entry.probeAt > ttl) {
           const spec = buildSpawnSpec(channel.update.file, [...channel.update.args, '--help'], this.env, this.platform);
           const ok = await runSpec(spec, { env: { ...this.env, ...provider.env } })
-            .then(({ stdout, stderr }) => helpDescribes(`${stdout}\n${stderr}`, channel.update.args), () => false);
+            .then((out) => updateHelpAccepted(out, channel.update.args), (err) => updateHelpAccepted(err, channel.update.args, { failed: true }));
           changed ||= ok !== entry.probeOk;
           Object.assign(entry, { probePath: found, probeMtime: mtime, probeAt: now, probeOk: ok });
         }
@@ -623,7 +626,9 @@ export class ProviderRegistry extends EventEmitter {
       npmNote: provider.npmNote,
       usageSource: provider.usage === null ? null : typeof provider.usage === 'string' ? provider.usage : 'command',
       historySource: provider.history === null ? null : typeof provider.history === 'string' ? provider.history : 'command',
-      accounts: provider.accounts.map(({ id, label }) => ({ id, label })),
+      reporting: provider.reporting,
+      reportingEnabled: this.reportingEnabled?.(provider) ?? null,
+      accounts: provider.accounts.map((account) => ({ id: account.id, label: account.label })),
       modelPattern: provider.modelPattern,
       color: provider.color,
       monogram: provider.monogram,
@@ -642,7 +647,7 @@ export class ProviderRegistry extends EventEmitter {
   }
 
   /** Spawn spec for node-pty, or throws with a user-facing message. */
-  spawnSpec(provider, extraArgs = [], resume = null) {
+  spawnSpec(provider, extraArgs = [], resume = null, leadArgs = []) {
     const resolved = this.resolve(provider);
     if (!resolved) {
       const hint = provider.install ? ` ${provider.install}` : '';
@@ -661,7 +666,7 @@ export class ProviderRegistry extends EventEmitter {
       }
       resumeArgs = provider.resumeArgs.map((arg) => arg.replaceAll('{id}', resume));
     }
-    return buildSpawnSpec(resolved, [...provider.args, ...resumeArgs, ...extraArgs], this.env, this.platform);
+    return buildSpawnSpec(resolved, [...leadArgs, ...provider.args, ...resumeArgs, ...extraArgs], this.env, this.platform);
   }
 
   async updateSpec(provider) {

package/src/manager/report-shims.mjs

@@ -2,8 +2,8 @@
 // session, without `npm link` or a global install.
 //
 // The coding tools run their hook commands through a shell (sh or Git Bash
-// for Claude Code, a login shell for Codex CLI, bash or PowerShell for
-// Gemini CLI, sh or PowerShell for Grok Build) and look the command up on
+// for Claude Code, a login shell for Codex CLI, sh or cmd.exe for
+// Antigravity CLI, sh or PowerShell for Grok Build) and look the command up on
 // the PATH they inherit from the terminal. The manager writes these shims
 // into its data folder at every start and puts that folder first on each
 // session's PATH. They run the reporter with the manager's own Node.js, and
@@ -12,8 +12,8 @@
 //
 // On Windows there is deliberately no .ps1 shim: PowerShell prefers a .ps1
 // over the PATHEXT extensions, and the default Restricted execution policy
-// refuses to run it. Gemini CLI and Grok Build run hooks in PowerShell without
-// bypassing that policy, so they would fail; with only a .cmd present,
+// refuses to run it. Grok Build runs hooks in PowerShell without
+// bypassing that policy, so it would fail; with only a .cmd present,
 // PowerShell falls through to it and cmd.exe runs it with no policy involved.
 // cmd.exe reads a batch file in the OEM code page, so no path may be written
 // into the .cmd: the script's path lives in a loader module next to it, as
@@ -48,6 +48,7 @@ export function shimContents({ execPath, script, platform = process.platform })
   const files = {
     [SHIM_NAME]: [
       '#!/bin/sh',
+      '[ "$1" = --hook ] && [ -z "$AGENT_GUILD_SESSION_ID" ] && exec cat >/dev/null',
       `n=${shQuote(forSh(execPath))}`,
       '[ -x "$n" ] || n=node',
       `exec "$n" ${shQuote(forSh(script))} "$@"`,
@@ -58,6 +59,7 @@ export function shimContents({ execPath, script, platform = process.platform })
     files[LOADER_NAME] = `import ${JSON.stringify(fileUrl(script, platform))};\n`;
     files[`${SHIM_NAME}.cmd`] = [
       '@ECHO OFF',
+      'IF "%~1"=="--hook" IF NOT DEFINED AGENT_GUILD_SESSION_ID EXIT /B 0',
       'IF EXIST "%AGENT_GUILD_NODE%" GOTO manager',
       `node "%~dp0${LOADER_NAME}" %*`,
       'EXIT /B %ERRORLEVEL%',

package/src/manager/server.mjs

@@ -207,7 +207,7 @@ export function createManagerServer({
     // Agent, model and tool-session reports may authenticate with the
     // per-session report token that the manager injects into each tool's
     // environment.
-    const reportMatch = route.match(/^\/sessions\/([a-f0-9]+)\/(agents|model|tool-session)$/);
+    const reportMatch = route.match(/^\/sessions\/([a-f0-9]+)\/(agents|model|tool-session|reporting|shells)$/);
     if (reportMatch && method === 'POST') {
       const [, id, kind] = reportMatch;
       const body = await readJsonBody(req);
@@ -217,6 +217,11 @@ export function createManagerServer({
       };
       if (kind === 'agents') return sendJson(res, 200, { agent: manager.reportAgent(id, body, auth) });
       if (kind === 'model') return sendJson(res, 200, { model: manager.reportModel(id, body, auth) });
+      if (kind === 'reporting') return sendJson(res, 200, { reporting: manager.reportHello(id, auth) });
+      if (kind === 'shells') {
+        manager.reportShell(id, body, auth);
+        return sendJson(res, 200, { ok: true });
+      }
       return sendJson(res, 200, { toolSessionId: manager.reportToolSession(id, body, auth) });
     }
 
@@ -269,6 +274,16 @@ export function createManagerServer({
       const account = registry.account(provider, url.searchParams.get('account'));
       return sendJson(res, 200, { history: await history.list(provider, account, { limit: url.searchParams.get('limit') }) });
     }
+    const reportingMatch = route.match(/^\/providers\/([a-z0-9][a-z0-9_-]{0,31})\/reporting$/);
+    if (reportingMatch && method === 'POST' && manager.sessionHooks) {
+      const provider = registry.get(reportingMatch[1]);
+      if (!provider) throw new HttpError(404, `unknown provider "${reportingMatch[1]}"`, 'unknown_provider');
+      const body = await readJsonBody(req);
+      if (typeof body.enabled !== 'boolean') throw new HttpError(400, 'enabled must be true or false', 'bad_request');
+      await manager.sessionHooks.setEnabled(provider, body.enabled);
+      registry.emit('updated');
+      return sendJson(res, 200, { provider: registry.describe(provider) });
+    }
     const installMatch = route.match(/^\/providers\/([a-z0-9][a-z0-9_-]{0,31})\/install$/);
     if (installMatch && method === 'POST') {
       const body = await readJsonBody(req);
@@ -280,7 +295,7 @@ export function createManagerServer({
     }
     if (route === '/sessions' && method === 'POST') {
       const body = await readJsonBody(req);
-      const session = manager.create(body);
+      const session = await manager.create(body);
       return sendJson(res, 201, { session: session.toJSON() });
     }
     if (route === '/shutdown' && method === 'POST') {
@@ -452,7 +467,7 @@ export function createManagerServer({
       if (isBinary) return;
       let msg;
       try { msg = JSON.parse(raw.toString('utf8')); } catch { return; }
-      if (msg.type === 'input' && typeof msg.data === 'string') session.write(msg.data);
+      if (msg.type === 'input' && typeof msg.data === 'string') session.input(msg.data);
       else if (msg.type === 'resize') session.resize(msg.cols, msg.rows);
     });
   }