@vidiemme/copilot-proxy 0.8.1 → 0.10.0

package/dist/usage/copilotUsage.js

@@ -0,0 +1,59 @@
+import { coerceTokenCount } from './types.js';
+function asObject(value) {
+    return typeof value === 'object' && value !== null && !Array.isArray(value) ? value : undefined;
+}
+const TOKEN_FIELDS = {
+    input: 'inputTokens',
+    cache_read: 'cachedInputTokens',
+    cache_write: 'cacheWriteTokens',
+    output: 'outputTokens',
+};
+/**
+ * Legge il blocco `copilot_usage` di una risposta GitHub Copilot.
+ *
+ * Le righe di `token_details` usano la stessa convenzione dei nostri contatori
+ * (input senza cache, letture, scritture, output). Sono anche l'unico posto
+ * in cui `/chat/completions` riporta le scritture in cache dei modelli
+ * Anthropic: l'`usage` standard le conta dentro `prompt_tokens`.
+ */
+export function readCopilotUsage(value) {
+    const block = asObject(value);
+    if (!block)
+        return undefined;
+    const nano = block.total_nano_aiu;
+    if (typeof nano !== 'number' || !Number.isFinite(nano) || nano < 0)
+        return undefined;
+    const billing = { totalNanoAiu: Math.round(nano) };
+    if (!Array.isArray(block.token_details))
+        return billing;
+    const tokens = { inputTokens: 0, cachedInputTokens: 0, cacheWriteTokens: 0, outputTokens: 0 };
+    let recognized = false;
+    for (const item of block.token_details) {
+        const detail = asObject(item);
+        const field = typeof detail?.token_type === 'string' ? TOKEN_FIELDS[detail.token_type] : undefined;
+        if (!detail || !field)
+            continue;
+        recognized = true;
+        tokens[field] += coerceTokenCount(detail.token_count);
+        if (!billing.model && typeof detail.model === 'string' && detail.model.length > 0) {
+            billing.model = detail.model;
+        }
+    }
+    if (recognized)
+        billing.tokens = tokens;
+    return billing;
+}
+/**
+ * Cerca `copilot_usage` in un payload: al primo livello in tutti i dialetti
+ * (risposta intera, chunk o evento SSE), e per prudenza anche dentro
+ * `response` / `message`, dove i due protocolli annidano il resto.
+ */
+export function findCopilotUsage(payload) {
+    const root = asObject(payload);
+    if (!root)
+        return undefined;
+    return (readCopilotUsage(root.copilot_usage) ??
+        readCopilotUsage(asObject(root.response)?.copilot_usage) ??
+        readCopilotUsage(asObject(root.message)?.copilot_usage));
+}
+//# sourceMappingURL=copilotUsage.js.map

