omniagent 0.1.12 → 0.1.14

package/README.md

@@ -1,6 +1,6 @@
 # omniagent
 
-One source of truth for agent config across Claude, Codex, Gemini, and Copilot (and [any other agent](docs/custom-targets.md))
+One source of truth for agent config across Claude, Codex, Antigravity (agy), and Copilot (and [any other agent](docs/custom-targets.md))
 
 Define canonical agent files once in `agents/`, then run `sync` to compile target-specific outputs.
 
@@ -89,14 +89,15 @@ omniagent --agent codex
 omniagent -p "Summarize this repo" --agent codex --output json
 ```
 
-`usage` supports Codex, Claude, and Gemini in v1. Copilot is not supported for usage
-extraction yet. Usage extraction may launch agent TUIs and may incur cost if an agent
-reads repo context or instructions on startup; omniagent uses cheap/minimal launch settings
-where possible. Usage extraction times out after 30 seconds unless the target config defines
-a target-specific timeout; built-in TUI probes may use longer defaults. Some CLIs require
-session-scoped setup flags to inspect usage, such as Gemini's `--skip-trust`; omniagent does
-not complete auth or onboarding prompts for you. Pass `--timeout=<seconds>` to override the
-per-agent timeout for the current run.
+`usage` supports Codex, Claude, and Antigravity (`agy`; `gemini` works as an alias). Copilot
+is not supported for usage extraction yet. Usage extraction may launch agent TUIs and may incur
+cost if an agent reads repo context or instructions on startup; omniagent uses cheap/minimal
+launch settings where possible. Usage extraction times out after 30 seconds unless the target
+config defines a target-specific timeout; built-in TUI probes may use longer defaults. Some CLIs
+gate usage inspection behind onboarding state — Antigravity requires the project to be trusted
+(run `agy` once and accept the trust prompt); omniagent does not complete auth or onboarding
+prompts for you. Pass `--timeout=<seconds>` to override the per-agent timeout for the current
+run.
 
 ## Local Overrides (`.local`)
 
@@ -213,6 +214,18 @@ Example usage:
 ./code-review.sh codex
 ```
 
+The shim also unifies structured outputs: pass a JSON schema (file path or inline JSON) with
+`--output-schema`, and stdout is exactly the schema-conforming JSON regardless of agent. Agents
+with native schema support (claude, codex) enforce it server-side; all others get a prompt-based
+fallback with client-side validation and automatic retries:
+
+```bash
+omniagent -p "Top 3 benefits of TypeScript" --agent claude \
+  --output-schema ./schema.json | jq .answer
+```
+
+See [`docs/cli-shim.md`](docs/cli-shim.md) for the full shared-flag capability matrix.
+
 ## Documentation
 
 - Docs index: [`docs/README.md`](docs/README.md)

package/dist/agy-Clt40QYQ.js

