openlimiter 2.0.2 → 2.0.4

package/dist/cli.js

@@ -1,17 +1,18 @@
-import { ACQUISITION_OUTCOME_SENTENCE, captureStatuslineAccount, pruneSnapshotCache, ACQUISITION_PROVIDERS, registerManagedCodexAccount, CREDENTIAL_FAILURE_SENTENCE, PROVIDER_CODES, acquireRefreshLock, clearRefreshSpawnFailure, mergeAcquiredSnapshots, createFetchTransport, readRefreshSpawnFailure, antigravitySpec, buildAdvice, canonicalJson, claudeSpec, codexSpec, cursorSpec, dedupeFailures, desktopHoldsCache, failureFromConnectorReason, freshness, geminiCliSpec, grokSpec, isProviderDue, kimiSpec, mergeSnapshots, normalizeMeters, normalizeMetersReport, openrouterSpec, readAcquisitionCredential, readAcquisitionSchedule, readSnapshotCache, readWindowsCredentialWith, resolveStateDirectory, runAcquisition, spawnDetachedRefresh, writeAcquisitionSchedule, probeAntigravity, resolveAgyExecutablePath } from "@openlimiter/core";
-import { antigravityFixture, claudeFixture, codexFixture, grokFixture, kimiFixture, connectors, manualFixture, opencodeFixture, openrouterFixture, parseAntigravityCodeAssistPayload, parseAntigravityPayload, parseClaudePayload, parseCodexPayload, parseCursorPayload, parseGeminiCliPayload, parseGrokPayload, parseKimiPayload, parseManualPayload, parseOpencodePayload, parseOpenrouterPayload } from "@openlimiter/connectors";
-import { AGENT_COMPATIBILITY, agentContextFromCache, agentContextSpillFromCache, agentVersionCompatibility, changeAgentHook, detectAgentInstallation, readAgentHookStatus, runAgentHook, validateAgentExecutableStamp, writeAgentContextSnapshot, loadHostedContextTrust, renderClaudeStatusline } from "@openlimiter/adapters";
+import { ACQUISITION_OUTCOME_SENTENCE, captureStatuslineAccount, pruneSnapshotCache, ACQUISITION_PROVIDERS, registerManagedCodexAccount, CREDENTIAL_FAILURE_SENTENCE, PROVIDER_CODES, acquireRefreshLock, clearRefreshSpawnFailure, mergeAcquiredSnapshots, createFetchTransport, readRefreshSpawnFailure, buildAdvice, canonicalJson, claudeSpec, codexSpec, cursorSpec, dedupeFailures, desktopHoldsCache, failureFromConnectorReason, freshness, geminiCliSpec, grokSpec, isProviderDue, kimiSpec, mergeSnapshotCache, mergeSnapshots, normalizeMeters, normalizeMetersReport, openrouterSpec, readAcquisitionCredential, readAcquisitionSchedule, readSnapshotCache, readWindowsCredentialWith, resolveStateDirectory, runAcquisition, spawnDetachedRefresh, trustedHelperWorkingDirectory, writeAcquisitionSchedule, windowsSystemTool } from "@openlimiter/core";
+import { antigravityFixture, claudeFixture, codexFixture, grokFixture, kimiFixture, connectors, manualFixture, opencodeFixture, openrouterFixture, parseAntigravityPayload, parseClaudePayload, parseCodexPayload, parseCursorPayload, parseGeminiCliPayload, parseGrokPayload, parseKimiPayload, parseManualPayload, parseOpencodePayload, parseOpenrouterPayload } from "@openlimiter/connectors";
+import { AGENT_COMPATIBILITY, agentContextFromCache, agentContextSpillFromCache, agentVersionCompatibility, changeAgentHook, detectAgentInstallation, readAgentHookStatus, runAgentHook, validateAgentExecutableStamp, writeAgentContextSnapshot, loadHostedContextTrust, } from "@openlimiter/adapters";
 import { execFile, spawn } from "node:child_process";
 import { randomUUID } from "node:crypto";
 import packageJson from "../package.json" with { type: "json" };
 import { homedir } from "node:os";
 import path from "node:path";
 import { PROVIDER_KEYS, STATUSLINE_KEYS, defaultConfig, initialize, isProviderKey, isStatuslineKey, providerValueText, readConfig, readProvidersConfig, readStatuslineConfig, setProviderValue, setStatuslineValue, statuslineValueText, writeConfig } from "./config.js";