package/dist/usage/copilotUsage.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"copilotUsage.js","sourceRoot":"","sources":["../../src/usage/copilotUsage.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAmB,MAAM,YAAY,CAAC;AAI/D,SAAS,QAAQ,CAAC,KAAc;IAC9B,OAAO,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,IAAI,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAE,KAAc,CAAC,CAAC,CAAC,SAAS,CAAC;AAC5G,CAAC;AAYD,MAAM,YAAY,GAAqC;IACrD,KAAK,EAAE,aAAa;IACpB,UAAU,EAAE,mBAAmB;IAC/B,WAAW,EAAE,kBAAkB;IAC/B,MAAM,EAAE,cAAc;CACvB,CAAC;AAEF;;;;;;;GAOG;AACH,MAAM,UAAU,gBAAgB,CAAC,KAAc;IAC7C,MAAM,KAAK,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC;IAC9B,IAAI,CAAC,KAAK;QAAE,OAAO,SAAS,CAAC;IAC7B,MAAM,IAAI,GAAG,KAAK,CAAC,cAAc,CAAC;IAClC,IAAI,OAAO,IAAI,KAAK,QAAQ,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,IAAI,GAAG,CAAC;QAAE,OAAO,SAAS,CAAC;IAErF,MAAM,OAAO,GAAmB,EAAE,YAAY,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC;IACnE,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,aAAa,CAAC;QAAE,OAAO,OAAO,CAAC;IAExD,MAAM,MAAM,GAAe,EAAE,WAAW,EAAE,CAAC,EAAE,iBAAiB,EAAE,CAAC,EAAE,gBAAgB,EAAE,CAAC,EAAE,YAAY,EAAE,CAAC,EAAE,CAAC;IAC1G,IAAI,UAAU,GAAG,KAAK,CAAC;IACvB,KAAK,MAAM,IAAI,IAAI,KAAK,CAAC,aAAa,EAAE,CAAC;QACvC,MAAM,MAAM,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAC;QAC9B,MAAM,KAAK,GAAG,OAAO,MAAM,EAAE,UAAU,KAAK,QAAQ,CAAC,CAAC,CAAC,YAAY,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;QACnG,IAAI,CAAC,MAAM,IAAI,CAAC,KAAK;YAAE,SAAS;QAChC,UAAU,GAAG,IAAI,CAAC;QAClB,MAAM,CAAC,KAAK,CAAC,IAAI,gBAAgB,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;QACtD,IAAI,CAAC,OAAO,CAAC,KAAK,IAAI,OAAO,MAAM,CAAC,KAAK,KAAK,QAAQ,IAAI,MAAM,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAClF,OAAO,CAAC,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC;QAC/B,CAAC;IACH,CAAC;IACD,IAAI,UAAU;QAAE,OAAO,CAAC,MAAM,GAAG,MAAM,CAAC;IACxC,OAAO,OAAO,CAAC;AACjB,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,gBAAgB,CAAC,OAAgB;IAC/C,MAAM,IAAI,GAAG,QAAQ,CAAC,OAAO,CAAC,CAAC;IAC/B,IAAI,CAAC,IAAI;QAAE,OAAO,SAAS,CAAC;IAC5B,OAAO,CACL,gBAAgB,CAAC,IAAI,CAAC,aAAa,CAAC;QACpC,gBAAgB,CAAC,QAAQ,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,aAAa,CAAC;QACxD,gBAAgB,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,aAAa,CAAC,CACxD,CAAC;AACJ,CAAC"}

package/dist/usage/fusion.d.ts

@@ -0,0 +1,6 @@
+export declare function isHydraFusionModel(value: unknown): boolean;
+/** Un modello selezionato esplicitamente, non il modello fisico restituito dall'upstream. */
+export declare function fusionFromSelectedModel(value: unknown): boolean | null;
+export declare function fusionFromChatSelection(selected: unknown, resolved: unknown): boolean | null;
+/** Il modello fisico da solo non basta: puo' essere stato scelto dal router Fusion. */
+export declare function fusionFromCliUsage(usage: Record<string, unknown>, selectedModel?: string): boolean | null;

package/dist/usage/fusion.js

