ai-spend-agent 0.7.1 → 0.7.3

package/dist/index.js

@@ -4,7 +4,7 @@ import { mkdir, readFile, rm, stat } from "node:fs/promises";
 import { homedir } from "node:os";
 import { basename, dirname, extname, join, resolve } from "node:path";
 import { fileURLToPath, pathToFileURL } from "node:url";
-import { analyzeSpend, attributeUsageRecords, buildUsageGlance, buildActivitySnapshot, loadContextHealth, detectLocalCredentials, detectLocalPlans, redactSecrets, readSafeStateText, invalidateConnectedSpendTrustReceipt, resolveSafeScanRoot, resolveSafeStateDirectory, subscriptionPlans, unsafeScanRootReason, selectProviderFinancialHeadlineRecords, writeSafeStateText, verifyConnectedSpendTrustReceipt, verifyConnectedSourceRegistryTrustReceipt, writeConnectedSpendTrustReceipt, loadDeadContext, sampleDeadContext, latestObservedWorkingDirectory, downgradeSampleUsageEvidence, isBundledSampleUsage, loadLocalAgentUsage, loadLocalAgentFinancialUsage, loadSampleUsageData, parseUsageRecord, scanLocalUsageSignals, buildMissingSourcePrompts, confirmMapping, createProviderConnectorStub, createLocalFolderSourceRegistry, createScanAuditLog, fetchProviderUsageRecords, addApprovedSource, normalizeSourceRegistry, downgradeUntrustedSourceRegistryClaims, buildSourceStatuses, slugifySourceId, financialEvidenceForRecords, formatSourceStatuses, readActivitySnapshot, recordActivitySnapshotRefreshFailure, sourceStatusDefinitions, writeActivitySnapshot } from "@agent-finops/core";
+import { analyzeSpend, attributeUsageRecords, buildUsageGlance, buildActivitySnapshot, loadContextHealth, detectLocalCredentials, detectLocalPlans, redactSecrets, readSafeStateText, invalidateConnectedSpendTrustReceipt, resolveSafeScanRoot, resolveSafeStateDirectory, subscriptionPlans, unsafeScanRootReason, selectProviderFinancialHeadlineRecords, writeSafeStateText, verifyConnectedSpendTrustReceipt, verifyConnectedSourceRegistryTrustReceipt, writeConnectedSpendTrustReceipt, loadDeadContext, sampleDeadContext, latestObservedWorkingDirectory, downgradeSampleUsageEvidence, isBundledSampleUsage, loadLocalAgentUsage, loadLocalAgentFinancialUsage, localAgentFormatDescriptors, localAgentFormatLabel, loadSampleUsageData, parseUsageRecord, scanLocalUsageSignals, buildMissingSourcePrompts, confirmMapping, createProviderConnectorStub, createLocalFolderSourceRegistry, createScanAuditLog, fetchProviderUsageRecords, addApprovedSource, normalizeSourceRegistry, downgradeUntrustedSourceRegistryClaims, buildSourceStatuses, slugifySourceId, financialEvidenceForRecords, formatSourceStatuses, readActivitySnapshot, recordActivitySnapshotRefreshFailure, sourceStatusDefinitions, writeActivitySnapshot } from "@agent-finops/core";
 import { StatuslineInstallerError, installClaudeStatusline, uninstallClaudeStatusline } from "./statuslineInstaller.js";
 import { readStatuslineCache, renderStatusline } from "./statuslineRuntime.js";
 import { generateActionPlanMarkdown, generateApplyArtifactMarkdown, generateDemoPackageMarkdown, generateHtmlReport, generateMarkdownReport, generatePlainEnglishSummary, generatePolicyConfigDraftMarkdown, generateReportCardCaption, generateReportCardSvg, generateVerificationPlanMarkdown, groupByDimensions } from "@agent-finops/report";
@@ -556,7 +556,7 @@ async function doctorSourcesCommand(args) {
         localError = sanitizeSecretishError(error instanceof Error ? error.message : String(error));
     }
     const checkedAt = now.toISOString();
