codesift-mcp 0.8.10 → 0.8.12

package/dist/storage/group-registry.js

@@ -0,0 +1,263 @@
+import { readFile, rename } from "node:fs/promises";
+import { join, resolve } from "node:path";
+import { atomicWriteFile } from "./_shared.js";
+/**
+ * Return the canonical path for the group registry file inside a data directory.
+ */
+export function getGroupRegistryPath(dataDir) {
+    return join(dataDir, "groups.json");
+}
+// ---------------------------------------------------------------------------
+// CRITICAL-3: per-path promise chain to serialize R-M-W mutations
+// (mirrors writeLocks pattern from index-store.ts)
+// ---------------------------------------------------------------------------
+const writeLocks = new Map();
+function chainMutation(registryPath, fn) {
+    // FIX-A: normalize path so "./x/groups.json" and "x/groups.json" share a lock
+    const lockKey = resolve(registryPath);
+    const prev = writeLocks.get(lockKey) ?? Promise.resolve();
+    const next = prev.then(fn);
+    // Swallow errors from the chain link so future callers aren't blocked
+    writeLocks.set(lockKey, next.catch(() => { }));
+    return next;
+}
+// ---------------------------------------------------------------------------
+// CRITICAL-2: reserved name guard
+// ---------------------------------------------------------------------------
+const RESERVED_NAMES = /^(__proto__|constructor|prototype)$/;
+function assertValidName(name) {
+    if (name.trim() === "") {
+        throw new Error(`Invalid group name: name must not be empty or whitespace-only.`);
+    }
+    if (RESERVED_NAMES.test(name)) {
+        throw new Error(`Invalid group name "${name}": reserved prototype/constructor names are not allowed.`);
+    }
+}
+// ---------------------------------------------------------------------------
+// CRITICAL-1: split load semantics
+//   ENOENT           → empty registry (legit first run)
+//   JSON/struct bad  → quarantine (rename to .corrupt-<ts>), return empty
+//   other read error → THROW (prevents silent wipe on EACCES/EMFILE)
+// ---------------------------------------------------------------------------
+/**
+ * Load the group registry from disk.
+ *
+ * - ENOENT → returns empty registry (first run)
+ * - Corrupt JSON or invalid structure → renames file to groups.json.corrupt-<ts>,
+ *   logs a warning, and returns empty registry (data is never silently destroyed)
+ * - Other I/O error (EACCES, EMFILE, …) → throws so callers can propagate
+ */
+export async function loadGroupRegistry(registryPath) {
+    let raw;
+    try {
+        raw = await readFile(registryPath, "utf-8");
+    }
+    catch (err) {
+        const code = err.code;
+        if (code === "ENOENT") {
+            return emptyGroupRegistry();
+        }
+        // EACCES, EMFILE, etc. — throw so mutations don't overwrite with empty state
+        throw err;
+    }
+    // File exists — try to parse
+    let parsed;
+    try {
+        parsed = JSON.parse(raw);
+    }
+    catch {
+        await quarantineCorrupt(registryPath);
+        return emptyGroupRegistry();
+    }
+    if (isValidGroupRegistry(parsed)) {
+        return parsed;
+    }
+    // Structurally invalid (valid JSON but wrong shape)
+    await quarantineCorrupt(registryPath);
+    return emptyGroupRegistry();
+}
+/**
+ * Rename the corrupt file to a timestamped sibling so data is never lost.
+ * Best-effort — if renaming fails we swallow the error (we already know the
+ * data is unusable).
+ */
+async function quarantineCorrupt(registryPath) {
+    const dest = `${registryPath}.corrupt-${Date.now()}`;
+    try {
+        await rename(registryPath, dest);
+        console.warn(`[codesift] group-registry: corrupt file quarantined as ${dest}`);
+    }
+    catch {
+        console.warn(`[codesift] group-registry: failed to quarantine corrupt file at ${registryPath}`);
+    }
+}
+/**
+ * Save the group registry atomically.
+ * Writes to a temp file first, then renames to prevent partial reads.
+ */
+export async function saveGroupRegistry(registryPath, registry) {
+    const data = JSON.stringify(registry);
+    await atomicWriteFile(registryPath, data);
+}
+/**
+ * Register or update a group. Duplicate repos are deduplicated.
+ * On overwrite: preserves created_at, updates updated_at.
+ *
+ * Mutations are serialized per registry path (CRITICAL-3 R-M-W race fix).
+ * Invalid/reserved names are rejected immediately (CRITICAL-2).
+ */
+export async function registerGroup(registryPath, input) {
+    assertValidName(input.name);
+    // FIX-B: runtime input validation
+    if (!Array.isArray(input.repos)) {
+        throw new Error(`Invalid repos: expected an array of strings, got ${typeof input.repos}.`);
+    }
+    for (const r of input.repos) {
+        if (typeof r !== "string" || r === "") {
+            throw new Error(`Invalid repos: every element must be a non-empty string (got ${JSON.stringify(r)}).`);
+        }
+    }
+    if (input.description !== undefined && typeof input.description !== "string") {
+        throw new Error(`Invalid description: expected a string, got ${typeof input.description}.`);
+    }
+    return chainMutation(registryPath, async () => {
+        const registry = await loadGroupRegistry(registryPath);
+        const now = Date.now();
+        const existing = Object.hasOwn(registry.groups, input.name)
+            ? registry.groups[input.name]
+            : undefined;
+        const deduped = [...new Set(input.repos)];
+        const group = existing
+            ? {
+                name: input.name,
+                repos: deduped,
+                ...(input.description !== undefined ? { description: input.description } : {}),
+                created_at: existing.created_at,
+                updated_at: now,
+            }
+            : {
+                name: input.name,
+                repos: deduped,
+                ...(input.description !== undefined ? { description: input.description } : {}),
+                created_at: now,
+                updated_at: now,
+            };
+        registry.groups[input.name] = group;
+        registry.updated_at = now;
+        await saveGroupRegistry(registryPath, registry);
+    });
+}
+/**
+ * Get a single group by name. Returns null if not found.
+ *
+ * Read-only: catches non-fatal load errors and returns null with a warning.
+ */
+export async function getGroup(registryPath, name) {
+    let registry;
+    try {
+        registry = await loadGroupRegistry(registryPath);
+    }
+    catch {
+        console.warn(`[codesift] group-registry: could not read registry at ${registryPath}`);
+        return null;
+    }
+    return Object.hasOwn(registry.groups, name) ? registry.groups[name] : null;
+}
+/**
+ * List all registered groups.
+ *
+ * Read-only: catches non-fatal load errors and returns empty array with a warning.
+ */
+export async function listGroups(registryPath) {
+    let registry;
+    try {
+        registry = await loadGroupRegistry(registryPath);
+    }
+    catch {
+        console.warn(`[codesift] group-registry: could not read registry at ${registryPath}`);
+        return [];
+    }
+    return Object.keys(registry.groups)
+        .filter((k) => Object.hasOwn(registry.groups, k))
+        .map((k) => registry.groups[k]);
+}
+/**
+ * Remove a group by name.
+ * Returns true if it existed and was removed, false otherwise (idempotent).
+ *
+ * Mutations are serialized per registry path (CRITICAL-3 R-M-W race fix).
+ */
+export async function removeGroup(registryPath, name) {
+    return chainMutation(registryPath, async () => {
+        const registry = await loadGroupRegistry(registryPath);
+        if (!Object.hasOwn(registry.groups, name)) {
+            return false;
+        }
+        delete registry.groups[name];
+        registry.updated_at = Date.now();
+        await saveGroupRegistry(registryPath, registry);
+        return true;
+    });
+}
+// ---------------------------------------------------------------------------
+// Internal helpers
+// ---------------------------------------------------------------------------
+function emptyGroupRegistry() {
+    return { groups: {}, updated_at: Date.now() };
+}
+/**
+ * Deep structural guard for a raw parsed GroupRegistry value.
+ * Mirrors the Array.isArray improvements from hash-snapshot.ts.
+ */
+function isValidGroupRegistry(value) {
+    if (typeof value !== "object" || value === null || Array.isArray(value)) {
+        return false;
+    }
+    const obj = value;
+    if (typeof obj["updated_at"] !== "number")
+        return false;
+    const groups = obj["groups"];
+    if (typeof groups !== "object" || groups === null || Array.isArray(groups)) {
+        return false;
+    }
+    // FIX-C: validate each group entry, guarding against prototype pollution,
+    // key/name mismatch, and reserved keys crafted on disk
+    for (const key of Object.keys(groups)) {
+        if (!Object.hasOwn(groups, key))
+            continue;
+        // Reject reserved keys even if they somehow appear in the JSON
+        if (RESERVED_NAMES.test(key))
+            return false;
+        const entry = groups[key];
+        if (!isValidRepoGroup(entry))
+            return false;
+        // key must equal the group's own name field — mismatch = tampered file
+        if (entry["name"] !== key)
+            return false;
+    }
+    return true;
+}
+function isValidRepoGroup(value) {
+    if (typeof value !== "object" || value === null || Array.isArray(value)) {
+        return false;
+    }
+    const obj = value;
+    if (typeof obj["name"] !== "string")
+        return false;
+    if (typeof obj["created_at"] !== "number")
+        return false;
+    if (typeof obj["updated_at"] !== "number")
+        return false;
+    const repos = obj["repos"];
+    if (!Array.isArray(repos))
+        return false;
+    for (const r of repos) {
+        if (typeof r !== "string")
+            return false;
+    }
+    // description is optional — if present it must be a string
+    if (Object.hasOwn(obj, "description") && typeof obj["description"] !== "string")
+        return false;
+    return true;
+}
+//# sourceMappingURL=group-registry.js.map

