@ai-dossier/cli 0.83.2 → 0.85.0

package/dist/usage/sync.d.ts

@@ -0,0 +1,67 @@
+/**
+ * `ai-dossier usage sync` (#782): refresh this host's persisted ledger, then
+ * exchange bundles with other hosts over ssh.
+ *
+ * Transport = the ssh the fleet already relies on (wls is the only host that can
+ * reach the others — see scripts/refresh-fleet.sh), streaming the bundle over
+ * stdin/stdout: no new secrets, no shared drop, no service. `sync --hosts a,b`
+ * is bidirectional so ONE run from wls leaves every host with every host's rows:
+ * pull (`ssh a usage export --all`) → merge locally → push (`ssh a usage import -`).
+ * The same bundles move by hand with `usage export` / `usage import <file>`.
+ */
+import { type CollectOptions, type LedgerPaths } from './ledger';
+import { type ImportResult } from './store';
+/** First-ever sync looks this far back; later ones resume from the ledger's newest row. */
+export declare const DEFAULT_INITIAL_SYNC_MS: number;
+/** Re-collect this far before the cursor: recent rows' attribution (dispatch/prep) can be refined after the fact. */
+export declare const CURSOR_OVERLAP_MS = 86400000;
+export interface RefreshDeps {
+    dir?: string;
+    paths?: LedgerPaths;
+    host?: string;
+    nowMs?: number;
+    openOpenCode?: CollectOptions['openOpenCode'];
+}
+export interface RefreshResult {
+    host: string;
+    since: string;
+    collected: number;
+    added: number;
+    updated: number;
+    total: number;
+}
+/** Collect this host's stores since the cursor (or `sinceMs`) and upsert them into its ledger file. */
+export declare function refreshLocal(deps?: RefreshDeps, sinceMs?: number): RefreshResult;
+/**
+ * Same resolution as refresh-fleet.sh's REMOTE_PRELUDE: a non-login ssh shell has
+ * no nvm on PATH, and a repo-local `node_modules/.bin/ai-dossier` can shadow the
+ * global install — so source nvm and prefer the global binary explicitly.
+ */
+export declare const REMOTE_PRELUDE: string;
+export interface SshResult {
+    status: number | null;
+    stdout: string;
+    stderr: string;
+}
+export type SshRunner = (host: string, script: string, input?: string) => SshResult;
+export declare const defaultSsh: SshRunner;
+export interface RemoteSyncResult {
+    host: string;
+    ok: boolean;
+    error?: string;
+    pulled?: ImportResult;
+    pushed_rows?: number;
+    push?: ImportResult | null;
+}
+export interface SyncOptions {
+    hosts: readonly string[];
+    /** Override the incremental cursor: exchange rows at or after this time. */
+    sinceMs?: number;
+    push?: boolean;
+    pull?: boolean;
+}
+/** Exchange bundles with each remote. Per-host failures are reported, never thrown. */
+export declare function syncWithRemotes(opts: SyncOptions, deps?: RefreshDeps & {
+    ssh?: SshRunner;
+}): RemoteSyncResult[];
+//# sourceMappingURL=sync.d.ts.map

package/dist/usage/sync.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"sync.d.ts","sourceRoot":"","sources":["../../src/usage/sync.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAKH,OAAO,EAAE,KAAK,cAAc,EAAqC,KAAK,WAAW,EAAE,MAAM,UAAU,CAAC;AACpG,OAAO,EAEL,KAAK,YAAY,EAQlB,MAAM,SAAS,CAAC;AAMjB,2FAA2F;AAC3F,eAAO,MAAM,uBAAuB,QAAW,CAAC;AAChD,qHAAqH;AACrH,eAAO,MAAM,iBAAiB,WAAM,CAAC;AAErC,MAAM,WAAW,WAAW;IAC1B,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,KAAK,CAAC,EAAE,WAAW,CAAC;IACpB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,YAAY,CAAC,EAAE,cAAc,CAAC,cAAc,CAAC,CAAC;CAC/C;AAED,MAAM,WAAW,aAAa;IAC5B,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,MAAM,CAAC;CACf;AAED,uGAAuG;AACvG,wBAAgB,YAAY,CAAC,IAAI,GAAE,WAAgB,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,aAAa,CAuBpF;AAMD;;;;GAIG;AACH,eAAO,MAAM,cAAc,QAKhB,CAAC;AAEZ,MAAM,WAAW,SAAS;IACxB,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;CAChB;AACD,MAAM,MAAM,SAAS,GAAG,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,MAAM,KAAK,SAAS,CAAC;AAKpF,eAAO,MAAM,UAAU,EAAE,SAOxB,CAAC;AAEF,MAAM,WAAW,gBAAgB;IAC/B,IAAI,EAAE,MAAM,CAAC;IACb,EAAE,EAAE,OAAO,CAAC;IACZ,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,YAAY,CAAC;IACtB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,IAAI,CAAC,EAAE,YAAY,GAAG,IAAI,CAAC;CAC5B;AA4BD,MAAM,WAAW,WAAW;IAC1B,KAAK,EAAE,SAAS,MAAM,EAAE,CAAC;IACzB,4EAA4E;IAC5E,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,IAAI,CAAC,EAAE,OAAO,CAAC;CAChB;AAED,uFAAuF;AACvF,wBAAgB,eAAe,CAC7B,IAAI,EAAE,WAAW,EACjB,IAAI,GAAE,WAAW,GAAG;IAAE,GAAG,CAAC,EAAE,SAAS,CAAA;CAAO,GAC3C,gBAAgB,EAAE,CAwFpB"}