-    for (const id of ["claude-code", "codex"]) {
+    for (const { id } of localAgentFormatDescriptors) {
         const records = (localLogs?.records ?? []).filter((record) => record.agentId === id);
         const evidence = financialEvidenceForRecords(records);
         const scan = localLogs?.sourceScans.find((entry) => entry.agent === id);
@@ -704,12 +704,12 @@ function localAgentDiagnosticSummary(diagnostics) {
     const unsupportedCount = unsupported
         .reduce((total, diagnostic) => total + diagnostic.count, 0);
     if (unsupportedCount > 0) {
-        messages.push(`${unsupportedCount} ${unsupported[0].agent === "codex" ? "Codex" : "Claude Code"} token snapshot(s) lacked the input/output components required for pricing.`);
+        messages.push(`${unsupportedCount} ${localAgentFormatLabel(unsupported[0].agent)} token snapshot(s) lacked the input/output components required for pricing.`);
     }
     const malformedCount = malformed
         .reduce((total, diagnostic) => total + diagnostic.count, 0);
     if (malformedCount > 0) {
-        messages.push(`${malformedCount} malformed JSONL line(s) were skipped in ${malformed[0].agent === "codex" ? "Codex" : "Claude Code"} transcripts.`);
+        messages.push(`${malformedCount} malformed JSONL line(s) were skipped in ${localAgentFormatLabel(malformed[0].agent)} transcripts.`);
     }
     return messages.length > 0 ? messages.join(" ") : undefined;
 }
@@ -1529,10 +1529,7 @@ function formatInitReceipt(input) {
             return `${plan.agent}: ${known} (${plan.billing})`;
         }).join("; ")
         : "none detected (billing mode remains unresolved)";
-    const sourceLines = (input.logs?.sourceScans ?? [
-        emptyInitSourceScan("claude-code"),
-        emptyInitSourceScan("codex")
-    ]).map((scan) => {
+    const sourceLines = (input.logs?.sourceScans ?? localAgentFormatDescriptors.map((descriptor) => (emptyInitSourceScan(descriptor.id)))).map((scan) => {
         const agentRecords = records.filter((record) => record.agentId === scan.agent);
         const priced = agentRecords.filter((record) => typeof record.amountUsd === "number").length;
         const skipped = scan.filesSkippedBeforeWindow ?? 0;

package/dist/statuslineRuntime.js

@@ -155,9 +155,18 @@ export function renderStatusline(result, options = {}) {
     if (overage) {
         // Billed overage is the sole compact paid-alert bridge and must survive
         // narrow layouts. It never derives from plan pressure.
+        if (hasMultipleSubscribedAgents(snapshot)) {
+            return assembleMultiSubscriptionOverageLine(snapshot, segments, overage, freshness, tier, columns, now);
+        }
         return assembleOverageLine(segments, overage, freshness, columns);
     }
+    if (snapshot.mode === "subscription" && hasMultipleSubscribedAgents(snapshot)) {
+        return assembleMultiSubscriptionLine(snapshot, freshness, tier, columns, now, options.timeZone);
+    }
     if (snapshot.mode === "mixed") {
+        if (hasMultipleSubscribedAgents(snapshot)) {
+            return assembleMultiSubscriptionMixedLine(snapshot, segments, freshness, tier, columns, now, options.timeZone);
+        }
         return assembleMixedLine(snapshot, segments, freshness, tier, columns, now, options.timeZone);
     }
     return assembleLine(segments, freshness, columns, overage);
@@ -256,6 +265,9 @@ function renderMetered(snapshot, tier) {
     return rendered;
 }
 function renderSubscription(snapshot, tier, now, timeZone) {
+    if (hasMultipleSubscribedAgents(snapshot)) {
+        return renderMultiSubscriptionSegments(snapshot, tier, now, timeZone);
+    }
     const agent = selectSubscriptionAgent(snapshot, now);
     if (!agent)
         return ["subscription detected", "runway not reported"];
@@ -276,6 +288,11 @@ function renderSubscription(snapshot, tier, now, timeZone) {
     return segments.length > 0 ? segments : ["subscription detected"];
 }
 function renderMixed(snapshot, tier, now, timeZone) {
+    if (hasMultipleSubscribedAgents(snapshot)) {
+        const segments = renderMultiSubscriptionSegments(snapshot, tier, now, timeZone);
+        appendMeteredSevenDaySegment(snapshot, segments);
+        return segments.length > 0 ? segments : ["mixed billing", "amounts unavailable"];
+    }
     const agent = selectSubscriptionAgent(snapshot, now);
     const limits = agent ? activeLimits(agent, now) : [];
     const selectedLimits = tier === "full"
@@ -284,6 +301,42 @@ function renderMixed(snapshot, tier, now, timeZone) {
     const segments = selectedLimits.map((limit) => formatLimit(limit, now, timeZone));
     if (limits.length === 0 && tier !== "minimal")
         segments.push("runway not reported");
+    appendMeteredSevenDaySegment(snapshot, segments);
+    const value = agent?.apiEquivalent.sevenDays;
+    if (value?.amountUsd !== null && value?.amountUsd !== undefined &&
+        value.financialEvidence === "estimated") {
+        segments.push(`sub ~${formatUsd(value.amountUsd)} 7d value`);
+    }
+    if (agent?.pressure === "extra_usage_credits_exhausted" && tier !== "minimal") {
+        segments.push("plan pressure");
+    }
+    return segments.length > 0 ? segments : ["mixed billing", "amounts unavailable"];
+}
+function renderMultiSubscriptionSegments(snapshot, tier, now, timeZone) {
+    const entries = orderedSubscriptionLimits(snapshot, now);
+    const selected = tier === "full" ? entries : entries.slice(0, 1);
+    const segments = selected.map(({ agent, limit }) => tier === "full"
+        ? formatAttributedLimit(agent, limit, now, timeZone)
+        : formatAttributedLimitCompact(agent, limit));
+    if (entries.length === 0 && tier !== "minimal") {
+        segments.push("subscription detected", "runway not reported");
+    }
+    const agents = orderedSubscriptionAgents(snapshot, now);
+    const valueAgents = tier === "full" ? agents : agents.slice(0, 1);
+    for (const agent of valueAgents) {
+        const value = agent.apiEquivalent.sevenDays;
+        if (value.amountUsd !== null && value.financialEvidence === "estimated") {
+            segments.push(`${subscriptionAgentLabel(agent)} ~${formatUsd(value.amountUsd)} 7d value`);
+        }
+    }
+    if (tier !== "minimal") {
+        for (const agent of agents.filter(({ pressure }) => pressure === "extra_usage_credits_exhausted")) {
+            segments.push(`${subscriptionAgentLabel(agent)} plan pressure`);
+        }
+    }
+    return segments.length > 0 ? segments : ["subscription detected"];
+}
+function appendMeteredSevenDaySegment(snapshot, segments) {
     const billed = snapshot.metered?.providerBilled.sevenDays;
     const estimated = snapshot.metered?.apiEquivalent.sevenDays;
     if (billed?.amountUsd !== null && billed?.amountUsd !== undefined &&
@@ -294,15 +347,6 @@ function renderMixed(snapshot, tier, now, timeZone) {
         estimated.financialEvidence === "estimated") {
         segments.push(`metered ~${formatUsd(estimated.amountUsd)} 7d`);
     }
-    const value = agent?.apiEquivalent.sevenDays;
-    if (value?.amountUsd !== null && value?.amountUsd !== undefined &&
-        value.financialEvidence === "estimated") {
-        segments.push(`sub ~${formatUsd(value.amountUsd)} 7d value`);
-    }
-    if (agent?.pressure === "extra_usage_credits_exhausted" && tier !== "minimal") {
-        segments.push("plan pressure");
-    }
-    return segments.length > 0 ? segments : ["mixed billing", "amounts unavailable"];
 }
 function renderUnresolved(snapshot, tier) {
     const value = snapshot.unresolved?.apiEquivalent.sevenDays;
@@ -324,6 +368,56 @@ function selectSubscriptionAgent(snapshot, now) {
         return left.agent.localeCompare(right.agent);
     })[0];
 }
+function hasMultipleSubscribedAgents(snapshot) {
+    return (snapshot.subscription?.agents.length ?? 0) > 1;
+}
+function orderedSubscriptionLimits(snapshot, now) {
+    return (snapshot.subscription?.agents ?? [])
+        .flatMap((agent) => activeLimits(agent, now).map((limit) => ({ agent, limit })))
+        .sort(compareSubscriptionLimitEntries);
+}
+function primarySubscriptionLimits(snapshot, now) {
+    return (snapshot.subscription?.agents ?? [])
+        .flatMap((agent) => {
+        const limit = [...activeLimits(agent, now)].sort(compareUrgency)[0];
+        return limit ? [{ agent, limit }] : [];
+    })
+        .sort(compareSubscriptionLimitEntries);
+}
+function compareSubscriptionLimitEntries(left, right) {
+    const urgency = compareUrgency(left.limit, right.limit);
+    if (urgency !== 0)
+        return urgency;
+    const observationDifference = Date.parse(right.limit.observedAt) - Date.parse(left.limit.observedAt);
+    if (observationDifference !== 0)
+        return observationDifference;
+    return left.agent.agent.localeCompare(right.agent.agent);
+}
+function orderedSubscriptionAgents(snapshot, now) {
+    return [...(snapshot.subscription?.agents ?? [])].sort((left, right) => {
+        const leftUrgent = [...activeLimits(left, now)].sort(compareUrgency)[0];
+        const rightUrgent = [...activeLimits(right, now)].sort(compareUrgency)[0];
+        if (leftUrgent && rightUrgent) {
+            const urgency = compareUrgency(leftUrgent, rightUrgent);
+            if (urgency !== 0)
+                return urgency;
+        }
+        else if (leftUrgent) {
+            return -1;
+        }
+        else if (rightUrgent) {
+            return 1;
+        }
+        const latestDifference = latestLimitObservation(right, now) - latestLimitObservation(left, now);
+        if (latestDifference !== 0)
+            return latestDifference;
+        const recordsDifference = right.apiEquivalent.sevenDays.recordCount -
+            left.apiEquivalent.sevenDays.recordCount;
+        if (recordsDifference !== 0)
+            return recordsDifference;
+        return left.agent.localeCompare(right.agent);
+    });
+}
 function latestLimitObservation(agent, now) {
     return Math.max(0, ...activeLimits(agent, now).map((limit) => Date.parse(limit.observedAt)));
 }
@@ -347,6 +441,24 @@ function formatLimit(limit, now, timeZone) {
     const reset = formatReset(limit, now, timeZone);
     return `${label} ${formatPercent(limit.remainingPercent)}% left ↻${reset}`;
 }
+function subscriptionAgentLabel(agent) {
+    return agent.agent === "claude-code" ? "claude" : "codex";
+}
+function formatAttributedLimit(agent, limit, now, timeZone) {
+    const label = limit.kind === "five-hour" ? "5h" : "week";
+    return `${subscriptionAgentLabel(agent)} ${label} ${formatPercent(limit.remainingPercent)}% ↻${formatReset(limit, now, timeZone)}`;
+}
+function formatAttributedLimitCompact(agent, limit) {
+    const label = limit.kind === "five-hour" ? "5h" : "wk";
+    return `${subscriptionAgentLabel(agent)} ${label} ${formatPercent(limit.remainingPercent)}%`;
+}
+function formatAttributedValue(agent, compact = false) {
+    const value = agent.apiEquivalent.sevenDays;
+    if (value.amountUsd === null || value.financialEvidence !== "estimated")
+        return undefined;
+    const window = compact ? "/7d" : " 7d";
+    return `${subscriptionAgentLabel(agent)} ~${formatUsd(value.amountUsd)}${window} value`;
+}
 function formatReset(limit, now, timeZone) {
     const reset = new Date(limit.resetsAt);
     const zone = validTimeZone(timeZone) ? timeZone : undefined;
@@ -444,6 +556,21 @@ function assembleOverageLine(segments, overage, freshness, columns) {
         ["billed"]
     ], columns);
 }
+function assembleMultiSubscriptionOverageLine(snapshot, fullSegments, overage, freshness, tier, columns, now) {
+    const primary = primarySubscriptionLimits(snapshot, now);
+    const compactPrimary = primary.map(({ agent, limit }) => formatAttributedLimitCompact(agent, limit));
+    const urgent = compactPrimary[0];
+    const candidates = [];
+    if (tier === "full")
+        candidates.push(["aibill", ...fullSegments, overage, freshness]);
+    if (tier !== "minimal") {
+        candidates.push(["aibill", ...compactPrimary, overage, freshness]);
+    }
+    if (urgent)
+        candidates.push(["aibill", urgent, overage, freshness]);
+    candidates.push(["aibill", overage, freshness], ["aibill", overage], [overage], ["OVERAGE billed"], ["billed"]);
+    return firstFittingLine(candidates, columns);
+}
 function assembleMixedLine(snapshot, fullSegments, freshness, tier, columns, now, timeZone) {
     const agent = selectSubscriptionAgent(snapshot, now);
     const urgent = agent ? [...activeLimits(agent, now)].sort(compareUrgency)[0] : undefined;
@@ -486,6 +613,75 @@ function assembleMixedLine(snapshot, fullSegments, freshness, tier, columns, now
     candidates.push(["mix", runway, meteredClear, shortFreshness], ["mix", runway.replace("↻", ""), meteredClear], ["mix", meteredClear], ["mix", metered], ["mix"]);
     return firstFittingLine(candidates, columns);
 }
+function assembleMultiSubscriptionLine(snapshot, freshness, tier, columns, now, timeZone) {
+    const entries = orderedSubscriptionLimits(snapshot, now);
+    const primary = primarySubscriptionLimits(snapshot, now);
+    const agents = orderedSubscriptionAgents(snapshot, now);
+    const fullLimits = entries.map(({ agent, limit }) => formatAttributedLimit(agent, limit, now, timeZone));
+    const compactLimits = entries.map(({ agent, limit }) => formatAttributedLimitCompact(agent, limit));
+    const compactPrimary = primary.map(({ agent, limit }) => formatAttributedLimitCompact(agent, limit));
+    const fullValues = agents.flatMap((agent) => formatAttributedValue(agent) ?? []);
+    const compactValues = agents.flatMap((agent) => formatAttributedValue(agent, true) ?? []);
+    const pressure = agents
+        .filter((agent) => agent.pressure === "extra_usage_credits_exhausted")
+        .map((agent) => `${subscriptionAgentLabel(agent)} plan pressure`);
+    const noRunway = entries.length === 0 ? ["subscription detected", "runway not reported"] : [];
+    const urgent = compactPrimary[0];
+    const urgentValue = agents[0] ? formatAttributedValue(agents[0], true) : undefined;
+    const candidates = [];
+    if (tier === "full") {
+        candidates.push(["aibill", ...noRunway, ...fullLimits, ...fullValues, ...pressure, freshness]);
+    }
+    if (tier !== "minimal") {
+        candidates.push(["aibill", ...noRunway, ...compactLimits, ...compactValues, ...pressure, freshness], ["aibill", ...noRunway, ...compactLimits, freshness], ["aibill", ...noRunway, ...compactPrimary, ...compactValues, freshness], ["aibill", ...noRunway, ...compactPrimary, freshness]);
+    }
+    if (urgent) {
+        if (urgentValue)
+            candidates.push(["aibill", urgent, urgentValue, freshness]);
+        candidates.push(["aibill", urgent, freshness], ["aibill", urgent], [urgent]);
+    }
+    else {
+        candidates.push(["aibill", "runway n/r", freshness], ["runway n/r", freshness], ["aibill", ...noRunway, ...compactValues, freshness], ["aibill", ...compactValues, freshness], ["aibill", "subscription detected", freshness], ["subscription detected"]);
+    }
+    return firstFittingLine(candidates, columns);
+}
+function assembleMultiSubscriptionMixedLine(snapshot, fullSegments, freshness, tier, columns, now, timeZone) {
+    const entries = orderedSubscriptionLimits(snapshot, now);
+    const primary = primarySubscriptionLimits(snapshot, now);
+    const agents = orderedSubscriptionAgents(snapshot, now);
+    const compactLimits = entries.map(({ agent, limit }) => formatAttributedLimitCompact(agent, limit));
+    const compactPrimary = primary.map(({ agent, limit }) => formatAttributedLimitCompact(agent, limit));
+    const compactValues = agents.flatMap((agent) => formatAttributedValue(agent, true) ?? []);
+    const noRunway = entries.length === 0 ? ["subscription detected", "runway not reported"] : [];
+    const urgent = compactPrimary[0];
+    const urgentValue = agents[0] ? formatAttributedValue(agents[0], true) : undefined;
+    const meteredBilled = snapshot.metered?.providerBilled.sevenDays;
+    const meteredEstimated = snapshot.metered?.apiEquivalent.sevenDays;
+    const metered = meteredBilled?.amountUsd !== null && meteredBilled?.amountUsd !== undefined &&
+        meteredBilled.financialEvidence === "verified"
+        ? `metered ${formatBilledUsd(meteredBilled.amountUsd)}/7d billed`
+        : meteredEstimated?.amountUsd !== null && meteredEstimated?.amountUsd !== undefined &&
+            meteredEstimated.financialEvidence === "estimated"
+            ? `metered ~${formatUsd(meteredEstimated.amountUsd)}/7d`
+            : "metered n/r";
+    const shortFreshness = compactFreshness(freshness);
+    const candidates = [];
+    if (tier === "full")
+        candidates.push(["aibill", ...fullSegments, freshness]);
+    if (tier !== "minimal") {
+        candidates.push(["aibill", "mix", ...noRunway, ...compactLimits, metered, ...compactValues, freshness], ["aibill", "mix", ...noRunway, ...compactPrimary, metered, freshness]);
+    }
+    if (urgent) {
+        if (urgentValue)
+            candidates.push(["aibill", "mix", urgent, metered, urgentValue, shortFreshness]);
+        candidates.push(["aibill", "mix", urgent, metered, shortFreshness], ["mix", urgent, metered], ["aibill", urgent, shortFreshness], ["aibill", urgent], [urgent]);
+    }
+    else {
+        candidates.push(["aibill", "mix", ...noRunway, metered, freshness], ["aibill", ...noRunway, freshness], ["aibill", "mix", "runway n/r", metered, shortFreshness], ["mix", "runway n/r", metered, shortFreshness], ["mix", "runway n/r", shortFreshness]);
+    }
+    candidates.push(["mix", metered, shortFreshness], ["mix", metered], ["mix"]);
+    return firstFittingLine(candidates, columns);
+}
 function formatLimitCompact(limit) {
     const label = limit.kind === "five-hour" ? "5h" : "wk";
     return `${label} ${formatPercent(limit.remainingPercent)}% left`;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ai-spend-agent",
-  "version": "0.7.1",
+  "version": "0.7.3",
   "description": "Local-first financial accountability CLI for Claude Code and Codex work, cost evidence, attribution, runway, provenance, and Context Health.",
   "type": "module",
   "main": "./dist/index.js",
@@ -54,8 +54,8 @@
     "prepack": "npm run build"
   },
   "dependencies": {
-    "@agent-finops/core": "0.7.1",
-    "@agent-finops/report": "0.7.1",
+    "@agent-finops/core": "0.7.3",
+    "@agent-finops/report": "0.7.3",
     "yocto-spinner": "^1.2.0"
   }
 }