quotacap 0.0.9 → 0.0.10

package/dist/cli/index.js

@@ -62,6 +62,12 @@ program.command("web").option("--port <n>").action(async (o) => {
     ensureDbDir();
     const db = openDb(getDbPath());
     migrate(db);
+    const { isDaemonRunning, startDaemon } = await import("../daemon.js");
+    if (!isDaemonRunning()) {
+        const started = await startDaemon();
+        if (!started.alreadyRunning)
+            console.log("daemon started (auto)");
+    }
     const app = buildApp(db);
     const port = o.port ? parseInt(o.port) : (await readConfig()).port;
     await app.listen({ port, host: "127.0.0.1" });
@@ -75,14 +81,18 @@ program.command("init").action(async () => {
 });
 program.command("daemon").option("--foreground", "keep foreground (default: true)").action(async (o) => {
     const { startDaemon } = await import("../daemon.js");
-    const { timer } = await startDaemon();
+    const started = await startDaemon();
+    if (started.alreadyRunning) {
+        console.log(`daemon already running (pid ${started.alreadyRunning})`);
+        return;
+    }
     console.log("QuotaCap daemon started" + (o.foreground !== false ? " (foreground)" : ""));
     // keep alive until SIGINT/SIGTERM — timer is ref'd so event loop stays alive
-    process.on("SIGINT", () => { clearInterval(timer); process.exit(0); });
-    process.on("SIGTERM", () => { clearInterval(timer); process.exit(0); });
+    process.on("SIGINT", () => { started.stop(); process.exit(0); });
+    process.on("SIGTERM", () => { started.stop(); process.exit(0); });
     // explicitly keep process alive if interval was somehow unref'd elsewhere
-    if (timer.ref)
-        timer.ref();
+    if (started.timer.ref)
+        started.timer.ref();
 });
 program.command("mcp").description("start MCP server (stdio over HTTP)").action(async () => {
     const mod = await import("../mcp/server.js");

package/dist/config.js

@@ -5,12 +5,12 @@ import { z } from "zod";
 export function getConfigPath(p) {
     if (p)
         return p;
-    return path.join(os.homedir(), ".quotacap", "config.json");
+    return path.join(process.env.QUOTACAP_HOME ?? os.homedir(), ".quotacap", "config.json");
 }
 export function getDbPath(p) {
     if (p)
         return p;
-    return path.join(os.homedir(), ".quotacap", "quotacap.db");
+    return path.join(process.env.QUOTACAP_HOME ?? os.homedir(), ".quotacap", "quotacap.db");
 }
 const ConfigSchema = z.object({
     port: z.number().default(8787),

package/dist/daemon.d.ts

@@ -1,3 +1,4 @@
+export declare function isDaemonRunning(file?: string): boolean;
 export declare function pollOnce(db: any, enabled: string[]): Promise<({
     provider: string;
     status: "fulfilled";
@@ -15,8 +16,14 @@ export declare function pollOnce(db: any, enabled: string[]): Promise<({
     value?: undefined;
 })[]>;
 export declare function startDaemon(): Promise<{
+    alreadyRunning: string;
+    db: any;
+    timer: any;
+    stop: () => void;
+} | {
     db: any;
     timer: NodeJS.Timeout;
+    alreadyRunning: string | undefined;
     stop: () => void;
 }>;
 export declare const start: typeof startDaemon;

package/dist/daemon.js

@@ -1,5 +1,34 @@
 import { pollAll } from "./adapters/index.js";
 import { upsertQuota } from "./store/quotas.js";
+import { getDbPath, readConfig } from "./config.js";
+import { openDb, migrate } from "./store/db.js";
+import { execFileSync } from "node:child_process";
+import fs from "node:fs";
+import path from "node:path";
+function pidFile() {
+    return path.join(path.dirname(getDbPath()), "daemon.pid");
+}
+// True when the pidfile names a live process that still runs quotacap — the
+// command check keeps a recycled pid from being mistaken for a running daemon
+// and matches both the compiled binary and `node dist/cli/index.js`.
+export function isDaemonRunning(file = pidFile()) {
+    try {
+        const pid = parseInt(fs.readFileSync(file, "utf8").trim(), 10);
+        if (!Number.isInteger(pid) || pid <= 0)
+            return false;
+        try {
+            process.kill(pid, 0);
+        }
+        catch {
+            return false;
+        }
+        const cmd = execFileSync("ps", ["-p", String(pid), "-o", "command="], { encoding: "utf8" }).trim();
+        return cmd.includes("quotacap") || cmd.includes("cli/index.js");
+    }
+    catch {
+        return false;
+    }
+}
 export async function pollOnce(db, enabled) {
     const results = await pollAll(enabled);
     for (const r of results) {
@@ -12,19 +41,30 @@ export async function pollOnce(db, enabled) {
     return results;
 }
 export async function startDaemon() {
-    const { getDbPath, readConfig } = await import("./config.js");
-    const { openDb, migrate } = await import("./store/db.js");
+    if (isDaemonRunning()) {
+        const existing = fs.readFileSync(pidFile(), "utf8").trim();
+        return { alreadyRunning: existing, db: null, timer: null, stop: () => { } };
+    }
+    const dbDir = path.dirname(getDbPath());
+    fs.mkdirSync(dbDir, { recursive: true });
     const db = openDb(getDbPath());
     migrate(db);
+    fs.mkdirSync(path.dirname(pidFile()), { recursive: true });
+    fs.writeFileSync(pidFile(), String(process.pid));
     const cfg = await readConfig();
     const intervalMs = (cfg.pollMinutes ?? 15) * 60 * 1000;
     // initial poll (fire-and-forget, don't block start)
     pollOnce(db, cfg.enabledProviders).catch(e => console.warn("[quotacap] initial poll failed", e?.message ?? String(e)));
     const jitter = Math.floor(Math.random() * 5000);
     const timer = setInterval(() => { pollOnce(db, cfg.enabledProviders).catch(e => console.warn("[quotacap] interval poll failed", e?.message ?? String(e))); }, intervalMs + jitter);
-    // keep event loop alive — this is the only long-lived process per design
-    // (previous unref() caused immediate exit after the initial poll)
-    return { db, timer, stop: () => clearInterval(timer) };
+    const stop = () => {
+        clearInterval(timer);
+        try {
+            fs.rmSync(pidFile(), { force: true });
+        }
+        catch { }
+    };
+    return { db, timer, alreadyRunning: undefined, stop };
 }
 // alias for plan's daemon.start() naming
 export const start = startDaemon;

package/dist/format/table.d.ts

@@ -1 +1,2 @@
+export declare function formatResetDate(iso: string): string;
 export declare function renderQuotasTable(quotas: any[], advisories?: any[]): string;

package/dist/format/table.js

@@ -1,11 +1,20 @@
 // The one table every surface renders: MCP tools, CLI status, web dashboard.
 // Quotas carry used/resets; advisories add days-left, burn and waste analysis.
 // Without advisories the analysis columns render as placeholders.
+export function formatResetDate(iso) {
+    return new Date(iso).toLocaleString(undefined, {
+        day: "numeric",
+        month: "short",
+        year: "numeric",
+        hour: "numeric",
+        minute: "2-digit",
+    });
+}
 export function renderQuotasTable(quotas, advisories = []) {
     const rows = quotas.map((q) => {
         const a = advisories.find((x) => x.provider === q.provider);
         const used = Math.round(q.usedPct ?? 0);
-        const resets = q.resetsAt ? new Date(q.resetsAt).toLocaleString() : "—";
+        const resets = q.resetsAt ? formatResetDate(q.resetsAt) : "—";
         const daysLeft = a?.daysLeft != null ? a.daysLeft.toFixed(1) : "—";
         const ideal = a?.idealRate != null ? `${Math.round(a.idealRate)}%/day` : "—";
         const burn = a?.burnMeasured ? `${a.burnRate.toFixed(1)}%/day` : a != null ? "collecting…" : "—";

package/dist/src/cli/index.js

@@ -62,6 +62,12 @@ program.command("web").option("--port <n>").action(async (o) => {
     ensureDbDir();
     const db = openDb(getDbPath());
     migrate(db);
+    const { isDaemonRunning, startDaemon } = await import("../daemon.js");
+    if (!isDaemonRunning()) {
+        const started = await startDaemon();
+        if (!started.alreadyRunning)
+            console.log("daemon started (auto)");
+    }
     const app = buildApp(db);
     const port = o.port ? parseInt(o.port) : (await readConfig()).port;
     await app.listen({ port, host: "127.0.0.1" });
@@ -75,14 +81,18 @@ program.command("init").action(async () => {
 });
 program.command("daemon").option("--foreground", "keep foreground (default: true)").action(async (o) => {
     const { startDaemon } = await import("../daemon.js");
-    const { timer } = await startDaemon();
+    const started = await startDaemon();
+    if (started.alreadyRunning) {
+        console.log(`daemon already running (pid ${started.alreadyRunning})`);
+        return;
+    }
     console.log("QuotaCap daemon started" + (o.foreground !== false ? " (foreground)" : ""));
     // keep alive until SIGINT/SIGTERM — timer is ref'd so event loop stays alive
-    process.on("SIGINT", () => { clearInterval(timer); process.exit(0); });
-    process.on("SIGTERM", () => { clearInterval(timer); process.exit(0); });
+    process.on("SIGINT", () => { started.stop(); process.exit(0); });
+    process.on("SIGTERM", () => { started.stop(); process.exit(0); });
     // explicitly keep process alive if interval was somehow unref'd elsewhere
-    if (timer.ref)
-        timer.ref();
+    if (started.timer.ref)
+        started.timer.ref();
 });
 program.command("mcp").description("start MCP server (stdio over HTTP)").action(async () => {
     const mod = await import("../mcp/server.js");

package/dist/src/config.js

@@ -5,12 +5,12 @@ import { z } from "zod";
 export function getConfigPath(p) {
     if (p)
         return p;
-    return path.join(os.homedir(), ".quotacap", "config.json");
+    return path.join(process.env.QUOTACAP_HOME ?? os.homedir(), ".quotacap", "config.json");
 }
 export function getDbPath(p) {
     if (p)
         return p;
-    return path.join(os.homedir(), ".quotacap", "quotacap.db");
+    return path.join(process.env.QUOTACAP_HOME ?? os.homedir(), ".quotacap", "quotacap.db");
 }
 const ConfigSchema = z.object({
     port: z.number().default(8787),

package/dist/src/daemon.d.ts

@@ -1,3 +1,4 @@
+export declare function isDaemonRunning(file?: string): boolean;
 export declare function pollOnce(db: any, enabled: string[]): Promise<({
     provider: string;
     status: "fulfilled";
@@ -15,8 +16,14 @@ export declare function pollOnce(db: any, enabled: string[]): Promise<({
     value?: undefined;
 })[]>;
 export declare function startDaemon(): Promise<{
+    alreadyRunning: string;
+    db: any;
+    timer: any;
+    stop: () => void;
+} | {
     db: any;
     timer: NodeJS.Timeout;
+    alreadyRunning: string | undefined;
     stop: () => void;
 }>;
 export declare const start: typeof startDaemon;

package/dist/src/daemon.js

@@ -1,5 +1,34 @@
 import { pollAll } from "./adapters/index.js";
 import { upsertQuota } from "./store/quotas.js";
+import { getDbPath, readConfig } from "./config.js";
+import { openDb, migrate } from "./store/db.js";
+import { execFileSync } from "node:child_process";
+import fs from "node:fs";
+import path from "node:path";
+function pidFile() {
+    return path.join(path.dirname(getDbPath()), "daemon.pid");
+}
+// True when the pidfile names a live process that still runs quotacap — the
+// command check keeps a recycled pid from being mistaken for a running daemon
+// and matches both the compiled binary and `node dist/cli/index.js`.
+export function isDaemonRunning(file = pidFile()) {
+    try {
+        const pid = parseInt(fs.readFileSync(file, "utf8").trim(), 10);
+        if (!Number.isInteger(pid) || pid <= 0)
+            return false;
+        try {
+            process.kill(pid, 0);
+        }
+        catch {
+            return false;
+        }
+        const cmd = execFileSync("ps", ["-p", String(pid), "-o", "command="], { encoding: "utf8" }).trim();
+        return cmd.includes("quotacap") || cmd.includes("cli/index.js");
+    }
+    catch {
+        return false;
+    }
+}
 export async function pollOnce(db, enabled) {
     const results = await pollAll(enabled);
     for (const r of results) {
@@ -12,19 +41,30 @@ export async function pollOnce(db, enabled) {
     return results;
 }
 export async function startDaemon() {
-    const { getDbPath, readConfig } = await import("./config.js");
-    const { openDb, migrate } = await import("./store/db.js");
+    if (isDaemonRunning()) {
+        const existing = fs.readFileSync(pidFile(), "utf8").trim();
+        return { alreadyRunning: existing, db: null, timer: null, stop: () => { } };
+    }
+    const dbDir = path.dirname(getDbPath());
+    fs.mkdirSync(dbDir, { recursive: true });
     const db = openDb(getDbPath());
     migrate(db);
+    fs.mkdirSync(path.dirname(pidFile()), { recursive: true });
+    fs.writeFileSync(pidFile(), String(process.pid));
     const cfg = await readConfig();
     const intervalMs = (cfg.pollMinutes ?? 15) * 60 * 1000;
     // initial poll (fire-and-forget, don't block start)
     pollOnce(db, cfg.enabledProviders).catch(e => console.warn("[quotacap] initial poll failed", e?.message ?? String(e)));
     const jitter = Math.floor(Math.random() * 5000);
     const timer = setInterval(() => { pollOnce(db, cfg.enabledProviders).catch(e => console.warn("[quotacap] interval poll failed", e?.message ?? String(e))); }, intervalMs + jitter);
-    // keep event loop alive — this is the only long-lived process per design
-    // (previous unref() caused immediate exit after the initial poll)
-    return { db, timer, stop: () => clearInterval(timer) };
+    const stop = () => {
+        clearInterval(timer);
+        try {
+            fs.rmSync(pidFile(), { force: true });
+        }
+        catch { }
+    };
+    return { db, timer, alreadyRunning: undefined, stop };
 }
 // alias for plan's daemon.start() naming
 export const start = startDaemon;

package/dist/src/format/table.d.ts

@@ -1 +1,2 @@
+export declare function formatResetDate(iso: string): string;
 export declare function renderQuotasTable(quotas: any[], advisories?: any[]): string;

package/dist/src/format/table.js

@@ -1,11 +1,20 @@
 // The one table every surface renders: MCP tools, CLI status, web dashboard.
 // Quotas carry used/resets; advisories add days-left, burn and waste analysis.
 // Without advisories the analysis columns render as placeholders.
+export function formatResetDate(iso) {
+    return new Date(iso).toLocaleString(undefined, {
+        day: "numeric",
+        month: "short",
+        year: "numeric",
+        hour: "numeric",
+        minute: "2-digit",
+    });
+}
 export function renderQuotasTable(quotas, advisories = []) {
     const rows = quotas.map((q) => {
         const a = advisories.find((x) => x.provider === q.provider);
         const used = Math.round(q.usedPct ?? 0);
-        const resets = q.resetsAt ? new Date(q.resetsAt).toLocaleString() : "—";
+        const resets = q.resetsAt ? formatResetDate(q.resetsAt) : "—";
         const daysLeft = a?.daysLeft != null ? a.daysLeft.toFixed(1) : "—";
         const ideal = a?.idealRate != null ? `${Math.round(a.idealRate)}%/day` : "—";
         const burn = a?.burnMeasured ? `${a.burnRate.toFixed(1)}%/day` : a != null ? "collecting…" : "—";

package/dist/src/store/quotas.d.ts

@@ -3,4 +3,4 @@ export declare function getLatestByProvider(db: any, provider: string): any;
 export declare function getAllLatest(db: any): any;
 export declare const getQuotas: typeof getAllLatest;
 export declare function getSnapshots(db: any): any;
-export declare function getBurnRates(db: any): Map<string, number>;
+export declare function getBurnRates(db: any, now?: number): Map<string, number>;

package/dist/src/store/quotas.js

@@ -26,25 +26,29 @@ export function getAllLatest(db) {
 // alias for plan's getQuotas naming
 export const getQuotas = getAllLatest;
 export function getSnapshots(db) { return db.prepare(`SELECT * FROM snapshots ORDER BY day DESC`).all(); }
-export function getBurnRates(db) {
-    const rows = db.prepare(`SELECT day, provider, used_pct FROM snapshots`).all();
+export function getBurnRates(db, now = Date.now()) {
+    // Burn is the used-pct delta over a real rolling window of poll history
+    // (up to 24h), so calendar-day boundaries and poll timing cannot skew it.
+    const rows = db.prepare(`SELECT provider, used_pct, fetched_at FROM quotas`).all();
     const byProvider = new Map();
     for (const r of rows) {
+        const t = new Date(r.fetched_at).getTime();
+        if (Number.isNaN(t))
+            continue;
         const pts = byProvider.get(r.provider) ?? [];
-        pts.push({ day: r.day, usedPct: r.used_pct });
+        pts.push({ usedPct: r.used_pct, t });
         byProvider.set(r.provider, pts);
     }
     const out = new Map();
     for (const [provider, pts] of byProvider) {
-        if (pts.length < 2)
-            continue;
-        const sorted = [...pts].sort((a, b) => a.day.localeCompare(b.day));
-        const first = sorted[0];
-        const last = sorted[sorted.length - 1];
-        const days = (new Date(last.day).getTime() - new Date(first.day).getTime()) / 86400000;
-        if (days < 1)
+        const sorted = pts.sort((a, b) => a.t - b.t);
+        const latest = sorted[sorted.length - 1];
+        const cutoff = latest.t - 86400000;
+        const windowStart = sorted.find((p) => p.t >= cutoff) ?? sorted[0];
+        const days = (latest.t - windowStart.t) / 86400000;
+        if (sorted.length < 2 || days < 1 / 24)
             continue;
-        const burn = (last.usedPct - first.usedPct) / days;
+        const burn = (latest.usedPct - windowStart.usedPct) / days;
         if (burn >= 0)
             out.set(provider, burn);
     }

package/dist/src/version.js

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