bitfab 0.61.1 → 0.61.3

package/dist/{chunk-S4WE6U2Y.js → chunk-WOHIAKZF.js}

@@ -1,6 +1,6 @@
 import {
   BitfabError
-} from "./chunk-I5J2FDKH.js";
+} from "./chunk-HVEZHLVQ.js";
 
 // src/codeChange.ts
 var NUL = String.fromCharCode(0);
@@ -81,18 +81,39 @@ var VALUE_FLAGS = /* @__PURE__ */ new Set([
   "--grader-ids",
   "--mock",
   "--param",
-  "--params"
+  "--params",
+  "--resume"
 ]);
 var BOOLEAN_FLAGS = /* @__PURE__ */ new Set([
   "--only-with-assertions",
   "--db-branch",
   "--no-db-branch",
   "--no-code-change",
-  "--dry-run"
+  "--dry-run",
+  "--force"
 ]);
 var HELP_FLAGS = /* @__PURE__ */ new Set(["--help", "-h"]);
 var MAX_ATTEMPTS = 100;
 var MAX_PINNED_TRACE_IDS = 100;
+var RESUME_CONFLICTING_FLAGS = [
+  ["traceIds", "--trace-ids"],
+  ["datasetIds", "--dataset-ids"],
+  ["limit", "--limit"],
+  ["attempts", "--attempts"],
+  ["graderIds", "--grader-ids"],
+  ["onlyWithAssertions", "--only-with-assertions"],
+  ["dryRun", "--dry-run"]
+];
+var RESUME_CLEARED_OPTIONS = {
+  traceIds: void 0,
+  limit: void 0,
+  datasetId: void 0,
+  datasetIds: void 0,
+  attempts: void 0,
+  graderIds: void 0,
+  onlyWithAssertions: void 0,
+  dryRun: void 0
+};
 function hasApprovedAssertion(assertions) {
   return assertions.some((assertion) => assertion.approvalState === "approved");
 }
@@ -156,6 +177,8 @@ Options:
   --mock none|all|marked
   --db-branch, --no-db-branch
   --dry-run (resolve inputs, run nothing)
+  --resume EXPERIMENT_ID (finish an experiment that stopped partway, running only the items it did not finish, with the traces, attempts, and graders it started with)
+  --force (with --resume, resume even when the experiment may still be running or the code changed since it started)
   --params PATH
   --param name=value (repeatable)
   -h, --help`;
@@ -236,7 +259,7 @@ async function seedFromRegistry(registry, pipeline, cases, options = {}) {
       sessionId: seedCase.sessionId
     })
   );
-  const { flushTraces: flushTraces2 } = await import("./http-NY6M2AK3.js");
+  const { flushTraces: flushTraces2 } = await import("./http-BYICBOWP.js");
   await flushTraces2(3e4);
   return { pipeline, traceFunctionKey, traceIds };
 }
@@ -356,6 +379,9 @@ function parseReplayCliArgs(registry, argv) {
         case "--dry-run":
           parsed.dryRun = true;
           break;
+        case "--force":
+          parsed.force = true;
+          break;
       }
       continue;
     }
@@ -414,6 +440,22 @@ ${usage(registry)}`
       case "--param":
         parsed.params.push(raw);
         break;