@@ -0,0 +1,138 @@
+import { c as cleanControlOutput, m as makeUsageLimit, a as compactLines } from "./cli.js";
+import { r as runPtyScenario, t as typeTextSteps, e as escapeKey, a as enterKey } from "./pty-CMd3Wxfe.js";
+const TRUST_DIALOG_PATTERN = /Do you trust the contents of this project\?/i;
+const READY_PATTERN = /\?\s+for shortcuts/i;
+const REMAINING_CREDITS_PATTERN = /Remaining AI Credits:\s*(.+?)\s*$/i;
+const CREDITS_NOT_ENABLED_PATTERN = /AI Credits not enabled/i;
+const ACCOUNT_PLAN_PATTERN = /^\S+@\S+\.\S+\s+\((.+?)\)\s*$/;
+const STANDALONE_PLAN_PATTERN = /^\((.*(?:quota|plan|tier).*)\)$/i;
+const SIGN_IN_PATTERN = /\b(?:not signed in|Signing in)\b/i;
+function isTrustDialog(snapshot) {
+  return TRUST_DIALOG_PATTERN.test(snapshot.raw) || TRUST_DIALOG_PATTERN.test(snapshot.screen);
+}
+function isReadyOrTrustDialog(snapshot) {
+  return READY_PATTERN.test(snapshot.screen) || isTrustDialog(snapshot);
+}
+function hasCreditsPanel(snapshot) {
+  return REMAINING_CREDITS_PATTERN.test(snapshot.screen) || REMAINING_CREDITS_PATTERN.test(cleanControlOutput(snapshot.raw));
+}
+function withTrustSkip(step) {
+  return { ...step, skipIf: isTrustDialog, skipIfSource: "raw" };
+}
+async function extractAgyUsage(context) {
+  const command = context.command ?? context.launch?.command ?? "agy";
+  const ptyResult = await runPtyScenario({
+    command,
+    args: context.launch?.args ?? [],
+    cwd: context.repoRoot,
+    cols: 120,
+    rows: 40,
+    timeoutMs: context.launch?.timeoutMs ?? 7e4,
+    signal: context.signal,
+    debug: context.debug,
+    steps: [
+      { waitFor: isReadyOrTrustDialog, waitForTimeoutMs: 25e3 },
+      ...typeTextSteps("/credits", 25).map(withTrustSkip),
+      withTrustSkip({ waitMs: 250, write: enterKey() }),
+      withTrustSkip({
+        waitFor: hasCreditsPanel,
+        waitForTimeoutMs: 15e3,
+        optional: true,
+        capture: "credits",
+        captureWaitMs: 500
+      }),
+      { write: escapeKey(), waitMs: 250 }
+    ]
+  });
+  const buildError = (message) => {
+    const error = new Error(message);
+    if (ptyResult.debug.length > 0) {
+      Object.assign(error, { debug: ptyResult.debug });
+    }
+    return error;
+  };
+  if (isTrustDialog(ptyResult)) {
+    throw buildError(
+      `Antigravity has not trusted this project yet. Run \`${command}\` in ${context.repoRoot} once, accept the trust prompt, then re-run usage.`
+    );
+  }
+  const snapshot = ptyResult.snapshots.credits ?? ptyResult;
+  const cleanedOutput = cleanControlOutput(snapshot.raw);
+  const parsed = parseAgyCredits(snapshot.screen, cleanedOutput);
+  if (parsed.notEnabled) {
+    throw buildError(
+      "Antigravity AI Credits are not enabled for this account. Enable them via /settings in agy."
+    );
+  }
+  if (parsed.remaining == null) {
+    if (SIGN_IN_PATTERN.test(snapshot.screen) || SIGN_IN_PATTERN.test(cleanedOutput)) {
+      throw buildError(`Antigravity is not signed in. Run \`${command}\` and complete the login.`);
+    }
+    throw buildError("Antigravity /credits output did not include a Remaining AI Credits value.");
+  }
+  return {
+    targetId: context.targetId,
+    displayName: context.displayName,
+    command,
+    limits: [
+      // Credits are an absolute balance rather than a percentage window.
+      makeUsageLimit({
+        targetId: context.targetId,
+        scope: "ai_credits",
+        window: "credits",
+        label: parsed.plan ? `AI Credits (${parsed.plan})` : "AI Credits",
+        percentUsed: null,
+        percentRemaining: null,
+        remainingText: parsed.remaining,
+        resetText: null,
+        raw: parsed.rawLine,
+        now: context.now
+      })
+    ],
+    debug: ptyResult.debug.length > 0 ? ptyResult.debug : void 0
+  };
+}
+function parseAgyCredits(screen, cleanedOutput = "") {
+  const fromScreen = parseAgyCreditsLines(compactLines(screen));
+  if (fromScreen.remaining != null || fromScreen.notEnabled) {
+    return fromScreen;
+  }
+  const fromRaw = parseAgyCreditsLines(compactLines(cleanedOutput));
+  if (fromRaw.remaining != null || fromRaw.notEnabled) {
+    return fromRaw;
+  }
+  return fromScreen.plan != null ? fromScreen : fromRaw;
+}
+function parseAgyCreditsLines(lines) {
+  const parsed = {
+    remaining: null,
+    notEnabled: false,
+    plan: null,
+    rawLine: ""
+  };
+  for (const line of lines) {
+    const remainingMatch = REMAINING_CREDITS_PATTERN.exec(line);
+    if (remainingMatch?.[1]) {
+      const value = remainingMatch[1].trim();
+      if (CREDITS_NOT_ENABLED_PATTERN.test(value)) {
+        parsed.notEnabled = true;
+        parsed.rawLine = line.trim();
+        continue;
+      }
+      parsed.remaining = value;
+      parsed.rawLine = line.trim();
+      continue;
+    }
+    if (parsed.plan == null) {
+      const planMatch = ACCOUNT_PLAN_PATTERN.exec(line) ?? STANDALONE_PLAN_PATTERN.exec(line);
+      if (planMatch?.[1]) {
+        parsed.plan = planMatch[1].trim();
+      }
+    }
+  }
+  return parsed;
+}
+export {
+  extractAgyUsage,
+  parseAgyCredits
+};