package/dist/usage/sync.js

@@ -0,0 +1,223 @@
+"use strict";
+/**
+ * `ai-dossier usage sync` (#782): refresh this host's persisted ledger, then
+ * exchange bundles with other hosts over ssh.
+ *
+ * Transport = the ssh the fleet already relies on (wls is the only host that can
+ * reach the others — see scripts/refresh-fleet.sh), streaming the bundle over
+ * stdin/stdout: no new secrets, no shared drop, no service. `sync --hosts a,b`
+ * is bidirectional so ONE run from wls leaves every host with every host's rows:
+ * pull (`ssh a usage export --all`) → merge locally → push (`ssh a usage import -`).
+ * The same bundles move by hand with `usage export` / `usage import <file>`.
+ */
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.defaultSsh = exports.REMOTE_PRELUDE = exports.CURSOR_OVERLAP_MS = exports.DEFAULT_INITIAL_SYNC_MS = void 0;
+exports.refreshLocal = refreshLocal;
+exports.syncWithRemotes = syncWithRemotes;
+const node_child_process_1 = require("node:child_process");
+const fs = __importStar(require("node:fs"));
+const path = __importStar(require("node:path"));
+const ledger_1 = require("./ledger");
+const store_1 = require("./store");
+const DAY = 86_400_000;
+// Limit: `sync` re-collects only CURSOR_OVERLAP_MS before its cursor, so an attribution change
+// (dispatch/prep join) to a row older than that is not re-persisted or re-sent; run
+// `usage sync --since <older>` to force a wider refresh.
+/** First-ever sync looks this far back; later ones resume from the ledger's newest row. */
+exports.DEFAULT_INITIAL_SYNC_MS = 30 * DAY;
+/** Re-collect this far before the cursor: recent rows' attribution (dispatch/prep) can be refined after the fact. */
+exports.CURSOR_OVERLAP_MS = DAY;
+/** Collect this host's stores since the cursor (or `sinceMs`) and upsert them into its ledger file. */
+function refreshLocal(deps = {}, sinceMs) {
+    const dir = deps.dir ?? (0, store_1.usageStoreDir)();
+    const host = deps.host ?? (0, store_1.localHostId)();
+    const nowMs = deps.nowMs ?? Date.now();
+    const cursor = (0, store_1.newestTs)(dir, host);
+    const since = sinceMs ?? (cursor !== null ? cursor - exports.CURSOR_OVERLAP_MS : nowMs - exports.DEFAULT_INITIAL_SYNC_MS);
+    const ledger = (0, ledger_1.collectLedger)({
+        sinceMs: since,
+        untilMs: nowMs,
+        paths: deps.paths ?? (0, ledger_1.defaultLedgerPaths)(),
+        host,
+        openOpenCode: deps.openOpenCode,
+    });
+    const stats = (0, store_1.persistLocal)(dir, host, ledger.rows, ledger.limits);
+    return {
+        host,
+        since: new Date(since).toISOString(),
+        collected: ledger.rows.length,
+        added: stats.added,
+        updated: stats.updated,
+        total: stats.total,
+    };
+}
+// ---------------------------------------------------------------------------
+// ssh transport
+// ---------------------------------------------------------------------------
+/**
+ * Same resolution as refresh-fleet.sh's REMOTE_PRELUDE: a non-login ssh shell has
+ * no nvm on PATH, and a repo-local `node_modules/.bin/ai-dossier` can shadow the
+ * global install — so source nvm and prefer the global binary explicitly.
+ */
+exports.REMOTE_PRELUDE = [
+    'export NVM_DIR="$HOME/.nvm"; [ -s "$NVM_DIR/nvm.sh" ] && . "$NVM_DIR/nvm.sh" >/dev/null 2>&1;',
+    'AD="$(npm root -g 2>/dev/null)/@ai-dossier/cli/bin/ai-dossier";',
+    '[ -x "$AD" ] || AD="$(command -v ai-dossier || true)";',
+    '[ -n "$AD" ] || { echo "no ai-dossier binary found" >&2; exit 90; };',
+].join(' ');
+/** A remote that hangs mid-transfer must not wedge a fleet sync (ConnectTimeout only covers connecting). */
+const SSH_TIMEOUT_MS = 10 * 60 * 1000;
+const defaultSsh = (host, script, input) => {
+    const r = (0, node_child_process_1.spawnSync)('ssh', ['-o', 'BatchMode=yes', '-o', 'ConnectTimeout=10', host, `${exports.REMOTE_PRELUDE}\n${script}`], { input, encoding: 'utf-8', maxBuffer: 1024 * 1024 * 1024, timeout: SSH_TIMEOUT_MS });
+    return { status: r.status, stdout: r.stdout ?? '', stderr: r.stderr ?? r.error?.message ?? '' };
+};
+exports.defaultSsh = defaultSsh;
+function readState(dir) {
+    try {
+        const s = JSON.parse(fs.readFileSync(path.join(dir, 'sync-state.json'), 'utf-8'));
+        if (!s || typeof s.remotes !== 'object' || !s.remotes)
+            return { remotes: {} };
+        // Legacy/garbled entries reset to a full initial window rather than being trusted.
+        for (const [h, v] of Object.entries(s.remotes))
+            if (!v || typeof v !== 'object')
+                delete s.remotes[h];
+        return s;
+    }
+    catch {
+        return { remotes: {} };
+    }
+}
+function writeState(dir, state) {
+    fs.mkdirSync(dir, { recursive: true });
+    const file = path.join(dir, 'sync-state.json');
+    const tmp = `${file}.${process.pid}.tmp`;
+    fs.writeFileSync(tmp, `${JSON.stringify(state, null, 2)}\n`);
+    fs.renameSync(tmp, file);
+}
+/** Exchange bundles with each remote. Per-host failures are reported, never thrown. */
+function syncWithRemotes(opts, deps = {}) {
+    const dir = deps.dir ?? (0, store_1.usageStoreDir)();
+    const local = deps.host ?? (0, store_1.localHostId)();
+    const nowMs = deps.nowMs ?? Date.now();
+    const ssh = deps.ssh ?? exports.defaultSsh;
+    const state = readState(dir);
+    const results = new Map();
+    const initial = nowMs - exports.DEFAULT_INITIAL_SYNC_MS;
+    const cursorOf = (host, dir_) => {
+        if (opts.sinceMs !== undefined)
+            return opts.sinceMs;
+        const iso = state.remotes[host]?.[dir_];
+        const t = iso ? Date.parse(iso) : Number.NaN;
+        return Number.isNaN(t) ? initial : t - exports.CURSOR_OVERLAP_MS;
+    };
+    const tail = (t) => t.trim().split('\n').slice(-2).join(' | ');
+    const valid = [];
+    for (const host of opts.hosts) {
+        if ((0, store_1.isValidHostId)(host))
+            valid.push(host);
+        else
+            results.set(host, { host, ok: false, error: 'invalid host name' });
+    }
+    // Pass 1 — pull from EVERY host first, so pass 2 pushes each host what all the others hold.
+    const pulledSince = [];
+    const pullOk = new Set();
+    for (const host of valid) {
+        const res = { host, ok: true };
+        results.set(host, res);
+        if (opts.pull === false)
+            continue;
+        const since = cursorOf(host, 'pull');
+        const out = ssh(host, `"$AD" usage export --all --since '${new Date(since).toISOString()}'`);
+        if (out.status !== 0) {
+            Object.assign(res, {
+                ok: false,
+                error: `pull failed (exit ${out.status}): ${tail(out.stderr)}`,
+            });
+            continue;
+        }
+        try {
+            res.pulled = (0, store_1.importBundle)(dir, out.stdout, local);
+            pulledSince.push(since);
+            pullOk.add(host);
+        }
+        catch (err) {
+            Object.assign(res, { ok: false, error: `pull import failed: ${err.message}` });
+        }
+    }
+    // Pass 2 — push everything except the target's own rows. Rows pulled this run may be OLDER
+    // than the target's push cursor (a host that was down, or a first pull), so reach back to the
+    // earliest pull window as well — otherwise those rows would never reach the other hosts.
+    const pushOk = new Set();
+    for (const host of valid) {
+        const res = results.get(host);
+        if (!res.ok || opts.push === false)
+            continue;
+        const since = Math.min(cursorOf(host, 'push'), ...pulledSince);
+        const bundle = (0, store_1.buildBundle)(dir, local, 
+        // The alias and the host's self-reported id can differ (ssh config vs os.hostname()).
+        (0, store_1.listHosts)(dir).filter((h) => h !== host && h !== results.get(host)?.pulled?.from), since);
+        res.pushed_rows = bundle.rows;
+        const out = ssh(host, '"$AD" usage import - --json', bundle.text);
+        if (out.status !== 0) {
+            Object.assign(res, {
+                ok: false,
+                error: `push failed (exit ${out.status}): ${tail(out.stderr)}`,
+            });
+            continue;
+        }
+        pushOk.add(host);
+        try {
+            res.push = JSON.parse(out.stdout.trim().split('\n').pop() ?? 'null');
+        }
+        catch {
+            res.push = null;
+        }
+    }
+    // Advance only the direction that actually ran and succeeded.
+    const stamp = new Date(nowMs).toISOString();
+    for (const host of valid) {
+        const entry = state.remotes[host] ?? {};
+        if (pullOk.has(host))
+            entry.pull = stamp;
+        if (pushOk.has(host))
+            entry.push = stamp;
+        if (entry.pull || entry.push)
+            state.remotes[host] = entry;
+    }
+    writeState(dir, state);
+    return opts.hosts.map((h) => results.get(h));
+}
+//# sourceMappingURL=sync.js.map