-import { ACQUISITION_PROVENANCE, ANTIGRAVITY_STATUSLINE_PROVENANCE, GROK_STATUSLINE_PROVENANCE, INGEST_PROVENANCE, MANUAL_PROVENANCE, STATUSLINE_PROVENANCE, environmentWithLocalMarkers, STDIN_BYTE_LIMIT, parseAntigravityStatuslinePayload, parseGrokStatuslinePayload, parseJsonText, persistSnapshots, readManualDocument, withProvenance } from "./ingest.js";
+import { ACQUISITION_PROVENANCE, ANTIGRAVITY_STATUSLINE_PROVENANCE, GROK_STATUSLINE_PROVENANCE, INGEST_PROVENANCE, MANUAL_PROVENANCE, STATUSLINE_PROVENANCE, environmentWithLocalMarkers, STDIN_BYTE_LIMIT, parseAntigravityStatuslinePayload, antigravityStatuslineAccount, parseGrokStatuslinePayload, parseJsonText, persistSnapshots, clearStatuslineFailure, readStatuslineFailure, recordStatuslineFailure, readManualDocument, withProvenance } from "./ingest.js";
 import { UnavailableCredentialStore } from "./credentials.js";
 import { failureLine, failureLines, renderTable, supportsColor } from "./render.js";
-import { isStatuslineHost, renderStatuslineLayout, statuslineColor, statuslineUnicode } from "./statusline.js";
+import { isStatuslineHost, renderPlainStatusline, renderStatuslineLayout, resolveProviderOrder, statuslineColor, statuslineUnicode } from "./statusline.js";
 import { parseStatuslineSession } from "./statusline-ingest.js";
+import { readApiSpend } from "./api-spend.js";
 import { TERMINAL_HOST_NAMES, installHost, terminalHide, terminalShow, terminalStatusTable, uninstallHost } from "./terminal.js";
 import { createFetchHubTransport, hubConfigured } from "./hub.js";
 import { DELIVERY_UNCONFIRMED_SENTENCE, REVOKED_SENTENCE, ensureFreshSession, isAborted, runDeviceLogin } from "./hub-auth.js";
@@ -48,8 +49,8 @@ function defaults() {
             throw new Error("No acquisition transport was injected");
         },
         spawnDetached: () => undefined,
-        probeAntigravity: async () => ({ ok: false, reason: "not_running" }),
         promptChoice: async () => "",
+        interactive: false,
         hubTransport: async () => {
             throw new Error("No hub transport was injected");
         },
