codetime-cli 0.1.0 → 0.2.0

package/bin/codetime.mjs

@@ -1329,9 +1329,10 @@ function msToIso(ms) {
 }
 
 // src/lib/constants.ts
-var PACKAGE_VERSION = true ? "0.1.0" : "0.1.1";
+var PACKAGE_VERSION = true ? "0.2.0" : "0.1.1";
 var DEFAULT_API_URL = "https://codetime.dev";
-var DEFAULT_BACKFILL_BATCH_SIZE = 500;
+var DEFAULT_BACKFILL_BATCH_SIZE = 50;
+var DEFAULT_BACKFILL_BATCH_BYTES = 800 * 1024;
 var ROLLUP_BUCKET_MS = 15 * 60 * 1e3;
 var DEFAULT_HOOK_SYNC_MIN_INTERVAL_SECONDS = 60;
 
@@ -4538,7 +4539,7 @@ 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>", "Events per batch during import").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("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("token [action] [value]", "Set, show, or clear the persisted API token").option("--remote <url>", "Override API base URL when setting a token").action((action, value, options) => tokenCommand(action, value, normalizeOptions(options), ctx));
   cli.command("machine [action]", "List or rename machines (requires login)").option("--name <name>", "New display name (used by `machine rename`)").option("--id <id>", "Machine id (defaults to current machine)").action((action, options) => machineCommand(action, normalizeOptions(options), ctx));
   return cli;
@@ -4556,6 +4557,7 @@ function normalizeOptions(options) {
     sourceRoot: "source-root",
     importRun: "import-run",
     batchSize: "batch-size",
+    batchBytes: "batch-bytes",
     skipConflicts: "skip-conflicts"
   };
   for (const [camel, dashed] of Object.entries(aliases)) {
@@ -5001,7 +5003,9 @@ async function importBackfillPlan(plan, options, ctx, registry) {
   const counts = { inserted: 0, skipped: 0, conflicts: 0, failed: 0 };
   const rollups = buildSessionRollups(canonicalEvents);
   const batchSize = Math.max(1, Math.floor(numberOption(options["batch-size"]) || DEFAULT_BACKFILL_BATCH_SIZE));
-  const totalBatches = Math.ceil(rollups.length / batchSize);
+  const batchBytes = Math.max(64 * 1024, Math.floor(numberOption(options["batch-bytes"]) || DEFAULT_BACKFILL_BATCH_BYTES));
+  const batches = packRollupBatches(rollups, batchSize, batchBytes);
+  const totalBatches = batches.length;
   let uploadBar;
   if (!options.json) {
     write(ctx.stdout, `rollup ${rollups.length} from ${canonicalEvents.length} events
@@ -5009,9 +5013,9 @@ async function importBackfillPlan(plan, options, ctx, registry) {
     uploadBar = new ProgressBar(ctx.stdout, `upload`.padEnd(12));
     uploadBar.init(totalBatches, `0/${totalBatches} batches, 0 inserted`);
   }
-  for (let index = 0; index < rollups.length; index += batchSize) {
-    const batch = rollups.slice(index, index + batchSize);
-    const batchNumber = Math.floor(index / batchSize) + 1;
+  for (let i = 0; i < batches.length; i += 1) {
+    const batch = batches[i];
+    const batchNumber = i + 1;
     try {
       const result2 = await sendSessionRollupBatch(batch, options, ctx);
       counts.inserted += result2.inserted;
@@ -5019,7 +5023,7 @@ async function importBackfillPlan(plan, options, ctx, registry) {
       counts.conflicts += result2.conflicts;
       counts.failed += result2.failed;
     } catch (error) {
-      debug(ctx, `backfill rollup batch ${index + 1}-${index + batch.length} failed: ${error.message}
+      debug(ctx, `backfill rollup batch ${batchNumber}/${totalBatches} (${batch.length} rollups) failed: ${error.message}
 `);
       counts.failed += batch.length;
     }
@@ -5111,6 +5115,24 @@ async function deleteSessionRollupsBySourceAPI(source, options, ctx) {
 function shouldUseIncrementalBackfill(options) {
   return !stringOption(options.since) && !stringOption(options.until) && !stringOption(options["source-root"]) && numberOption(options.limit) === void 0;
 }
+function packRollupBatches(rollups, maxCount, maxBytes) {
+  const batches = [];
+  let current = [];
+  let currentBytes = 0;
+  for (const rollup of rollups) {
+    const size = JSON.stringify(rollup).length;
+    const wouldExceed = current.length > 0 && (current.length >= maxCount || currentBytes + size > maxBytes);
+    if (wouldExceed) {
+      batches.push(current);
+      current = [];
+      currentBytes = 0;
+    }
+    current.push(rollup);
+    currentBytes += size;
+  }
+  if (current.length > 0) batches.push(current);
+  return batches;
+}
 function selectBackfillFilesForImport(files, watermarkTs) {
   if (!watermarkTs) {
     return files;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "codetime-cli",
   "type": "module",
-  "version": "0.1.0",
+  "version": "0.2.0",
   "description": "codetime CLI — install AI-agent hooks (Claude Code, Codex, OpenCode, Pi) and report activity to codetime.dev.",
   "license": "MIT",
   "publishConfig": {
@@ -35,7 +35,7 @@
   "devDependencies": {
     "cac": "^7.0.0",
     "esbuild": "^0.28.0",
-    "@codetime/shared": "0.1.0"
+    "@codetime/shared": "0.2.0"
   },
   "scripts": {
     "build": "tsc -p tsconfig.json",