quotacap 0.0.26 → 0.0.28

package/dist/adapters/grok.js

@@ -35,35 +35,73 @@ function parseGrokReset(raw, now) {
     }
     return dt.toISOString();
 }
+function validPct(v) {
+    return Number.isFinite(v) && v >= 0 && v <= 100;
+}
 export function parseGrokTui(text, now = new Date()) {
     const cleaned = stripAnsi(text);
-    const planMatch = cleaned.match(/Weekly lim[i!l]t\s*\(([^)]+)\)/i);
+    // The TUI writes "Weekly lim", repositions the cursor, then writes
+    // "t (Tier)", so after ANSI stripping the header reads "Weekly limt".
+    // The [i!l] class stays optional to keep tolerating past glitch variants.
+    const headerRe = /Weekly\s+lim[i!l]?t\s*\(([^)]+)\)/gi;
     let plan = "unknown";
-    if (planMatch) {
-        plan = planMatch[1].trim();
+    let lastHeaderIdx = -1;
+    for (const m of cleaned.matchAll(headerRe)) {
+        if (m.index === undefined)
+            continue;
+        plan = m[1].trim();
+        lastHeaderIdx = m.index;
     }
-    else {
+    if (lastHeaderIdx < 0) {
         const tier = cleaned.match(/\b(SuperGrok|Grok\s+Pro|Grok\s+Enterprise|Grok\s+Basic)\b/i);
         if (tier)
             plan = tier[1].trim();
     }
-    const pctRe = /Weekly lim[i!l]t[^\n%]*?(\d+)%/i;
-    const mPct = cleaned.match(pctRe);
     let usedPct = null;
-    if (mPct) {
-        const v = parseInt(mPct[1], 10);
-        if (Number.isFinite(v) && v >= 0 && v <= 100)
-            usedPct = v;
+    // 1. Dialog header: first percent in a bounded window after the LAST
+    // header (later renders supersede earlier ones). The bar percent sits on
+    // the line below the header, so this must span newlines.
+    if (lastHeaderIdx >= 0) {
+        const after = cleaned.slice(lastHeaderIdx, lastHeaderIdx + 1200);
+        const m = after.match(/(\d{1,3})%/);
+        if (m) {
+            const v = parseInt(m[1], 10);
+            if (validPct(v))
+                usedPct = v;
+        }
     }
+    // 2. Legacy same-line form ("Weekly limit (Tier) 26%"), excluding the
+    // startup status line "Weekly limit left: N%", which reports REMAINING
+    // quota with inverted semantics. Last valid match wins.
     if (usedPct === null) {
-        const barRe = /[█░▓▓]+\s*(\d+)%/;
-        const b = cleaned.match(barRe);
-        if (b) {
-            const v = parseInt(b[1], 10);
-            if (Number.isFinite(v) && v >= 0 && v <= 100)
+        const lineRe = /Weekly\s+lim[i!l]?t[^\n%]*?(\d{1,3})%/gi;
+        for (const m of cleaned.matchAll(lineRe)) {
+            if (/left/i.test(m[0]))
+                continue;
+            const v = parseInt(m[1], 10);
+            if (validPct(v))
                 usedPct = v;
         }
     }
+    // 3. Bare progress-bar percent. Last valid match wins.
+    if (usedPct === null) {
+        const barRe = /[█░▓▒]+\s*(\d{1,3})%/g;
+        for (const m of cleaned.matchAll(barRe)) {
+            const v = parseInt(m[1], 10);
+            if (validPct(v))
+                usedPct = v;
+        }
+    }
+    // 4. Status-line remaining figure ("Weekly limit left: N%") converted to
+    // used. Last valid match wins.
+    if (usedPct === null) {
+        const leftRe = /Weekly\s+lim[i!l]?t\s+left\s*:?\s*(\d{1,3})%/gi;
+        for (const m of cleaned.matchAll(leftRe)) {
+            const v = parseInt(m[1], 10);
+            if (validPct(v))
+                usedPct = 100 - v;
+        }
+    }
     if (usedPct === null)
         throw new Error("grok: weekly percent not found in TUI output");
     let creditsUsd;
@@ -73,11 +111,13 @@ export function parseGrokTui(text, now = new Date()) {
         if (Number.isFinite(v) && v >= 0)
             creditsUsd = v;
     }
-    const mReset = cleaned.match(/Resets:\s*([A-Za-z]+\s+\d+,\s*\d+:\d+)/i);
+    const resetRe = /Resets:\s*([A-Za-z]+\s+\d+,\s*\d+:\d+)/gi;
+    let resetsRaw = null;
+    for (const m of cleaned.matchAll(resetRe))
+        resetsRaw = m[1].trim();
     let resetsAt = null;
     let estimated = false;
-    if (mReset) {
-        const resetsRaw = mReset[1].trim();
+    if (resetsRaw) {
         resetsAt = parseGrokReset(resetsRaw, now);
         if (!resetsAt)
             throw new Error(`grok: bad resets timestamp "${resetsRaw}"`);
@@ -115,7 +155,10 @@ export const grokAdapter = {
             rows: 50,
             settleDelayMs: 5000,
             input: "/usage\r",
-            completionRegex: /Weekly lim|Credits:/i,
+            // Wait for the usage dialog (tier header or Resets line), not the
+            // startup status line "Weekly limit left: N%", which matches /Weekly lim/
+            // and would complete before the dialog renders.
+            completionRegex: /Weekly\s+lim[i!l]?t\s*\(|Resets:|Credits:/i,
             timeoutMs: 14000,
             maxBytes: 256 * 1024,
             signal: adapterSignal("grok"),

package/dist/cli/advise.js

@@ -4,7 +4,7 @@ import { ensureConfig, getDbPath } from "../config.js";
 import { createServiceClient } from "../runtime/client.js";
 import { VERSION } from "../version.js";
 import { isServiceManaged, runServiceCommand } from "../service/index.js";
-import { detectChannel, printUpdateFooter, readUpdateCache, refreshUpdateCache, updateFooter, } from "../runtime/updates.js";
+import { detectChannel, printUpdateFooter, printVersionLine, readUpdateCache, refreshUpdateCache, updateFooter, } from "../runtime/updates.js";
 import { ClientError, OFFLINE_LABEL, emptySnapshot, offlineOnlyClient, resolveSnapshot } from "./snapshot-source.js";
 import { checkSkew, execSkewWarning, olderCliWarning, takeoverManaged, unmanagedSkewWarning, } from "./takeover.js";
 export function registerAdviseCommand(program, deps) {
@@ -67,6 +67,9 @@ export function registerAdviseCommand(program, deps) {
                             ...takeoverOpts,
                         });
                         console.error(r.message);
+                        // The takeover verified the daemon now reports the CLI version;
+                        // keep the pre-check health from mislabeling the version line.
+                        health.version = VERSION;
                     }
                     catch (e) {
                         console.error(e instanceof Error ? e.message : String(e));
@@ -108,6 +111,7 @@ export function registerAdviseCommand(program, deps) {
                     console.log(JSON.stringify(rec, null, 2));
                 else {
                     console.log(`${rec.use}: ${rec.reason}`);
+                    printVersionLine(o, VERSION, health?.version);
                     printUpdateFooter(o, footer);
                 }
                 return;
@@ -123,6 +127,7 @@ export function registerAdviseCommand(program, deps) {
             console.log(JSON.stringify(rec, null, 2));
         else {
             console.log(`${rec.use}: ${rec.reason}`);
+            printVersionLine(o, VERSION, health?.version);
             printUpdateFooter(o, footer);
         }
     });

package/dist/cli/status.js

@@ -6,7 +6,7 @@ import { assertValidSortKey } from "../format/rows.js";
 import { createServiceClient } from "../runtime/client.js";
 import { VERSION } from "../version.js";
 import { isServiceManaged, runServiceCommand } from "../service/index.js";
-import { detectChannel, printUpdateFooter, readUpdateCache, refreshUpdateCache, updateFooter, } from "../runtime/updates.js";
+import { detectChannel, printUpdateFooter, printVersionLine, readUpdateCache, refreshUpdateCache, updateFooter, } from "../runtime/updates.js";
 import { ClientError, OFFLINE_LABEL, offlineOnlyClient, resolveSnapshot } from "./snapshot-source.js";
 import { checkSkew, execSkewWarning, olderCliWarning, takeoverManaged, unmanagedSkewWarning, } from "./takeover.js";
 const WIDE_COLUMNS = 100;
@@ -76,6 +76,9 @@ export function registerStatusCommand(program, deps) {
                             ...takeoverOpts,
                         });
                         console.error(r.message);
+                        // The takeover verified the daemon now reports the CLI version;
+                        // keep the pre-check health from mislabeling the version line.
+                        health.version = VERSION;
                     }
                     catch (e) {
                         console.error(e instanceof Error ? e.message : String(e));
@@ -122,6 +125,7 @@ export function registerStatusCommand(program, deps) {
                     return;
                 }
                 console.log(e.message);
+                printVersionLine(o, VERSION, health?.version);
                 printUpdateFooter(o, footer);
                 return;
             }
@@ -153,6 +157,7 @@ export function registerStatusCommand(program, deps) {
             if (issues)
                 console.log("\n" + issues);
         }
+        printVersionLine(o, VERSION, health?.version);
         printUpdateFooter(o, footer);
     });
 }

package/dist/cli/takeover.js

@@ -119,7 +119,7 @@ export async function takeoverManaged(opts) {
         : "unknown";
     const execService = opts.execService ?? ((args, o) => runServiceCommand(args, o ?? {}, {}));
     const verb = opts.refreshRegistration ? "install" : "restart";
-    const code = await execService([verb], opts.refreshRegistration ? { version: cliVersion } : undefined);
+    const code = await execService([verb], opts.refreshRegistration ? { version: cliVersion, quiet: true } : undefined);
     if (code !== 0) {
         throw new TakeoverError(`daemon upgrade failed: service ${verb} exited ${code}`);
     }

package/dist/runtime/updates.d.ts

@@ -57,6 +57,10 @@ export declare function updateFooter(current: string, latest: string | null): st
 export declare function printUpdateFooter(o: {
     json?: boolean;
 }, footer: string | null): void;
+export declare function printVersionLine(o: {
+    json?: boolean;
+    compact?: boolean;
+}, cliVersion: string, daemonVersion: unknown): void;
 export declare function platformAssetName(platform?: NodeJS.Platform, arch?: string): string;
 export declare function verifyChecksum(data: Buffer, sumsText: string, name: string): boolean;
 export declare function defaultExtractTar(tarball: string, destDir: string): void;

package/dist/runtime/updates.js

@@ -333,6 +333,17 @@ export function printUpdateFooter(o, footer) {
         return;
     console.error(footer);
 }
+// Version identity line, printed next to the update footer under the same
+// stderr/TTY rules, plus never under --compact (prompt renderers must not
+// see per-render noise). The daemon part appears only when the reachable
+// daemon reports a version that differs from the CLI.
+export function printVersionLine(o, cliVersion, daemonVersion) {
+    if (o.json || o.compact || !process.stderr.isTTY)
+        return;
+    const daemon = typeof daemonVersion === "string" && daemonVersion ? daemonVersion : null;
+    const suffix = daemon && daemon !== cliVersion ? ` · daemon ${daemon}` : "";
+    console.error(`quotacap ${cliVersion}${suffix}`);
+}
 export function platformAssetName(platform = process.platform, arch = process.arch) {
     const os = platform === "darwin" ? "darwin" : platform === "linux" ? "linux" : null;
     const a = arch === "arm64" ? "arm64" : arch === "x64" ? "x64" : null;

package/dist/service/index.js

@@ -75,8 +75,14 @@ export async function runServiceCommand(args, opts = {}, deps = {}) {
             case "install":
                 // Internal: the post-update refresh passes the target version so
                 // install compares and records it instead of the old in-process
-                // VERSION. The `service install` CLI never sets opts.version.
-                await backend.install({ ...deps, version: opts.version ?? deps.version });
+                // VERSION, plus quiet so a good update prints its own three lines
+                // instead of the install chatter. The `service install` CLI never
+                // sets opts.version or opts.quiet.
+                await backend.install({
+                    ...deps,
+                    version: opts.version ?? deps.version,
+                    quiet: opts.quiet ?? deps.quiet,
+                });
                 break;
             case "uninstall":
                 await backend.uninstall(deps);

package/dist/service/macos.d.ts

@@ -21,6 +21,7 @@ export interface ServiceDeps {
     sleep?: (ms: number) => Promise<void>;
     bootstrapTimeoutMs?: number;
     version?: string;
+    quiet?: boolean;
 }
 export declare function foregroundGuidance(verb: string, platform: string): string;
 export declare function defaultRunLaunchctl(args: string[]): string;

package/dist/service/macos.js

@@ -279,6 +279,8 @@ export async function install(deps = {}) {
         (deps.print ?? console.log)(foregroundGuidance("install", platform));
         return;
     }
+    if (deps.quiet)
+        deps = { ...deps, print: () => { } };
     const { home, uid, dataDir, print, run, lint, sleep, bootstrapTimeoutMs } = resolved(deps);
     const version = deps.version ?? VERSION;
     // Provision beside the data dir the service will use (identical to the
@@ -342,6 +344,14 @@ export async function install(deps = {}) {
             installedAt: (deps.now?.() ?? new Date()).toISOString(),
         }, dataDir);
         bootoutQuiet(run, uid, print);
+        // bootout is asynchronous: without this the replacement races the dying
+        // process for the port, the same race restart() guards against.
+        // deps.port keeps tests off the real daemon's port.
+        const upgradePort = deps.port ?? (await readConfig()).port;
+        const waitReleased = deps.waitReleased ?? defaultWaitReleased;
+        if (!(await waitReleased(upgradePort))) {
+            print(`port ${upgradePort} is still in use after stopping; starting anyway`);
+        }
     }
     else {
         writeServiceMetadata({

package/dist/service/systemd.d.ts

@@ -18,6 +18,7 @@ export interface SystemdDeps {
     error?: (msg: string) => void;
     now?: () => Date;
     version?: string;
+    quiet?: boolean;
 }
 export declare function formatSystemctlError(args: string[], detail: string): Error;
 export declare function defaultRunSystemctl(args: string[]): string;

package/dist/service/systemd.js

@@ -106,6 +106,8 @@ export async function install(deps = {}) {
         (deps.print ?? console.log)(foregroundGuidance("install", platform));
         return;
     }
+    if (deps.quiet)
+        deps = { ...deps, print: () => { } };
     const { home, dataDir, print, run } = resolved(deps);
     const version = deps.version ?? VERSION;
     // Provision beside the data dir the service will use (identical to the
@@ -157,6 +159,14 @@ export async function install(deps = {}) {
             installedAt: (deps.now?.() ?? new Date()).toISOString(),
         }, dataDir);
         stopQuiet(run, print);
+        // systemctl stop can return before the port is released; same race as
+        // launchd. deps.port mirrors start(): tests must never probe the real
+        // daemon's port.
+        const upgradePort = deps.port ?? (await readConfig()).port;
+        const waitReleased = deps.waitReleased ?? defaultWaitReleased;
+        if (!(await waitReleased(upgradePort))) {
+            print(`port ${upgradePort} is still in use after stopping; starting anyway`);
+        }
     }
     else {
         writeServiceMetadata({

package/dist/version.js

@@ -1,2 +1,2 @@
 // generated by scripts/build-embed.mjs — do not edit
-export const VERSION = "0.0.26";
+export const VERSION = "0.0.28";

package/dist/web/src/App.js

@@ -95,7 +95,7 @@ function App() {
         : null;
     const header = (_jsx(Header, { runtime: snapshot?.runtime ?? null, unreachable: error?.kind === "service-unavailable", refreshing: refreshing, onRefresh: () => void refresh(), onSettings: () => setSettingsOpen(true) }));
     if (snapshot && setupMode) {
-        return (_jsxs(_Fragment, { children: [header, _jsx("main", { children: _jsx(Onboarding, { snapshot: snapshot, onFirstPoll: () => void refresh(), polling: refreshing, pollError: pollErrorText }) }), _jsx(SettingsDrawer, { open: settingsOpen, providers: snapshot.providers, onRefresh: () => void refresh(), refreshing: refreshing, onClose: () => setSettingsOpen(false) }), _jsx(SiteFooter, {})] }));
+        return (_jsxs(_Fragment, { children: [header, _jsx("main", { children: _jsx(Onboarding, { snapshot: snapshot, onFirstPoll: () => void refresh(), polling: refreshing, pollError: pollErrorText }) }), _jsx(SettingsDrawer, { open: settingsOpen, providers: snapshot.providers, onRefresh: () => void refresh(), refreshing: refreshing, onClose: () => setSettingsOpen(false) }), _jsx(SiteFooter, { version: snapshot.runtime.version })] }));
     }
     return (_jsxs(_Fragment, { children: [header, _jsxs("main", { children: [notice && (_jsx("div", { "data-testid": "refresh-notice", role: "status", children: notice })), loading && !snapshot && (_jsx("div", { "data-testid": "state-loading", "aria-busy": "true", "aria-label": "Loading quota state", children: [0, 1, 2].map((i) => (_jsx("div", { "aria-hidden": "true", className: "skel", style: {
                                 height: 64,
@@ -109,7 +109,7 @@ function App() {
                         }, onViewAdvice: () => {
                             setSelectedProvider(null);
                             setAdviceOpen(true);
-                        } }))] }), _jsx(ProviderDrawer, { provider: snapshot?.providers.find((p) => p.id === selectedProvider) ?? null, asOf: snapshot?.asOf ?? "", recommendation: snapshot?.recommendation ?? null, onClose: () => setSelectedProvider(null), onRenamed: () => void load() }), snapshot && (_jsx(AdviceDrawer, { open: adviceOpen, recommendation: snapshot.recommendation, providers: snapshot.providers, asOf: snapshot.asOf, onClose: () => setAdviceOpen(false) })), _jsx(SettingsDrawer, { open: settingsOpen, providers: snapshot?.providers ?? [], onRefresh: () => void refresh(), refreshing: refreshing, onClose: () => setSettingsOpen(false) }), _jsx(SiteFooter, {})] }));
+                        } }))] }), _jsx(ProviderDrawer, { provider: snapshot?.providers.find((p) => p.id === selectedProvider) ?? null, asOf: snapshot?.asOf ?? "", recommendation: snapshot?.recommendation ?? null, onClose: () => setSelectedProvider(null), onRenamed: () => void load() }), snapshot && (_jsx(AdviceDrawer, { open: adviceOpen, recommendation: snapshot.recommendation, providers: snapshot.providers, asOf: snapshot.asOf, onClose: () => setAdviceOpen(false) })), _jsx(SettingsDrawer, { open: settingsOpen, providers: snapshot?.providers ?? [], onRefresh: () => void refresh(), refreshing: refreshing, onClose: () => setSettingsOpen(false) }), _jsx(SiteFooter, { version: snapshot?.runtime.version })] }));
 }
 const el = typeof document === "undefined" ? null : document.getElementById("app");
 if (el)

package/dist/web/src/components/PacingLegend.d.ts

@@ -1,3 +1,5 @@
 import React from "react";
 export declare function PacingLegend(): React.JSX.Element;
-export declare function SiteFooter(): React.JSX.Element;
+export declare function SiteFooter({ version }: {
+    version?: string;
+}): React.JSX.Element;

package/dist/web/src/components/PacingLegend.js

@@ -38,6 +38,7 @@ function servingHost() {
         return "127.0.0.1";
     }
 }
-export function SiteFooter() {
-    return (_jsxs("footer", { className: "sitefoot", children: [_jsxs("div", { className: "sitefoot-start", children: [_jsxs("span", { children: ["QuotaCap \u00B7 local quota tracker \u00B7 bound to ", _jsx("code", { children: servingHost() })] }), _jsx(PacingLegend, {})] }), _jsx("span", { children: "MIT licence \u00B7 no telemetry \u00B7 history stays on this machine" })] }));
+export function SiteFooter({ version }) {
+    const name = version ? `QuotaCap v${version}` : "QuotaCap";
+    return (_jsxs("footer", { className: "sitefoot", children: [_jsxs("div", { className: "sitefoot-start", children: [_jsxs("span", { children: [name, " \u00B7 local quota tracker \u00B7 bound to ", _jsx("code", { children: servingHost() })] }), _jsx(PacingLegend, {})] }), _jsx("span", { children: "MIT licence \u00B7 no telemetry \u00B7 history stays on this machine" })] }));
 }