codetime-cli 0.7.3 → 0.7.4

package/bin/codetime.mjs

@@ -208,7 +208,7 @@ var init_fs = __esm({
 
 // src/cli.ts
 import { spawn } from "node:child_process";
-import { rm as rm2, stat as stat6 } from "node:fs/promises";
+import { rm as rm2, stat as stat7 } from "node:fs/promises";
 import os3 from "node:os";
 import path13 from "node:path";
 import { fileURLToPath } from "node:url";
@@ -1030,7 +1030,7 @@ import { readFile as readFile2, stat as stat2 } from "node:fs/promises";
 import path2 from "node:path";
 
 // src/lib/constants.ts
-var PACKAGE_VERSION = true ? "0.7.3" : "0.1.1";
+var PACKAGE_VERSION = true ? "0.7.4" : "0.1.1";
 var DEFAULT_API_URL = "https://codetime.dev";
 var DEFAULT_BACKFILL_BATCH_SIZE = 50;
 var DEFAULT_BACKFILL_BATCH_BYTES = 800 * 1024;
@@ -2334,7 +2334,7 @@ function createClaudeCodeAdapter() {
 }
 
 // src/adapters/codex.ts
-import { readFile as readFile4 } from "node:fs/promises";
+import { readFile as readFile4, stat as stat4 } from "node:fs/promises";
 import path7 from "node:path";
 
 // src/lib/diff.ts
@@ -2381,6 +2381,7 @@ function fileActivitiesFromPatchChanges(changes, ts, cwd, displayFilePath3) {
 }
 
 // src/adapters/codex.ts
+init_fs();
 async function parseCodexSessionFile(filePath, options) {
   const text = await readFile4(filePath, "utf8");
   const lines = text.split("\n").filter(Boolean);
@@ -3037,15 +3038,39 @@ function createCodexAdapter() {
       const base = codexHome(home, env);
       return [
         path7.join(base, "sessions"),
+        // Codex moves old rollouts here as it rotates; include so pre-existing
+        // archived history is discovered, not silently dropped. Actual file
+        // listing dedups active vs archived — see codexBackfillFiles.
+        path7.join(base, "archived_sessions"),
         path7.join(base, "history.jsonl")
       ];
     },
     parseSessionFile: parseCodexSessionFile
   };
 }
+async function codexBackfillFiles(sourceRoot, home, env) {
+  const files = sourceRoot ? await listJsonlFiles(sourceRoot) : await codexDefaultFiles(home, env);
+  return Promise.all(files.map(async (filePath) => {
+    const info = await stat4(filePath);
+    return { path: filePath, modifiedAt: info.mtime.toISOString() };
+  }));
+}
+async function codexDefaultFiles(home, env) {
+  const base = codexHome(home, env);
+  const sessionsDir = path7.join(base, "sessions");
+  const archivedDir = path7.join(base, "archived_sessions");
+  const [activeFiles, archivedFiles, historyFiles] = await Promise.all([
+    listJsonlFiles(sessionsDir),
+    listJsonlFiles(archivedDir),
+    listJsonlFiles(path7.join(base, "history.jsonl"))
+  ]);
+  const activeRelative = new Set(activeFiles.map((f) => path7.relative(sessionsDir, f)));
+  const dedupedArchived = archivedFiles.filter((f) => !activeRelative.has(path7.relative(archivedDir, f)));
+  return [...activeFiles, ...dedupedArchived, ...historyFiles];
+}
 
 // src/adapters/gemini.ts
-import { readFile as readFile5, stat as stat4 } from "node:fs/promises";
+import { readFile as readFile5, stat as stat5 } from "node:fs/promises";
 import path8 from "node:path";
 init_fs();
 function tokenFromKeys(record, keys) {
@@ -3221,7 +3246,7 @@ function parseJsonlRecords(lines, fileStem, fallbackTs) {
 async function parseGeminiSessionFile(filePath, options) {
   const text = await readFile5(filePath, "utf8");
   const fileStem = path8.basename(filePath).replace(/\.jsonl?$/, "");
-  const info = await stat4(filePath);
+  const info = await stat5(filePath);
   const fallbackTs = info.mtime.toISOString();
   let parsed;
   if (filePath.endsWith(".jsonl")) {
@@ -3312,7 +3337,7 @@ async function geminiBackfillFiles(sourceRoot, home, env) {
   );
   const files = fileLists.flat().sort();
   return Promise.all(files.map(async (filePath) => {
-    const info = await stat4(filePath);
+    const info = await stat5(filePath);
     return { path: filePath, modifiedAt: info.mtime.toISOString() };
   }));
 }
@@ -3731,19 +3756,19 @@ function opencodeDataCandidates(home, env) {
   return [primary, path9.join(home, ".opencode", "opencode.db")];
 }
 async function opencodeBackfillFiles(sourceRoot, home = os2.homedir(), env) {
-  const { stat: stat7 } = await import("node:fs/promises");
+  const { stat: stat8 } = await import("node:fs/promises");
   if (sourceRoot) {
     if (!sourceRoot.endsWith(".db")) {
       return [];
     }
-    const info = await stat7(sourceRoot).catch(() => null);
+    const info = await stat8(sourceRoot).catch(() => null);
     if (!info) {
       return [];
     }
     return [{ path: sourceRoot, modifiedAt: info.mtime.toISOString() }];
   }
   for (const candidatePath of opencodeDataCandidates(home, env)) {
-    const info = await stat7(candidatePath).catch(() => null);
+    const info = await stat8(candidatePath).catch(() => null);
     if (info) {
       return [{ path: candidatePath, modifiedAt: info.mtime.toISOString() }];
     }
@@ -4912,7 +4937,7 @@ function defaultMachineName() {
 init_fs();
 
 // src/lib/logger.ts
-import { appendFile, mkdir as mkdir2, rename as rename2, stat as stat5 } from "node:fs/promises";
+import { appendFile, mkdir as mkdir2, rename as rename2, stat as stat6 } from "node:fs/promises";
 import { homedir as homedir2 } from "node:os";
 import path12 from "node:path";
 var MAX_BYTES = 1 * 1024 * 1024;
@@ -4930,7 +4955,7 @@ function serializeError(error) {
 }
 async function rotateIfNeeded(file) {
   try {
-    const info = await stat5(file);
+    const info = await stat6(file);
     if (info.size > MAX_BYTES) {
       await rename2(file, `${file}.1`).catch(() => {
       });
@@ -5217,7 +5242,7 @@ async function deleteMachine(remote, id) {
 }
 
 // src/lib/types.ts
-var BACKFILL_STATE_SCHEMA_VERSION = 4;
+var BACKFILL_STATE_SCHEMA_VERSION = 5;
 
 // src/cli.ts
 function createRegistry() {
@@ -5288,8 +5313,8 @@ function createCli(ctx, registry) {
   cli.command("hook", "Read agent hook JSON from stdin and report a throttled event").option("--agent <name>", "Agent name").option("--project <name>", "Project name").option("--min-interval <seconds>", "Minimum seconds between similar hook reports").action((options) => hookCommand(normalizeOptions(options), ctx));
   cli.command("sync-local-trigger", "Trigger one background local sync with throttle and locking").option("--min-interval <seconds>", "Minimum seconds between sync triggers").action((options) => syncLocalTriggerCommand(normalizeOptions(options), ctx, registry));
   cli.command("sync-local-runner", "Internal background local sync runner").option("--lock-file <path>", "Lock file for the active sync").option("--state-file <path>", "State file for trigger metadata").action((options) => syncLocalRunnerCommand(normalizeOptions(options), ctx, registry));
-  cli.command("backfill [action]", "Inspect local history import candidates").option("--source <source>", "Backfill source").option("--since <time>", "Only include history after this time").option("--until <time>", "Only include history before this time").option("--project <name>", "Project filter").option("--source-root <path>", "Override source history root").option("--include-source-path", "Include local source paths in output").option("--import-run <id>", "Import run id for verify/resume workflows").option("--limit <count>", "Maximum session files to parse").option("--batch-size <count>", "Max rollups per request (also bounded by --batch-bytes)").option("--batch-bytes <bytes>", "Soft byte cap for the JSON body of a single ingest POST").option("--replace", "Replace conflicting records during import (default)").option("--skip-conflicts", "Skip conflicting records instead of replacing them").option("--force", "Force full re-import: clear watermark and re-process all files").action((action, options) => backfillCommand({ ...normalizeOptions(options), action }, ctx, registry));
-  cli.command("sync", "Import and upload all local agent history (shorthand for `backfill import --source all`)").option("--source <source>", "Limit to one source (default: all)").option("--since <time>", "Only include history after this time").option("--until <time>", "Only include history before this time").option("--project <name>", "Project filter").option("--batch-size <count>", "Max rollups per request (also bounded by --batch-bytes)").option("--force", "Force full re-import: clear watermark and re-process all files").option("--dry-run", "Print the planned import without uploading").action((options) => {
+  cli.command("backfill [action]", "Inspect local history import candidates").option("--source <source>", "Backfill source").option("--since <time>", "Only include history after this time").option("--until <time>", "Only include history before this time").option("--project <name>", "Project filter").option("--source-root <path>", "Override source history root").option("--include-source-path", "Include local source paths in output").option("--import-run <id>", "Import run id for verify/resume workflows").option("--limit <count>", "Maximum session files to parse").option("--batch-size <count>", "Max rollups per request (also bounded by --batch-bytes)").option("--batch-bytes <bytes>", "Soft byte cap for the JSON body of a single ingest POST").option("--replace", "Replace conflicting records during import (default)").option("--skip-conflicts", "Skip conflicting records instead of replacing them").option("--force", "Full re-import: re-parse every file and overwrite matching rollups (non-destructive \u2014 nothing is deleted)").option("--purge", "Before re-importing, delete THIS machine's existing rollups for the source(s). Destructive: also removes rollups whose local files are gone. Implies --force").action((action, options) => backfillCommand({ ...normalizeOptions(options), action }, ctx, registry));
+  cli.command("sync", "Import and upload all local agent history (shorthand for `backfill import --source all`)").option("--source <source>", "Limit to one source (default: all)").option("--since <time>", "Only include history after this time").option("--until <time>", "Only include history before this time").option("--project <name>", "Project filter").option("--batch-size <count>", "Max rollups per request (also bounded by --batch-bytes)").option("--force", "Full re-import: re-parse every file and overwrite matching rollups (non-destructive \u2014 nothing is deleted)").option("--purge", "Before re-importing, delete THIS machine's existing rollups for the source(s). Destructive: also removes rollups whose local files are gone. Implies --force").option("--dry-run", "Print the planned import without uploading").action((options) => {
     const opts = normalizeOptions(options);
     return backfillCommand({ ...opts, action: "import", source: stringOption(opts.source) || "all" }, ctx, registry);
   });
@@ -5641,11 +5666,15 @@ async function listBackfillSourceFiles(source, options, ctx) {
   if (source.id === "gemini") {
     return geminiBackfillFiles(stringOption(options["source-root"]), resolveHome(options, ctx), ctx.env);
   }
+  if (source.id === "codex") {
+    const files2 = await codexBackfillFiles(stringOption(options["source-root"]), resolveHome(options, ctx), ctx.env);
+    return files2.sort((a, b) => a.path.localeCompare(b.path)).slice(0, numberOption(options.limit) || void 0);
+  }
   const roots = stringOption(options["source-root"]) ? [requiredOption(options, "source-root")] : source.paths;
   const fileLists = await Promise.all(roots.map((r) => listJsonlFiles(r)));
   const files = fileLists.flat().sort().slice(0, numberOption(options.limit) || void 0);
   return Promise.all(files.map(async (filePath) => {
-    const info = await stat6(filePath);
+    const info = await stat7(filePath);
     return { path: filePath, modifiedAt: info.mtime.toISOString() };
   }));
 }
@@ -5729,8 +5758,11 @@ async function importBackfillPlan(plan, options, ctx, registry) {
     return 1;
   }
   const sourceDefs = registry.all().filter((a) => supportedSources.has(a.id) && (source === "all" || a.id === source)).map((a) => ({ id: a.id, label: a.label, paths: a.sourcePaths(home, ctx.env) }));
-  if (options.force) {
-    await purgeForcedSources(sourceDefs, home, options, ctx);
+  if (options.purge) {
+    await purgeSourceRollups(sourceDefs, options, ctx);
+  }
+  if (options.force || options.purge) {
+    await clearBackfillWatermark(home, ctx);
   }
   const incrementalState = shouldUseIncrementalBackfill(options) ? await readBackfillIncrementalState(home, ctx) : void 0;
   if (!options.json) {
@@ -5764,13 +5796,15 @@ async function importBackfillPlan(plan, options, ctx, registry) {
   }
   return counts.failed > 0 || counts.conflicts > 0 && !options["skip-conflicts"] ? 1 : 0;
 }
-async function purgeForcedSources(sourceDefs, home, options, ctx) {
+async function clearBackfillWatermark(home, ctx) {
   try {
     await rm2(backfillIncrementalStatePath(home), { force: true });
   } catch (error) {
     debug(ctx, `Failed to clear backfill watermark: ${error.message}
 `);
   }
+}
+async function purgeSourceRollups(sourceDefs, options, ctx) {
   for (const item of sourceDefs) {
     try {
       const deleted = await deleteSessionRollupsBySourceAPI(item.id, options, ctx);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "codetime-cli",
   "type": "module",
-  "version": "0.7.3",
+  "version": "0.7.4",
   "description": "codetime CLI — install AI-agent hooks (Claude Code, Codex, OpenCode, Pi) and report activity to codetime.dev.",
   "license": "MIT",
   "publishConfig": {