package/dist/storage/group-registry.js.map

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

package/dist/storage/hash-snapshot.d.ts

@@ -0,0 +1,36 @@
+export declare const HASH_SNAPSHOT_VERSION = 1;
+export interface FileHashSnapshot {
+    version: 1;
+    repo: string;
+    created_at: number;
+    files: Record<string, string>;
+}
+/**
+ * Convert an index path to its companion snapshot path.
+ * e.g. "/x/abc123.index.json" → "/x/abc123.snapshot.json"
+ *
+ * Throws if indexPath does not end with ".index.json" (safety guard against
+ * accidentally overwriting the wrong file).
+ */
+export declare function getSnapshotPath(indexPath: string): string;
+/**
+ * Write a FileHashSnapshot atomically.
+ */
+export declare function saveHashSnapshot(path: string, snap: FileHashSnapshot): Promise<void>;
+/**
+ * Load a FileHashSnapshot from disk.
+ * Returns null when:
+ *   - the file does not exist
+ *   - the file contains invalid JSON
+ *   - the stored version !== 1
+ *   - expectedRepo is provided and does not match snapshot.repo
+ *
+ * Non-ENOENT file read errors are logged as a warning before returning null.
+ * JSON parse errors are silent (expected corruption path).
+ */
+export declare function loadHashSnapshot(path: string, expectedRepo?: string): Promise<FileHashSnapshot | null>;
+/**
+ * Delete a snapshot file idempotently — never throws if the file is absent.
+ */
+export declare function deleteHashSnapshot(path: string): Promise<void>;
+//# sourceMappingURL=hash-snapshot.d.ts.map