+      case "--resume":
+        parsed.resume = raw;
+        break;
+    }
+  }
+  if (parsed.force === true && parsed.resume === void 0) {
+    throw new BitfabError("--force only applies with --resume <experimentId>.");
+  }
+  if (parsed.resume !== void 0) {
+    const conflicting = RESUME_CONFLICTING_FLAGS.filter(
+      ([key]) => parsed[key] !== void 0
+    ).map(([, flag]) => flag);
+    if (conflicting.length > 0) {
+      throw new BitfabError(
+        `--resume reuses the traces, attempts, and graders experiment ${parsed.resume} started with, so it cannot be combined with ${conflicting.join(", ")}.`
+      );
     }
   }
   if (parsed.traceIds !== void 0 && parsed.datasetIds !== void 0) {
@@ -525,7 +567,12 @@ function renderSummary(pipeline, result, stderr) {
   let matched = 0;
   let missed = 0;
   let errors = 0;
+  let carriedOver = 0;
   for (const item of result.items) {
+    if (item.carriedOver === true) {
+      carriedOver += 1;
+      continue;
+    }
     if (item.error !== null) {
       errors += 1;
       continue;
@@ -545,7 +592,10 @@ function renderSummary(pipeline, result, stderr) {
   }
   stderr("\n\u2500\u2500\u2500 Summary \u2500\u2500\u2500");
   stderr(`  Pipeline: ${pipeline}`);
-  stderr(`  Replayed: ${result.items.length}`);
+  stderr(`  Replayed: ${result.items.length - carriedOver}`);
+  if (carriedOver > 0) {
+    stderr(`  Carried over from the earlier run: ${carriedOver}`);
+  }
   if (result.attempts > 1) {
     stderr(`  Attempts: ${result.attempts}`);
   }
@@ -582,6 +632,9 @@ function safeJson(value) {
     return String(value);
   }
 }
+function resumeCommand(registryPath, pipeline, experimentId) {
+  return `Resume with: bitfab-replay --registry ${registryPath ?? "<path>"} ${pipeline} --resume ${experimentId}`;
+}
 function reportReplayError(error, stderr) {
   for (const item of error.items) {
     stderr(
@@ -589,7 +642,7 @@ function reportReplayError(error, stderr) {
     );
   }
 }
-async function runReplayCli(registry, argv = typeof process === "undefined" ? [] : process.argv.slice(2), io = {}) {
+async function runReplayCli(registry, argv = typeof process === "undefined" ? [] : process.argv.slice(2), io = {}, registryPath) {
   const stdout = io.stdout ?? console.log;
   const stderr = io.stderr ?? console.error;
   const args = parseReplayCliArgs(registry, argv);
@@ -610,6 +663,7 @@ async function runReplayCli(registry, argv = typeof process === "undefined" ? []
   }
   const selectedDatasetIds = args.datasetIds ?? registrationDatasetIds;
   const codeChange = await loadCodeChange(args.codeChangePath, readFile);
+  let startedExperimentId;
   const options = {
     ...registrationOptions,
     ...args.name === void 0 ? {} : { name: args.name },
@@ -633,69 +687,85 @@ async function runReplayCli(registry, argv = typeof process === "undefined" ? []
     onItemStart: reportReplayProgress,
     onItemFinish: reportReplayProgress,
     onExperimentStart: ({ experimentId, experimentUrl }) => {
+      startedExperimentId = experimentId;
       stderr(`[replay] Experiment ${experimentId}: ${experimentUrl}`);
     }
   };
-  if (args.traceIds !== void 0) {
-    options.traceIds = args.traceIds;
-    options.datasetIds = void 0;
-  } else if (args.datasetIds !== void 0) {
-    options.traceIds = void 0;
-  }
-  const bound = args.limit ?? registrationOptions.limit;
-  options.limit = void 0;
-  if (options.traceIds !== void 0) {
-    if (bound !== void 0) {
-      options.traceIds = await boundTraceIds(
-        registration.client,
-        options.traceIds,
-        bound,
-        options.onlyWithAssertions === true
-      );
+  if (args.resume !== void 0) {
+    Object.assign(options, RESUME_CLEARED_OPTIONS, {
+      resume: args.resume,
+      ...args.force === true ? { force: true } : {}
+    });
+    stderr(
+      `[replay] Resuming experiment ${args.resume} of "${traceFunctionKey}"...`
+    );
+  } else {
+    if (args.traceIds !== void 0) {
+      options.traceIds = args.traceIds;
+      options.datasetIds = void 0;
+    } else if (args.datasetIds !== void 0) {
+      options.traceIds = void 0;
     }
-  } else if (options.datasetIds !== void 0) {
-    if (bound !== void 0) {
-      const pinned = await pinnedDatasetMembers(
-        registration.client,
-        options.datasetIds,
-        bound,
-        options.onlyWithAssertions === true
-      );
-      if (pinned !== void 0) {
-        options.traceIds = pinned;
+    const bound = args.limit ?? registrationOptions.limit;
+    options.limit = void 0;
+    if (options.traceIds !== void 0) {
+      if (bound !== void 0) {
+        options.traceIds = await boundTraceIds(
+          registration.client,
+          options.traceIds,
+          bound,
+          options.onlyWithAssertions === true
+        );
+      }
+    } else if (options.datasetIds !== void 0) {
+      if (bound !== void 0) {
+        const pinned = await pinnedDatasetMembers(
+          registration.client,
+          options.datasetIds,
+          bound,
+          options.onlyWithAssertions === true
+        );
+        if (pinned !== void 0) {
+          options.traceIds = pinned;
+        }
       }
+    } else {
+      options.limit = bound ?? 10;
     }
-  } else {
-    options.limit = bound ?? 10;
+    const attemptsSuffix = options.attempts !== void 0 && options.attempts > 1 ? ` (${options.attempts} attempts each)` : "";
+    stderr(
+      `[replay] ${args.dryRun === true ? "Resolving inputs for" : "Replaying"} ${describeSelection(options)} from "${traceFunctionKey}"${attemptsSuffix}...`
+    );
   }
-  const attemptsSuffix = options.attempts !== void 0 && options.attempts > 1 ? ` (${options.attempts} attempts each)` : "";
-  stderr(
-    `[replay] ${args.dryRun === true ? "Resolving inputs for" : "Replaying"} ${describeSelection(options)} from "${traceFunctionKey}"${attemptsSuffix}...`
-  );
+  let result;
   try {
-    const result = await registration.client.replay(
+    result = await registration.client.replay(
       traceFunctionKey,
       registration.fn,
       options
     );
-    if (args.dryRun === true) {
-      renderDryRun(args.pipeline, result, stderr);
-    } else {
-      renderSummary(args.pipeline, result, stderr);
-    }
-    stdout(serializeReplayResult(result));
-    if (result.items.length === 0) {
-      throw new BitfabError(
-        `No traces matched "${traceFunctionKey}", so nothing was replayed. Seed cases with --seed, or capture a trace first.`
-      );
-    }
-    return result;
   } catch (error) {
     if (error instanceof ReplayError) {
       reportReplayError(error, stderr);
     }
+    const experimentId = error instanceof ReplayError ? error.experimentId : startedExperimentId;
+    if (experimentId !== void 0) {
+      stderr(resumeCommand(registryPath, args.pipeline, experimentId));
+    }
     throw error;
   }
+  if (args.dryRun === true) {
+    renderDryRun(args.pipeline, result, stderr);
+  } else {
+    renderSummary(args.pipeline, result, stderr);
+  }
+  stdout(serializeReplayResult(result));
+  if (result.items.length === 0) {
+    throw new BitfabError(
+      `No traces matched "${traceFunctionKey}", so nothing was replayed. Seed cases with --seed, or capture a trace first.`
+    );
+  }
+  return result;
 }
 
 // src/registryCommand.ts
@@ -790,4 +860,4 @@ export {
   runRegistryMain,
   runIfEntrypoint
 };
-//# sourceMappingURL=chunk-S4WE6U2Y.js.map
+//# sourceMappingURL=chunk-WOHIAKZF.js.map