oc2token 0.1.24 → 0.1.25

package/dist/src/usage/record-result.js

@@ -0,0 +1,91 @@
+import { containsInstant, sumUsageRecords } from "../domain/index.js";
+function sortedErrors(errors) {
+    return [...errors].sort((left, right) => (String(left.sessionID ?? "") + "\0" + left.code + "\0" + left.message).localeCompare(String(right.sessionID ?? "") + "\0" + right.code + "\0" + right.message));
+}
+function groupBreakdowns(records, window, select, withProvider = false) {
+    const groups = new Map();
+    for (const record of records) {
+        const name = select(record);
+        if (name === undefined || name.length === 0)
+            continue;
+        const bucket = groups.get(name);
+        if (bucket === undefined)
+            groups.set(name, [record]);
+        else
+            bucket.push(record);
+    }
+    const breakdowns = [];
+    for (const [name, group] of groups.entries()) {
+        const totals = sumUsageRecords(group, window);
+        breakdowns.push(withProvider ? { name, provider: name, totals } : { name, totals });
+    }
+    return breakdowns.sort((left, right) => right.totals.recorded_total - left.totals.recorded_total || left.name.localeCompare(right.name));
+}
+/**
+ * Shared finalization for local-file scanners. Derives per-window totals and
+ * provider/model/project breakdowns from the normalized records so every
+ * file-backed provider reports the same shape as the Codex scanner.
+ */
+export function buildRecordResult(input) {
+    const errors = sortedErrors(input.errors);
+    const coverage = {
+        complete: errors.length === 0 && input.sessionsSkipped === 0,
+        sessionsDiscovered: input.sessionsDiscovered,
+        sessionsScanned: input.sessionsScanned,
+        sessionsSkipped: input.sessionsSkipped,
+        pagesRead: input.pagesRead,
+        jobsRetried: 0,
+        provisionalMessages: input.provisionalMessages ?? 0,
+        errors,
+    };
+    const totalsByWindow = Object.fromEntries(input.windows.map((window) => [window.kind, sumUsageRecords(input.records, window)]));
+    const providersByWindow = {};
+    const modelsByWindow = {};
+    const projectsByWindow = {};
+    for (const window of input.windows) {
+        const inWindow = input.records.filter((record) => containsInstant(window, record.createdAt));
+        if (inWindow.length === 0)
+            continue;
+        const providers = groupBreakdowns(inWindow, window, (record) => record.provider, true);
+        if (providers.length > 0)
+            providersByWindow[window.kind] = providers;
+        const models = groupBreakdowns(inWindow, window, (record) => record.model);
+        if (models.length > 0)
+            modelsByWindow[window.kind] = models;
+        const projects = groupBreakdowns(inWindow, window, (record) => record.project);
+        if (projects.length > 0)
+            projectsByWindow[window.kind] = projects;
+    }
+    const pickGlobal = (byWindow) => {
+        const preferred = byWindow.week ?? byWindow.day ?? byWindow.hour;
+        if (preferred !== undefined)
+            return preferred;
+        const all = Object.values(byWindow).flat();
+        return all.length > 0 ? all : undefined;
+    };
+    const providers = pickGlobal(providersByWindow);
+    const models = pickGlobal(modelsByWindow);
+    const projects = pickGlobal(projectsByWindow);
+    const providersByWindowTyped = providersByWindow;
+    const modelsByWindowTyped = modelsByWindow;
+    const projectsByWindowTyped = projectsByWindow;
+    return {
+        capturedAt: new Date(input.capturedAt.getTime()),
+        windows: input.windows.map((window) => ({
+            ...window,
+            from: new Date(window.from.getTime()),
+            to: new Date(window.to.getTime()),
+        })),
+        source: input.source,
+        records: input.records,
+        totalsByWindow,
+        ...(providers === undefined ? {} : { providers }),
+        ...(models === undefined ? {} : { models }),
+        ...(projects === undefined ? {} : { projects }),
+        ...(Object.keys(providersByWindow).length === 0 ? {} : { providersByWindow: providersByWindowTyped }),
+        ...(Object.keys(modelsByWindow).length === 0 ? {} : { modelsByWindow: modelsByWindowTyped }),
+        ...(Object.keys(projectsByWindow).length === 0 ? {} : { projectsByWindow: projectsByWindowTyped }),
+        coverage,
+    };
+}
+//# sourceMappingURL=record-result.js.map

package/dist/src/usage/record-result.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"record-result.js","sourceRoot":"","sources":["../../../src/usage/record-result.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "oc2token",
-  "version": "0.1.24",
-  "description": "A macOS-first OpenCode 2 token usage dashboard CLI",
+  "version": "0.1.25",
+  "description": "A macOS-first token usage dashboard CLI for OpenCode 2, Codex, Antigravity, Pi, and DeepSeek Harness",
   "type": "module",
   "bin": {
     "oc2token": "dist/src/cli.js"
@@ -30,6 +30,11 @@
   },
   "keywords": [
     "opencode",
+    "codex",
+    "antigravity",
+    "pi-harness",
+    "deepseek-harness",
+    "dsh",
     "tokens",
     "terminal",
     "tui"