@@ -0,0 +1,45 @@
+function modelName(value) {
+    if (typeof value !== 'string' || value.trim().length === 0)
+        return undefined;
+    return value.trim().toLowerCase().replace(/^copilot\//, '');
+}
+export function isHydraFusionModel(value) {
+    const model = modelName(value);
+    return model === 'hydrafusion' || model === 'hydrafusion-max';
+}
+/** Un modello selezionato esplicitamente, non il modello fisico restituito dall'upstream. */
+export function fusionFromSelectedModel(value) {
+    const model = modelName(value);
+    if (!model || model === 'auto')
+        return null;
+    if (isHydraFusionModel(model))
+        return true;
+    if (model.includes('fusion'))
+        return null;
+    return false;
+}
+export function fusionFromChatSelection(selected, resolved) {
+    const selection = fusionFromSelectedModel(selected);
+    if (selection !== false)
+        return selection;
+    const requested = modelName(selected)?.replace(/[._]/g, '-');
+    const actual = modelName(resolved)?.replace(/[._]/g, '-');
+    return requested && actual === requested ? false : null;
+}
+/** Il modello fisico da solo non basta: puo' essere stato scelto dal router Fusion. */
+export function fusionFromCliUsage(usage, selectedModel) {
+    const fusion = usage.fusion;
+    if (typeof fusion === 'object' && fusion !== null && !Array.isArray(fusion)) {
+        const syntheticModel = fusion.syntheticModel;
+        return isHydraFusionModel(syntheticModel) ? true : null;
+    }
+    if (fusion !== null && fusion !== undefined)
+        return null;
+    const selected = modelName(selectedModel);
+    const actual = modelName(usage.model);
+    if (selected && actual === selected && usage.isAuto !== true && fusionFromSelectedModel(selected) === false) {
+        return false;
+    }
+    return null;
+}
+//# sourceMappingURL=fusion.js.map

package/dist/usage/fusion.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"fusion.js","sourceRoot":"","sources":["../../src/usage/fusion.ts"],"names":[],"mappings":"AAAA,SAAS,SAAS,CAAC,KAAc;IAC/B,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,CAAC,IAAI,EAAE,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,SAAS,CAAC;IAC7E,OAAO,KAAK,CAAC,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC,OAAO,CAAC,YAAY,EAAE,EAAE,CAAC,CAAC;AAC9D,CAAC;AAED,MAAM,UAAU,kBAAkB,CAAC,KAAc;IAC/C,MAAM,KAAK,GAAG,SAAS,CAAC,KAAK,CAAC,CAAC;IAC/B,OAAO,KAAK,KAAK,aAAa,IAAI,KAAK,KAAK,iBAAiB,CAAC;AAChE,CAAC;AAED,6FAA6F;AAC7F,MAAM,UAAU,uBAAuB,CAAC,KAAc;IACpD,MAAM,KAAK,GAAG,SAAS,CAAC,KAAK,CAAC,CAAC;IAC/B,IAAI,CAAC,KAAK,IAAI,KAAK,KAAK,MAAM;QAAE,OAAO,IAAI,CAAC;IAC5C,IAAI,kBAAkB,CAAC,KAAK,CAAC;QAAE,OAAO,IAAI,CAAC;IAC3C,IAAI,KAAK,CAAC,QAAQ,CAAC,QAAQ,CAAC;QAAE,OAAO,IAAI,CAAC;IAC1C,OAAO,KAAK,CAAC;AACf,CAAC;AAED,MAAM,UAAU,uBAAuB,CAAC,QAAiB,EAAE,QAAiB;IAC1E,MAAM,SAAS,GAAG,uBAAuB,CAAC,QAAQ,CAAC,CAAC;IACpD,IAAI,SAAS,KAAK,KAAK;QAAE,OAAO,SAAS,CAAC;IAC1C,MAAM,SAAS,GAAG,SAAS,CAAC,QAAQ,CAAC,EAAE,OAAO,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC;IAC7D,MAAM,MAAM,GAAG,SAAS,CAAC,QAAQ,CAAC,EAAE,OAAO,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC;IAC1D,OAAO,SAAS,IAAI,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC;AAC1D,CAAC;AAED,uFAAuF;AACvF,MAAM,UAAU,kBAAkB,CAAC,KAA8B,EAAE,aAAsB;IACvF,MAAM,MAAM,GAAG,KAAK,CAAC,MAAM,CAAC;IAC5B,IAAI,OAAO,MAAM,KAAK,QAAQ,IAAI,MAAM,KAAK,IAAI,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC;QAC5E,MAAM,cAAc,GAAI,MAAkC,CAAC,cAAc,CAAC;QAC1E,OAAO,kBAAkB,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC;IAC1D,CAAC;IACD,IAAI,MAAM,KAAK,IAAI,IAAI,MAAM,KAAK,SAAS;QAAE,OAAO,IAAI,CAAC;IAEzD,MAAM,QAAQ,GAAG,SAAS,CAAC,aAAa,CAAC,CAAC;IAC1C,MAAM,MAAM,GAAG,SAAS,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;IACtC,IAAI,QAAQ,IAAI,MAAM,KAAK,QAAQ,IAAI,KAAK,CAAC,MAAM,KAAK,IAAI,IAAI,uBAAuB,CAAC,QAAQ,CAAC,KAAK,KAAK,EAAE,CAAC;QAC5G,OAAO,KAAK,CAAC;IACf,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC"}