@@ -88,7 +89,12 @@ const NEWLINE = "\n";
 const execFileRunner = async (executable, helperArguments, timeoutMilliseconds) => await new Promise((resolve) => {
     execFile(executable, [...helperArguments], (() => {
         if (!executable.toLowerCase().endsWith("powershell.exe")) {
-            return { timeout: timeoutMilliseconds, maxBuffer: 262_144, windowsHide: true };
+            return {
+                cwd: trustedHelperWorkingDirectory(process.platform, process.env),
+                timeout: timeoutMilliseconds,
+                maxBuffer: 262_144,
+                windowsHide: true
+            };
         }
         const environment = { ...process.env };
         /* Windows environment names ignore case, but a copied process.env keeps
@@ -100,6 +106,7 @@ const execFileRunner = async (executable, helperArguments, timeoutMilliseconds)
         }
         environment["PSModulePath"] = path.win32.join(process.env["SystemRoot"] ?? "C:\\Windows", "System32", "WindowsPowerShell", "v1.0", "Modules");
         return {
+            cwd: trustedHelperWorkingDirectory(process.platform, environment),
             timeout: timeoutMilliseconds,
             maxBuffer: 262_144,
             windowsHide: true,
@@ -109,17 +116,48 @@ const execFileRunner = async (executable, helperArguments, timeoutMilliseconds)
         resolve(error === null ? { ok: true, stdout } : { ok: false });
     });
 });
+/** Build a direct browser opener invocation without a command shell. */
+export function browserOpenInvocation(url, platform, environment = process.env) {
+    if (url.length > 2_048)
+        return null;
+    try {
+        if (new URL(url).protocol !== "https:")
+            return null;
+    }
+    catch {
+        return null;
+    }
+    if (platform === "win32") {
+        return {
+            executable: windowsSystemTool("rundll32.exe", environment),
+            arguments: ["url.dll,FileProtocolHandler", url],
+            cwd: trustedHelperWorkingDirectory(platform, environment)
+        };
+    }
+    return platform === "darwin"
+        ? {
+            executable: "open",
+            arguments: [url],
+            cwd: trustedHelperWorkingDirectory(platform, environment)
+        }
+        : {
+            executable: "xdg-open",
+            arguments: [url],
+            cwd: trustedHelperWorkingDirectory(platform, environment)
+        };
+}
 /** Open a URL in the person's browser, best effort and never awaited. */
 function openBrowserPlatform(url, platform) {
-    if (!/^https:\/\//u.test(url) || url.length > 2_048)
+    const invocation = browserOpenInvocation(url, platform);
+    if (invocation === null)
         return;
-    const [command, commandArguments] = platform === "win32"
-        ? ["cmd", ["/c", "start", "", url]]
-        : platform === "darwin"
-            ? ["open", [url]]
-            : ["xdg-open", [url]];
     try {
-        const child = spawn(command, commandArguments, { stdio: "ignore", detached: true });
+        const child = spawn(invocation.executable, [...invocation.arguments], {
+            cwd: invocation.cwd,
+            stdio: "ignore",
+            detached: true,
+            shell: false
+        });
         child.once("error", () => undefined);
         child.unref();
     }
@@ -131,13 +169,9 @@ function openBrowserPlatform(url, platform) {
 export function runtimeDependencies() {
     return {
         acquisitionTransport: createFetchTransport(),
-        probeAntigravity: (options) => probeAntigravity({
-            ...options,
-            runCommand: options?.runCommand ?? execFileRunner
-        }),
-        resolveExecutablePath: resolveAgyExecutablePath,
         spawnDetached: (executable, argumentsList, options) => {
             const child = spawn(executable, [...argumentsList], {
+                cwd: options.cwd,
                 detached: true,
                 stdio: "ignore",
                 windowsHide: true
@@ -281,11 +315,13 @@ async function refresh(dependencies, now) {
  */
 export function acquisitionSpecs(providers) {
     return [
-        claudeSpec({ parse: parseClaudePayload, enabled: providers.claude.poll }),
+        claudeSpec({
+            parse: parseClaudePayload,
+            enabled: providers.claude.recorded && providers.claude.poll
+        }),
         codexSpec(parseCodexPayload),
         cursorSpec(parseCursorPayload),
         geminiCliSpec(parseGeminiCliPayload),
-        antigravitySpec(parseAntigravityCodeAssistPayload),
         grokSpec(parseGrokPayload),
         kimiSpec(parseKimiPayload),
         openrouterSpec(parseOpenrouterPayload)
@@ -330,7 +366,7 @@ function credentialReader(dependencies) {
                     }
                 };
         }
-        return await readAcquisitionCredential(provider, {
+        const result = await readAcquisitionCredential(provider, {
             ...(dependencies.stateDirectory === undefined ? {} : { stateDirectory: dependencies.stateDirectory }),
             platform: dependencies.platform,
             environment: dependencies.environment,
@@ -342,6 +378,26 @@ function credentialReader(dependencies) {
                     readWindowsCredential: async (target) => await readWindowsCredentialWith(target, { runCommand: runner })
                 })
         });
+        if (provider !== "CODEX" || !result.ok)
+            return result;
+        const installation = Object.prototype.hasOwnProperty.call(dependencies.detectedAgentInstallations, "codex")
+            ? dependencies.detectedAgentInstallations.codex ?? null
+            : await detectAgentInstallation("codex", {
+                environment: dependencies.environment,
+                platform: dependencies.platform,
+                runCommand: async (executable, argumentsList, timeoutMilliseconds) => {
+                    const command = await execFileRunner(executable, argumentsList, timeoutMilliseconds);
+                    return command.ok
+                        ? { ok: true, stdout: command.stdout, stderr: "" }
+                        : command;
+                }
+            });
+        if (installation === null)
+            return { ok: false, reason: "absent" };
+        return {
+            ok: true,
+            credential: { ...result.credential, executable: installation.executable }
+        };
     };
 }
 /**
@@ -423,6 +479,12 @@ async function acquisitionStatusRow(spec, schedule, readCredential, snapshots, n
         nextAttemptAt
     };
 }
+/** What each status line write failure means, in words with no dashes. */
+const STATUSLINE_FAILURE_SENTENCE = {
+    ingest: "the last status line payload could not be read",
+    cache_write: "the last status line reading could not be saved to the cache",
+    agent_context: "the last status line reading was saved, the agent context file could not be written"
+};
 /** The acquisition block doctor prints under the connector block. */
 async function acquisitionDoctorRows(dependencies, snapshots, now) {
     const providers = await readProvidersConfig(dependencies.stateDirectory);
@@ -437,29 +499,16 @@ async function acquisitionDoctorRows(dependencies, snapshots, now) {
         rows.push("REFRESH SPAWN FAILED " + failedAt +
             " the background refresh could not be started on this machine");
     }
+    const statusline = await readStatuslineFailure(dependencies.stateDirectory);
+    if (statusline !== null) {
+        rows.push(["STATUSLINE WRITE FAILED", statusline.at, statusline.stage, statusline.errorClass,
+            STATUSLINE_FAILURE_SENTENCE[statusline.stage]].join(" "));
+    }
     return [ACQUISITION_HEADER, ...rows].join(NEWLINE);
 }
-/**
- * Where a person can still see a reading this row could not take.
- *
- * Antigravity and Gemini CLI meter the same Google Code Assist pool. When
- * Google withholds the reading from this client but another tool on the machine
- * has already written one, the honest thing is to point at it rather than leave
- * a bare refusal, so the person knows the number exists and where.
- */
-function sharedQuotaNote(row, snapshots) {
-    if (row.provider !== "ANTIGRAVITY")
-        return null;
-    return snapshots.some((snapshot) => snapshot.provider === "GEMINI_CLI")
-        ? "the shared Code Assist quota is shown under gemini_cli"
-        : null;
-}
 /** One row of the refresh report, in the space separated grammar doctor uses. */
-function acquisitionLine(row, snapshots = []) {
-    const shared = row.status === "read" ? null : sharedQuotaNote(row, snapshots);
-    const note = [row.reason ?? row.disclosure ?? "", shared ?? ""]
-        .filter((part) => part !== "")
-        .join(", ");
+function acquisitionLine(row, _snapshots = []) {
+    const note = row.reason ?? row.disclosure ?? "";
     return [
         row.provider.toLowerCase(),
         row.detected ? "yes" : "no",
@@ -510,13 +559,7 @@ async function refreshCommand(dependencies, now) {
             now,
             schedule,
             readCredential: credentialReader(dependencies),
-            stamp: acquisitionStamp,
-            ...(dependencies.probeAntigravity === undefined
-                ? {}
-                : { probeAntigravity: dependencies.probeAntigravity }),
-            ...(dependencies.resolveExecutablePath === undefined
-                ? {}
-                : { resolveExecutablePath: dependencies.resolveExecutablePath })
+            stamp: acquisitionStamp
         });
         /*
          * Ownership is checked before every write, not once at the start. A round
@@ -702,12 +745,15 @@ async function ingestStandardInput(dependencies, now, host = "claude") {
     if (host === "codex" || host === "shell")
         return null;
     try {
-        const accountId = await captureStatuslineAccount(host === "antigravity" ? "ANTIGRAVITY" : host === "grok" ? "GROK" : "CLAUDE", {
+        const accountIdBeforePayload = host === "antigravity" ? null : await captureStatuslineAccount(host === "grok" ? "GROK" : "CLAUDE", {
             environment: dependencies.environment, homeDirectory: dependencies.homeDirectory, platform: dependencies.platform, ...(dependencies.stateDirectory ? { stateDirectory: dependencies.stateDirectory } : {}), now
         });
         const document = parseJsonText(await dependencies.readStandardInput());
         if (!document.ok)
             return null;
+        const accountId = host === "antigravity"
+            ? antigravityStatuslineAccount(document.value)
+            : accountIdBeforePayload;
         const meters = host === "antigravity"
             ? parseAntigravityStatuslinePayload(document.value, now)
             : host === "grok"
@@ -725,22 +771,37 @@ async function ingestStandardInput(dependencies, now, host = "claude") {
         const incoming = normalizeMeters(withProvenance(meters, provenance).map(meter => ({ ...meter, ...(accountId ? { accountId } : {}) })));
         if (incoming.length === 0)
             return { snapshots: null, payload: document.value };
+        /* The render still draws when a write fails, so each failure is kept for
+           doctor by its stage, and the next full success clears it. */
+        let merged;
         try {
-            const { merged } = await persistSnapshots(incoming, dependencies.stateDirectory, now);
-            return { snapshots: merged, payload: document.value };
+            merged = (await mergeSnapshotCache(incoming, dependencies.stateDirectory ?? resolveStateDirectory(), Date.parse(now))).merged;
         }
-        catch {
+        catch (error) {
+            await recordStatuslineFailure(dependencies.stateDirectory, now, "cache_write", error);
             const existing = await cachedSnapshots(dependencies.stateDirectory);
             return { snapshots: mergeSnapshots(existing, incoming), payload: document.value };
         }
+        try {
+            await writeAgentContextSnapshot(merged, dependencies.stateDirectory, now);
+            await clearStatuslineFailure(dependencies.stateDirectory);
+        }
+        catch (error) {
+            await recordStatuslineFailure(dependencies.stateDirectory, now, "agent_context", error);
+        }
+        return { snapshots: merged, payload: document.value };
     }
-    catch {
+    catch (error) {
+        await recordStatuslineFailure(dependencies.stateDirectory, now, "ingest", error);
         return null;
     }
 }
 async function initCommand(dependencies) {
     const environment = await environmentWithLocalMarkers(dependencies.environment, dependencies.stateDirectory);
     try {
+        if (!(await ensureClaudePollChoice(dependencies))) {
+            return fail(EXIT_FAILURE, "openlimiter init: configuration could not be written, so Claude usage stays off.");
+        }
         const result = await initialize(environment, dependencies.credentialStore, dependencies.promptForSecret, dependencies.stateDirectory);
         const detected = result.config.connectors
             .filter((connector) => connector.detected)
@@ -951,14 +1012,16 @@ async function statuslineCommand(dependencies, argumentsList, now) {
     }
     const advice = buildAdvice(snapshots, now, PROVIDER_CODES);
     const config = await readStatuslineConfig(dependencies.stateDirectory);
-    if (!config.bars)
-        return succeed(renderClaudeStatusline(advice));
+    if (!config.bars) {
+        return succeed(renderPlainStatusline(advice, snapshots, now, resolveProviderOrder(config.order), config.meters));
+    }
     return succeed(renderStatuslineLayout({
         advice,
         snapshots,
         now,
         config,
         session: parseStatuslineSession(ingested?.payload),
+        apiSpend: await readApiSpend(dependencies.stateDirectory ?? resolveStateDirectory()),
         color: statuslineColor(config.color, dependencies.environment, dependencies.colorOutput, host),
         unicode: statuslineUnicode(dependencies.environment),
         host
@@ -1532,10 +1595,39 @@ async function triggerSyncAfterRefresh(dependencies, now) {
 }
 /* -------------------------------------------------------------- setup */
 const SETUP_SIGN_IN_PROMPT = "Sign in to sync your bars to the hub and your phone (free)";
+const CLAUDE_POLL_DISCLOSURE = "OpenLimiter can read the same usage Claude shows by sending a direct usage request with your Claude sign in on this computer. Anthropic's policy for tools like this is unresolved.";
+const CLAUDE_POLL_QUESTION = "Show Fable limit? Enter to turn it on, N to keep it off: ";
 async function promptOrSkip(dependencies, question) {
+    if (!dependencies.interactive)
+        return false;
     const answer = await dependencies.promptChoice?.(question) ?? "";
     return !answer.trim().toLowerCase().startsWith("s");
 }
+/** Record one real Claude polling choice before any terminal acquisition. */
+async function ensureClaudePollChoice(dependencies) {
+    const stored = await readConfig(dependencies.stateDirectory);
+    if (!stored.ok && stored.reason !== "missing")
+        return false;
+    const config = stored.ok ? stored.config : defaultConfig(dependencies.environment);
+    if (config.providers.claude.recorded)
+        return true;
+    let enabled = false;
+    if (dependencies.interactive) {
+        dependencies.emit(CLAUDE_POLL_DISCLOSURE);
+        const answer = await dependencies.promptChoice?.(CLAUDE_POLL_QUESTION) ?? "n";
+        enabled = !answer.trim().toLowerCase().startsWith("n");
+    }
+    try {
+        await writeConfig({
+            ...config,
+            providers: { claude: { poll: enabled, recorded: true } }
+        }, dependencies.stateDirectory);
+        return true;
+    }
+    catch {
+        return false;
+    }
+}
 /** Step one: sign in, or say plainly why this machine did not. */
 async function setupSignInStep(dependencies) {
     const lines = ["1. Sign in", SETUP_SIGN_IN_PROMPT];
@@ -1750,6 +1842,9 @@ async function setupShowBarsStep(dependencies) {
 async function setupCommand(dependencies, now) {
     await setupSignInStep(dependencies);
     await setupConnectStep(dependencies);
+    if (!(await ensureClaudePollChoice(dependencies))) {
+        dependencies.emit("Claude usage stays off because the choice could not be saved.");
+    }
     const collected = await refreshCommand(dependencies, now);
     if (collected.exitCode !== 0 && collected.stderr !== "")
         dependencies.emit(collected.stderr);
@@ -1761,9 +1856,11 @@ async function setupCommand(dependencies, now) {
 export async function runCli(argumentsList, overrides = {}) {
     const setupOutput = [];
     const hasOutputSink = overrides.emit !== undefined;
+    const interactive = overrides.interactive ?? overrides.promptChoice !== undefined;
     const dependencies = {
         ...defaults(),
         ...overrides,
+        interactive,
         ...(hasOutputSink ? {} : { emit: (line) => setupOutput.push(line) })
     };
     const command = argumentsList[0] ?? "setup";