ftown-bridge 0.20.4 → 0.20.6

package/dist/security/security-nudge.js

@@ -0,0 +1,98 @@
+export const SECURITY_NUDGE_TYPE = 'ftown_security_changed';
+/** `bridges:security#${userId}`; userId is the Centrifugo user (account email). */
+export function securityNudgeChannel(userId) {
+    if (!userId)
+        throw new Error('securityNudgeChannel: userId is required');
+    return `bridges:security#${userId}`;
+}
+export function securityNudge(scope) {
+    return { type: SECURITY_NUDGE_TYPE, version: 1, scope };
+}
+export function parseSecurityNudge(data) {
+    if (typeof data !== 'object' || data === null || Array.isArray(data))
+        return null;
+    const proto = Object.getPrototypeOf(data);
+    if (proto !== Object.prototype && proto !== null)
+        return null;
+    const record = data;
+    const keys = Object.keys(record);
+    if (keys.length !== 3 || !keys.includes('type') || !keys.includes('version') || !keys.includes('scope'))
+        return null;
+    const type = record.type;
+    const version = record.version;
+    const scope = record.scope;
+    if (type !== SECURITY_NUDGE_TYPE || version !== 1)
+        return null;
+    return scope === 'approvals' || scope === 'account' ? scope : null;
+}
+/** Minimum spacing between nudge-triggered refreshes of one scope at one receiver. */
+export const SECURITY_NUDGE_MIN_SPACING_MS = 1000;
+/** Bridge-only safety re-read of account trust when no nudge arrives. */
+export const ACCOUNT_SAFETY_REFRESH_MS = 3600000;
+const defaultTimers = {
+    now: () => Date.now(),
+    setTimeout: (fn, ms) => setTimeout(fn, ms),
+    clearTimeout: (handle) => clearTimeout(handle),
+};
+/**
+ * Calls `run` for request()s, never two runs at once, and never two run starts closer than minSpacingMs.
+ * Requests during a run or inside the spacing window collapse into ONE trailing run.
+ * `run` rejections are swallowed. After dispose(), nothing runs. Timers use the injected `timers`.
+ */
+export function createCoalescedTrigger(run, minSpacingMs, timers = defaultTimers) {
+    let disposed = false;
+    let running = false;
+    let pending = false;
+    let lastStart = null;
+    let timer = null;
+    const schedule = () => {
+        if (disposed || running || !pending || timer !== null)
+            return;
+        const wait = lastStart === null ? 0 : lastStart + minSpacingMs - timers.now();
+        if (wait <= 0) {
+            start();
+            return;
+        }
+        timer = timers.setTimeout(() => { timer = null; schedule(); }, wait);
+    };
+    const finish = () => {
+        running = false;
+        schedule();
+    };
+    const start = () => {
+        pending = false;
+        running = true;
+        lastStart = timers.now();
+        let result;
+        try {
+            result = run();
+        }
+        catch (_error) {
+            finish();
+            return;
+        }
+        if (result && typeof result.then === 'function') {
+            result.then(finish, finish);
+        }
+        else {
+            finish();
+        }
+    };
+    return {
+        request() {
+            if (disposed)
+                return;
+            pending = true;
+            schedule();
+        },
+        dispose() {
+            disposed = true;
+            pending = false;
+            if (timer !== null) {
+                timers.clearTimeout(timer);
+                timer = null;
+            }
+        },
+    };
+}
+//# sourceMappingURL=security-nudge.js.map

package/dist/security/security-nudge.js.map

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

package/dist/usage-collector.d.ts

@@ -1,3 +1,4 @@
+import { type JsonlFoldCache } from './jsonl-fold-cache.js';
 import type { Session, SessionUsage } from './types.js';
 /**
  * Per-session token usage extraction from harness-native session files.
@@ -38,6 +39,8 @@ export interface UsageCollectorOptions {
     museSessionsDir?: string;
     /** Cap on wall-clock read time per collection. Default 15s. */
     timeoutMs?: number;