package/dist/storage/hash-snapshot.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"hash-snapshot.d.ts","sourceRoot":"","sources":["../../src/storage/hash-snapshot.ts"],"names":[],"mappings":"AAGA,eAAO,MAAM,qBAAqB,IAAI,CAAC;AAEvC,MAAM,WAAW,gBAAgB;IAC/B,OAAO,EAAE,CAAC,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,MAAM,CAAC;IACnB,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAC/B;AAED;;;;;;GAMG;AACH,wBAAgB,eAAe,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,CAOzD;AAED;;GAEG;AACH,wBAAsB,gBAAgB,CACpC,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,gBAAgB,GACrB,OAAO,CAAC,IAAI,CAAC,CAGf;AAED;;;;;;;;;;GAUG;AACH,wBAAsB,gBAAgB,CACpC,IAAI,EAAE,MAAM,EACZ,YAAY,CAAC,EAAE,MAAM,GACpB,OAAO,CAAC,gBAAgB,GAAG,IAAI,CAAC,CAkClC;AAED;;GAEG;AACH,wBAAsB,kBAAkB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CASpE"}

package/dist/storage/hash-snapshot.js

@@ -0,0 +1,101 @@
+import { readFile, unlink } from "node:fs/promises";
+import { atomicWriteFile } from "./_shared.js";
+export const HASH_SNAPSHOT_VERSION = 1;
+/**
+ * Convert an index path to its companion snapshot path.
+ * e.g. "/x/abc123.index.json" → "/x/abc123.snapshot.json"
+ *
+ * Throws if indexPath does not end with ".index.json" (safety guard against
+ * accidentally overwriting the wrong file).
+ */
+export function getSnapshotPath(indexPath) {
+    if (!indexPath.endsWith(".index.json")) {
+        throw new Error(`hash-snapshot: expected an .index.json path, got "${indexPath}"`);
+    }
+    return indexPath.replace(/\.index\.json$/, ".snapshot.json");
+}
+/**
+ * Write a FileHashSnapshot atomically.
+ */
+export async function saveHashSnapshot(path, snap) {
+    const data = JSON.stringify(snap);
+    await atomicWriteFile(path, data);
+}
+/**
+ * Load a FileHashSnapshot from disk.
+ * Returns null when:
+ *   - the file does not exist
+ *   - the file contains invalid JSON
+ *   - the stored version !== 1
+ *   - expectedRepo is provided and does not match snapshot.repo
+ *
+ * Non-ENOENT file read errors are logged as a warning before returning null.
+ * JSON parse errors are silent (expected corruption path).
+ */
+export async function loadHashSnapshot(path, expectedRepo) {
+    let raw;
+    try {
+        raw = await readFile(path, "utf-8");
+    }
+    catch (err) {
+        // ENOENT = expected case (file doesn't exist yet). Other errors = log & degrade.
+        const errno = err?.code;
+        if (errno !== "ENOENT") {
+            const msg = err instanceof Error ? err.message : String(err);
+            console.warn(`[codesift] hash-snapshot load failed (degrading to full re-parse): ${msg}`);
+        }
+        return null;
+    }
+    let parsed;
+    try {
+        parsed = JSON.parse(raw);
+    }
+    catch {
+        // JSON parse errors are silent (corruption is expected & recoverable)
+        return null;
+    }
+    if (!isValidSnapshot(parsed)) {
+        return null;
+    }
+    if (expectedRepo !== undefined && parsed.repo !== expectedRepo) {
+        return null;
+    }
+    return parsed;
+}
+/**
+ * Delete a snapshot file idempotently — never throws if the file is absent.
+ */
+export async function deleteHashSnapshot(path) {
+    try {
+        await unlink(path);
+    }
+    catch (err) {
+        // ENOENT = already gone, which is fine. Re-throw anything else.
+        if (err.code !== "ENOENT") {
+            throw err;
+        }
+    }
+}
+function isValidSnapshot(value) {
+    if (typeof value !== "object" || value === null || Array.isArray(value)) {
+        return false;
+    }
+    const obj = value;
+    if (obj["version"] !== HASH_SNAPSHOT_VERSION)
+        return false;
+    if (typeof obj["repo"] !== "string")
+        return false;
+    if (typeof obj["created_at"] !== "number")
+        return false;
+    const files = obj["files"];
+    if (typeof files !== "object" || files === null || Array.isArray(files)) {
+        return false;
+    }
+    // All values in files must be strings
+    for (const v of Object.values(files)) {
+        if (typeof v !== "string")
+            return false;
+    }
+    return true;
+}
+//# sourceMappingURL=hash-snapshot.js.map