package/dist/usage/fusionCorrelator.d.ts

@@ -0,0 +1,34 @@
+import { type UsageEventPayload } from '@vidiemme/copilot-usage-contract';
+import type { Logger } from '../collector/forwarder.js';
+/**
+ * Il record CLI viene scritto dopo la risposta HTTP. Il primo evento resta
+ * indipendente dal log; un secondo invio con lo stesso requestId lo arricchisce.
+ */
+export declare class FusionCorrelator {
+    private readonly stateDir;
+    private readonly onResolved;
+    private readonly logger;
+    private readonly pollIntervalMs;
+    private readonly waitMs;
+    private readonly pending;
+    private timer;
+    private inFlight;
+    private closed;
+    private readonly warnedSessions;
+    private readonly files;
+    /** Il record CLI puo' precedere di poco la registrazione della richiesta nel proxy. */
+    private readonly seen;
+    constructor(stateDir: string, onResolved: (event: UsageEventPayload & {
+        hydraFusion: boolean;
+    }) => void, logger: Pick<Logger, 'warn'>, pollIntervalMs?: number, waitMs?: number);
+    track(event: UsageEventPayload): void;
+    close(): Promise<void>;
+    private schedule;
+    private scan;
+    /**
+     * Legge solo le righe complete aggiunte dall'ultima scansione. Il modello
+     * selezionato resta noto finche' la lettura e' continua: dopo un salto torna
+     * sconosciuto, cosi' non si deduce una selezione diretta senza prove.
+     */
+    private readNewLines;
+}

package/dist/usage/fusionCorrelator.js