+    /** Incremental read cache. Default: defaultJsonlFoldCache (shared process-wide). Tests inject a fresh one. */
+    foldCache?: JsonlFoldCache;
 }
 /**
  * Claude Code project-directory slug: every non-alphanumeric character of the

package/dist/usage-collector.js

@@ -3,7 +3,39 @@ import { readFile, readdir, realpath, stat } from 'node:fs/promises';
 import { createInterface } from 'node:readline';
 import { homedir } from 'node:os';
 import { join, resolve, sep } from 'node:path';
+import { defaultJsonlFoldCache } from './jsonl-fold-cache.js';
 const DEFAULT_TIMEOUT_MS = 15_000;
+function newModelSums() {
+    return { byModel: new Map(), counted: 0 };
+}
+function modelAcc(state, model) {
+    let acc = state.byModel.get(model);
+    if (!acc) {
+        acc = { model, inputTokens: 0, outputTokens: 0, cacheReadTokens: 0, cacheWriteTokens: 0 };
+        state.byModel.set(model, acc);
+    }
+    return acc;
+}
+/** Builds the SessionUsage for per-model sums; copies, so the result never aliases fold state. */
+function usageFromModels(byModel, harness) {
+    const perModel = [...byModel.values()].map((m) => ({ ...m }));
+    const sum = (pick) => perModel.reduce((acc, m) => acc + pick(m), 0);
+    const inputTokens = sum((m) => m.inputTokens);
+    const outputTokens = sum((m) => m.outputTokens);
+    const cacheReadTokens = sum((m) => m.cacheReadTokens);
+    const cacheWriteTokens = sum((m) => m.cacheWriteTokens);
+    return {
+        inputTokens,
+        outputTokens,
+        cacheReadTokens,
+        cacheWriteTokens,
+        totalTokens: inputTokens + outputTokens + cacheReadTokens + cacheWriteTokens,
+        models: perModel.map((m) => m.model),
+        perModel,
+        harness,
+        collectedAt: new Date().toISOString(),
+    };
+}
 /**
  * Claude Code project-directory slug: every non-alphanumeric character of the
  * working directory becomes '-'. Verified against real transcript dirs on this
@@ -93,48 +125,29 @@ async function collectPiUsage(workingDir, sessionCreatedAt, options, nativeSessi
     const filePath = await containedPiSessionFile(baseDir, candidatePath);
     if (!filePath)
         return null;
-    let counted = 0;
-    const byModel = new Map();
-    for await (const raw of jsonlLines(filePath, deadline)) {
+    const usage = await (options.foldCache ?? defaultJsonlFoldCache).fold(filePath, piUsageFold, options.timeoutMs ?? DEFAULT_TIMEOUT_MS, (state) => (state.counted === 0 ? null : usageFromModels(state.byModel, 'pi')));
+    return usage ?? null;
+}
+const piUsageFold = {
+    kind: 'pi-usage-v1',
+    init: newModelSums,
+    step(state, raw) {
         const entry = raw;
         const message = entry?.type === 'message' ? entry.message : undefined;
         const usage = message?.role === 'assistant' ? message.usage : undefined;
         if (!message || !usage || typeof message.model !== 'string' || !message.model)
-            continue;
+            return;
         const model = typeof message.provider === 'string' && message.provider
             ? `${message.provider}/${message.model}`
             : message.model;
-        let acc = byModel.get(model);
-        if (!acc) {
-            acc = { model, inputTokens: 0, outputTokens: 0, cacheReadTokens: 0, cacheWriteTokens: 0 };
-            byModel.set(model, acc);
-        }
+        const acc = modelAcc(state, model);
         acc.inputTokens += safeTokenCount(usage.input);
         acc.outputTokens += safeTokenCount(usage.output);
         acc.cacheReadTokens += safeTokenCount(usage.cacheRead);
         acc.cacheWriteTokens += safeTokenCount(usage.cacheWrite);
-        counted += 1;
-    }
-    if (counted === 0)
-        return null;
-    const perModel = [...byModel.values()];
-    const sum = (pick) => perModel.reduce((total, model) => total + pick(model), 0);
-    const inputTokens = sum((model) => model.inputTokens);
-    const outputTokens = sum((model) => model.outputTokens);
-    const cacheReadTokens = sum((model) => model.cacheReadTokens);
-    const cacheWriteTokens = sum((model) => model.cacheWriteTokens);
-    return {
-        inputTokens,
-        outputTokens,
-        cacheReadTokens,
-        cacheWriteTokens,
-        totalTokens: inputTokens + outputTokens + cacheReadTokens + cacheWriteTokens,
-        models: perModel.map((model) => model.model),
-        perModel,
-        harness: 'pi',
-        collectedAt: new Date().toISOString(),
-    };
-}
+        state.counted += 1;
+    },
+};
 function safeTokenCount(value) {
     return typeof value === 'number' && Number.isFinite(value) && value >= 0 ? value : 0;
 }
@@ -183,64 +196,39 @@ async function collectClaudeUsage(claudeSessionId, workingDir, options) {
         return null;
     const baseDir = options.claudeProjectsDir ?? join(homedir(), '.claude', 'projects');
     const filePath = join(baseDir, claudeProjectSlug(workingDir), `${claudeSessionId}.jsonl`);
-    const deadline = Date.now() + (options.timeoutMs ?? DEFAULT_TIMEOUT_MS);
-    let counted = 0;
-    // Keyed by model id; Map preserves first-appearance order.
-    const byModel = new Map();
-    // An assistant message spans MULTIPLE jsonl lines (one per content block),
-    // each repeating the same message.id and identical usage — count each
-    // message id exactly once or sums double/triple.
-    const seenMessageIds = new Set();
-    for await (const raw of jsonlLines(filePath, deadline)) {
+    const usage = await (options.foldCache ?? defaultJsonlFoldCache).fold(filePath, claudeUsageFold, options.timeoutMs ?? DEFAULT_TIMEOUT_MS, (state) => (state.counted === 0 ? null : usageFromModels(state.byModel, 'claude')));
+    return usage ?? null;
+}
+const claudeUsageFold = {
+    kind: 'claude-usage-v1',
+    init: () => ({ ...newModelSums(), seenMessageIds: new Set() }),
+    step(state, raw) {
         const entry = raw;
         if (entry?.type !== 'assistant')
-            continue;
+            return;
         const message = entry.message;
         const usage = message?.usage;
         if (!message || !usage)
-            continue;
+            return;
         const model = message.model ?? '';
         // '<synthetic>' rows are harness-injected placeholders with zero usage.
         if (!model || model === '<synthetic>')
-            continue;
+            return;
         const id = message.id;
         if (id) {
-            if (seenMessageIds.has(id))
-                continue;
-            seenMessageIds.add(id);
+            if (state.seenMessageIds.has(id))
+                return;
+            state.seenMessageIds.add(id);
         }
         // Models can vary mid-session — attribute tokens per message's model.
-        let acc = byModel.get(model);
-        if (!acc) {
-            acc = { model, inputTokens: 0, outputTokens: 0, cacheReadTokens: 0, cacheWriteTokens: 0 };
-            byModel.set(model, acc);
-        }
+        const acc = modelAcc(state, model);
         acc.inputTokens += usage.input_tokens ?? 0;
         acc.outputTokens += usage.output_tokens ?? 0;
         acc.cacheReadTokens += usage.cache_read_input_tokens ?? 0;
         acc.cacheWriteTokens += usage.cache_creation_input_tokens ?? 0;
-        counted += 1;
-    }
-    if (counted === 0)
-        return null;
-    const perModel = [...byModel.values()];
-    const sum = (pick) => perModel.reduce((acc, m) => acc + pick(m), 0);
-    const inputTokens = sum((m) => m.inputTokens);
-    const outputTokens = sum((m) => m.outputTokens);
-    const cacheReadTokens = sum((m) => m.cacheReadTokens);
-    const cacheWriteTokens = sum((m) => m.cacheWriteTokens);
-    return {
-        inputTokens,
-        outputTokens,
-        cacheReadTokens,
-        cacheWriteTokens,
-        totalTokens: inputTokens + outputTokens + cacheReadTokens + cacheWriteTokens,
-        models: perModel.map((m) => m.model),
-        perModel,
-        harness: 'claude',
-        collectedAt: new Date().toISOString(),
-    };
-}
+        state.counted += 1;
+    },
+};
 /** Resolve ~/.codex/sessions/<yyyy>/<mm>/<dd>/rollout-*-<id>.jsonl (date-partitioned). */
 async function findCodexRollout(baseDir, codexSessionId) {
     const suffix = `-${codexSessionId}.jsonl`;
@@ -282,41 +270,16 @@ async function collectCodexUsage(codexSessionId, options) {
     const filePath = await findCodexRollout(baseDir, codexSessionId);
     if (!filePath)
         return null;
-    const deadline = Date.now() + (options.timeoutMs ?? DEFAULT_TIMEOUT_MS);
-    const models = [];
-    let lastTotals = null;
-    for await (const raw of jsonlLines(filePath, deadline)) {
-        const entry = raw;
-        const payload = entry?.payload;
-        if (!payload)
-            continue;
-        if (entry.type === 'turn_context' && payload.model) {
-            if (!models.includes(payload.model))
-                models.push(payload.model);
-            continue;
-        }
-        // token_count events carry cumulative totals — the LAST one wins. Some
-        // token_count events have info: null (rate-limit-only updates); skip them.
-        if (payload.type === 'token_count') {
-            const totals = payload.info?.total_token_usage;
-            if (totals) {
-                lastTotals = {
-                    input: totals.input_tokens ?? 0,
-                    cached: totals.cached_input_tokens ?? 0,
-                    output: totals.output_tokens ?? 0,
-                };
-            }
-        }
-    }
-    if (!lastTotals)
+    const totals = await (options.foldCache ?? defaultJsonlFoldCache).fold(filePath, codexUsageFold, options.timeoutMs ?? DEFAULT_TIMEOUT_MS, (state) => (state.lastTotals ? { models: [...state.models], ...state.lastTotals } : null));
+    if (!totals)
         return null;
     // Codex counts cached tokens INSIDE input_tokens (input 11276 / cached 9088 /
     // total 11305 = 11276 + 29 in real rollouts) — split them so totalTokens
     // (sum of the four) matches codex's own total_tokens. output_tokens already
     // includes reasoning tokens. Codex reports no cache writes.
-    const cacheReadTokens = Math.min(lastTotals.cached, lastTotals.input);
-    const inputTokens = lastTotals.input - cacheReadTokens;
-    const outputTokens = lastTotals.output;
+    const cacheReadTokens = Math.min(totals.cached, totals.input);
+    const inputTokens = totals.input - cacheReadTokens;
+    const outputTokens = totals.output;
     const cacheWriteTokens = 0;
     // Codex rollouts carry only cumulative totals — there is no per-model
     // attribution, so perModel is deliberately absent (models lists what ran).
@@ -326,11 +289,38 @@ async function collectCodexUsage(codexSessionId, options) {
         cacheReadTokens,
         cacheWriteTokens,
         totalTokens: inputTokens + outputTokens + cacheReadTokens + cacheWriteTokens,
-        models,
+        models: totals.models,
         harness: 'codex',
         collectedAt: new Date().toISOString(),
     };
 }
+const codexUsageFold = {
+    kind: 'codex-usage-v1',
+    init: () => ({ models: [], lastTotals: null }),
+    step(state, raw) {
+        const entry = raw;
+        const payload = entry?.payload;
+        if (!payload)
+            return;
+        if (entry.type === 'turn_context' && payload.model) {
+            if (!state.models.includes(payload.model))
+                state.models.push(payload.model);
+            return;
+        }
+        // token_count events carry cumulative totals — the LAST one wins. Some
+        // token_count events have info: null (rate-limit-only updates); skip them.
+        if (payload.type === 'token_count') {
+            const totals = payload.info?.total_token_usage;
+            if (totals) {
+                state.lastTotals = {
+                    input: totals.input_tokens ?? 0,
+                    cached: totals.cached_input_tokens ?? 0,
+                    output: totals.output_tokens ?? 0,
+                };
+            }
+        }
+    },
+};
 /**
  * Resolve the kimi-code session dir that this ftown session spawned.
  *
@@ -393,54 +383,57 @@ async function collectKimiCodeUsage(workingDir, sessionCreatedAt, options) {
     catch {
         return null;
     }
+    const cache = options.foldCache ?? defaultJsonlFoldCache;
     let counted = 0;
     // Keyed by model id; Map preserves first-appearance order across agents.
     const byModel = new Map();
     for (const agent of agentNames) {
         const wirePath = join(agentsDir, agent, 'wire.jsonl');
-        for await (const raw of jsonlLines(wirePath, deadline)) {
-            const entry = raw;
-            if (entry?.type !== 'usage.record')
-                continue;
-            const usage = entry.usage;
-            if (!usage)
-                continue;
-            const model = entry.model ?? '';
-            if (!model)
-                continue;
-            let acc = byModel.get(model);
+        const sums = await cache.fold(wirePath, kimiUsageFold, options.timeoutMs ?? DEFAULT_TIMEOUT_MS, (state) => ({
+            byModel: new Map([...state.byModel].map(([k, m]) => [k, { ...m }])),
+            counted: state.counted,
+        }));
+        if (!sums)
+            continue;
+        counted += sums.counted;
+        for (const m of sums.byModel.values()) {
+            const acc = byModel.get(m.model);
             if (!acc) {
-                acc = { model, inputTokens: 0, outputTokens: 0, cacheReadTokens: 0, cacheWriteTokens: 0 };
-                byModel.set(model, acc);
+                byModel.set(m.model, m);
+                continue;
             }
-            // Per-turn incremental records — SUM across all of them.
-            acc.inputTokens += usage.inputOther ?? 0;
-            acc.outputTokens += usage.output ?? 0;
-            acc.cacheReadTokens += usage.inputCacheRead ?? 0;
-            acc.cacheWriteTokens += usage.inputCacheCreation ?? 0;
-            counted += 1;
+            acc.inputTokens += m.inputTokens;
+            acc.outputTokens += m.outputTokens;
+            acc.cacheReadTokens += m.cacheReadTokens;
+            acc.cacheWriteTokens += m.cacheWriteTokens;
         }
     }
     if (counted === 0)
         return null;
-    const perModel = [...byModel.values()];
-    const sum = (pick) => perModel.reduce((acc, m) => acc + pick(m), 0);
-    const inputTokens = sum((m) => m.inputTokens);
-    const outputTokens = sum((m) => m.outputTokens);
-    const cacheReadTokens = sum((m) => m.cacheReadTokens);
-    const cacheWriteTokens = sum((m) => m.cacheWriteTokens);
-    return {
-        inputTokens,
-        outputTokens,
-        cacheReadTokens,
-        cacheWriteTokens,
-        totalTokens: inputTokens + outputTokens + cacheReadTokens + cacheWriteTokens,
-        models: perModel.map((m) => m.model),
-        perModel,
-        harness: 'kimi-code',
-        collectedAt: new Date().toISOString(),
-    };
+    return usageFromModels(byModel, 'kimi-code');
 }
+const kimiUsageFold = {
+    kind: 'kimi-usage-v1',
+    init: newModelSums,
+    step(state, raw) {
+        const entry = raw;
+        if (entry?.type !== 'usage.record')
+            return;
+        const usage = entry.usage;
+        if (!usage)
+            return;
+        const model = entry.model ?? '';
+        if (!model)
+            return;
+        const acc = modelAcc(state, model);
+        // Per-turn incremental records — SUM across all of them.
+        acc.inputTokens += usage.inputOther ?? 0;
+        acc.outputTokens += usage.output ?? 0;
+        acc.cacheReadTokens += usage.inputCacheRead ?? 0;
+        acc.cacheWriteTokens += usage.inputCacheCreation ?? 0;
+        state.counted += 1;
+    },
+};
 /**
  * Resolve the muse session.jsonl that this ftown session spawned.
  *
@@ -578,8 +571,7 @@ async function collectMuseUsageById(museSessionId, options) {
     const filePath = await findMuseSessionFileById(baseDir, museSessionId);
     if (!filePath)
         return null;
-    const deadline = Date.now() + (options.timeoutMs ?? DEFAULT_TIMEOUT_MS);
-    return sumMuseSessionFile(filePath, deadline);
+    return sumMuseSessionFile(filePath, options);
 }
 async function collectMuseUsage(workingDir, sessionCreatedAt, options) {
     const baseDir = options.museSessionsDir
@@ -588,28 +580,27 @@ async function collectMuseUsage(workingDir, sessionCreatedAt, options) {
     const filePath = await resolveMuseSessionFile(baseDir, workingDir, sessionCreatedAt, deadline);
     if (!filePath)
         return null;
-    return sumMuseSessionFile(filePath, deadline);
+    return sumMuseSessionFile(filePath, options);
 }
-async function sumMuseSessionFile(filePath, deadline) {
-    let counted = 0;
-    // Keyed by model id; Map preserves first-appearance order.
-    const byModel = new Map();
-    for await (const raw of jsonlLines(filePath, deadline)) {
+async function sumMuseSessionFile(filePath, options) {
+    const usage = await (options.foldCache ?? defaultJsonlFoldCache).fold(filePath, museUsageFold, options.timeoutMs ?? DEFAULT_TIMEOUT_MS, (state) => (state.counted === 0 ? null : usageFromModels(state.byModel, 'muse')));
+    return usage ?? null;
+}
+const museUsageFold = {
+    kind: 'muse-usage-v1',
+    init: newModelSums,
+    step(state, raw) {
         const entry = raw;
         if (entry?.payload_type !== 'runtime.session')
-            continue;
+            return;
         const event = entry.payload?.kind === 'run' ? entry.payload.event : undefined;
         if (event?.kind !== 'model_completed')
-            continue;
+            return;
         const usage = event.usage;
         const model = event.model ?? '';
         if (!usage || !model)
-            continue;
-        let acc = byModel.get(model);
-        if (!acc) {
-            acc = { model, inputTokens: 0, outputTokens: 0, cacheReadTokens: 0, cacheWriteTokens: 0 };
-            byModel.set(model, acc);
-        }
+            return;
+        const acc = modelAcc(state, model);
         // Per-call records — SUM across all of them. Verified against real logs:
         // input_tokens INCLUDES cached tokens (cached(n) ≈ input(n-1)), so split
         // them codex-style; cached_tokens duplicates cache_read_tokens (ignored);
@@ -620,26 +611,7 @@ async function sumMuseSessionFile(filePath, deadline) {
         acc.outputTokens += safeTokenCount(usage.output_tokens);
         acc.cacheReadTokens += cacheRead;
         acc.cacheWriteTokens += safeTokenCount(usage.cache_write_tokens);
-        counted += 1;
-    }
-    if (counted === 0)
-        return null;
-    const perModel = [...byModel.values()];
-    const sum = (pick) => perModel.reduce((acc, m) => acc + pick(m), 0);
-    const inputTokens = sum((m) => m.inputTokens);
-    const outputTokens = sum((m) => m.outputTokens);
-    const cacheReadTokens = sum((m) => m.cacheReadTokens);
-    const cacheWriteTokens = sum((m) => m.cacheWriteTokens);
-    return {
-        inputTokens,
-        outputTokens,
-        cacheReadTokens,
-        cacheWriteTokens,
-        totalTokens: inputTokens + outputTokens + cacheReadTokens + cacheWriteTokens,
-        models: perModel.map((m) => m.model),
-        perModel,
-        harness: 'muse',
-        collectedAt: new Date().toISOString(),
-    };
-}
+        state.counted += 1;
+    },
+};
 //# sourceMappingURL=usage-collector.js.map