@nocoo/pew 0.2.0 → 0.6.0

package/dist/commands/session-upload.js

@@ -0,0 +1,177 @@
+/**
+ * Session upload command — sends local session queue records to the Pew SaaS.
+ *
+ * Flow:
+ * 1. Load API key from config
+ * 2. Read un-uploaded session records from queue (using saved offset)
+ * 3. Deduplicate: keep only latest snapshot per session_key
+ * 4. Split into batches of ≤50 (D1 Free plan limit)
+ * 5. POST each batch to /api/ingest/sessions with Bearer token
+ * 6. Persist offset after all batches succeed
+ * 7. Retry on 5xx/429 with exponential backoff
+ */
+import { ConfigManager } from "../config/manager.js";
+import { SessionQueue } from "../storage/session-queue.js";
+// ---------------------------------------------------------------------------
+// Constants
+// ---------------------------------------------------------------------------
+const DEFAULT_BATCH_SIZE = 50;
+const DEFAULT_MAX_RETRIES = 2;
+const DEFAULT_RETRY_DELAY_MS = 1000;
+// ---------------------------------------------------------------------------
+// Upload dedup
+// ---------------------------------------------------------------------------
+/**
+ * Unlike token's aggregateRecords() which SUMS, session dedup
+ * keeps only the LATEST snapshot per session_key.
+ *
+ * This ensures idempotent uploads: re-scanning the same session
+ * files produces the same final result after server-side monotonic
+ * upsert (WHERE excluded.snapshot_at >= session_records.snapshot_at).
+ */
+export function deduplicateSessionRecords(records) {
+    if (records.length === 0)
+        return [];
+    const map = new Map();
+    for (const r of records) {
+        const existing = map.get(r.session_key);
+        if (!existing || r.snapshot_at > existing.snapshot_at) {
+            map.set(r.session_key, r);
+        }
+    }
+    return [...map.values()];
+}
+// ---------------------------------------------------------------------------
+// Implementation
+// ---------------------------------------------------------------------------
+export async function executeSessionUpload(opts) {
+    const { stateDir, apiUrl, dev = false, fetch: fetchFn, batchSize = DEFAULT_BATCH_SIZE, maxRetries = DEFAULT_MAX_RETRIES, retryDelayMs = DEFAULT_RETRY_DELAY_MS, onProgress, } = opts;
+    // 1. Load API key
+    const configManager = new ConfigManager(stateDir, dev);
+    const config = await configManager.load();
+    if (!config.token) {
+        return {
+            success: false,
+            uploaded: 0,
+            batches: 0,
+            error: "Not logged in. Run `pew login` first.",
+        };
+    }
+    // 2. Read un-uploaded records
+    const queue = new SessionQueue(stateDir);
+    const currentOffset = await queue.loadOffset();
+    const { records: rawRecords, newOffset } = await queue.readFromOffset(currentOffset);
+    if (rawRecords.length === 0) {
+        return { success: true, uploaded: 0, batches: 0 };
+    }
+    // 2b. Pre-deduplicate: keep only latest snapshot per session_key
+    const records = deduplicateSessionRecords(rawRecords);
+    // 3. Split into batches
+    const batches = [];
+    for (let i = 0; i < records.length; i += batchSize) {
+        batches.push(records.slice(i, i + batchSize));
+    }
+    // 4. Upload each batch
+    const endpoint = `${apiUrl}/api/ingest/sessions`;
+    let totalUploaded = 0;
+    let batchesCompleted = 0;
+    for (let batchIdx = 0; batchIdx < batches.length; batchIdx++) {
+        const batch = batches[batchIdx];
+        onProgress?.({
+            phase: "uploading",
+            batch: batchIdx + 1,
+            totalBatches: batches.length,
+            total: records.length,
+            message: `Uploading session batch ${batchIdx + 1}/${batches.length} (${batch.length} records)...`,
+        });
+        const result = await sendBatchWithRetry({
+            endpoint,
+            token: config.token,
+            batch,
+            fetchFn,
+            maxRetries,
+            retryDelayMs,
+        });
+        if (!result.ok) {
+            return {
+                success: false,
+                uploaded: totalUploaded,
+                batches: batchesCompleted,
+                error: result.error,
+            };
+        }
+        totalUploaded += batch.length;
+        batchesCompleted++;
+    }
+    // 5. All batches succeeded — save final offset
+    await queue.saveOffset(newOffset);
+    onProgress?.({
+        phase: "done",
+        total: totalUploaded,
+        message: `Uploaded ${totalUploaded} session records in ${batchesCompleted} batch(es).`,
+    });
+    return {
+        success: true,
+        uploaded: totalUploaded,
+        batches: batchesCompleted,
+    };
+}
+async function sendBatchWithRetry(opts) {
+    const { endpoint, token, batch, fetchFn, maxRetries, retryDelayMs } = opts;
+    let lastError = "";
+    for (let attempt = 0; attempt <= maxRetries; attempt++) {
+        if (attempt > 0 && retryDelayMs > 0) {
+            await sleep(retryDelayMs * 2 ** (attempt - 1));
+        }
+        try {
+            const resp = await fetchFn(endpoint, {
+                method: "POST",
+                headers: {
+                    "Content-Type": "application/json",
+                    Authorization: `Bearer ${token}`,
+                },
+                body: JSON.stringify(batch),
+            });
+            if (resp.ok) {
+                return { ok: true };
+            }
+            // 429 — rate limited, retry with Retry-After if available
+            if (resp.status === 429) {
+                const retryAfter = resp.headers.get("Retry-After");
+                const retryMs = retryAfter
+                    ? Math.max(Number(retryAfter) * 1000, retryDelayMs)
+                    : retryDelayMs * 2 ** attempt;
+                if (attempt < maxRetries && retryMs > 0) {
+                    await sleep(retryMs);
+                }
+                const body = await resp.json().catch(() => ({}));
+                lastError = `429: ${body.error ?? "Too Many Requests"}`;
+                continue;
+            }
+            // 4xx — client error, don't retry
+            if (resp.status >= 400 && resp.status < 500) {
+                const body = await resp.json().catch(() => ({}));
+                const msg = body.error ?? `HTTP ${resp.status}`;
+                return { ok: false, error: `${resp.status}: ${msg}` };
+            }
+            // 5xx — server error, retry
+            const body = await resp.json().catch(() => ({}));
+            lastError = `${resp.status}: ${body.error ?? "Server Error"}`;
+        }
+        catch (err) {
+            lastError = String(err.message ?? err);
+            // Network errors — don't retry if maxRetries is 0
+            if (attempt >= maxRetries) {
+                return { ok: false, error: lastError };
+            }
+        }
+    }
+    return {
+        ok: false,
+        error: `Upload failed after ${maxRetries + 1} attempts: ${lastError}`,
+    };
+}
+function sleep(ms) {
+    return new Promise((resolve) => setTimeout(resolve, ms));
+}
+//# sourceMappingURL=session-upload.js.map