@@ -0,0 +1,182 @@
+import { open, readdir, stat } from 'node:fs/promises';
+import { join } from 'node:path';
+import { mergeHydraFusion } from '@vidiemme/copilot-usage-contract';
+import { sessionCalls } from '../reload/copilotCli.js';
+const MAX_LOG_BYTES = 4 * 1024 * 1024;
+const MAX_PENDING = 10_000;
+function missingFile(error) {
+    return error instanceof Error && 'code' in error && error.code === 'ENOENT';
+}
+/**
+ * Il record CLI viene scritto dopo la risposta HTTP. Il primo evento resta
+ * indipendente dal log; un secondo invio con lo stesso requestId lo arricchisce.
+ */
+export class FusionCorrelator {
+    stateDir;
+    onResolved;
+    logger;
+    pollIntervalMs;
+    waitMs;
+    pending = new Map();
+    timer;
+    inFlight;
+    closed = false;
+    warnedSessions = new Set();
+    files = new Map();
+    /** Il record CLI puo' precedere di poco la registrazione della richiesta nel proxy. */
+    seen = new Map();
+    constructor(stateDir, onResolved, logger, pollIntervalMs = 1000, waitMs = 15_000) {
+        this.stateDir = stateDir;
+        this.onResolved = onResolved;
+        this.logger = logger;
+        this.pollIntervalMs = pollIntervalMs;
+        this.waitMs = waitMs;
+    }
+    track(event) {
+        if (this.closed || event.hydraFusion != null)
+            return;
+        if (this.pending.size >= MAX_PENDING && !this.pending.has(event.requestId)) {
+            this.logger.warn({ pending: this.pending.size }, 'troppe richieste in attesa del routing Fusion');
+            return;
+        }
+        this.pending.set(event.requestId, { event, addedAt: Date.now(), reportedFalse: false });
+        this.schedule(0);
+    }
+    async close() {
+        this.closed = true;
+        if (this.timer)
+            clearTimeout(this.timer);
+        this.timer = undefined;
+        await this.inFlight;
+        this.pending.clear();
+    }
+    schedule(delay) {
+        if (this.closed || this.timer || this.inFlight || this.pending.size === 0)
+            return;
+        this.timer = setTimeout(() => {
+            this.timer = undefined;
+            const run = this.scan().catch((error) => {
+                this.logger.warn({ err: error }, 'lettura dei metadati Fusion fallita');
+            });
+            this.inFlight = run;
+            void run.then(() => {
+                this.inFlight = undefined;
+                this.schedule(this.pollIntervalMs);
+            });
+        }, delay);
+        this.timer.unref();
+    }
+    async scan() {
+        const now = Date.now();
+        for (const [id, pending] of this.pending) {
+            if (now - pending.addedAt >= this.waitMs)
+                this.pending.delete(id);
+        }
+        if (this.pending.size === 0)
+            return;
+        let entries;
+        try {
+            entries = await readdir(this.stateDir, { withFileTypes: true });
+        }
+        catch (error) {
+            if (!missingFile(error))
+                throw error;
+            return;
+        }
+        const oldest = Math.min(...[...this.pending.values()].map(({ addedAt }) => addedAt)) - 5000;
+        const present = new Set();
+        for (const entry of entries) {
+            if (!entry.isDirectory())
+                continue;
+            const file = join(this.stateDir, entry.name, 'events.jsonl');
+            present.add(file);
+            try {
+                await this.readNewLines(file, entry.name, oldest);
+            }
+            catch (error) {
+                if (!missingFile(error)) {
+                    this.logger.warn({ err: error, sessionId: entry.name }, 'lettura della sessione Copilot fallita');
+                }
+            }
+        }
+        for (const file of this.files.keys()) {
+            if (!present.has(file))
+                this.files.delete(file);
+        }
+        for (const [requestId, seen] of this.seen) {
+            if (now - seen.at >= this.waitMs)
+                this.seen.delete(requestId);
+        }
+        for (const [requestId, pending] of this.pending) {
+            const hydraFusion = this.seen.get(requestId)?.hydraFusion;
+            if (hydraFusion === undefined)
+                continue;
+            if (hydraFusion) {
+                this.pending.delete(requestId);
+                this.onResolved({ ...pending.event, hydraFusion: true });
+            }
+            else if (!pending.reportedFalse) {
+                pending.reportedFalse = true;
+                this.onResolved({ ...pending.event, hydraFusion: false });
+            }
+        }
+    }
+    /**
+     * Legge solo le righe complete aggiunte dall'ultima scansione. Il modello
+     * selezionato resta noto finche' la lettura e' continua: dopo un salto torna
+     * sconosciuto, cosi' non si deduce una selezione diretta senza prove.
+     */
+    async readNewLines(file, sessionId, oldest) {
+        const info = await stat(file);
+        if (!info.isFile())
+            return;
+        let state = this.files.get(file);
+        if (state && info.size < state.offset)
+            state = undefined;
+        if (!state && info.mtimeMs < oldest)
+            return;
+        const from = state?.offset ?? 0;
+        if (!state || info.size - from > MAX_LOG_BYTES) {
+            const offset = Math.max(0, info.size - MAX_LOG_BYTES);
+            state = { offset, cursor: {}, skipPartialLine: offset > 0 };
+            this.files.set(file, state);
+        }
+        if (info.size === state.offset)
+            return;
+        const buffer = Buffer.alloc(info.size - state.offset);
+        const handle = await open(file, 'r');
+        let bytesRead;
+        try {
+            ({ bytesRead } = await handle.read(buffer, 0, buffer.length, state.offset));
+        }
+        finally {
+            await handle.close();
+        }
+        // Il newline e' un byte singolo anche in UTF-8: l'ultima riga incompleta si rilegge alla prossima scansione.
+        const end = buffer.subarray(0, bytesRead).lastIndexOf(0x0a);
+        if (end < 0)
+            return;
+        const lines = buffer.subarray(0, end).toString('utf-8').split('\n');
+        state.offset += end + 1;
+        if (state.skipPartialLine) {
+            lines.shift();
+            state.skipPartialLine = false;
+        }
+        const warnInvalid = () => {
+            if (this.warnedSessions.has(sessionId))
+                return;
+            this.warnedSessions.add(sessionId);
+            this.logger.warn({ sessionId }, 'record Copilot non valido: routing non determinabile');
+        };
+        const now = Date.now();
+        for (const call of sessionCalls(lines, '', sessionId, warnInvalid, state.cursor)) {
+            const hydraFusion = mergeHydraFusion(this.seen.get(call.requestId)?.hydraFusion, call.hydraFusion);
+            if (hydraFusion === null)
+                continue;
+            if (!this.seen.has(call.requestId) && this.seen.size >= MAX_PENDING)
+                continue;
+            this.seen.set(call.requestId, { hydraFusion, at: now });
+        }
+    }
+}
+//# sourceMappingURL=fusionCorrelator.js.map