package/dist/usage/sync.js.map

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

package/dist/usage/types.d.ts

@@ -44,7 +44,13 @@ export interface UsageRow {
     unit: string | null;
     /** `prep` when the row is batch-prep spend attributed to `batch` by enqueue-time session capture (#796). */
     role?: 'prep';
+    /** For `role: 'prep'`: how the attributing window's start was found (#899). */
+    prep_basis?: PrepBasis;
+    /** For `role: 'prep'`: how many sibling batches (one enqueue) this row's window was split across, when > 1. */
+    prep_split?: number;
 }
+/** `marker` = the session's first batch-issues-preparation run; `prev-enqueue` / `lookback-cap` = upper bounds. */
+export type PrepBasis = 'marker' | 'prev-enqueue' | 'lookback-cap';
 /** A provider limit / rate-limit wall observed in a source store. */
 export interface LimitEvent {
     ts: string;

package/dist/usage/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/usage/types.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,uCAAuC;AACvC,MAAM,MAAM,WAAW,GAAG,aAAa,GAAG,UAAU,CAAC;AAErD,oHAAoH;AACpH,MAAM,MAAM,WAAW,GAAG,UAAU,GAAG,QAAQ,GAAG,QAAQ,CAAC;AAE3D,MAAM,WAAW,QAAQ;IACvB,iGAAiG;IACjG,EAAE,EAAE,MAAM,CAAC;IACX,8EAA8E;IAC9E,IAAI,EAAE,MAAM,CAAC;IACb,4GAA4G;IAC5G,QAAQ,EAAE,MAAM,CAAC;IACjB,2FAA2F;IAC3F,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IACrB,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,4FAA4F;IAC5F,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,MAAM,CAAC;IACpB,sGAAsG;IACtG,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,MAAM,EAAE,WAAW,CAAC;IACpB,uFAAuF;IACvF,UAAU,EAAE,MAAM,CAAC;IACnB,oHAAoH;IACpH,iBAAiB,EAAE,MAAM,GAAG,IAAI,CAAC;IACjC,wGAAwG;IACxG,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IACrB,GAAG,EAAE,MAAM,GAAG,IAAI,CAAC;IACnB,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IACrB,YAAY,EAAE,WAAW,GAAG,IAAI,CAAC;IACjC,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IACrB,wFAAwF;IACxF,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;IACpB,4GAA4G;IAC5G,IAAI,CAAC,EAAE,MAAM,CAAC;CACf;AAED,qEAAqE;AACrE,MAAM,WAAW,UAAU;IACzB,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,oCAAoC;IACpC,MAAM,EAAE,aAAa,GAAG,OAAO,CAAC;IAChC,uFAAuF;IACvF,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;IACpB,0DAA0D;IAC1D,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,6CAA6C;IAC7C,MAAM,EAAE,MAAM,CAAC;IACf,mHAAmH;IACnH,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,wDAAwD;IACxD,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,6GAA6G;AAC7G,MAAM,WAAW,eAAe;IAC9B,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,IAAI,GAAG,aAAa,GAAG,OAAO,CAAC;IACvC,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,+CAA+C;AAC/C,MAAM,WAAW,MAAM;IACrB,IAAI,EAAE,QAAQ,EAAE,CAAC;IACjB,MAAM,EAAE,UAAU,EAAE,CAAC;IACrB,UAAU,EAAE,eAAe,EAAE,CAAC;IAC9B,qGAAqG;IACrG,WAAW,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAClC"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/usage/types.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,uCAAuC;AACvC,MAAM,MAAM,WAAW,GAAG,aAAa,GAAG,UAAU,CAAC;AAErD,oHAAoH;AACpH,MAAM,MAAM,WAAW,GAAG,UAAU,GAAG,QAAQ,GAAG,QAAQ,CAAC;AAE3D,MAAM,WAAW,QAAQ;IACvB,iGAAiG;IACjG,EAAE,EAAE,MAAM,CAAC;IACX,8EAA8E;IAC9E,IAAI,EAAE,MAAM,CAAC;IACb,4GAA4G;IAC5G,QAAQ,EAAE,MAAM,CAAC;IACjB,2FAA2F;IAC3F,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IACrB,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,4FAA4F;IAC5F,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,MAAM,CAAC;IACpB,sGAAsG;IACtG,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,MAAM,EAAE,WAAW,CAAC;IACpB,uFAAuF;IACvF,UAAU,EAAE,MAAM,CAAC;IACnB,oHAAoH;IACpH,iBAAiB,EAAE,MAAM,GAAG,IAAI,CAAC;IACjC,wGAAwG;IACxG,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IACrB,GAAG,EAAE,MAAM,GAAG,IAAI,CAAC;IACnB,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IACrB,YAAY,EAAE,WAAW,GAAG,IAAI,CAAC;IACjC,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IACrB,wFAAwF;IACxF,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;IACpB,4GAA4G;IAC5G,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,+EAA+E;IAC/E,UAAU,CAAC,EAAE,SAAS,CAAC;IACvB,+GAA+G;IAC/G,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED,mHAAmH;AACnH,MAAM,MAAM,SAAS,GAAG,QAAQ,GAAG,cAAc,GAAG,cAAc,CAAC;AAEnE,qEAAqE;AACrE,MAAM,WAAW,UAAU;IACzB,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,oCAAoC;IACpC,MAAM,EAAE,aAAa,GAAG,OAAO,CAAC;IAChC,uFAAuF;IACvF,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;IACpB,0DAA0D;IAC1D,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,6CAA6C;IAC7C,MAAM,EAAE,MAAM,CAAC;IACf,mHAAmH;IACnH,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,wDAAwD;IACxD,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,6GAA6G;AAC7G,MAAM,WAAW,eAAe;IAC9B,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,IAAI,GAAG,aAAa,GAAG,OAAO,CAAC;IACvC,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,+CAA+C;AAC/C,MAAM,WAAW,MAAM;IACrB,IAAI,EAAE,QAAQ,EAAE,CAAC;IACjB,MAAM,EAAE,UAAU,EAAE,CAAC;IACrB,UAAU,EAAE,eAAe,EAAE,CAAC;IAC9B,qGAAqG;IACrG,WAAW,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAClC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ai-dossier/cli",
-  "version": "0.83.2",
+  "version": "0.85.0",
   "description": "Create, verify, sign, publish, and run dossiers — portable, signed, versioned skills for any LLM tool. The dossier ⇄ Claude Code skill bridge (install-skill / skill-export).",
   "main": "dist/cli.js",
   "bin": {