package/dist/commands/session-upload.js.map

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

package/dist/commands/status.d.ts

@@ -1,3 +1,11 @@
+/** Resolved source directory paths used for file classification */
+export interface SourceDirs {
+    claudeDir: string;
+    codexSessionsDir: string;
+    geminiDir: string;
+    openCodeMessageDir: string;
+    openclawDir: string;
+}
 /** Status summary for display */
 export interface StatusResult {
     /** Number of tracked files */
@@ -15,5 +23,6 @@ export interface StatusResult {
  */
 export declare function executeStatus(opts: {
     stateDir: string;
+    sourceDirs: SourceDirs;
 }): Promise<StatusResult>;
 //# sourceMappingURL=status.d.ts.map

package/dist/commands/status.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"status.d.ts","sourceRoot":"","sources":["../../src/commands/status.ts"],"names":[],"mappings":"AAKA,iCAAiC;AACjC,MAAM,WAAW,YAAY;IAC3B,8BAA8B;IAC9B,YAAY,EAAE,MAAM,CAAC;IACrB,wCAAwC;IACxC,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,4CAA4C;IAC5C,cAAc,EAAE,MAAM,CAAC;IACvB,0BAA0B;IAC1B,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CACjC;AAED;;;GAGG;AACH,wBAAsB,aAAa,CAAC,IAAI,EAAE;IACxC,QAAQ,EAAE,MAAM,CAAC;CAClB,GAAG,OAAO,CAAC,YAAY,CAAC,CA4BxB"}
+{"version":3,"file":"status.d.ts","sourceRoot":"","sources":["../../src/commands/status.ts"],"names":[],"mappings":"AAGA,mEAAmE;AACnE,MAAM,WAAW,UAAU;IACzB,SAAS,EAAE,MAAM,CAAC;IAClB,gBAAgB,EAAE,MAAM,CAAC;IACzB,SAAS,EAAE,MAAM,CAAC;IAClB,kBAAkB,EAAE,MAAM,CAAC;IAC3B,WAAW,EAAE,MAAM,CAAC;CACrB;AAED,iCAAiC;AACjC,MAAM,WAAW,YAAY;IAC3B,8BAA8B;IAC9B,YAAY,EAAE,MAAM,CAAC;IACrB,wCAAwC;IACxC,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,4CAA4C;IAC5C,cAAc,EAAE,MAAM,CAAC;IACvB,0BAA0B;IAC1B,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CACjC;AAiBD;;;GAGG;AACH,wBAAsB,aAAa,CAAC,IAAI,EAAE;IACxC,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE,UAAU,CAAC;CACxB,GAAG,OAAO,CAAC,YAAY,CAAC,CAuBxB"}

package/dist/commands/status.js

@@ -1,28 +1,39 @@
 import { CursorStore } from "../storage/cursor-store.js";
 import { LocalQueue } from "../storage/local-queue.js";
+/**
+ * Classify a cursor file path into a source label.
+ *
+ * Uses resolved source directories (startsWith) so that custom paths
+ * like $CODEX_HOME are classified correctly.
+ */
+function classifySource(filePath, dirs) {
+    if (filePath.startsWith(dirs.claudeDir))
+        return "claude-code";
+    if (filePath.startsWith(dirs.codexSessionsDir))
+        return "codex";
+    if (filePath.startsWith(dirs.geminiDir))
+        return "gemini-cli";
+    if (filePath.startsWith(dirs.openCodeMessageDir))
+        return "opencode";
+    if (filePath.startsWith(dirs.openclawDir))
+        return "openclaw";
+    return "unknown";
+}
 /**
  * Compute the current sync status.
  * Pure logic — no CLI I/O.
  */
 export async function executeStatus(opts) {
-    const { stateDir } = opts;
+    const { stateDir, sourceDirs } = opts;
     const cursorStore = new CursorStore(stateDir);
     const queue = new LocalQueue(stateDir);
     const cursors = await cursorStore.load();
     const offset = await queue.loadOffset();
     const { records } = await queue.readFromOffset(offset);
-    // Count files by source based on path patterns
+    // Count files by source using resolved directory paths
     const sources = {};
     for (const filePath of Object.keys(cursors.files)) {
-        let source = "unknown";
-        if (filePath.includes(".claude"))
-            source = "claude-code";
-        else if (filePath.includes(".gemini"))
-            source = "gemini-cli";
-        else if (filePath.includes("opencode"))
-            source = "opencode";
-        else if (filePath.includes(".openclaw"))
-            source = "openclaw";
+        const source = classifySource(filePath, sourceDirs);
         sources[source] = (sources[source] || 0) + 1;
     }
     return {

package/dist/commands/status.js.map

@@ -1 +1 @@
-{"version":3,"file":"status.js","sourceRoot":"","sources":["../../src/commands/status.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AACzD,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AAevD;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,aAAa,CAAC,IAEnC;IACC,MAAM,EAAE,QAAQ,EAAE,GAAG,IAAI,CAAC;IAE1B,MAAM,WAAW,GAAG,IAAI,WAAW,CAAC,QAAQ,CAAC,CAAC;IAC9C,MAAM,KAAK,GAAG,IAAI,UAAU,CAAC,QAAQ,CAAC,CAAC;IAEvC,MAAM,OAAO,GAAG,MAAM,WAAW,CAAC,IAAI,EAAE,CAAC;IACzC,MAAM,MAAM,GAAG,MAAM,KAAK,CAAC,UAAU,EAAE,CAAC;IACxC,MAAM,EAAE,OAAO,EAAE,GAAG,MAAM,KAAK,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC;IAEvD,+CAA+C;IAC/C,MAAM,OAAO,GAA2B,EAAE,CAAC;IAC3C,KAAK,MAAM,QAAQ,IAAI,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;QAClD,IAAI,MAAM,GAAG,SAAS,CAAC;QACvB,IAAI,QAAQ,CAAC,QAAQ,CAAC,SAAS,CAAC;YAAE,MAAM,GAAG,aAAa,CAAC;aACpD,IAAI,QAAQ,CAAC,QAAQ,CAAC,SAAS,CAAC;YAAE,MAAM,GAAG,YAAY,CAAC;aACxD,IAAI,QAAQ,CAAC,QAAQ,CAAC,UAAU,CAAC;YAAE,MAAM,GAAG,UAAU,CAAC;aACvD,IAAI,QAAQ,CAAC,QAAQ,CAAC,WAAW,CAAC;YAAE,MAAM,GAAG,UAAU,CAAC;QAE7D,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC;IAC/C,CAAC;IAED,OAAO;QACL,YAAY,EAAE,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,MAAM;QAC/C,QAAQ,EAAE,OAAO,CAAC,SAAS;QAC3B,cAAc,EAAE,OAAO,CAAC,MAAM;QAC9B,OAAO;KACR,CAAC;AACJ,CAAC"}
+{"version":3,"file":"status.js","sourceRoot":"","sources":["../../src/commands/status.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AACzD,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AAuBvD;;;;;GAKG;AACH,SAAS,cAAc,CAAC,QAAgB,EAAE,IAAgB;IACxD,IAAI,QAAQ,CAAC,UAAU,CAAC,IAAI,CAAC,SAAS,CAAC;QAAE,OAAO,aAAa,CAAC;IAC9D,IAAI,QAAQ,CAAC,UAAU,CAAC,IAAI,CAAC,gBAAgB,CAAC;QAAE,OAAO,OAAO,CAAC;IAC/D,IAAI,QAAQ,CAAC,UAAU,CAAC,IAAI,CAAC,SAAS,CAAC;QAAE,OAAO,YAAY,CAAC;IAC7D,IAAI,QAAQ,CAAC,UAAU,CAAC,IAAI,CAAC,kBAAkB,CAAC;QAAE,OAAO,UAAU,CAAC;IACpE,IAAI,QAAQ,CAAC,UAAU,CAAC,IAAI,CAAC,WAAW,CAAC;QAAE,OAAO,UAAU,CAAC;IAC7D,OAAO,SAAS,CAAC;AACnB,CAAC;AAED;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,aAAa,CAAC,IAGnC;IACC,MAAM,EAAE,QAAQ,EAAE,UAAU,EAAE,GAAG,IAAI,CAAC;IAEtC,MAAM,WAAW,GAAG,IAAI,WAAW,CAAC,QAAQ,CAAC,CAAC;IAC9C,MAAM,KAAK,GAAG,IAAI,UAAU,CAAC,QAAQ,CAAC,CAAC;IAEvC,MAAM,OAAO,GAAG,MAAM,WAAW,CAAC,IAAI,EAAE,CAAC;IACzC,MAAM,MAAM,GAAG,MAAM,KAAK,CAAC,UAAU,EAAE,CAAC;IACxC,MAAM,EAAE,OAAO,EAAE,GAAG,MAAM,KAAK,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC;IAEvD,uDAAuD;IACvD,MAAM,OAAO,GAA2B,EAAE,CAAC;IAC3C,KAAK,MAAM,QAAQ,IAAI,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;QAClD,MAAM,MAAM,GAAG,cAAc,CAAC,QAAQ,EAAE,UAAU,CAAC,CAAC;QACpD,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC;IAC/C,CAAC;IAED,OAAO;QACL,YAAY,EAAE,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,MAAM;QAC/C,QAAQ,EAAE,OAAO,CAAC,SAAS;QAC3B,cAAc,EAAE,OAAO,CAAC,MAAM;QAC9B,OAAO;KACR,CAAC;AACJ,CAAC"}

package/dist/commands/sync.d.ts

@@ -1,13 +1,23 @@
+import type { QueryMessagesFn } from "../parsers/opencode-sqlite.js";
 /** Sync execution options */
 export interface SyncOptions {
     /** Directory for persisting state (cursors, queue) */
     stateDir: string;
     /** Override: Claude data directory (~/.claude) */
     claudeDir?: string;
+    /** Override: Codex CLI sessions directory (~/.codex/sessions) */
+    codexSessionsDir?: string;
     /** Override: Gemini data directory (~/.gemini) */
     geminiDir?: string;
     /** Override: OpenCode message directory (~/.local/share/opencode/storage/message) */
     openCodeMessageDir?: string;
+    /** Override: OpenCode SQLite database path (~/.local/share/opencode/opencode.db) */
+    openCodeDbPath?: string;
+    /** Factory for opening the OpenCode SQLite DB (DI for testability) */
+    openMessageDb?: (dbPath: string) => {
+        queryMessages: QueryMessagesFn;
+        close: () => void;
+    } | null;
     /** Override: OpenClaw data directory (~/.openclaw) */
     openclawDir?: string;
     /** Progress callback */
@@ -16,7 +26,7 @@ export interface SyncOptions {
 /** Progress event for UI display */
 export interface ProgressEvent {
     source: string;
-    phase: "discover" | "parse" | "aggregate" | "done";
+    phase: "discover" | "parse" | "aggregate" | "done" | "warn";
     current?: number;
     total?: number;
     message?: string;
@@ -27,6 +37,7 @@ export interface SyncResult {
     totalRecords: number;
     sources: {
         claude: number;
+        codex: number;
         gemini: number;
         opencode: number;
         openclaw: number;
@@ -34,6 +45,7 @@ export interface SyncResult {
     /** Total files scanned per source */
     filesScanned: {
         claude: number;
+        codex: number;
         gemini: number;
         opencode: number;
         openclaw: number;

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

@@ -1 +1 @@
-{"version":3,"file":"sync.d.ts","sourceRoot":"","sources":["../../src/commands/sync.ts"],"names":[],"mappings":"AA0BA,6BAA6B;AAC7B,MAAM,WAAW,WAAW;IAC1B,sDAAsD;IACtD,QAAQ,EAAE,MAAM,CAAC;IACjB,kDAAkD;IAClD,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,kDAAkD;IAClD,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,qFAAqF;IACrF,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,sDAAsD;IACtD,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,wBAAwB;IACxB,UAAU,CAAC,EAAE,CAAC,KAAK,EAAE,aAAa,KAAK,IAAI,CAAC;CAC7C;AAED,oCAAoC;AACpC,MAAM,WAAW,aAAa;IAC5B,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,UAAU,GAAG,OAAO,GAAG,WAAW,GAAG,MAAM,CAAC;IACnD,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,iCAAiC;AACjC,MAAM,WAAW,UAAU;IACzB,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,MAAM,CAAC;IACrB,OAAO,EAAE;QACP,MAAM,EAAE,MAAM,CAAC;QACf,MAAM,EAAE,MAAM,CAAC;QACf,QAAQ,EAAE,MAAM,CAAC;QACjB,QAAQ,EAAE,MAAM,CAAC;KAClB,CAAC;IACF,qCAAqC;IACrC,YAAY,EAAE;QACZ,MAAM,EAAE,MAAM,CAAC;QACf,MAAM,EAAE,MAAM,CAAC;QACf,QAAQ,EAAE,MAAM,CAAC;QACjB,QAAQ,EAAE,MAAM,CAAC;KAClB,CAAC;CACH;AAUD;;;;;GAKG;AACH,wBAAsB,WAAW,CAAC,IAAI,EAAE,WAAW,GAAG,OAAO,CAAC,UAAU,CAAC,CA2SxE"}
+{"version":3,"file":"sync.d.ts","sourceRoot":"","sources":["../../src/commands/sync.ts"],"names":[],"mappings":"AA4BA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAIrE,6BAA6B;AAC7B,MAAM,WAAW,WAAW;IAC1B,sDAAsD;IACtD,QAAQ,EAAE,MAAM,CAAC;IACjB,kDAAkD;IAClD,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,iEAAiE;IACjE,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,kDAAkD;IAClD,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,qFAAqF;IACrF,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,oFAAoF;IACpF,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,sEAAsE;IACtE,aAAa,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK;QAAE,aAAa,EAAE,eAAe,CAAC;QAAC,KAAK,EAAE,MAAM,IAAI,CAAA;KAAE,GAAG,IAAI,CAAC;IACjG,sDAAsD;IACtD,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,wBAAwB;IACxB,UAAU,CAAC,EAAE,CAAC,KAAK,EAAE,aAAa,KAAK,IAAI,CAAC;CAC7C;AAED,oCAAoC;AACpC,MAAM,WAAW,aAAa;IAC5B,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,UAAU,GAAG,OAAO,GAAG,WAAW,GAAG,MAAM,GAAG,MAAM,CAAC;IAC5D,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,iCAAiC;AACjC,MAAM,WAAW,UAAU;IACzB,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,MAAM,CAAC;IACrB,OAAO,EAAE;QACP,MAAM,EAAE,MAAM,CAAC;QACf,KAAK,EAAE,MAAM,CAAC;QACd,MAAM,EAAE,MAAM,CAAC;QACf,QAAQ,EAAE,MAAM,CAAC;QACjB,QAAQ,EAAE,MAAM,CAAC;KAClB,CAAC;IACF,qCAAqC;IACrC,YAAY,EAAE;QACZ,MAAM,EAAE,MAAM,CAAC;QACf,KAAK,EAAE,MAAM,CAAC;QACd,MAAM,EAAE,MAAM,CAAC;QACf,QAAQ,EAAE,MAAM,CAAC;QACjB,QAAQ,EAAE,MAAM,CAAC;KAClB,CAAC;CACH;AAUD;;;;;GAKG;AACH,wBAAsB,WAAW,CAAC,IAAI,EAAE,WAAW,GAAG,OAAO,CAAC,UAAU,CAAC,CAmgBxE"}

package/dist/commands/sync.js

@@ -1,11 +1,13 @@
 import { stat } from "node:fs/promises";
 import { CursorStore } from "../storage/cursor-store.js";
 import { LocalQueue } from "../storage/local-queue.js";
-import { discoverClaudeFiles, discoverGeminiFiles, discoverOpenCodeFiles, discoverOpenClawFiles, } from "../discovery/sources.js";
+import { discoverClaudeFiles, discoverCodexFiles, discoverGeminiFiles, discoverOpenCodeFiles, discoverOpenClawFiles, } from "../discovery/sources.js";
 import { parseClaudeFile } from "../parsers/claude.js";
+import { parseCodexFile } from "../parsers/codex.js";
 import { parseGeminiFile } from "../parsers/gemini.js";
 import { parseOpenCodeFile } from "../parsers/opencode.js";
 import { parseOpenClawFile } from "../parsers/openclaw.js";
+import { processOpenCodeMessages } from "../parsers/opencode-sqlite.js";
 import { toUtcHalfHourStart, bucketKey, addTokens, emptyTokenDelta } from "../utils/buckets.js";
 /**
  * Execute the sync operation: discover files, parse incrementally,
@@ -19,8 +21,8 @@ export async function executeSync(opts) {
     const queue = new LocalQueue(stateDir);
     const cursors = await cursorStore.load();
     const allDeltas = [];
-    const sourceCounts = { claude: 0, gemini: 0, opencode: 0, openclaw: 0 };
-    const filesScanned = { claude: 0, gemini: 0, opencode: 0, openclaw: 0 };
+    const sourceCounts = { claude: 0, codex: 0, gemini: 0, opencode: 0, openclaw: 0 };
+    const filesScanned = { claude: 0, codex: 0, gemini: 0, opencode: 0, openclaw: 0 };
     // ---------- Claude Code ----------
     if (opts.claudeDir) {
         onProgress?.({
@@ -43,7 +45,16 @@ export async function executeSync(opts) {
                 continue;
             const inode = st.ino;
             const startOffset = prev && prev.inode === inode ? (prev.offset ?? 0) : 0;
-            const result = await parseClaudeFile({ filePath, startOffset });
+            const result = await parseClaudeFile({ filePath, startOffset }).catch((err) => {
+                onProgress?.({
+                    source: "claude-code",
+                    phase: "warn",
+                    message: `Skipping ${filePath}: ${err instanceof Error ? err.message : String(err)}`,
+                });
+                return null;
+            });
+            if (!result)
+                continue;
             cursors.files[filePath] = {
                 inode,
                 offset: result.endOffset,
@@ -87,7 +98,16 @@ export async function executeSync(opts) {
                 filePath,
                 startIndex,
                 lastTotals,
+            }).catch((err) => {
+                onProgress?.({
+                    source: "gemini-cli",
+                    phase: "warn",
+                    message: `Skipping ${filePath}: ${err instanceof Error ? err.message : String(err)}`,
+                });
+                return null;
             });
+            if (!result)
+                continue;
             cursors.files[filePath] = {
                 inode,
                 lastIndex: result.lastIndex,
@@ -143,7 +163,16 @@ export async function executeSync(opts) {
                 continue;
             }
             const lastTotals = prev && prev.inode === inode ? (prev.lastTotals ?? null) : null;
-            const result = await parseOpenCodeFile({ filePath, lastTotals });
+            const result = await parseOpenCodeFile({ filePath, lastTotals }).catch((err) => {
+                onProgress?.({
+                    source: "opencode",
+                    phase: "warn",
+                    message: `Skipping ${filePath}: ${err instanceof Error ? err.message : String(err)}`,
+                });
+                return null;
+            });
+            if (!result)
+                continue;
             cursors.files[filePath] = {
                 inode,
                 size: st.size,
@@ -166,6 +195,103 @@ export async function executeSync(opts) {
         // Persist directory mtimes for next run
         cursors.dirMtimes = discovery.dirMtimes;
     }
+    // ---------- OpenCode SQLite ----------
+    if (opts.openCodeDbPath) {
+        onProgress?.({
+            source: "opencode-sqlite",
+            phase: "discover",
+            message: "Checking OpenCode SQLite database...",
+        });
+        // Check if DB file exists
+        const dbStat = await stat(opts.openCodeDbPath).catch(() => null);
+        if (dbStat && !opts.openMessageDb) {
+            // DB file exists but adapter is missing (bun:sqlite not available)
+            onProgress?.({
+                source: "opencode-sqlite",
+                phase: "warn",
+                message: `OpenCode SQLite database found at ${opts.openCodeDbPath} but bun:sqlite is not available — SQLite token data will NOT be synced`,
+            });
+        }
+        else if (dbStat && opts.openMessageDb) {
+            const dbInode = dbStat.ino;
+            const prevSqlite = cursors.openCodeSqlite;
+            // If inode changed (DB recreated), reset cursor
+            const lastTimeCreated = prevSqlite && prevSqlite.inode === dbInode
+                ? prevSqlite.lastTimeCreated
+                : 0;
+            const prevProcessedIds = new Set(prevSqlite && prevSqlite.inode === dbInode
+                ? (prevSqlite.lastProcessedIds ?? [])
+                : []);
+            const handle = opts.openMessageDb(opts.openCodeDbPath);
+            if (handle) {
+                try {
+                    // Query uses >= to avoid missing same-millisecond rows.
+                    // We dedup previously-processed IDs from the prior batch.
+                    const rawRows = handle.queryMessages(lastTimeCreated);
+                    const rows = prevProcessedIds.size > 0
+                        ? rawRows.filter((r) => !prevProcessedIds.has(r.id))
+                        : rawRows;
+                    // Collect JSON messageKeys from cursor store for dedup.
+                    // During the overlap window (~Feb 15-17), both JSON and SQLite
+                    // sources contain the same messages. We skip any SQLite row
+                    // whose messageKey is already tracked by a JSON file cursor.
+                    const jsonMessageKeys = new Set();
+                    for (const cursor of Object.values(cursors.files)) {
+                        const oc = cursor;
+                        if (oc.messageKey) {
+                            jsonMessageKeys.add(oc.messageKey);
+                        }
+                    }
+                    // Filter rows: exclude assistant messages already tracked by JSON parser.
+                    // row.role is extracted at the SQL level via json_extract — no need to
+                    // parse the full data JSON here.
+                    const filteredRows = rows.filter((row) => {
+                        if (row.role !== "assistant")
+                            return true; // non-assistant rows don't produce deltas
+                        const key = `${row.session_id}|${row.id}`;
+                        return !jsonMessageKeys.has(key);
+                    });
+                    const dedupSkipped = rows.length - filteredRows.length;
+                    const result = processOpenCodeMessages(filteredRows);
+                    onProgress?.({
+                        source: "opencode-sqlite",
+                        phase: "parse",
+                        message: `Parsed ${result.deltas.length} deltas from ${rawRows.length} SQLite rows${dedupSkipped > 0 ? ` (${dedupSkipped} deduped)` : ""}`,
+                    });
+                    allDeltas.push(...result.deltas);
+                    sourceCounts.opencode += result.deltas.length;
+                    // Update SQLite cursor — advance past ALL rows (including deduped).
+                    // Rows are ORDER BY time_created ASC, so the last row has the
+                    // highest time_created. Track IDs at the max timestamp for
+                    // same-millisecond dedup on the next query.
+                    const maxTime = rawRows.length > 0
+                        ? rawRows[rawRows.length - 1].time_created
+                        : lastTimeCreated;
+                    const idsAtMax = rawRows
+                        .filter((r) => r.time_created === maxTime)
+                        .map((r) => r.id);
+                    cursors.openCodeSqlite = {
+                        lastTimeCreated: maxTime,
+                        lastProcessedIds: idsAtMax,
+                        lastSessionUpdated: prevSqlite?.lastSessionUpdated ?? 0,
+                        inode: dbInode,
+                        updatedAt: new Date().toISOString(),
+                    };
+                }
+                finally {
+                    handle.close();
+                }
+            }
+            else {
+                // openMessageDb returned null — DB exists but couldn't be opened
+                onProgress?.({
+                    source: "opencode-sqlite",
+                    phase: "warn",
+                    message: `Failed to open OpenCode SQLite database at ${opts.openCodeDbPath} — SQLite token data will NOT be synced`,
+                });
+            }
+        }
+    }
     // ---------- OpenClaw ----------
     if (opts.openclawDir) {
         onProgress?.({
@@ -189,7 +315,16 @@ export async function executeSync(opts) {
                 continue;
             const inode = st.ino;
             const startOffset = prev && prev.inode === inode ? (prev.offset ?? 0) : 0;
-            const result = await parseOpenClawFile({ filePath, startOffset });
+            const result = await parseOpenClawFile({ filePath, startOffset }).catch((err) => {
+                onProgress?.({
+                    source: "openclaw",
+                    phase: "warn",
+                    message: `Skipping ${filePath}: ${err instanceof Error ? err.message : String(err)}`,
+                });
+                return null;
+            });
+            if (!result)
+                continue;
             cursors.files[filePath] = {
                 inode,
                 offset: result.endOffset,
@@ -205,6 +340,63 @@ export async function executeSync(opts) {
             });
         }
     }
+    // ---------- Codex CLI ----------
+    if (opts.codexSessionsDir) {
+        onProgress?.({
+            source: "codex",
+            phase: "discover",
+            message: "Discovering Codex CLI files...",
+        });
+        const files = await discoverCodexFiles(opts.codexSessionsDir);
+        filesScanned.codex = files.length;
+        onProgress?.({
+            source: "codex",
+            phase: "parse",
+            total: files.length,
+            message: `Parsing ${files.length} Codex files...`,
+        });
+        for (let i = 0; i < files.length; i++) {
+            const filePath = files[i];
+            const prev = cursors.files[filePath];
+            const st = await stat(filePath).catch(() => null);
+            if (!st)
+                continue;
+            const inode = st.ino;
+            const startOffset = prev && prev.inode === inode ? (prev.offset ?? 0) : 0;
+            const lastTotals = prev && prev.inode === inode ? (prev.lastTotals ?? null) : null;
+            const lastModel = prev && prev.inode === inode ? (prev.lastModel ?? null) : null;
+            const result = await parseCodexFile({
+                filePath,
+                startOffset,
+                lastTotals,
+                lastModel,
+            }).catch((err) => {
+                onProgress?.({
+                    source: "codex",
+                    phase: "warn",
+                    message: `Skipping ${filePath}: ${err instanceof Error ? err.message : String(err)}`,
+                });
+                return null;
+            });
+            if (!result)
+                continue;
+            cursors.files[filePath] = {
+                inode,
+                offset: result.endOffset,
+                lastTotals: result.lastTotals,
+                lastModel: result.lastModel,
+                updatedAt: new Date().toISOString(),
+            };
+            allDeltas.push(...result.deltas);
+            sourceCounts.codex += result.deltas.length;
+            onProgress?.({
+                source: "codex",
+                phase: "parse",
+                current: i + 1,
+                total: files.length,
+            });
+        }
+    }
     // ---------- Aggregate into half-hour buckets ----------
     onProgress?.({
         source: "all",
@@ -233,6 +425,7 @@ export async function executeSync(opts) {
     const records = [];
     for (const bucket of buckets.values()) {
         const totalTokens = bucket.tokens.inputTokens +
+            bucket.tokens.cachedInputTokens +
             bucket.tokens.outputTokens +
             bucket.tokens.reasoningOutputTokens;
         records.push({
@@ -246,12 +439,17 @@ export async function executeSync(opts) {
             total_tokens: totalTokens,
         });
     }
+    // ---------- Save cursor state FIRST (before queue) ----------
+    // Cursor must be persisted before the queue write so that a crash
+    // between the two operations does not cause double-counting on the
+    // next sync. Worst case: cursor saved but queue not written — data
+    // is lost for this cycle (acceptable), but never duplicated.
+    cursors.updatedAt = new Date().toISOString();
+    await cursorStore.save(cursors);
+    // ---------- Write to queue ----------
     if (records.length > 0) {
         await queue.appendBatch(records);
     }
-    // ---------- Save cursor state ----------
-    cursors.updatedAt = new Date().toISOString();
-    await cursorStore.save(cursors);
     onProgress?.({
         source: "all",
         phase: "done",