@nocoo/pika 0.2.2 → 0.5.4

package/dist/bin.js

@@ -1,71 +1,22 @@
 #!/usr/bin/env bun
 // @bun
 var __defProp = Object.defineProperty;
+var __returnValue = (v) => v;
+function __exportSetter(name, newValue) {
+  this[name] = __returnValue.bind(null, newValue);
+}
 var __export = (target, all) => {
   for (var name in all)
     __defProp(target, name, {
       get: all[name],
       enumerable: true,
       configurable: true,
-      set: (newValue) => all[name] = () => newValue
+      set: __exportSetter.bind(all, name)
     });
 };
 var __esm = (fn, res) => () => (fn && (res = fn(fn = 0)), res);
 var __require = import.meta.require;
 
-// ../core/src/types.ts
-var SOURCES;
-var init_types = __esm(() => {
-  SOURCES = [
-    "claude-code",
-    "codex",
-    "gemini-cli",
-    "opencode",
-    "vscode-copilot"
-  ];
-});
-
-// ../../package.json
-var package_default;
-var init_package = __esm(() => {
-  package_default = {
-    name: "pika",
-    version: "0.2.2",
-    private: true,
-    workspaces: [
-      "packages/*"
-    ],
-    scripts: {
-      dev: "bun run --cwd packages/web dev",
-      build: "bun run --filter '*' build",
-      test: "vitest run",
-      "test:watch": "vitest",
-      "test:coverage": "vitest run --coverage",
-      lint: "tsc --noEmit && tsc --noEmit -p packages/web/tsconfig.json",
-      "lint:typecheck": "tsc --noEmit && tsc --noEmit -p packages/web/tsconfig.json",
-      "sync-versions": "bun scripts/sync-versions.ts --write",
-      prepare: "husky"
-    },
-    devDependencies: {
-      "@vitest/coverage-v8": "^3.1.1",
-      husky: "^9.1.7",
-      typescript: "^5.8.2",
-      vitest: "^3.1.1"
-    },
-    overrides: {
-      undici: ">=7.24.0",
-      cookie: ">=0.7.0"
-    }
-  };
-});
-
-// ../core/src/version.ts
-var PIKA_VERSION;
-var init_version = __esm(() => {
-  init_package();
-  PIKA_VERSION = package_default.version;
-});
-
 // ../core/src/constants.ts
 var PARSER_REVISION = 2, SCHEMA_VERSION = 1, METADATA_BATCH_SIZE = 50, LOGIN_TIMEOUT_MS = 120000, CONFIG_DIR = "pika", CONFIG_FILE = "config.json", DEV_CONFIG_FILE = "config.dev.json", PARSE_ERRORS_FILE = "parse-errors.jsonl", MAX_UPLOAD_RETRIES = 2, INITIAL_BACKOFF_MS = 1000, CONTENT_UPLOAD_CONCURRENCY = 2, MAX_CONTENT_UPLOAD_BYTES, MAX_METADATA_BODY_BYTES, MAX_DECOMPRESSED_CONTENT_BYTES;
 var init_constants = __esm(() => {
@@ -74,12 +25,6 @@ var init_constants = __esm(() => {
   MAX_DECOMPRESSED_CONTENT_BYTES = 256 * 1024 * 1024;
 });
 
-// ../core/src/validation.ts
-var init_validation = __esm(() => {
-  init_types();
-  init_constants();
-});
-
 // ../core/src/chunking.ts
 var init_chunking = __esm(() => {
   init_constants();
@@ -121,25 +66,95 @@ function truncateAtWord(text, maxLen) {
   const cutoff = maxLen - 1;
   const lastSpace = text.lastIndexOf(" ", cutoff);
   if (lastSpace > 0) {
-    return text.slice(0, lastSpace) + "\u2026";
+    return `${text.slice(0, lastSpace)}\u2026`;
   }
-  return text.slice(0, cutoff) + "\u2026";
+  return `${text.slice(0, cutoff)}\u2026`;
 }
 var MAX_TITLE_LENGTH = 80;
 
+// ../core/src/types.ts
+var SOURCES;
+var init_types = __esm(() => {
+  SOURCES = [
+    "claude-code",
+    "codex",
+    "gemini-cli",
+    "opencode",
+    "vscode-copilot"
+  ];
+});
+
+// ../core/src/validation.ts
+var init_validation = __esm(() => {
+  init_constants();
+  init_types();
+});
+
+// ../../package.json
+var package_default;
+var init_package = __esm(() => {
+  package_default = {
+    name: "pika",
+    version: "0.5.4",
+    private: true,
+    workspaces: [
+      "packages/*"
+    ],
+    scripts: {
+      dev: "bun run --cwd packages/web dev",
+      build: "bun run --filter '*' build",
+      test: "vitest run",
+      "test:watch": "vitest",
+      "test:coverage": "vitest run --coverage",
+      "test:e2e": "vitest run --config packages/web/vitest.e2e.config.ts",
+      "test:all": "bun run test:coverage && bun run test:e2e",
+      lint: "tsc --noEmit && tsc --noEmit -p packages/web/tsconfig.json",
+      "lint:typecheck": "tsc --noEmit && tsc --noEmit -p packages/web/tsconfig.json",
+      "lint:biome": "bunx biome check packages/",
+      "lint:secrets": "gitleaks detect --source . --no-git --config .gitleaks.toml",
+      "lint:deps": "osv-scanner scan --lockfile=bun.lock",
+      "lint:all": "bun run lint && bunx biome check packages/ && bun run lint:secrets && bun run lint:deps",
+      "sync-versions": "bun scripts/sync-versions.ts --write",
+      prepare: "husky"
+    },
+    devDependencies: {
+      "@biomejs/biome": "^2.4.9",
+      "@vitest/coverage-v8": "^3.1.1",
+      husky: "^9.1.7",
+      typescript: "^5.8.2",
+      vitest: "^3.1.1"
+    },
+    overrides: {
+      undici: ">=7.24.0",
+      cookie: ">=0.7.0",
+      picomatch: ">=4.0.4",
+      "brace-expansion": ">=5.0.5",
+      "fast-xml-parser": ">=5.5.9",
+      next: ">=16.2.1"
+    }
+  };
+});
+
+// ../core/src/version.ts
+var PIKA_VERSION;
+var init_version = __esm(() => {
+  init_package();
+  PIKA_VERSION = package_default.version;
+});
+
 // ../core/src/index.ts
 var init_src = __esm(() => {
-  init_types();
-  init_version();
+  init_chunking();
   init_constants();
+  init_types();
   init_validation();
-  init_chunking();
+  init_version();
 });
 
 // src/config/manager.ts
-import { readFileSync, writeFileSync, mkdirSync, existsSync } from "fs";
-import { join } from "path";
 import { randomUUID } from "crypto";
+import { existsSync, mkdirSync, readFileSync, writeFileSync } from "fs";
+import { join } from "path";
 
 class ConfigManager {
   configDir;
@@ -166,7 +181,7 @@ class ConfigManager {
     }
     const existing = this.read();
     const merged = { ...existing, ...partial };
-    writeFileSync(this.configPath, JSON.stringify(merged, null, 2) + `
+    writeFileSync(this.configPath, `${JSON.stringify(merged, null, 2)}
 `, {
       mode: 384
     });
@@ -194,45 +209,6 @@ var init_manager = __esm(() => {
   init_src();
 });
 
-// src/storage/cursor-store.ts
-import { readFile, writeFile, mkdir } from "fs/promises";
-import { join as join2, dirname } from "path";
-function emptyState() {
-  return { version: 1, files: {}, updatedAt: null };
-}
-
-class CursorStore {
-  filePath;
-  constructor(storeDir) {
-    this.filePath = join2(storeDir, CURSORS_FILE2);
-  }
-  async load() {
-    try {
-      const raw = await readFile(this.filePath, "utf-8");
-      return JSON.parse(raw);
-    } catch {
-      return emptyState();
-    }
-  }
-  async save(state) {
-    const dir = dirname(this.filePath);
-    await mkdir(dir, { recursive: true });
-    await writeFile(this.filePath, JSON.stringify(state, null, 2) + `
-`);
-  }
-}
-var CURSORS_FILE2 = "cursors.json";
-var init_cursor_store = () => {};
-
-// src/utils/file-changed.ts
-function fileUnchanged(prev, curr) {
-  if (!prev)
-    return false;
-  if (prev.mtimeMs === undefined || prev.size === undefined)
-    return false;
-  return prev.inode === curr.inode && prev.mtimeMs === curr.mtimeMs && prev.size === curr.size;
-}
-
 // src/utils/hash-project-ref.ts
 import { createHash } from "crypto";
 function hashProjectRef(raw) {
@@ -461,7 +437,7 @@ function extractProjectName(filePath) {
 }
 async function parseClaudeFileMulti(filePath, startOffset = 0) {
   const st = await stat(filePath).catch(() => null);
-  if (!st || !st.isFile() || st.size === 0)
+  if (!st?.isFile() || st.size === 0)
     return [];
   if (startOffset >= st.size)
     return [];
@@ -494,11 +470,20 @@ var init_claude = __esm(() => {
   init_hash_project_ref();
 });
 
+// src/utils/file-changed.ts
+function fileUnchanged(prev, curr) {
+  if (!prev)
+    return false;
+  if (prev.mtimeMs === undefined || prev.size === undefined)
+    return false;
+  return prev.inode === curr.inode && prev.mtimeMs === curr.mtimeMs && prev.size === curr.size;
+}
+
 // src/drivers/session/claude.ts
 import { readdir, stat as stat2 } from "fs/promises";
-import { join as join3 } from "path";
+import { join as join2 } from "path";
 async function discoverClaudeFiles(claudeDir) {
-  const projectsDir = join3(claudeDir, "projects");
+  const projectsDir = join2(claudeDir, "projects");
   try {
     await stat2(projectsDir);
   } catch {
@@ -516,7 +501,9 @@ async function walkJsonl(dir, results) {
     return;
   }
   for (const entry of entries) {
-    const fullPath = join3(dir, entry.name);
+    if (entry.isDirectory() && SKIP_DIRS.has(entry.name))
+      continue;
+    const fullPath = join2(dir, entry.name);
     if (entry.isDirectory()) {
       await walkJsonl(fullPath, results);
     } else if (entry.isFile() && entry.name.endsWith(".jsonl")) {
@@ -524,9 +511,10 @@ async function walkJsonl(dir, results) {
     }
   }
 }
-var claudeSessionDriver;
+var SKIP_DIRS, claudeSessionDriver;
 var init_claude2 = __esm(() => {
   init_claude();
+  SKIP_DIRS = new Set(["subagents"]);
   claudeSessionDriver = {
     source: "claude-code",
     async discover(opts) {
@@ -822,7 +810,7 @@ function buildEmptyResult(filePath) {
 }
 async function parseCodexFile(filePath, startOffset = 0) {
   const st = await stat3(filePath).catch(() => null);
-  if (!st || !st.isFile() || st.size === 0)
+  if (!st?.isFile() || st.size === 0)
     return buildEmptyResult(filePath);
   if (startOffset >= st.size)
     return buildEmptyResult(filePath);
@@ -865,7 +853,7 @@ var init_codex = __esm(() => {
 
 // src/drivers/session/codex.ts
 import { readdir as readdir2, stat as stat4 } from "fs/promises";
-import { join as join4 } from "path";
+import { join as join3 } from "path";
 async function walkFiltered(dir, results, filter) {
   let entries;
   try {
@@ -874,7 +862,7 @@ async function walkFiltered(dir, results, filter) {
     return;
   }
   for (const entry of entries) {
-    const fullPath = join4(dir, entry.name);
+    const fullPath = join3(dir, entry.name);
     if (entry.isDirectory()) {
       await walkFiltered(fullPath, results, filter);
     } else if (entry.isFile() && filter(entry.name)) {
@@ -907,10 +895,20 @@ var init_codex2 = __esm(() => {
     },
     resumeState(cursor, fingerprint) {
       if (!cursor || cursor.inode !== fingerprint.inode) {
-        return { kind: "codex", startOffset: 0, lastTotalTokens: 0, lastModel: null };
+        return {
+          kind: "codex",
+          startOffset: 0,
+          lastTotalTokens: 0,
+          lastModel: null
+        };
       }
       if (cursor.offset > fingerprint.size) {
-        return { kind: "codex", startOffset: 0, lastTotalTokens: 0, lastModel: null };
+        return {
+          kind: "codex",
+          startOffset: 0,
+          lastTotalTokens: 0,
+          lastModel: null
+        };
       }
       return {
         kind: "codex",
@@ -921,6 +919,8 @@ var init_codex2 = __esm(() => {
     },
     async parse(filePath, resume) {
       const result = await parseCodexFile(filePath, resume.startOffset);
+      if (result.canonical.messages.length === 0)
+        return [];
       return [result];
     },
     buildCursor(fingerprint, results) {
@@ -945,7 +945,7 @@ var init_codex2 = __esm(() => {
 });
 
 // src/parsers/gemini.ts
-import { readFile as readFile2, stat as stat5 } from "fs/promises";
+import { readFile, stat as stat5 } from "fs/promises";
 function toNonNegInt3(value) {
   if (typeof value !== "number" || !Number.isFinite(value) || value < 0)
     return 0;
@@ -1103,11 +1103,11 @@ function buildEmptyResult2(filePath) {
 }
 async function parseGeminiFile(filePath, startIndex = 0) {
   const st = await stat5(filePath).catch(() => null);
-  if (!st || !st.isFile() || st.size === 0)
+  if (!st?.isFile() || st.size === 0)
     return buildEmptyResult2(filePath);
   let rawContent;
   try {
-    rawContent = await readFile2(filePath, "utf8");
+    rawContent = await readFile(filePath, "utf8");
   } catch {
     return buildEmptyResult2(filePath);
   }
@@ -1157,9 +1157,9 @@ var init_gemini = __esm(() => {
 
 // src/drivers/session/gemini.ts
 import { readdir as readdir3, stat as stat6 } from "fs/promises";
-import { join as join5 } from "path";
+import { join as join4 } from "path";
 async function discoverGeminiFiles(geminiDir) {
-  const tmpDir = join5(geminiDir, "tmp");
+  const tmpDir = join4(geminiDir, "tmp");
   try {
     await stat6(tmpDir);
   } catch {
@@ -1175,7 +1175,7 @@ async function discoverGeminiFiles(geminiDir) {
   for (const projEntry of projectDirs) {
     if (!projEntry.isDirectory())
       continue;
-    const chatsDir = join5(tmpDir, projEntry.name, "chats");
+    const chatsDir = join4(tmpDir, projEntry.name, "chats");
     let chatFiles;
     try {
       chatFiles = await readdir3(chatsDir, { withFileTypes: true });
@@ -1184,7 +1184,7 @@ async function discoverGeminiFiles(geminiDir) {
     }
     for (const chatEntry of chatFiles) {
       if (chatEntry.isFile() && chatEntry.name.startsWith("session-") && chatEntry.name.endsWith(".json")) {
-        results.push(join5(chatsDir, chatEntry.name));
+        results.push(join4(chatsDir, chatEntry.name));
       }
     }
   }
@@ -1229,6 +1229,8 @@ var init_gemini2 = __esm(() => {
     },
     async parse(filePath, resume) {
       const result = await parseGeminiFile(filePath, resume.startIndex);
+      if (result.canonical.messages.length === 0)
+        return [];
       return [result];
     },
     buildCursor(fingerprint, results) {
@@ -1256,8 +1258,8 @@ var init_gemini2 = __esm(() => {
 });
 
 // src/parsers/opencode.ts
-import { readFile as readFile3, readdir as readdir4 } from "fs/promises";
-import { join as join6 } from "path";
+import { readdir as readdir4, readFile as readFile2 } from "fs/promises";
+import { join as join5 } from "path";
 function toNonNegInt4(value) {
   if (typeof value !== "number" || !Number.isFinite(value) || value < 0)
     return 0;
@@ -1421,14 +1423,14 @@ function buildEmptyResult3(sessionId, rawPath) {
 }
 async function loadJsonFileWithRaw(filePath) {
   try {
-    const raw = await readFile3(filePath, "utf8");
+    const raw = await readFile2(filePath, "utf8");
     return { parsed: JSON.parse(raw), raw };
   } catch {
     return null;
   }
 }
 async function loadPartsForMessageWithRaw(partDir, messageId) {
-  const msgPartDir = join6(partDir, messageId);
+  const msgPartDir = join5(partDir, messageId);
   let entries;
   try {
     entries = await readdir4(msgPartDir);
@@ -1440,7 +1442,7 @@ async function loadPartsForMessageWithRaw(partDir, messageId) {
   for (const entry of entries.sort()) {
     if (!entry.endsWith(".json"))
       continue;
-    const filePath = join6(msgPartDir, entry);
+    const filePath = join5(msgPartDir, entry);
     const loaded = await loadJsonFileWithRaw(filePath);
     if (loaded && typeof loaded.parsed.type === "string") {
       parts.push(loaded.parsed);
@@ -1481,7 +1483,7 @@ async function parseOpenCodeJsonSession(sessionJsonPath, messageDir, partDir) {
   const rawSourceFiles = [
     { path: sessionJsonPath, format: "json", content: sessionLoaded.raw }
   ];
-  const sessionMsgDir = join6(messageDir, session.id);
+  const sessionMsgDir = join5(messageDir, session.id);
   let msgEntries;
   try {
     msgEntries = await readdir4(sessionMsgDir);
@@ -1492,12 +1494,16 @@ async function parseOpenCodeJsonSession(sessionJsonPath, messageDir, partDir) {
   for (const entry of msgEntries.sort()) {
     if (!entry.endsWith(".json"))
       continue;
-    const msgPath = join6(sessionMsgDir, entry);
+    const msgPath = join5(sessionMsgDir, entry);
     const msgLoaded = await loadJsonFileWithRaw(msgPath);
     if (!msgLoaded || typeof msgLoaded.parsed.role !== "string")
       continue;
     const msg = msgLoaded.parsed;
-    rawSourceFiles.push({ path: msgPath, format: "json", content: msgLoaded.raw });
+    rawSourceFiles.push({
+      path: msgPath,
+      format: "json",
+      content: msgLoaded.raw
+    });
     const partsResult = await loadPartsForMessageWithRaw(partDir, msg.id);
     msg.parts = partsResult.parts;
     rawSourceFiles.push(...partsResult.sourceFiles);
@@ -1521,13 +1527,13 @@ var init_opencode = __esm(() => {
 });
 
 // src/drivers/session/opencode.ts
-import { readdir as readdir5, stat as stat8 } from "fs/promises";
-import { join as join7, dirname as dirname2, basename as basename2 } from "path";
+import { readdir as readdir5, stat as stat7 } from "fs/promises";
+import { basename as basename2, dirname, join as join6 } from "path";
 async function discoverOpenCodeJsonFiles(messageDir, ctx, inodeToFilePath) {
-  const storageDir = dirname2(messageDir);
-  const sessionDir = join7(storageDir, "session");
+  const storageDir = dirname(messageDir);
+  const sessionDir = join6(storageDir, "session");
   try {
-    await stat8(sessionDir);
+    await stat7(sessionDir);
   } catch {
     return [];
   }
@@ -1542,7 +1548,7 @@ async function discoverOpenCodeJsonFiles(messageDir, ctx, inodeToFilePath) {
   for (const projEntry of projectDirs) {
     if (!projEntry.isDirectory())
       continue;
-    const projDir = join7(sessionDir, projEntry.name);
+    const projDir = join6(sessionDir, projEntry.name);
     let sessionFiles;
     try {
       sessionFiles = await readdir5(projDir, { withFileTypes: true });
@@ -1551,18 +1557,18 @@ async function discoverOpenCodeJsonFiles(messageDir, ctx, inodeToFilePath) {
     }
     for (const fileEntry of sessionFiles) {
       if (fileEntry.isFile() && fileEntry.name.startsWith("ses_") && fileEntry.name.endsWith(".json")) {
-        const filePath = join7(projDir, fileEntry.name);
+        const filePath = join6(projDir, fileEntry.name);
         results.push(filePath);
         if (inodeToFilePath) {
           try {
-            const fileStat = await stat8(filePath);
+            const fileStat = await stat7(filePath);
             inodeToFilePath.set(fileStat.ino, filePath);
           } catch {}
         }
         const sessionId = basename2(fileEntry.name, ".json");
-        const sessionMsgDir = join7(messageDir, sessionId);
+        const sessionMsgDir = join6(messageDir, sessionId);
         try {
-          const msgStat = await stat8(sessionMsgDir);
+          const msgStat = await stat7(sessionMsgDir);
           msgDirMtimes[filePath] = msgStat.mtimeMs;
         } catch {}
       }
@@ -1606,11 +1612,11 @@ function createOpenCodeJsonDriver(syncCtx) {
       return { kind: "opencode-json" };
     },
     async parse(filePath, _resume) {
-      const sessionDir = dirname2(filePath);
-      const projectSessionDir = dirname2(sessionDir);
-      const storageDir = dirname2(projectSessionDir);
-      const messageDir = join7(storageDir, "message");
-      const partDir = join7(storageDir, "part");
+      const sessionDir = dirname(filePath);
+      const projectSessionDir = dirname(sessionDir);
+      const storageDir = dirname(projectSessionDir);
+      const messageDir = join6(storageDir, "message");
+      const partDir = join6(storageDir, "part");
       const result = await parseOpenCodeJsonSession(filePath, messageDir, partDir);
       if (syncCtx) {
         if (!syncCtx.openCodeSessionState) {
@@ -1621,6 +1627,8 @@ function createOpenCodeJsonDriver(syncCtx) {
           totalMessages: result.canonical.messages.length
         });
       }
+      if (result.canonical.messages.length === 0)
+        return [];
       return [result];
     },
     buildCursor(fingerprint, _results) {
@@ -1641,8 +1649,8 @@ var init_opencode2 = __esm(() => {
 });
 
 // src/parsers/vscode-copilot.ts
-import { readFile as readFile4, stat as stat9 } from "fs/promises";
-import { dirname as dirname3, join as join8 } from "path";
+import { readFile as readFile3, stat as stat8 } from "fs/promises";
+import { dirname as dirname2, join as join7 } from "path";
 function toNonNegInt5(value) {
   if (typeof value !== "number" || !Number.isFinite(value) || value < 0)
     return 0;
@@ -1838,10 +1846,10 @@ function extractRequestMessages(req, fallbackModel, accum) {
 }
 async function extractWorkspaceFolder(sessionFilePath) {
   try {
-    const chatSessionsDir = dirname3(sessionFilePath);
-    const workspaceDir = dirname3(chatSessionsDir);
-    const workspaceJsonPath = join8(workspaceDir, "workspace.json");
-    const content = await readFile4(workspaceJsonPath, "utf8");
+    const chatSessionsDir = dirname2(sessionFilePath);
+    const workspaceDir = dirname2(chatSessionsDir);
+    const workspaceJsonPath = join7(workspaceDir, "workspace.json");
+    const content = await readFile3(workspaceJsonPath, "utf8");
     const data = JSON.parse(content);
     if (typeof data?.folder === "string") {
       const folder = data.folder.replace(/^file:\/\//, "");
@@ -1983,14 +1991,14 @@ function extractMessages(state, processedIds = new Set) {
   return { accum, newRequestIds };
 }
 async function parseVscodeCopilotFile(filePath, startOffset = 0, processedRequestIds = [], workspaceFolder = null) {
-  const st = await stat9(filePath).catch(() => null);
-  if (!st || !st.isFile() || st.size === 0)
+  const st = await stat8(filePath).catch(() => null);
+  if (!st?.isFile() || st.size === 0)
     return { ...buildEmptyResult4(filePath), newRequestIds: [] };
   if (startOffset >= st.size)
     return { ...buildEmptyResult4(filePath), newRequestIds: [] };
   let rawContent;
   try {
-    rawContent = await readFile4(filePath, "utf8");
+    rawContent = await readFile3(filePath, "utf8");
   } catch {
     return { ...buildEmptyResult4(filePath), newRequestIds: [] };
   }
@@ -2005,7 +2013,10 @@ async function parseVscodeCopilotFile(filePath, startOffset = 0, processedReques
   if (accum.messages.length === 0)
     return { ...buildEmptyResult4(filePath), newRequestIds: [] };
   const folder = workspaceFolder ?? await extractWorkspaceFolder(filePath);
-  return { ...buildParseResult5(state, accum, filePath, rawContent, folder), newRequestIds };
+  return {
+    ...buildParseResult5(state, accum, filePath, rawContent, folder),
+    newRequestIds
+  };
 }
 var init_vscode_copilot = __esm(() => {
   init_src();
@@ -2014,7 +2025,7 @@ var init_vscode_copilot = __esm(() => {
 
 // src/drivers/session/vscode-copilot.ts
 import { readdir as readdir6 } from "fs/promises";
-import { join as join9 } from "path";
+import { join as join8 } from "path";
 async function collectJsonl(dir) {
   let entries;
   try {
@@ -2025,25 +2036,25 @@ async function collectJsonl(dir) {
   const results = [];
   for (const entry of entries) {
     if (entry.isFile() && entry.name.endsWith(".jsonl")) {
-      results.push(join9(dir, entry.name));
+      results.push(join8(dir, entry.name));
     }
   }
   return results;
 }
 async function discoverInBaseDir(baseDir) {
   const results = [];
-  const wsDir = join9(baseDir, "workspaceStorage");
+  const wsDir = join8(baseDir, "workspaceStorage");
   try {
     const wsDirEntries = await readdir6(wsDir, { withFileTypes: true });
     for (const entry of wsDirEntries) {
       if (!entry.isDirectory())
         continue;
-      const chatDir = join9(wsDir, entry.name, "chatSessions");
+      const chatDir = join8(wsDir, entry.name, "chatSessions");
       const files = await collectJsonl(chatDir);
       results.push(...files);
     }
   } catch {}
-  const globalDir = join9(baseDir, "globalStorage", "emptyWindowChatSessions");
+  const globalDir = join8(baseDir, "globalStorage", "emptyWindowChatSessions");
   const globalFiles = await collectJsonl(globalDir);
   results.push(...globalFiles);
   return results;
@@ -2071,10 +2082,18 @@ var init_vscode_copilot2 = __esm(() => {
     },
     resumeState(cursor, fingerprint) {
       if (!cursor || cursor.inode !== fingerprint.inode) {
-        return { kind: "vscode-copilot", startOffset: 0, processedRequestIds: [] };
+        return {
+          kind: "vscode-copilot",
+          startOffset: 0,
+          processedRequestIds: []
+        };
       }
       if (cursor.offset > fingerprint.size) {
-        return { kind: "vscode-copilot", startOffset: 0, processedRequestIds: [] };
+        return {
+          kind: "vscode-copilot",
+          startOffset: 0,
+          processedRequestIds: []
+        };
       }
       return {
         kind: "vscode-copilot",
@@ -2106,25 +2125,25 @@ var init_vscode_copilot2 = __esm(() => {
 });
 
 // src/drivers/registry.ts
-import { stat as stat11 } from "fs/promises";
+import { stat as stat9 } from "fs/promises";
 import { homedir } from "os";
-import { join as join10 } from "path";
+import { join as join9 } from "path";
 function resolveDefaultPaths(home) {
   const h = home ?? homedir();
   return {
-    claudeDir: join10(h, ".claude"),
-    codexSessionsDir: join10(h, ".codex", "sessions"),
-    geminiDir: join10(h, ".gemini"),
-    openCodeDir: join10(h, ".local", "share", "opencode"),
+    claudeDir: join9(h, ".claude"),
+    codexSessionsDir: join9(h, ".codex", "sessions"),
+    geminiDir: join9(h, ".gemini"),
+    openCodeDir: join9(h, ".local", "share", "opencode"),
     vscodeCopilotDirs: [
-      join10(h, "Library", "Application Support", "Code", "User"),
-      join10(h, "Library", "Application Support", "Code - Insiders", "User")
+      join9(h, "Library", "Application Support", "Code", "User"),
+      join9(h, "Library", "Application Support", "Code - Insiders", "User")
     ]
   };
 }
 async function exists(path) {
   try {
-    await stat11(path);
+    await stat9(path);
     return true;
   } catch {
     return false;
@@ -2144,7 +2163,7 @@ async function buildDriverSet(overrides, syncCtx, sourceFilter) {
     exists(paths.codexSessionsDir),
     exists(paths.geminiDir),
     exists(paths.openCodeDir),
-    exists(join10(paths.openCodeDir, "opencode.db")),
+    exists(join9(paths.openCodeDir, "opencode.db")),
     ...paths.vscodeCopilotDirs.map((d) => exists(d))
   ]);
   const discoverOpts = {};
@@ -2155,10 +2174,10 @@ async function buildDriverSet(overrides, syncCtx, sourceFilter) {
   if (geminiExists)
     discoverOpts.geminiDir = paths.geminiDir;
   if (openCodeExists) {
-    discoverOpts.openCodeMessageDir = join10(paths.openCodeDir, "storage", "message");
+    discoverOpts.openCodeMessageDir = join9(paths.openCodeDir, "storage", "message");
   }
   if (openCodeDbExists) {
-    discoverOpts.openCodeDbPath = join10(paths.openCodeDir, "opencode.db");
+    discoverOpts.openCodeDbPath = join9(paths.openCodeDir, "opencode.db");
   }
   const activeVscodeDirs = paths.vscodeCopilotDirs.filter((_, i) => vscodeDirExists[i]);
   if (activeVscodeDirs.length > 0) {
@@ -2193,7 +2212,7 @@ var init_registry = __esm(() => {
 });
 
 // src/drivers/session/opencode-sqlite.ts
-import { stat as stat12 } from "fs/promises";
+import { stat as stat10 } from "fs/promises";
 function shouldSkipForJson(sessionKey, sqliteLastMessageAt, sqliteTotalMessages, jsonState) {
   if (!jsonState)
     return false;
@@ -2242,9 +2261,7 @@ function queryMessagesForSession(db, sessionId, watermark, lastMessageIds) {
       if (!data.id)
         data.id = row.id;
       messages.push(data);
-    } catch {
-      continue;
-    }
+    } catch {}
   }
   return messages;
 }
@@ -2261,9 +2278,7 @@ function queryAllMessagesForSession(db, sessionId) {
         data.id = row.id;
       messages.push(data);
       rawDataStrings.push(row.data);
-    } catch {
-      continue;
-    }
+    } catch {}
   }
   return { messages, rawDataStrings };
 }
@@ -2278,9 +2293,7 @@ function queryPartsForMessageWithRaw(db, messageId) {
         continue;
       parts.push(data);
       rawDataStrings.push(row.data);
-    } catch {
-      continue;
-    }
+    } catch {}
   }
   return { parts, rawDataStrings };
 }
@@ -2317,7 +2330,7 @@ function createOpenCodeSqliteDriver(openDb, dbPath) {
     async run(prevCursor, ctx) {
       let dbStat;
       try {
-        dbStat = await stat12(dbPath);
+        dbStat = await stat10(dbPath);
       } catch {
         return {
           results: [],
@@ -2424,6 +2437,36 @@ var init_opencode_sqlite = __esm(() => {
   init_opencode();
 });
 
+// src/storage/cursor-store.ts
+import { mkdir, readFile as readFile4, writeFile } from "fs/promises";
+import { dirname as dirname3, join as join10 } from "path";
+function emptyState() {
+  return { version: 1, files: {}, updatedAt: null };
+}
+
+class CursorStore {
+  filePath;
+  constructor(storeDir) {
+    this.filePath = join10(storeDir, CURSORS_FILE2);
+  }
+  async load() {
+    try {
+      const raw = await readFile4(this.filePath, "utf-8");
+      return JSON.parse(raw);
+    } catch {
+      return emptyState();
+    }
+  }
+  async save(state) {
+    const dir = dirname3(this.filePath);
+    await mkdir(dir, { recursive: true });
+    await writeFile(this.filePath, `${JSON.stringify(state, null, 2)}
+`);
+  }
+}
+var CURSORS_FILE2 = "cursors.json";
+var init_cursor_store = () => {};
+
 // src/upload/engine.ts
 import { createHash as createHash2 } from "crypto";
 function sha256(input) {
@@ -2483,11 +2526,11 @@ function parseRetryAfter(value) {
   if (!value)
     return INITIAL_BACKOFF_MS;
   const seconds = parseInt(value, 10);
-  if (!isNaN(seconds) && seconds >= 0) {
+  if (!Number.isNaN(seconds) && seconds >= 0) {
     return seconds * 1000;
   }
   const date = new Date(value);
-  if (!isNaN(date.getTime())) {
+  if (!Number.isNaN(date.getTime())) {
     const ms = date.getTime() - Date.now();
     return Math.max(0, ms);
   }
@@ -2534,9 +2577,8 @@ async function uploadBatch(snapshots, opts) {
     }
     if (response.status >= 500) {
       if (attempt < MAX_UPLOAD_RETRIES) {
-        const backoff = INITIAL_BACKOFF_MS * Math.pow(2, attempt);
+        const backoff = INITIAL_BACKOFF_MS * 2 ** attempt;
         await sleepFn(backoff);
-        continue;
       }
     }
   }
@@ -2601,8 +2643,8 @@ var init_engine = __esm(() => {
 });
 
 // src/upload/content.ts
-import { gzip } from "zlib";
 import { promisify } from "util";
+import { gzip } from "zlib";
 async function gzipCompress(input) {
   return gzipAsync(Buffer.from(input, "utf-8"));
 }
@@ -2649,9 +2691,8 @@ async function putWithRetry(url, body, headers, opts) {
     }
     if (response.status >= 500) {
       if (attempt < MAX_UPLOAD_RETRIES) {
-        const backoff = INITIAL_BACKOFF_MS * Math.pow(2, attempt);
+        const backoff = INITIAL_BACKOFF_MS * 2 ** attempt;
         await sleepFn(backoff);
-        continue;
       }
     }
   }
@@ -2697,7 +2738,7 @@ async function uploadToPresignedUrl(presignedUrl, body, opts) {
     }
     if (response.status >= 500) {
       if (attempt < MAX_UPLOAD_RETRIES) {
-        const backoff = INITIAL_BACKOFF_MS * Math.pow(2, attempt);
+        const backoff = INITIAL_BACKOFF_MS * 2 ** attempt;
         await sleepFn(backoff);
         continue;
       }
@@ -2817,9 +2858,9 @@ var init_content = __esm(() => {
 });
 
 // src/commands/sync-pipeline.ts
-import { stat as stat13 } from "fs/promises";
+import { stat as stat11 } from "fs/promises";
 async function getFingerprint(filePath) {
-  const s = await stat13(filePath);
+  const s = await stat11(filePath);
   return {
     inode: s.ino,
     mtimeMs: s.mtimeMs,
@@ -2827,14 +2868,12 @@ async function getFingerprint(filePath) {
   };
 }
 async function runSyncPipeline(input, opts) {
-  const {
-    fileDrivers,
-    dbDriver,
-    discoverOpts,
-    syncCtx
-  } = input;
+  const { fileDrivers, dbDriver, discoverOpts, syncCtx } = input;
   const log = opts.logger;
-  let cursorState = { ...input.cursorState, files: { ...input.cursorState.files } };
+  const cursorState = {
+    ...input.cursorState,
+    files: { ...input.cursorState.files }
+  };
   const allResults = [];
   const parseErrors = [];
   let totalFiles = 0;
@@ -2904,15 +2943,11 @@ async function runSyncPipeline(input, opts) {
     }
   }
   cursorState.updatedAt = new Date().toISOString();
+  const emptyCount = allResults.filter((r) => r.canonical.messages.length === 0).length;
+  const uploadableResults = allResults.filter((r) => r.canonical.messages.length > 0);
   let uploadResult;
   let contentResult;
-  if (opts.upload && allResults.length > 0) {
-    const transformed = allResults.map((r) => toSessionSnapshot(r.canonical, r.raw));
-    const snapshots = transformed.map((t) => t.snapshot);
-    const precomputedMap = new Map;
-    for (const t of transformed) {
-      precomputedMap.set(t.snapshot.sessionKey, t.precomputed);
-    }
+  if (opts.upload && uploadableResults.length > 0) {
     const uploadOpts = {
       apiUrl: opts.apiUrl,
       apiKey: opts.apiKey,
@@ -2920,70 +2955,99 @@ async function runSyncPipeline(input, opts) {
       fetch: opts.fetch,
       sleep: opts.sleep
     };
-    log?.uploadMetadataStart(snapshots.length);
-    uploadResult = await uploadMetadataBatches(snapshots, uploadOpts);
-    log?.uploadMetadataDone(uploadResult.totalIngested, uploadResult.totalConflicts);
     const contentOpts = {
       apiUrl: opts.apiUrl,
       apiKey: opts.apiKey,
       fetch: opts.fetch,
       sleep: opts.sleep
     };
-    const totalSessions = allResults.length;
-    log?.uploadContentStart(totalSessions);
-    let contentDone = 0;
-    const wrappedContentOpts = {
-      ...contentOpts
+    const totalSessions = uploadableResults.length;
+    const pipelineBatches = splitBatches(uploadableResults, METADATA_BATCH_SIZE);
+    uploadResult = {
+      totalIngested: 0,
+      totalConflicts: 0,
+      totalBatches: 0,
+      errors: []
     };
-    const originalFetch = contentOpts.fetch ?? globalThis.fetch;
-    if (log) {
-      const completedSessions = new Set;
-      wrappedContentOpts.fetch = async (input2, init) => {
-        const response = await originalFetch(input2, init);
-        const url = typeof input2 === "string" ? input2 : input2.url;
-        if (url.includes("/api/ingest/content/") && url.endsWith("/canonical")) {
-          const parts = url.split("/");
-          const sessionKey = decodeURIComponent(parts[parts.length - 2]);
-          if (!completedSessions.has(sessionKey)) {
-            completedSessions.add(sessionKey);
-            contentDone++;
-            log.uploadContentProgress(contentDone, totalSessions);
-          }
-        }
-        return response;
-      };
+    contentResult = {
+      uploaded: 0,
+      skipped: 0,
+      errors: []
+    };
+    log?.uploadMetadataStart(totalSessions);
+    for (const batch of pipelineBatches) {
+      const transformed = batch.map((r) => toSessionSnapshot(r.canonical, r.raw));
+      const batchSnapshots = transformed.map((t) => t.snapshot);
+      const batchUploadResult = await uploadMetadataBatches(batchSnapshots, uploadOpts);
+      uploadResult.totalIngested += batchUploadResult.totalIngested;
+      uploadResult.totalConflicts += batchUploadResult.totalConflicts;
+      uploadResult.totalBatches += batchUploadResult.totalBatches;
+      uploadResult.errors.push(...batchUploadResult.errors);
     }
-    contentResult = await uploadContentBatch(allResults.map((r) => ({
-      canonical: r.canonical,
-      raw: r.raw,
-      precomputed: precomputedMap.get(r.canonical.sessionKey)
-    })), log ? wrappedContentOpts : contentOpts, opts.contentConcurrency);
-    log?.uploadContentDone(contentResult.uploaded, contentResult.skipped, contentResult.errors.length);
-    if (contentResult.errors.length > 0) {
-      const rolledBackFiles = new Set;
-      let rollbackDbCursor = false;
-      for (const { sessionKey } of contentResult.errors) {
-        const filePath = sessionKeyToFile.get(sessionKey);
-        if (filePath && !rolledBackFiles.has(filePath)) {
-          rolledBackFiles.add(filePath);
-          const prev = prevCursors.get(filePath);
-          if (prev === undefined) {
-            delete cursorState.files[filePath];
-          } else {
-            cursorState.files[filePath] = prev;
+    log?.uploadMetadataDone(uploadResult.totalIngested, uploadResult.totalConflicts);
+    let contentDone = 0;
+    log?.uploadContentStart(totalSessions);
+    for (const batch of pipelineBatches) {
+      const batchPrecomputed = new Map;
+      for (const r of batch) {
+        const t = toSessionSnapshot(r.canonical, r.raw);
+        batchPrecomputed.set(t.snapshot.sessionKey, t.precomputed);
+      }
+      const wrappedContentOpts = { ...contentOpts };
+      const originalFetch = contentOpts.fetch ?? globalThis.fetch;
+      if (log) {
+        const completedSessions = new Set;
+        wrappedContentOpts.fetch = async (input2, init) => {
+          const response = await originalFetch(input2, init);
+          const url = typeof input2 === "string" ? input2 : input2.url;
+          if (url.includes("/api/ingest/content/") && url.endsWith("/canonical")) {
+            const parts = url.split("/");
+            const sessionKey = decodeURIComponent(parts[parts.length - 2]);
+            if (!completedSessions.has(sessionKey)) {
+              completedSessions.add(sessionKey);
+              contentDone++;
+              log.uploadContentProgress(contentDone, totalSessions);
+            }
+          }
+          return response;
+        };
+      }
+      const batchContentResult = await uploadContentBatch(batch.map((r) => ({
+        canonical: r.canonical,
+        raw: r.raw,
+        precomputed: batchPrecomputed.get(r.canonical.sessionKey)
+      })), log ? wrappedContentOpts : contentOpts, opts.contentConcurrency);
+      contentResult.uploaded += batchContentResult.uploaded;
+      contentResult.skipped += batchContentResult.skipped;
+      contentResult.errors.push(...batchContentResult.errors);
+      if (batchContentResult.errors.length > 0) {
+        const rolledBackFiles = new Set;
+        let rollbackDbCursor = false;
+        for (const { sessionKey } of batchContentResult.errors) {
+          const filePath = sessionKeyToFile.get(sessionKey);
+          if (filePath && !rolledBackFiles.has(filePath)) {
+            rolledBackFiles.add(filePath);
+            const prev = prevCursors.get(filePath);
+            if (prev === undefined) {
+              delete cursorState.files[filePath];
+            } else {
+              cursorState.files[filePath] = prev;
+            }
+          }
+          if (dbSourcedSessionKeys.has(sessionKey)) {
+            rollbackDbCursor = true;
           }
         }
-        if (dbSourcedSessionKeys.has(sessionKey)) {
-          rollbackDbCursor = true;
+        if (rollbackDbCursor) {
+          cursorState.openCodeSqlite = prevDbCursor;
         }
       }
-      if (rollbackDbCursor) {
-        cursorState.openCodeSqlite = prevDbCursor;
-      }
     }
+    log?.uploadContentDone(contentResult.uploaded, contentResult.skipped, contentResult.errors.length);
   }
   return {
-    totalParsed: allResults.length,
+    totalParsed: uploadableResults.length,
+    totalEmpty: emptyCount,
     totalFiles,
     totalSkipped,
     parseErrors,
@@ -2993,8 +3057,9 @@ async function runSyncPipeline(input, opts) {
   };
 }
 var init_sync_pipeline = __esm(() => {
-  init_engine();
+  init_src();
   init_content();
+  init_engine();
 });
 
 // src/commands/sync.ts
@@ -3003,8 +3068,8 @@ __export(exports_sync, {
   default: () => sync_default,
   buildDbDriver: () => buildDbDriver
 });
+import { basename as basename3, join as join11 } from "path";
 import { defineCommand } from "citty";
-import { join as join11, basename as basename3 } from "path";
 import consola from "consola";
 async function buildDbDriver(driverSet, openDbOverride) {
   if (!driverSet.dbDriversAvailable || !driverSet.discoverOpts.openCodeDbPath) {
@@ -3024,9 +3089,9 @@ var sync_default;
 var init_sync = __esm(() => {
   init_src();
   init_manager();
-  init_cursor_store();
   init_registry();
   init_opencode_sqlite();
+  init_cursor_store();
   init_sync_pipeline();
   sync_default = defineCommand({
     meta: {
@@ -3134,7 +3199,7 @@ var init_sync = __esm(() => {
         logger
       });
       await cursorStore.save(result.cursorState);
-      consola.success(`Parsed ${result.totalParsed} session(s) from ${result.totalFiles} file(s) (${result.totalSkipped} unchanged)`);
+      consola.success(`Parsed ${result.totalParsed} session(s) from ${result.totalFiles} file(s) (${result.totalSkipped} unchanged${result.totalEmpty > 0 ? `, ${result.totalEmpty} empty skipped` : ""})`);
       if (result.uploadResult) {
         consola.success(`Uploaded ${result.uploadResult.totalIngested} session(s) in ${result.uploadResult.totalBatches} batch(es)`);
         if (result.uploadResult.totalConflicts > 0) {
@@ -3203,7 +3268,10 @@ function performLogin(deps) {
     });
     const timer = setTimeout(() => {
       cleanup();
-      resolve({ success: false, error: "Login timeout \u2014 no response received" });
+      resolve({
+        success: false,
+        error: "Login timeout \u2014 no response received"
+      });
     }, timeoutMs);
     function cleanup() {
       clearTimeout(timer);
@@ -3218,10 +3286,10 @@ var exports_login = {};
 __export(exports_login, {
   default: () => login_default
 });
+import { homedir as homedir2, platform } from "os";
+import { join as join12 } from "path";
 import { defineCommand as defineCommand2 } from "citty";
 import consola2 from "consola";
-import { join as join12 } from "path";
-import { homedir as homedir2, platform } from "os";
 function getBrowserCommand() {
   switch (platform()) {
     case "darwin":
@@ -3429,9 +3497,9 @@ var exports_status = {};
 __export(exports_status, {
   default: () => status_default
 });
-import { defineCommand as defineCommand3 } from "citty";
 import { readFile as readFile5 } from "fs/promises";
 import { join as join13 } from "path";
+import { defineCommand as defineCommand3 } from "citty";
 import consola3 from "consola";
 var status_default;
 var init_status = __esm(() => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocoo/pika",
-  "version": "0.2.2",
+  "version": "0.5.4",
   "description": "Replay and search coding agent sessions",
   "type": "module",
   "bin": {