agent-fuel 0.4.0 → 0.4.1

package/dist/adapters/agy.js

@@ -1,13 +1,11 @@
 import fs from 'node:fs/promises';
 import path from 'node:path';
 import os from 'node:os';
-import { TuiScraper } from '../tmux.js';
+import { TuiScraper, sleep } from '../tmux.js';
+import { debug } from '../debug.js';
 const CACHE_PATH = path.join(os.homedir(), '.gemini/antigravity-cli/.agent-fuel-quota-cache.json');
 const CACHE_TTL_MS = 5 * 60 * 1000; // 5 minutes
 // ── Scraping ───────────────────────────────────────────────────────────────
-async function sleep(ms) {
-    return new Promise(res => setTimeout(res, ms));
-}
 /**
  * Launches `agy` in a tmux session, opens the `/usage` panel, waits for
  * the Model Quota list to render, then returns clean rendered screen text.
@@ -16,8 +14,16 @@ async function runAgyUsage() {
     const tui = new TuiScraper('agy');
     try {
         tui.start();
-        // Wait for AGY main menu ready
-        await tui.waitFor(/for shortcuts/, 20_000);
+        // Wait for AGY main menu ready.
+        // On first run in a new directory, AGY shows a "Do you trust this project?"
+        // prompt. The "Yes, I trust this folder" option is pre-selected; press Enter.
+        const firstScreen = await tui.waitFor(/for shortcuts|Do you trust/i, 20_000);
+        if (!/for shortcuts/i.test(firstScreen)) {
+            debug('agy:scrape', 'trust prompt detected — confirming with Enter');
+            await sleep(300); // ensure app is fully interactive before sending input
+            tui.sendKey('Enter');
+            await tui.waitFor(/for shortcuts/, 15_000);
+        }
         // Navigate to /usage panel
         tui.send('/usage');
         await tui.waitFor(/Model Quota/, 10_000);

package/dist/adapters/claude.js

@@ -1,9 +1,6 @@
-import { TuiScraper } from '../tmux.js';
+import { TuiScraper, sleep } from '../tmux.js';
 import { debug } from '../debug.js';
 // ── TUI scraper ────────────────────────────────────────────────────────────
-async function sleep(ms) {
-    return new Promise(res => setTimeout(res, ms));
-}
 /**
  * Launches `claude` in a tmux session, opens /status, navigates to the
  * Status tab (which shows real quota usage bars), and returns the captured
@@ -33,6 +30,23 @@ async function runClaudeScrape() {
         tui.kill();
     }
 }
+// ── Parser ─────────────────────────────────────────────────────────────────
+/** Convert any 12h am/pm time within a string to 24h (HH:MM). */
+function to24h(s) {
+    return s.replace(/\b(\d{1,2})(?::(\d{2}))?\s*(am|pm)\b/gi, (_, h, m, meridiem) => {
+        let hour = parseInt(h, 10);
+        const min = m ?? '00';
+        if (meridiem.toLowerCase() === 'am') {
+            if (hour === 12)
+                hour = 0; // 12am → 00:xx
+        }
+        else {
+            if (hour !== 12)
+                hour += 12; // 1–11pm → 13–23
+        }
+        return `${String(hour).padStart(2, '0')}:${min}`;
+    });
+}
 function parseScrapeOutput(screen) {
     debug('claude:parse', `screen length: ${screen.length}`);
     debug('claude:parse', 'screen', screen);
@@ -42,9 +56,10 @@ function parseScrapeOutput(screen) {
     debug('claude:parse', `found ${usedMatches.length} "% used" matches`);
     const sessionUsedPct = usedMatches[0] ? parseInt(usedMatches[0][1], 10) : null;
     const weeklyUsedPct = usedMatches[1] ? parseInt(usedMatches[1][1], 10) : null;
-    // Reset time: "Resets H:MMam" or "Resets May 30 at 6am" — grab the first occurrence
+    // Reset time: "Resets H:MMam" or "Resets May 30 at 6am" — grab the first occurrence,
+    // then normalise any 12h am/pm component to 24h (e.g. "11:10pm" → "23:10").
     const resetMatch = screen.match(/Resets\s+([^\n\r]+)/i);
-    const sessionResetAt = resetMatch ? resetMatch[1].trim() : null;
+    const sessionResetAt = resetMatch ? to24h(resetMatch[1].trim()) : null;
     debug('claude:parse', 'result', { sessionUsedPct, sessionResetAt, weeklyUsedPct });
     return { sessionUsedPct, sessionResetAt, weeklyUsedPct };
 }

package/dist/adapters/codex.js

@@ -1,7 +1,7 @@
 import { exec, execFileSync } from 'node:child_process';
 import { promisify } from 'node:util';
 import { readFileSync, unlinkSync } from 'node:fs';
-import { TuiScraper } from '../tmux.js';
+import { TuiScraper, sleep } from '../tmux.js';
 import { debug } from '../debug.js';
 const execAsync = promisify(exec);
 // Used ONLY as a rough fallback estimate when the TUI scrape cannot determine
@@ -10,9 +10,14 @@ const execAsync = promisify(exec);
 const DEFAULT_BUDGET_USD = 20.0;
 const ROLLING_WINDOW_MS = 5 * 60 * 60 * 1000;
 // ── TUI scraper (tmux) ─────────────────────────────────────────────────────
-async function sleep(ms) {
-    return new Promise(res => setTimeout(res, ms));
-}
+// Codex may show one or more blocking dialogs before its main screen ("Tip:").
+// Known dialogs and their dismissal key ("2" = skip/use existing):
+//   • Update nag:      "Update available! x.x → y.y"
+//   • New-model intro: "Introducing GPT-5.5"
+const CODEX_READY = /Tip:/i;
+const CODEX_DIALOG = /Update available|Introducing GPT|Try new model|Use existing model/i;
+const CODEX_EITHER = new RegExp(`(?:${CODEX_READY.source})|(?:${CODEX_DIALOG.source})`, 'i');
+const CODEX_STARTUP_MS = 25_000;
 /**
  * Launches `codex` in a tmux session, pipes all terminal bytes to a temp
  * file, sends /status twice, then reads the file and returns the raw bytes.
@@ -31,8 +36,19 @@ async function runCodexScrape() {
         // Stream all pane output to a file from the start
         execFileSync('tmux', ['pipe-pane', '-t', tui.sessionId, `cat >> '${pipePath}'`]);
         debug('codex:scrape', `pipe-pane logging to ${pipePath}`);
-        // Wait for TUI ready: current screen (historyLines=0) shows Tip, meaning MCP boot done
-        await tui.waitFor(/Tip:/i, 20_000, 0);
+        // Wait for TUI ready, dismissing any blocking dialogs along the way.
+        const dialogDeadline = Date.now() + CODEX_STARTUP_MS;
+        let screen = await tui.waitFor(CODEX_EITHER, CODEX_STARTUP_MS, 0);
+        while (!CODEX_READY.test(screen)) {
+            debug('codex:scrape', 'blocking dialog detected — sending "2" to dismiss');
+            tui.send('2');
+            await sleep(1_000); // wait for dialog to actually clear before re-checking
+            const remaining = dialogDeadline - Date.now(); // compute AFTER sleep
+            if (remaining < 500) {
+                throw new Error('Codex TUI never reached ready state after dismissing dialogs');
+            }
+            screen = await tui.waitFor(CODEX_EITHER, remaining, 0);
+        }
         // First /status: panel says "Limits: refresh requested; run /status again shortly"
         tui.send('/status');
         await sleep(2_000);
@@ -156,7 +172,7 @@ async function fetchCcusageEstimate(budgetLimit) {
         if (latestActivity > 0) {
             try {
                 resetAt = new Date(latestActivity + ROLLING_WINDOW_MS).toLocaleTimeString([], {
-                    hour: '2-digit', minute: '2-digit',
+                    hour: '2-digit', minute: '2-digit', hour12: false,
                 });
             }
             catch { /* leave null */ }

package/dist/tmux.d.ts

@@ -11,3 +11,4 @@ export declare class TuiScraper {
     waitFor(pattern: RegExp, timeoutMs: number, historyLines?: number): Promise<string>;
     kill(): void;
 }
+export declare function sleep(ms: number): Promise<void>;

package/dist/tmux.js

@@ -67,6 +67,6 @@ export class TuiScraper {
         catch { /* already dead */ }
     }
 }
-function sleep(ms) {
+export function sleep(ms) {
     return new Promise(res => setTimeout(res, ms));
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agent-fuel",
-  "version": "0.4.0",
+  "version": "0.4.1",
   "description": "Sleek term-based dashboard for AI coding CLI quotas",
   "type": "module",
   "main": "dist/index.js",
@@ -28,7 +28,7 @@
   "author": "Pedro Rodrigues",
   "license": "MIT",
   "devDependencies": {
-    "@types/node": "^20.11.24",
-    "typescript": "^5.3.3"
+    "@types/node": "^25.9.1",
+    "typescript": "^6.0.3"
   }
 }