package/dist/storage/hash-snapshot.js.map

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

package/dist/storage/usage-stats.d.ts

@@ -9,6 +9,11 @@ export interface RepoStats {
     repo: string;
     call_count: number;
 }
+export interface HostStats {
+    host: string;
+    call_count: number;
+    total_tokens: number;
+}
 export interface DailyStats {
     date: string;
     call_count: number;
@@ -25,6 +30,8 @@ export interface UsageStats {
     avg_calls_per_session: number;
     tools: ToolStats[];
     top_repos: RepoStats[];
+    /** Per-machine breakdown — only meaningful once usage-remote/ logs are synced in. */
+    hosts: HostStats[];
     daily: DailyStats[];
     query_types: QueryTypeStats[];
     earliest_ts: number;
@@ -35,6 +42,7 @@ export declare function getUsageStats(options?: {
     repo?: string;
     tool?: string;
     session_id?: string;
+    host?: string;
 }): Promise<UsageStats>;
 export declare function formatUsageReport(stats: UsageStats): string;
 //# sourceMappingURL=usage-stats.d.ts.map

package/dist/storage/usage-stats.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"usage-stats.d.ts","sourceRoot":"","sources":["../../src/storage/usage-stats.ts"],"names":[],"mappings":"AASA,MAAM,WAAW,SAAS;IACxB,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,mBAAmB,EAAE,MAAM,CAAC;IAC5B,cAAc,EAAE,MAAM,CAAC;IACvB,iBAAiB,EAAE,MAAM,CAAC;CAC3B;AAED,MAAM,WAAW,SAAS;IACxB,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,WAAW,UAAU;IACzB,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,MAAM,CAAC;IACnB,YAAY,EAAE,MAAM,CAAC;CACtB;AAED,MAAM,WAAW,cAAc;IAC7B,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,WAAW,UAAU;IACzB,WAAW,EAAE,MAAM,CAAC;IACpB,cAAc,EAAE,MAAM,CAAC;IACvB,qBAAqB,EAAE,MAAM,CAAC;IAC9B,KAAK,EAAE,SAAS,EAAE,CAAC;IACnB,SAAS,EAAE,SAAS,EAAE,CAAC;IACvB,KAAK,EAAE,UAAU,EAAE,CAAC;IACpB,WAAW,EAAE,cAAc,EAAE,CAAC;IAC9B,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,EAAE,MAAM,CAAC;CACnB;AA+DD,wBAAsB,aAAa,CAAC,OAAO,CAAC,EAAE;IAC5C,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB,GAAG,OAAO,CAAC,UAAU,CAAC,CAuHtB;AAMD,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,UAAU,GAAG,MAAM,CA0E3D"}
+{"version":3,"file":"usage-stats.d.ts","sourceRoot":"","sources":["../../src/storage/usage-stats.ts"],"names":[],"mappings":"AAUA,MAAM,WAAW,SAAS;IACxB,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,mBAAmB,EAAE,MAAM,CAAC;IAC5B,cAAc,EAAE,MAAM,CAAC;IACvB,iBAAiB,EAAE,MAAM,CAAC;CAC3B;AAED,MAAM,WAAW,SAAS;IACxB,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,WAAW,SAAS;IACxB,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,MAAM,CAAC;IACnB,YAAY,EAAE,MAAM,CAAC;CACtB;AAED,MAAM,WAAW,UAAU;IACzB,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,MAAM,CAAC;IACnB,YAAY,EAAE,MAAM,CAAC;CACtB;AAED,MAAM,WAAW,cAAc;IAC7B,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,WAAW,UAAU;IACzB,WAAW,EAAE,MAAM,CAAC;IACpB,cAAc,EAAE,MAAM,CAAC;IACvB,qBAAqB,EAAE,MAAM,CAAC;IAC9B,KAAK,EAAE,SAAS,EAAE,CAAC;IACnB,SAAS,EAAE,SAAS,EAAE,CAAC;IACvB,qFAAqF;IACrF,KAAK,EAAE,SAAS,EAAE,CAAC;IACnB,KAAK,EAAE,UAAU,EAAE,CAAC;IACpB,WAAW,EAAE,cAAc,EAAE,CAAC;IAC9B,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,EAAE,MAAM,CAAC;CACnB;AAyFD,wBAAsB,aAAa,CAAC,OAAO,CAAC,EAAE;IAC5C,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,IAAI,CAAC,EAAE,MAAM,CAAC;CACf,GAAG,OAAO,CAAC,UAAU,CAAC,CAqItB;AAMD,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,UAAU,GAAG,MAAM,CAmF3D"}

package/dist/storage/usage-stats.js

@@ -1,5 +1,6 @@
-import { readFile } from "node:fs/promises";
-import { getCumulativeSavings, getUsagePath } from "./usage-tracker.js";
+import { readFile, readdir } from "node:fs/promises";
+import { join, basename } from "node:path";
+import { getCumulativeSavings, getUsagePath, getRemoteUsageDir, getLocalHostTag } from "./usage-tracker.js";
 import { formatTable } from "../formatters.js";
 // ---------------------------------------------------------------------------
 // Loading
@@ -13,42 +14,71 @@ function isValidEntry(value) {
         typeof obj["elapsed_ms"] === "number" &&
         typeof obj["session_id"] === "string");
 }