package/dist/{claude-Blr7YqBx.js → claude-BuXp9FHS.js}

@@ -4,7 +4,7 @@ import os from "node:os";
 import path from "node:path";
 import { promisify } from "node:util";
 import { c as cleanControlOutput, a as compactLines, p as parsePercentUsed, m as makeUsageLimit } from "./cli.js";
-import { r as runPtyScenario, e as enterKey, a as escapeKey } from "./pty-CZBSAJzE.js";
+import { r as runPtyScenario, a as enterKey, e as escapeKey } from "./pty-CMd3Wxfe.js";
 const execFileAsync = promisify(execFile);
 const CLAUDE_CODE_KEYCHAIN_SERVICE = "Claude Code-credentials";
 const CLAUDE_CODE_CREDENTIALS_PATH = [".claude", ".credentials.json"];
@@ -50,7 +50,7 @@ async function extractClaudeUsageFromTui(context) {
       { waitFor: /Claude|>|❯/u, waitForSource: "screen", waitForTimeoutMs: 8e3 },
       { write: `/usage${enterKey()}` },
       {
-        waitFor: hasClaudeUsageRows,
+        waitFor: hasClaudeUsageResult,
         waitForTimeoutMs: 15e3,
         capture: "usage",
         captureWaitMs: 500
@@ -65,6 +65,12 @@ async function extractClaudeUsageFromTui(context) {
   const parsed = parseClaudeUsage(usageSnapshot.screen, cleanedOutput);
   const limits = buildClaudeUsageLimits(parsed, context);
   if (limits.length === 0) {
+    const usageError = extractClaudeUsageError(usageSnapshot.screen, cleanedOutput);
+    if (usageError != null) {
+      const error = new Error(`Claude usage error: ${usageError}`);
+      Object.assign(error, { debug: ptyResult.debug });
+      throw error;
+    }
     throw new Error("Claude usage output did not include session or weekly usage rows.");
   }
   return {
@@ -288,6 +294,26 @@ function hasClaudeUsageRows(snapshot) {
   const parsed = parseClaudeUsage(snapshot.screen, cleanControlOutput(snapshot.raw));
   return Boolean(parsed.currentSessionUsed || parsed.currentWeekUsed);
 }
+function hasClaudeUsageResult(snapshot) {
+  return hasClaudeUsageRows(snapshot) || extractClaudeUsageError(snapshot.screen) != null;
+}
+function extractClaudeUsageError(screen, cleanedOutput = "") {
+  for (const source of [screen, cleanedOutput]) {
+    for (const line of compactLines(source)) {
+      const errorMatch = /^Error:\s*(.+)$/i.exec(line);
+      if (errorMatch?.[1]) {
+        return errorMatch[1].trim();
+      }
+      if (isClaudeAuthErrorLine(line)) {
+        return line;
+      }
+    }
+  }
+  return null;
+}
+function isClaudeAuthErrorLine(line) {
+  return /\b(?:auth(?:entication)?|credentials?|login|logged in|token)\b/i.test(line) && /\b(?:error|expired|failed|invalid|missing|not|please|required|sign in)\b/i.test(line);
+}
 function buildClaudeUsageLimits(parsed, context) {
   const sessionUsed = parsePercentUsed(parsed.currentSessionUsed);
   const weekUsed = parsePercentUsed(parsed.currentWeekUsed);