ai-spend-agent 0.1.5 → 0.2.1

package/dist/index.js

@@ -3,7 +3,7 @@ import { realpathSync } from "node:fs";
 import { mkdir, readFile, rm, stat, writeFile } from "node:fs/promises";
 import { dirname, extname, join, resolve } from "node:path";
 import { fileURLToPath, pathToFileURL } from "node:url";
-import { analyzeSpend, attributeUsageRecords, detectLocalCredentials, redactSecrets, unsafeScanRootReason, loadDeadContext, sampleDeadContext, loadLocalAgentUsage, loadSampleUsageData, scanLocalUsageSignals, buildMissingSourcePrompts, confirmMapping, createProviderConnectorStub, createLocalFolderSourceRegistry, createScanAuditLog, fetchProviderUsageRecords, addApprovedSource, slugifySourceId } from "@agent-finops/core";
+import { analyzeSpend, attributeUsageRecords, detectLocalCredentials, detectLocalPlans, redactSecrets, subscriptionPlans, unsafeScanRootReason, loadDeadContext, sampleDeadContext, loadLocalAgentUsage, loadSampleUsageData, scanLocalUsageSignals, buildMissingSourcePrompts, confirmMapping, createProviderConnectorStub, createLocalFolderSourceRegistry, createScanAuditLog, fetchProviderUsageRecords, addApprovedSource, slugifySourceId } from "@agent-finops/core";
 import { generateActionPlanMarkdown, generateApplyArtifactMarkdown, generateDemoPackageMarkdown, generateHtmlReport, generateMarkdownReport, generatePlainEnglishSummary, generatePolicyConfigDraftMarkdown, generateReportCardCaption, generateReportCardSvg, generateVerificationPlanMarkdown, groupByDimensions } from "@agent-finops/report";
 export async function runCli(argv = process.argv.slice(2)) {
     if (argv.includes("--help") || argv.includes("-h") || argv[0] === "help") {
@@ -70,6 +70,27 @@ async function quickstartCommand(args) {
     const summary = analyzeSpend(records);
     const groupBy = args.groupBy ?? "model";
     const color = args.noColor ? false : undefined;
+    // Persona: --plan override wins; otherwise read the plans the coding agents
+    // themselves persisted locally (read-only, whitelisted fields, no network).
+    let detectedPlans;
+    if (args.plan) {
+        const override = planOverrideFromFlag(args.plan);
+        if (!override) {
+            return {
+                exitCode: 1,
+                stdout: "",
+                stderr: `Unknown --plan "${args.plan}". Valid plans: ${subscriptionPlans.map((plan) => plan.id).join(", ")}`
+            };
+        }
+        detectedPlans = [override];
+    }
+    else {
+        detectedPlans = await detectLocalPlans({
+            // Env overrides keep tests (and unusual installs) isolated from $HOME.
+            claudeConfigPath: process.env.AI_SPEND_CLAUDE_CONFIG,
+            codexAuthPath: process.env.AI_SPEND_CODEX_AUTH
+        }).catch(() => []);
+    }
     // Surface auto-detected credentials so the user knows their next 2-min step,
     // without ever printing a raw secret.
     const detection = await detectLocalCredentials({ cwd: resolve(args.path) });
@@ -102,7 +123,8 @@ async function quickstartCommand(args) {
         color,
         mode,
         nextSteps,
-        deadContext
+        deadContext,
+        detectedPlans
     });
     const header = [`  ${dataModeBanner(mode)}`, ...warnings.map((warning) => `  ! ${warning}`)].join("\n");
     return ok(`${header}\n${summaryText}`);
@@ -190,6 +212,13 @@ async function doctorCommand(args) {
     const hasLogs = claudeFound || codexFound;
     const detection = await detectLocalCredentials({ cwd: rootPath }).catch(() => ({ credentials: [] }));
     const providerRefs = detection.credentials.map((credential) => `${credential.provider} (${credential.hint})`);
+    const plans = await detectLocalPlans({
+        claudeConfigPath: process.env.AI_SPEND_CLAUDE_CONFIG,
+        codexAuthPath: process.env.AI_SPEND_CODEX_AUTH
+    }).catch(() => []);
+    const planLine = plans.length > 0
+        ? plans.map((plan) => `${plan.planLabel} (${plan.agent}, ${plan.billing === "api_key" ? "pay per token" : plan.billing})`).join(", ")
+        : "none detected (use --plan to declare one)";
     const warnings = [];
     if (stateMode === "sample")
         warnings.push("sample state present — it will be shown as DEMO and cannot mask real logs; run `ai-spend-agent reset` to clear it");
@@ -215,6 +244,7 @@ async function doctorCommand(args) {
         `Claude Code logs: ${claudeFound ? "found" : "not found"}`,
         `Codex logs: ${codexFound ? "found" : "not found"}`,
         `provider env references: ${providerRefs.length > 0 ? providerRefs.join(", ") : "none detected"}`,
+        `subscription plans: ${planLine}`,
         "redaction policy: secrets are never printed or persisted",
         "plan check: available (subscription vs API-rate math)",
         `data mode you'll get now: ${predictedMode}`,
@@ -663,6 +693,20 @@ async function connectCommand(args) {
     lines.push(`missing: ${source.fieldsMissing.join(", ")}`);
     return ok(lines.join("\n"));
 }
+/** Map a --plan id to a synthetic DetectedPlan (explicit user override). */
+function planOverrideFromFlag(planId) {
+    const plan = subscriptionPlans.find((candidate) => candidate.id === planId);
+    if (!plan)
+        return undefined;
+    return {
+        agent: plan.agent,
+        provider: plan.provider,
+        planId: plan.id,
+        planLabel: plan.name,
+        billing: "subscription",
+        source: "--plan override"
+    };
+}
 function describeOrigin(credential) {
     if (credential.origin === "process_env")
         return "your shell environment";
@@ -791,7 +835,7 @@ async function reportCommand(args) {
         return {
             exitCode: 1,
             stdout: "",
-            stderr: `No local spend state found at ${stateDir}. Run scan --sample --path <dir> first. ${error instanceof Error ? error.message : ""}`
+            stderr: `Couldn't build a report: ${error instanceof Error ? error.message : String(error)}`
         };
     }
 }
@@ -853,15 +897,35 @@ async function applyArtifactCommand(args) {
         return {
             exitCode: 1,
             stdout: "",
-            stderr: `No local spend state found at ${stateDir}. Run scan --sample --path <dir> first. ${error instanceof Error ? error.message : ""}`
+            stderr: `Couldn't build apply artifacts: ${error instanceof Error ? error.message : String(error)}`
         };
     }
 }
 async function buildReportInput(stateDir, rootPath) {
-    const [spendState, discovery, mappings, sourceRegistry, missingSourcePrompts, confirmedMappings, providerRecordsState] = await Promise.all([
-        readJson(join(stateDir, "spend.json")),
-        readJson(join(stateDir, "discovery.json")),
-        readJson(join(stateDir, "mappings.json")),
+    let spendState = await readOptionalJson(join(stateDir, "spend.json"), undefined);
+    let mappings = await readOptionalJson(join(stateDir, "mappings.json"), undefined);
+    // The quickstart intentionally writes nothing — so `report`/`apply-artifact`
+    // right after a first run must fall back to the SAME live local-log read
+    // (never sample data), then persist it so subsequent runs are consistent.
+    if (!spendState?.summary || !spendState.records || spendState.records.length === 0) {
+        const logs = await loadLocalAgentUsage({
+            claudeProjectsDir: process.env.AI_SPEND_CLAUDE_LOGS_DIR,
+            codexSessionsDir: process.env.AI_SPEND_CODEX_LOGS_DIR
+        }).catch(() => undefined);
+        if (!logs || logs.records.length === 0) {
+            throw new Error("no persisted spend state and no local Claude Code/Codex logs found. " +
+                "Run `npx ai-spend-agent` first (or `npx ai-spend-agent scan --sample --path <dir>` for a demo-data report).");
+        }
+        const records = logs.records;
+        const summary = analyzeSpend(records);
+        const liveMappings = attributeUsageRecords(records);
+        await mkdir(stateDir, { recursive: true });
+        await writeLocalSpendState(stateDir, records, summary, liveMappings, "local_logs");
+        spendState = { summary, records, mode: "local_logs" };
+        mappings = liveMappings;
+    }
+    const [discovery, sourceRegistry, missingSourcePrompts, confirmedMappings, providerRecordsState] = await Promise.all([
+        readOptionalJson(join(stateDir, "discovery.json"), emptyDiscovery(rootPath)),
         readSourceRegistry(stateDir, rootPath),
         readOptionalJson(join(stateDir, "missing-sources.json"), []),
         readConfirmedMappings(stateDir),
@@ -874,7 +938,7 @@ async function buildReportInput(stateDir, rootPath) {
         allRecords: spendState.records ?? [],
         dataMode: spendState.mode,
         discovery,
-        mappings,
+        mappings: mappings ?? [],
         sourceRegistry,
         missingSourcePrompts,
         confirmedMappings,
@@ -882,6 +946,17 @@ async function buildReportInput(stateDir, rootPath) {
         providerQa: providerRecordsState.qa ? [providerRecordsState.qa] : []
     };
 }
+function emptyDiscovery(rootPath) {
+    return {
+        rootPath,
+        scannedFiles: 0,
+        skippedDirectories: [],
+        unreadablePaths: [],
+        signals: [],
+        secretsDetected: [],
+        redactedEvidence: []
+    };
+}
 async function writeApplyArtifacts(stateDir, reportInput) {
     const paths = {
         codingPrompt: join(stateDir, "ai-spend-coding-agent-prompt.md"),
@@ -927,6 +1002,14 @@ function parseArgs(argv) {
             parsed.ignoreState = true;
             continue;
         }
+        if (arg === "--plan") {
+            const next = rest[index + 1];
+            if (next) {
+                parsed.plan = next;
+                index += 1;
+            }
+            continue;
+        }
         if (arg === "--group-by") {
             const next = rest[index + 1];
             if (isGroupByDimension(next)) {
@@ -1203,6 +1286,7 @@ function helpText() {
         "Run with no command for an instant, zero-key demo:",
         "  ai-spend-agent                       Show where your AI money goes (sample/auto-detected data)",
         "  ai-spend-agent --group-by agent      Drill down by source|model|client|project|agent|user|workspace|apiKey",
+        "  ai-spend-agent --plan <id>           Declare your plan when auto-detection can't (claude-max-5x|claude-max-20x|claude-pro|chatgpt-plus|chatgpt-pro)",
         "",
         "Connect your real spend (cost data is ADMIN/owner-gated):",
         "  ai-spend-agent connect openai        Self-serve in ~2 min with an org-owner Admin key",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ai-spend-agent",
-  "version": "0.1.5",
+  "version": "0.2.1",
   "description": "Your AI spend in one view, in 90 seconds — local-first CLI for OpenAI, Anthropic, Cursor, Copilot + Claude Code/Codex session logs, with a ranked savings cut list, and flags the tools your agent loads but never uses (dead context).",
   "type": "module",
   "main": "./dist/index.js",
@@ -49,8 +49,8 @@
     "prepack": "npm run build"
   },
   "dependencies": {
-    "@agent-finops/core": "0.1.5",
-    "@agent-finops/report": "0.1.5",
+    "@agent-finops/core": "0.2.1",
+    "@agent-finops/report": "0.2.1",
     "yocto-spinner": "^1.2.0"
   }
 }