package/dist/usage/fusionCorrelator.js.map

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

package/dist/usage/types.d.ts

@@ -16,6 +16,8 @@ export { totalInputTokens };
 export interface ParsedUsage extends TokenUsage {
     /** Id modello dichiarato dalla risposta upstream, se presente. */
     model?: string;
+    /** Addebito GitHub della richiesta (`copilot_usage.total_nano_aiu`), se riportato. */
+    billedNanoAiu?: number;
 }
 export declare const EMPTY_USAGE: TokenUsage;
 export declare function isUsageEmpty(usage: TokenUsage): boolean;

package/dist/usage/types.js.map

@@ -1 +1 @@
-{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/usage/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAsB,MAAM,kCAAkC,CAAC;AAgBxF,OAAO,EAAE,gBAAgB,EAAE,CAAC;AAO5B,MAAM,CAAC,MAAM,WAAW,GAAe;IACrC,WAAW,EAAE,CAAC;IACd,iBAAiB,EAAE,CAAC;IACpB,gBAAgB,EAAE,CAAC;IACnB,YAAY,EAAE,CAAC;CAChB,CAAC;AAEF,MAAM,UAAU,YAAY,CAAC,KAAiB;IAC5C,OAAO,CACL,KAAK,CAAC,WAAW,KAAK,CAAC;QACvB,KAAK,CAAC,iBAAiB,KAAK,CAAC;QAC7B,KAAK,CAAC,gBAAgB,KAAK,CAAC;QAC5B,KAAK,CAAC,YAAY,KAAK,CAAC,CACzB,CAAC;AACJ,CAAC;AAED,SAAS,KAAK,CAAC,KAAc;IAC3B,OAAO,OAAO,KAAK,KAAK,QAAQ,IAAI,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AAClG,CAAC;AAED,OAAO,EAAE,KAAK,IAAI,gBAAgB,EAAE,CAAC"}
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/usage/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAsB,MAAM,kCAAkC,CAAC;AAgBxF,OAAO,EAAE,gBAAgB,EAAE,CAAC;AAS5B,MAAM,CAAC,MAAM,WAAW,GAAe;IACrC,WAAW,EAAE,CAAC;IACd,iBAAiB,EAAE,CAAC;IACpB,gBAAgB,EAAE,CAAC;IACnB,YAAY,EAAE,CAAC;CAChB,CAAC;AAEF,MAAM,UAAU,YAAY,CAAC,KAAiB;IAC5C,OAAO,CACL,KAAK,CAAC,WAAW,KAAK,CAAC;QACvB,KAAK,CAAC,iBAAiB,KAAK,CAAC;QAC7B,KAAK,CAAC,gBAAgB,KAAK,CAAC;QAC5B,KAAK,CAAC,YAAY,KAAK,CAAC,CACzB,CAAC;AACJ,CAAC;AAED,SAAS,KAAK,CAAC,KAAc;IAC3B,OAAO,OAAO,KAAK,KAAK,QAAQ,IAAI,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AAClG,CAAC;AAED,OAAO,EAAE,KAAK,IAAI,gBAAgB,EAAE,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vidiemme/copilot-proxy",
-  "version": "0.8.1",
+  "version": "0.10.0",
   "type": "module",
   "description": "Proxy locale: misura il consumo di token di GitHub Copilot e lo attribuisce al progetto",
   "license": "MIT",
@@ -38,7 +38,7 @@
     "prepublishOnly": "npm run build"
   },
   "dependencies": {
-    "@vidiemme/copilot-usage-contract": "^0.1.0",
+    "@vidiemme/copilot-usage-contract": "^0.1.4",
     "fastify": "^5.12.7",
     "jsonc-parser": "^3.3.1",
     "undici": "^8.12.3",