@agent-finops/core 0.7.0 → 0.7.2

package/dist/activitySnapshot.d.ts

@@ -1,10 +1,11 @@
 import { z } from "zod";
 import { type LocalAgentCall, type LocalAgentSourceScan } from "./localAgentLogs.js";
+import type { LocalAgentFormatId } from "./localAgentFormats/types.js";
 import type { DetectedPlan } from "./planDetection.js";
 import { type UsageRecord } from "./schema.js";
 import { type SourceValidationCoverage } from "./sourceStatus.js";
-export declare const activitySnapshotAgentValues: readonly ["claude-code", "codex"];
-export type ActivitySnapshotAgent = typeof activitySnapshotAgentValues[number];
+export declare const activitySnapshotAgentValues: readonly LocalAgentFormatId[];
+export type ActivitySnapshotAgent = LocalAgentFormatId;
 export declare const activitySnapshotPlanIdValues: readonly ["claude-pro", "claude-max-5x", "claude-max-20x", "chatgpt-plus", "chatgpt-pro"];
 export type ActivitySnapshotPlanId = typeof activitySnapshotPlanIdValues[number];
 export declare const activitySnapshotProviderValues: readonly ["openai", "anthropic", "cursor", "github-copilot", "other"];
@@ -177,10 +178,7 @@ export declare const activitySnapshotLimitSchema: z.ZodObject<{
 }, z.core.$strict>;
 export type ActivitySnapshotLimit = z.infer<typeof activitySnapshotLimitSchema>;
 export declare const activitySnapshotSubscriptionAgentSchema: z.ZodObject<{
-    agent: z.ZodEnum<{
-        "claude-code": "claude-code";
-        codex: "codex";
-    }>;
+    agent: z.ZodString & z.ZodType<LocalAgentFormatId, string, z.core.$ZodTypeInternals<LocalAgentFormatId, string>>;
     billing: z.ZodLiteral<"subscription">;
     planId: z.ZodNullable<z.ZodEnum<{
         "claude-max-20x": "claude-max-20x";
@@ -260,10 +258,7 @@ export declare const activitySnapshotOverageSchema: z.ZodObject<{
 export type ActivitySnapshotOverage = z.infer<typeof activitySnapshotOverageSchema>;
 export declare const activitySnapshotCoverageSchema: z.ZodObject<{
     agents: z.ZodArray<z.ZodObject<{
-        agent: z.ZodEnum<{
-            "claude-code": "claude-code";
-            codex: "codex";
-        }>;
+        agent: z.ZodString & z.ZodType<LocalAgentFormatId, string, z.core.$ZodTypeInternals<LocalAgentFormatId, string>>;
         directoryStatus: z.ZodEnum<{
             missing: "missing";
             readable: "readable";
@@ -314,8 +309,8 @@ export declare const activitySnapshotCoverageSchema: z.ZodObject<{
     recordsPriced: z.ZodNumber;
     recordsUnpriced: z.ZodNumber;
     validationStatus: z.ZodEnum<{
-        complete: "complete";
         failed: "failed";
+        complete: "complete";
         not_checked: "not_checked";
         partial: "partial";
     }>;
@@ -354,10 +349,7 @@ export declare const activitySnapshotSchema: z.ZodObject<{
     }>;
     subscription: z.ZodNullable<z.ZodObject<{
         agents: z.ZodArray<z.ZodObject<{
-            agent: z.ZodEnum<{
-                "claude-code": "claude-code";
-                codex: "codex";
-            }>;
+            agent: z.ZodString & z.ZodType<LocalAgentFormatId, string, z.core.$ZodTypeInternals<LocalAgentFormatId, string>>;
             billing: z.ZodLiteral<"subscription">;
             planId: z.ZodNullable<z.ZodEnum<{
                 "claude-max-20x": "claude-max-20x";
@@ -428,10 +420,7 @@ export declare const activitySnapshotSchema: z.ZodObject<{
     }, z.core.$strict>>;
     metered: z.ZodNullable<z.ZodObject<{
         agents: z.ZodArray<z.ZodObject<{
-            agent: z.ZodEnum<{
-                "claude-code": "claude-code";
-                codex: "codex";
-            }>;
+            agent: z.ZodString & z.ZodType<LocalAgentFormatId, string, z.core.$ZodTypeInternals<LocalAgentFormatId, string>>;
             billing: z.ZodLiteral<"api_key">;
             planId: z.ZodNullable<z.ZodEnum<{
                 "claude-max-20x": "claude-max-20x";
@@ -532,10 +521,7 @@ export declare const activitySnapshotSchema: z.ZodObject<{
     }, z.core.$strict>>;
     unresolved: z.ZodNullable<z.ZodObject<{
         agents: z.ZodArray<z.ZodObject<{
-            agent: z.ZodEnum<{
-                "claude-code": "claude-code";
-                codex: "codex";
-            }>;
+            agent: z.ZodString & z.ZodType<LocalAgentFormatId, string, z.core.$ZodTypeInternals<LocalAgentFormatId, string>>;
             billing: z.ZodLiteral<"unknown">;
             planId: z.ZodNullable<z.ZodEnum<{
                 "claude-max-20x": "claude-max-20x";
@@ -600,10 +586,7 @@ export declare const activitySnapshotSchema: z.ZodObject<{
     }, z.core.$strict>>;
     coverage: z.ZodObject<{
         agents: z.ZodArray<z.ZodObject<{
-            agent: z.ZodEnum<{
-                "claude-code": "claude-code";
-                codex: "codex";
-            }>;
+            agent: z.ZodString & z.ZodType<LocalAgentFormatId, string, z.core.$ZodTypeInternals<LocalAgentFormatId, string>>;
             directoryStatus: z.ZodEnum<{
                 missing: "missing";
                 readable: "readable";
@@ -654,8 +637,8 @@ export declare const activitySnapshotSchema: z.ZodObject<{
         recordsPriced: z.ZodNumber;
         recordsUnpriced: z.ZodNumber;
         validationStatus: z.ZodEnum<{
-            complete: "complete";
             failed: "failed";
+            complete: "complete";
             not_checked: "not_checked";
             partial: "partial";
         }>;

package/dist/activitySnapshot.js

@@ -1,10 +1,13 @@
 import { z } from "zod";
 import { aggregateCalls, dedupeCumulativeSessionCalls } from "./localAgentLogs.js";
+import { localAgentFormatDescriptors } from "./localAgentFormats/registry.js";
 import { estimateTokenCostUsd, PRICING_TABLE_AS_OF } from "./modelPricing.js";
 import { isBundledSampleUsage } from "./schema.js";
 import { sourceValidationCoverageValues } from "./sourceStatus.js";
 const DAY_MS = 24 * 60 * 60 * 1_000;
-export const activitySnapshotAgentValues = ["claude-code", "codex"];
+export const activitySnapshotAgentValues = Object.freeze(localAgentFormatDescriptors.map((descriptor) => descriptor.id));
+const activitySnapshotAgentValueSet = new Set(activitySnapshotAgentValues);
+const activitySnapshotAgentLimit = activitySnapshotAgentValues.length;
 export const activitySnapshotPlanIdValues = [
     "claude-pro",
     "claude-max-5x",
@@ -45,7 +48,9 @@ const isoTimestampSchema = z.string().datetime({ offset: true });
 const usdSchema = z.number().finite().nonnegative();
 const countSchema = z.number().int().nonnegative();
 const windowCoverageSchema = z.enum(["complete", "partial", "missing"]);
-const agentSchema = z.enum(activitySnapshotAgentValues);
+const agentSchema = z.string().refine(isSnapshotAgent, {
+    message: "Agent must be registered as a local-agent format."
+});
 const planIdSchema = z.enum(activitySnapshotPlanIdValues).nullable();
 export const activitySnapshotApiEquivalentWindowSchema = z.object({
     amountUsd: usdSchema.nullable(),
@@ -169,14 +174,14 @@ export const activitySnapshotSubscriptionAgentSchema = z.object({
     }
 });
 const activitySnapshotSubscriptionSchema = z.object({
-    agents: z.array(activitySnapshotSubscriptionAgentSchema).min(1).max(2)
+    agents: z.array(activitySnapshotSubscriptionAgentSchema).min(1).max(activitySnapshotAgentLimit)
 }).strict().superRefine(uniqueAgentEntries);
 const activitySnapshotMeteredSchema = z.object({
     agents: z.array(z.object({
         agent: agentSchema,
         billing: z.literal("api_key"),
         planId: planIdSchema
-    }).strict()).max(2),
+    }).strict()).max(activitySnapshotAgentLimit),
     apiEquivalent: activitySnapshotApiEquivalentWindowsSchema,
     providerBilled: activitySnapshotBilledWindowsSchema
 }).strict().superRefine((value, context) => {
@@ -196,7 +201,7 @@ const activitySnapshotUnresolvedSchema = z.object({
         agent: agentSchema,
         billing: z.literal("unknown"),
         planId: planIdSchema
-    }).strict()).max(2),
+    }).strict()).max(activitySnapshotAgentLimit),
     apiEquivalent: activitySnapshotApiEquivalentWindowsSchema
 }).strict().superRefine((value, context) => {
     uniqueAgentEntries(value, context);
@@ -290,7 +295,7 @@ const activitySnapshotProviderCoverageSchema = z.object({
     }
 });
 export const activitySnapshotCoverageSchema = z.object({
-    agents: z.array(activitySnapshotAgentCoverageSchema).max(2),
+    agents: z.array(activitySnapshotAgentCoverageSchema).max(activitySnapshotAgentLimit),
     providers: z.array(activitySnapshotProviderCoverageSchema).max(5),
     recordsParsed: countSchema,
     recordsPriced: countSchema,
@@ -483,8 +488,10 @@ export function buildActivitySnapshot(input) {
         if (isSnapshotAgent(entry.record.agentId))
             activeAgents.add(entry.record.agentId);
     }
-    for (const call of calls)
-        activeAgents.add(call.agent);
+    for (const call of calls) {
+        if (isSnapshotAgent(call.agent))
+            activeAgents.add(call.agent);
+    }
     const meteredAgents = [...activeAgents]
         .filter((agent) => plans.get(agent)?.billing === "api_key")
         .sort()
@@ -529,7 +536,7 @@ export function buildActivitySnapshot(input) {
     const subscription = hasSubscriptionActivity ? { agents: subscriptionAgents } : null;
     const metered = hasMeteredActivity ? {
         agents: meteredAgents,
-        apiEquivalent: buildApiWindows(meteredApiRecords, allCalls.filter((call) => plans.get(call.agent)?.billing === "api_key"), trustedIds, asOfMs, localCoverageForRecords(meteredApiRecords, scans, [...plans.entries()]
+        apiEquivalent: buildApiWindows(meteredApiRecords, allCalls.filter((call) => (isSnapshotAgent(call.agent) && plans.get(call.agent)?.billing === "api_key")), trustedIds, asOfMs, localCoverageForRecords(meteredApiRecords, scans, [...plans.entries()]
             .filter(([, plan]) => plan.billing === "api_key")
             .map(([agent]) => agent))),
         providerBilled: buildBilledWindows(meteredBilledRecords, asOfMs, providers)
@@ -537,6 +544,8 @@ export function buildActivitySnapshot(input) {
     const unresolved = hasUnresolvedActivity ? {
         agents: unresolvedAgents,
         apiEquivalent: buildApiWindows(unresolvedRecords, allCalls.filter((call) => {
+            if (!isSnapshotAgent(call.agent))
+                return false;
             const billing = plans.get(call.agent)?.billing;
             return billing !== "subscription" && billing !== "api_key";
         }), trustedIds, asOfMs, unresolvedCoverageForRecords(unresolvedRecords, scans, providers))
@@ -1200,7 +1209,7 @@ function inRollingWindow(timestamp, asOfMs, days) {
     return Number.isFinite(value) && value >= asOfMs - days * DAY_MS && value <= asOfMs;
 }
 function isSnapshotAgent(value) {
-    return typeof value === "string" && activitySnapshotAgentValues.includes(value);
+    return typeof value === "string" && activitySnapshotAgentValueSet.has(value);
 }
 function isKnownPlanId(value) {
     return typeof value === "string" && activitySnapshotPlanIdValues.includes(value);