-async function loadEntries(options) {
-    const usagePath = getUsagePath();
-    let raw;
+/** The local log plus any host logs synced into usage-remote/. Each source
+ *  carries a fallback host tag for entries written before the `host` field
+ *  existed: the local hostname, or the remote file's name stem. */
+async function listUsageSources() {
+    const sources = [{ path: getUsagePath(), fallbackHost: getLocalHostTag() }];
+    const remoteDir = getRemoteUsageDir();
     try {
-        raw = await readFile(usagePath, "utf-8");
+        for (const name of await readdir(remoteDir)) {
+            if (!name.endsWith(".jsonl"))
+                continue;
+            sources.push({
+                path: join(remoteDir, name),
+                fallbackHost: basename(name, ".jsonl"),
+            });
+        }
     }
     catch {
-        return [];
+        // usage-remote/ absent — single-machine setup
     }
+    return sources;
+}
+async function loadEntries(options) {
     const sinceTs = options?.since ? new Date(options.since).getTime() : 0;
     const repoFilter = options?.repo ?? null;
     const toolFilter = options?.tool ?? null;
     const sessionFilter = options?.session_id ?? null;
+    const hostFilter = options?.host ?? null;
     const entries = [];
-    for (const line of raw.split("\n")) {
-        const trimmed = line.trim();
-        if (!trimmed)
-            continue;
+    for (const source of await listUsageSources()) {
+        let raw;
         try {
-            const parsed = JSON.parse(trimmed);
-            if (!isValidEntry(parsed))
-                continue;
-            if (parsed.ts < sinceTs)
-                continue;
-            if (repoFilter && parsed.repo !== repoFilter)
-                continue;
-            if (toolFilter && parsed.tool !== toolFilter)
-                continue;
-            if (sessionFilter && parsed.session_id !== sessionFilter)
-                continue;
-            entries.push(parsed);
+            raw = await readFile(source.path, "utf-8");
         }
         catch {
-            // Skip malformed lines
+            continue;
+        }
+        for (const line of raw.split("\n")) {
+            const trimmed = line.trim();
+            if (!trimmed)
+                continue;
+            try {
+                const parsed = JSON.parse(trimmed);
+                if (!isValidEntry(parsed))
+                    continue;
+                if (parsed.host === undefined)
+                    parsed.host = source.fallbackHost;
+                if (parsed.ts < sinceTs)
+                    continue;
+                if (repoFilter && parsed.repo !== repoFilter)
+                    continue;
+                if (toolFilter && parsed.tool !== toolFilter)
+                    continue;
+                if (sessionFilter && parsed.session_id !== sessionFilter)
+                    continue;
+                if (hostFilter && parsed.host !== hostFilter)
+                    continue;
+                entries.push(parsed);
+            }
+            catch {
+                // Skip malformed lines
+            }
         }
     }
+    // Sources are per-host append logs — interleave them chronologically.
+    entries.sort((a, b) => a.ts - b.ts);
     return entries;
 }
 // ---------------------------------------------------------------------------
@@ -63,6 +93,7 @@ export async function getUsageStats(options) {
             avg_calls_per_session: 0,
             tools: [],
             top_repos: [],
+            hosts: [],
             daily: [],
             query_types: [],
             earliest_ts: 0,
@@ -72,6 +103,7 @@ export async function getUsageStats(options) {
     // Per-tool aggregation
     const toolMap = new Map();
     const repoMap = new Map();
+    const hostMap = new Map();
     const sessionSet = new Set();
     const dailyMap = new Map();
     // codebase_retrieval query type breakdown
@@ -90,6 +122,12 @@ export async function getUsageStats(options) {
         if (entry.repo) {
             repoMap.set(entry.repo, (repoMap.get(entry.repo) ?? 0) + 1);
         }
+        // Host stats (loadEntries guarantees a host on every entry)
+        const hostKey = entry.host ?? "unknown";
+        const hostStats = hostMap.get(hostKey) ?? { calls: 0, tokens: 0 };
+        hostStats.calls += 1;
+        hostStats.tokens += entry.result_tokens;
+        hostMap.set(hostKey, hostStats);
         // Sessions
         sessionSet.add(entry.session_id);
         // Daily
@@ -134,6 +172,9 @@ export async function getUsageStats(options) {
         .map(([repo, call_count]) => ({ repo, call_count }))
         .sort((a, b) => b.call_count - a.call_count)
         .slice(0, 20);
+    const hosts = [...hostMap.entries()]
+        .map(([host, stats]) => ({ host, call_count: stats.calls, total_tokens: stats.tokens }))
+        .sort((a, b) => b.call_count - a.call_count);
     const daily = [...dailyMap.entries()]
         .map(([date, stats]) => ({
         date,
@@ -155,6 +196,7 @@ export async function getUsageStats(options) {
         avg_calls_per_session: Math.round((entries.length / totalSessions) * 10) / 10,
         tools,
         top_repos,
+        hosts,
         daily,
         query_types,
         earliest_ts: earliest,
@@ -214,6 +256,14 @@ export function formatUsageReport(stats) {
         }
         lines.push("");
     }
+    // Hosts — only worth showing once logs from more than one machine are merged
+    if (stats.hosts.length > 1) {
+        lines.push("--- Hosts ---");
+        for (const h of stats.hosts) {
+            lines.push(`  ${h.host}: ${h.call_count} calls, ${h.total_tokens} tokens`);
+        }
+        lines.push("");
+    }
     // Daily breakdown (last 14 days max)
     if (stats.daily.length > 0) {
         lines.push("--- Daily Usage ---");