@impz/testing 6.1.1 → 6.2.1

package/dist/index.js

@@ -21955,7 +21955,7 @@ import { join as join47 } from "path";
 // packages/daemon/package.json
 var package_default = {
   name: "@impz/daemon",
-  version: "6.1.1",
+  version: "6.2.1",
   private: true,
   description: "impd: the imp host daemon",
   type: "module",
@@ -27277,7 +27277,7 @@ async function startFirecracker(command, paths, cgroupProcs = null, mergeWrapper
   writeRegularFile(paths.pidFile, `${String(child.pid)}
 `);
   const deadline = Date.now() + SOCKET_WAIT_MS;
-  while (!existsSync6(paths.apiSocket)) {
+  while (!await probeListening(paths.apiSocket)) {
     if (child.exitCode !== null || Date.now() > deadline) {
       stopPid(child.pid);
       throw new Error(`firecracker did not open its API socket (exit ${String(child.exitCode)}): ${readLogTail(paths.logFile)}`);
@@ -27286,6 +27286,18 @@ async function startFirecracker(command, paths, cgroupProcs = null, mergeWrapper
   }
   return child.pid;
 }
+async function probeListening(socketPath) {
+  if (!existsSync6(socketPath)) {
+    return false;
+  }
+  try {
+    const connection = await Bun.connect({ unix: socketPath, socket: { data: () => {} } });
+    connection.end();
+    return true;
+  } catch {
+    return false;
+  }
+}
 function probeProcessAlive(pid, socket, procRoot = "/proc") {
   const state = readStatFields(pid, procRoot)?.[0];
   if (state === undefined || state === "Z" || state === "X") {
@@ -37572,15 +37584,15 @@ function buildDeferredAdmission() {
   };
 }
 
-// packages/daemon/src/platform/process/semaphore.ts
-function createSemaphore(limit) {
-  const waiters = [];
+// packages/daemon/src/platform/process/priority-semaphore.ts
+function createPrioritySemaphore(limit) {
+  const waiters = { foreground: [], background: [] };
   let active = 0;
   return {
-    run: async (task) => {
+    run: async (priority, task) => {
       if (active >= limit) {
         const turn = Promise.withResolvers();
-        waiters.push(turn.resolve);
+        waiters[priority].push(turn.resolve);
         await turn.promise;
       } else {
         active += 1;
@@ -37588,7 +37600,7 @@ function createSemaphore(limit) {
       try {
         return await task();
       } finally {
-        const next = waiters.shift();
+        const next = waiters.foreground.shift() ?? waiters.background.shift();
         if (next === undefined) {
           active -= 1;
         } else {
@@ -37709,7 +37721,7 @@ var ENFORCE_INTERVAL_MS = 5000;
 var ENFORCE_TRIGGER = "RAM over budget";
 var ORDINARY_TRIGGER = "RAM outside the huge page pool";
 function createRamGovernor(deps) {
-  const admission = createSemaphore(1);
+  const admission = createPrioritySemaphore(1);
   const reservations = new Map;
   const now = deps.now ?? Date.now;
   let stuckOver = false;
@@ -37905,7 +37917,7 @@ function createRamGovernor(deps) {
     }
   };
   return {
-    admit: (request) => admission.run(async () => {
+    admit: (request) => admission.run(toTaskPriority(request), async () => {
       const hugePagesMib = request.hugePagesMib ?? 0;
       const hostBudgets = readBudgets();
       const budgets = hugePagesMib > 0 ? { ...hostBudgets, ordinaryMib: null } : hostBudgets;
@@ -37967,7 +37979,7 @@ function createRamGovernor(deps) {
       reservations.delete(id);
       pendingHugePages.delete(id);
     },
-    admitGrow: (request) => admission.run(async () => {
+    admitGrow: (request) => admission.run("background", async () => {
       const listed = await deps.listAwake();
       if (!listed.some((imp) => imp.id === request.id)) {
         return false;
@@ -38024,7 +38036,7 @@ function createRamGovernor(deps) {
         headroomMib: usage.headroomMib
       };
     },
-    enforce: () => admission.run(async () => {
+    enforce: () => admission.run("background", async () => {
       const budgets = readBudgets();
       const room = await makeRoom({
         excludeId: null,
@@ -38051,6 +38063,9 @@ function createRamGovernor(deps) {
 function pickEffectiveShortfall(usage, budgets, requestedMib) {
   return pickShortfall({ ramMib: usage.effectiveMib, ordinaryMib: usage.ordinaryEffectiveMib }, budgets, requestedMib);
 }
+function toTaskPriority(request) {
+  return request.isBackground === true ? "background" : "foreground";
+}
 
 // packages/daemon/src/vm/watchdog/agent-watchdog.ts
 var HOUR_MS = 3600000;
@@ -38876,7 +38891,6 @@ function createStorageGate(clock = REAL_CLOCK) {
 }
 
 // packages/daemon/src/vm/templates/boot-templates.ts
-import { createHash as createHash4 } from "crypto";
 import {
   existsSync as existsSync9,
   mkdirSync as mkdirSync12,
@@ -38890,8 +38904,18 @@ import {
 } from "fs";
 import { join as join18 } from "path";
 import { withContext as withContext2 } from "@logtape/logtape";
+import { match as match10 } from "ts-pattern";
 import * as z75 from "zod";
 
+// packages/daemon/src/platform/process/semaphore.ts
+function createSemaphore(limit) {
+  const semaphore = createPrioritySemaphore(limit);
+  return { run: (task) => semaphore.run("foreground", task) };
+}
+
+// packages/daemon/src/vm/templates/build-template-key.ts
+import { createHash as createHash4 } from "crypto";
+
 // packages/daemon/src/vm/vmm/configure-vm.ts
 function createMarks() {
   const marks = {};
@@ -38947,8 +38971,41 @@ async function setupVm(api, config) {
   await api.putBalloon(VM_DEVICES.balloon);
 }
 
+// packages/daemon/src/vm/templates/build-template-key.ts
+var TEMPLATE_BOOT_ARGS = [...BASE_BOOT_ARGS, "imp.template=1"].join(" ");
+function buildTemplateKey(identity, shape) {
+  const fields = {
+    guestKernel: identity.guestKernel,
+    systemDrive: identity.systemDrive,
+    firecrackerVersion: identity.firecrackerVersion,
+    snapshotVersion: identity.snapshotVersion,
+    hostKernel: identity.hostKernel,
+    cpuModel: identity.cpuModel,
+    cpuFlags: identity.cpuFlags,
+    bootArgs: TEMPLATE_BOOT_ARGS,
+    devices: VM_DEVICES,
+    memoryMib: shape.memoryMib,
+    vcpus: shape.vcpus,
+    ...shape.hugePages === "2M" && { hugePages: shape.hugePages }
+  };
+  return createHash4("sha256").update(JSON.stringify(fields)).digest("hex");
+}
+
+// packages/daemon/src/vm/templates/pick-restore-failure-outcome.ts
+import { match as match7 } from "ts-pattern";
+function pickRestoreFailureOutcome(facts) {
+  if (!facts.isCurrentBuild) {
+    return "ignore";
+  }
+  return match7(facts.fault).with(null, () => "ignore").with("agent", () => facts.restoredNow > facts.restoredBefore ? "keep" : pickCountedOutcome(facts)).with("load", () => pickCountedOutcome(facts)).exhaustive();
+}
+var MAX_RESTORE_FAILURES = 3;
+function pickCountedOutcome(facts) {
+  return facts.failuresBefore + 1 >= MAX_RESTORE_FAILURES && !facts.isOff ? "disable" : "remove";
+}
+
 // packages/daemon/src/vm/templates/template-locks.ts
-import { match as match8 } from "ts-pattern";
+import { match as match9 } from "ts-pattern";
 
 // packages/daemon/src/vm/templates/can-admit-lock.ts
 var MAX_LOCKED_PERCENT = 10;
@@ -38959,10 +39016,10 @@ function canAdmitLock(admission) {
 }
 
 // packages/daemon/src/vm/templates/pick-lock-outcome.ts
-import { P as P3, match as match7 } from "ts-pattern";
+import { P as P3, match as match8 } from "ts-pattern";
 var MIB4 = 1024 * 1024;
 function pickLockOutcome(result, isCurrent) {
-  return match7(result).with({ errno: P3.number }, (failed) => ({ kind: "failed", errno: failed.errno })).with({ declinedBytes: P3.number }, (declined) => ({
+  return match8(result).with({ errno: P3.number }, (failed) => ({ kind: "failed", errno: failed.errno })).with({ declinedBytes: P3.number }, (declined) => ({
     kind: "declined",
     lockMib: Math.ceil(declined.declinedBytes / MIB4)
   })).with({ lock: P3.select() }, (lock) => isCurrent ? { kind: "held", lock, lockMib: Math.ceil(lock.lockedBytes / MIB4) } : { kind: "stale", lock }).exhaustive();
@@ -38990,7 +39047,7 @@ function createTemplateLocks(deps) {
         }
         return isAdmitted;
       });
-      match8(pickLockOutcome(result, deps.probeCurrent(target))).with({ kind: "failed" }, (failed) => {
+      match9(pickLockOutcome(result, deps.probeCurrent(target))).with({ kind: "failed" }, (failed) => {
         deps.logger.warning("boot template {key} memory not locked (errno {errno}): a restore reads what the host dropped", { key, errno: String(failed.errno) });
       }).with({ kind: "declined" }, (declined) => {
         deps.logger.info("boot template {key} memory not locked: {lockMib} MiB would take the locks past a tenth of the RAM budget", { key, lockMib: String(declined.lockMib) });
@@ -39031,7 +39088,6 @@ function createTemplateLocks(deps) {
 }
 
 // packages/daemon/src/vm/templates/boot-templates.ts
-var TEMPLATE_BOOT_ARGS = [...BASE_BOOT_ARGS, "imp.template=1"].join(" ");
 var TEMPLATE_ADDRESS = {
   slot: -1,
   tap: "imp-tpl",
@@ -39052,7 +39108,6 @@ var MIB6 = 1024 * 1024;
 var MIN_MISSES = 2;
 var MAX_TEMPLATES = 4;
 var MAX_BUILD_FAILURES = 3;
-var MAX_RESTORE_FAILURES = 3;
 var BUILD_RETRY_MS = 60000;
 var TemplateMetaSchema = z75.object({
   buildId: z75.string(),
@@ -39065,23 +39120,6 @@ var TemplateMetaSchema = z75.object({
 class BuildRefusedError extends Error {
   name = "BuildRefusedError";
 }
-function buildTemplateKey(identity, shape) {
-  const fields = {
-    guestKernel: identity.guestKernel,
-    systemDrive: identity.systemDrive,
-    firecrackerVersion: identity.firecrackerVersion,
-    snapshotVersion: identity.snapshotVersion,
-    hostKernel: identity.hostKernel,
-    cpuModel: identity.cpuModel,
-    cpuFlags: identity.cpuFlags,
-    bootArgs: TEMPLATE_BOOT_ARGS,
-    devices: VM_DEVICES,
-    memoryMib: shape.memoryMib,
-    vcpus: shape.vcpus,
-    ...shape.hugePages === "2M" && { hugePages: shape.hugePages }
-  };
-  return createHash4("sha256").update(JSON.stringify(fields)).digest("hex");
-}
 function createBootTemplates(deps) {
   const root = join18(deps.dataDir, "templates");
   const now = deps.now ?? Date.now;
@@ -39089,6 +39127,7 @@ function createBootTemplates(deps) {
   const building = createSingleFlight();
   const records = new Map;
   const lastUsed = new Map;
+  const restoredByBuild = new Map;
   const lane = createSemaphore(1);
   const getRecord = (key) => {
     const found = records.get(key);
@@ -39262,7 +39301,8 @@ function createBootTemplates(deps) {
         reserveMib: Math.ceil(shape.memoryMib * deps.bootReservePercent / 100),
         memoryMib: shape.memoryMib,
         hugePagesMib: shape.hugePages === "2M" ? shape.memoryMib : 0,
-        maySleepImps: false
+        maySleepImps: false,
+        isBackground: true
       });
       return await (deps.diskBudget === undefined ? writeAdmitted() : deps.diskBudget.withRoom(shape.memoryMib * MIB6, writeAdmitted));
     } catch (error) {
@@ -39345,21 +39385,33 @@ function createBootTemplates(deps) {
       return null;
     },
     buildTemplate: createTemplateFiles,
-    reportFailure: (files, isTemplateFault) => {
-      if (!isTemplateFault || readMeta(files.key)?.buildId !== files.buildId) {
-        return;
-      }
+    reportFailure: (files, failure) => {
       const record = getRecord(files.key);
-      record.restoreFailures += 1;
-      removeDir(files.key);
-      if (record.restoreFailures >= MAX_RESTORE_FAILURES && !record.isOff) {
+      const outcome = pickRestoreFailureOutcome({
+        fault: failure.fault,
+        isCurrentBuild: readMeta(files.key)?.buildId === files.buildId,
+        restoredBefore: failure.restoredBefore,
+        restoredNow: restoredByBuild.get(files.buildId) ?? 0,
+        failuresBefore: record.restoreFailures,
+        isOff: record.isOff
+      });
+      const removeFailed = () => {
+        record.restoreFailures += 1;
+        removeDir(files.key);
+      };
+      match10(outcome).with("ignore", () => {}).with("keep", () => {
+        getImpdLogger("boot").info("boot template {key} kept: its agent timed out while another restore of it succeeded", { key: files.key.slice(0, 12) });
+      }).with("remove", removeFailed).with("disable", () => {
+        removeFailed();
         record.isOff = true;
         getImpdLogger("boot").warning("boot template {key} off until impd restarts: {restoreFailures} restores failed", { key: files.key.slice(0, 12), restoreFailures: String(record.restoreFailures) });
-      }
+      }).exhaustive();
     },
     reportRestored: (files) => {
       getRecord(files.key).restoreFailures = 0;
+      restoredByBuild.set(files.buildId, (restoredByBuild.get(files.buildId) ?? 0) + 1);
     },
+    countRestored: (files) => restoredByBuild.get(files.buildId) ?? 0,
     removeStale: () => {
       if (!existsSync9(root)) {
         return [];
@@ -43288,18 +43340,18 @@ async function setupRestoreCommand(plan, jails) {
 }
 
 class TemplateRestoreError extends Error {
-  isTemplateFault;
-  constructor(message, isTemplateFault, cause) {
+  fault;
+  constructor(message, fault, cause) {
     super(message, { cause });
     this.name = "TemplateRestoreError";
-    this.isTemplateFault = isTemplateFault;
+    this.fault = fault;
   }
 }
 async function loadTemplateVm(plan, jails, options = {}) {
   const marks = createMarks();
   const pid = await startRestoreProcess(plan, jails, options.mergeWrapper ?? null);
   marks.setMark("spawn");
-  const step = { isTemplateFault: true };
+  const step = { fault: "load" };
   try {
     const api = (options.createClient ?? createFirecrackerClient)(plan.paths.apiSocket);
     const isUffd = plan.hugePages === "2M";
@@ -43326,14 +43378,15 @@ async function loadTemplateVm(plan, jails, options = {}) {
     jails.seal(plan.paths, pid);
     await api.resume();
     marks.setMark("resume");
+    step.fault = "agent";
     await waitForAgent(plan.paths.vsockSocket, {
-      deadlineMs: VM_DEADLINES.agentMs,
+      deadlineMs: options.parkedAgentMs ?? VM_DEADLINES.agentMs,
       attemptMs: 200,
       maxDelayMs: RESTORE_PING_DELAY_MS,
       isParked: true
     });
     marks.setMark("parked");
-    step.isTemplateFault = false;
+    step.fault = null;
     const diskBytes = await plan.diskReady;
     if (plan.jail !== null) {
       jails.setupDiskOwner(plan.paths, plan.jail);
@@ -43368,7 +43421,7 @@ async function loadTemplateVm(plan, jails, options = {}) {
     await waitForExit(pid, plan.paths.apiSocket, VM_DEADLINES.killMs);
     await jails.release(plan.paths.impId);
     throw new TemplateRestoreError(`template restore failed: ${reason}
-${readLogTail(plan.paths.logFile, 5)}`, step.isTemplateFault, error);
+${readLogTail(plan.paths.logFile, 5)}`, step.fault, error);
   }
 }
 
@@ -43398,6 +43451,7 @@ async function startColdVm(context, start) {
   const diskBytes = readDiskBytes();
   Promise.allSettled([diskBytes]);
   if (template !== null && template !== undefined) {
+    const restoredBefore = context.templates?.countRestored(template) ?? 0;
     try {
       const vm = await context.vms.loadTemplateVm({
         firecrackerBin: context.config.firecrackerBin,
@@ -43441,8 +43495,8 @@ async function startColdVm(context, start) {
         key: template.key.slice(0, 12),
         error: getErrorMessage(error)
       });
-      const isTemplateFault = error instanceof TemplateRestoreError && error.isTemplateFault;
-      context.templates?.reportFailure(template, isTemplateFault);
+      const fault = error instanceof TemplateRestoreError ? error.fault : null;
+      context.templates?.reportFailure(template, { fault, restoredBefore });
     }
   }
   await diskBytes;
@@ -43476,9 +43530,19 @@ function formatGuestSteps(steps) {
 
 // packages/daemon/src/imps/imps/imp-vm-ops.ts
 var SLEEP_CONCURRENCY = 2;
+var RESTORE_CONCURRENCY = 4;
 var NO_JAIL_CGROUP = "a jailed VM starts only in its own cgroup, and it has none: the cpu controller is not delegated to /sys/fs/cgroup/imps, or the setup of imps/<id> failed (see the log); set IMP_JAILER=false on a host without cgroup delegation";
-function createImpVmOps(context) {
+function createImpVmOps(host) {
   const sleepSlots = createSemaphore(SLEEP_CONCURRENCY);
+  const wakeSlots = createSemaphore(RESTORE_CONCURRENCY);
+  const templateSlots = createSemaphore(RESTORE_CONCURRENCY);
+  const context = {
+    ...host,
+    vms: {
+      ...host.vms,
+      loadTemplateVm: (options) => templateSlots.run(() => host.vms.loadTemplateVm(options))
+    }
+  };
   let isStopping = false;
   const updateState = async (imp, change) => {
     const updated = await updateLockedImpState(context.db, imp, change);
@@ -43639,7 +43703,7 @@ function createImpVmOps(context) {
     }
     return imp.isDiskGrowPending ? setGrowPending(imp, false) : imp;
   };
-  const wakeImpVm = makeWakeImpVm({
+  const startWake = makeWakeImpVm({
     context,
     isStopping: () => isStopping,
     updateState,
@@ -43648,6 +43712,7 @@ function createImpVmOps(context) {
     startColdImpVm,
     growGuestDisk
   });
+  const wakeImpVm = (imp) => wakeSlots.run(() => startWake(imp));
   const requireRunningImp = async (imp) => {
     if (imp.state === "running") {
       return imp;
@@ -43703,7 +43768,7 @@ function countStepsMs(timings) {
 }
 
 // packages/daemon/src/imps/imps/services/service-api.ts
-import { match as match9 } from "ts-pattern";
+import { match as match11 } from "ts-pattern";
 
 // packages/daemon/src/imps/imps/services/create-log-decoders.ts
 function createLogDecoders() {
@@ -43927,7 +43992,7 @@ function handleAgentError(service) {
     if (!(error instanceof AgentError)) {
       throw error;
     }
-    throw match9(error.code).with("NO_SERVICE", () => buildNotFoundError("service", service)).with("SERVICE_EXISTS", () => buildConflictError("service", service)).with("BAD_REQUEST", () => new ImpdError("BAD_REQUEST", { message: error.detail })).with("AGENT_OUTDATED", () => buildAgentOutdatedApiError(error.message)).otherwise(() => error);
+    throw match11(error.code).with("NO_SERVICE", () => buildNotFoundError("service", service)).with("SERVICE_EXISTS", () => buildConflictError("service", service)).with("BAD_REQUEST", () => new ImpdError("BAD_REQUEST", { message: error.detail })).with("AGENT_OUTDATED", () => buildAgentOutdatedApiError(error.message)).otherwise(() => error);
   };
 }
 function stopStreams(streams) {
@@ -45028,28 +45093,29 @@ function createVmRunner(jails, options = {}) {
       setMark("spawn");
       try {
         const api = createClient(plan.paths.apiSocket);
-        const versionPromise = api.readVersion();
-        await setupVm(api, {
-          kernelPath: plan.kernelPath,
-          bootArgs: buildBootArgs(plan),
-          vcpus: plan.vcpus,
-          memoryMib: plan.memoryMib,
-          hugePages: plan.hugePages ?? "None",
-          diskPath: plan.paths.disk,
-          systemDrivePath: plan.systemDrivePath,
-          vsockPath: plan.paths.vsockSocket,
-          tap: plan.address.tap,
-          guestMac: plan.address.guestMac
-        });
-        const regionMib = getRegionMib(plan.memoryMib, plan.maxMemoryMib);
-        if (regionMib > 0) {
-          await api.putHotplugMemory({
-            totalSizeMib: regionMib,
-            slotSizeMib: SLOT_MIB,
-            blockSizeMib: BLOCK_MIB
+        const configure = async () => {
+          await setupVm(api, {
+            kernelPath: plan.kernelPath,
+            bootArgs: buildBootArgs(plan),
+            vcpus: plan.vcpus,
+            memoryMib: plan.memoryMib,
+            hugePages: plan.hugePages ?? "None",
+            diskPath: plan.paths.disk,
+            systemDrivePath: plan.systemDrivePath,
+            vsockPath: plan.paths.vsockSocket,
+            tap: plan.address.tap,
+            guestMac: plan.address.guestMac
           });
-        }
-        const firecrackerVersion = await versionPromise;
+          const regionMib = getRegionMib(plan.memoryMib, plan.maxMemoryMib);
+          if (regionMib > 0) {
+            await api.putHotplugMemory({
+              totalSizeMib: regionMib,
+              slotSizeMib: SLOT_MIB,
+              blockSizeMib: BLOCK_MIB
+            });
+          }
+        };
+        const [firecrackerVersion] = await Promise.all([api.readVersion(), configure()]);
         setMark("configure");
         jails.removeUffdDevice(plan.paths.impId);
         jails.seal(plan.paths, pid);
@@ -46884,7 +46950,7 @@ function readSettled2(row, imp) {
 
 // packages/daemon/src/imp-ops/moves/move-sender.ts
 import invariant6 from "tiny-invariant";
-import { match as match10 } from "ts-pattern";
+import { match as match12 } from "ts-pattern";
 
 // packages/daemon/src/platform/db/move-send-steps.ts
 var MOVE_SEND_STEPS = [
@@ -47447,7 +47513,7 @@ function createMoveSender(deps) {
   };
   const recoverSend = async (imp, row) => {
     const log = getImpdLogger("move").with({ imp: imp.name });
-    await match10(pickSendRecovery(imp.moveState, row?.step)).with("unmark", () => removeMark(imp)).with("wait", () => {
+    await match12(pickSendRecovery(imp.moveState, row?.step)).with("unmark", () => removeMark(imp)).with("wait", () => {
       log.info("a prepared send waits for its send after a restart");
     }).with("abort", async () => {
       const isUndone = await resetSend(imp, row?.peer_url ?? null, row?.ticket ?? null);
@@ -47569,7 +47635,7 @@ function buildPublicError(name) {
 }
 function pickSendRecovery(moveState, step) {
   if (moveState === "sending") {
-    return match10(step).with(undefined, () => "unmark").with("prepared", () => "wait").with("streaming", () => "abort").with("sent", () => "commit").exhaustive();
+    return match12(step).with(undefined, () => "unmark").with("prepared", () => "wait").with("streaming", () => "abort").with("sent", () => "commit").exhaustive();
   }
   return moveState === "moved" && step === "sent" ? "commit" : "none";
 }
@@ -47621,7 +47687,7 @@ function createMoveService(deps) {
 // packages/daemon/src/surface/moves/create-move-peer-handler.ts
 import { OpenAPIHandler } from "@orpc/openapi/fetch";
 import { ORPCError as ORPCError7, implement as implement3, onError as onError3 } from "@orpc/server";
-import { match as match11 } from "ts-pattern";
+import { match as match13 } from "ts-pattern";
 function createMovePeerHandler(deps) {
   const withTicket = async (step, context, call) => {
     const startedAt = deps.now();
@@ -47672,7 +47738,7 @@ function createMovePeerHandler(deps) {
   const respondReceive = async (context) => {
     try {
       const received = await withTicket("receive", context, (checked) => deps.calls.receive(checked, context.request));
-      return match11(received).with({ kind: "part" }, (sent) => Response.json({ part: sent.part }, { status: 202 })).with({ kind: "receipt" }, (sent) => Response.json(sent.receipt)).exhaustive();
+      return match13(received).with({ kind: "part" }, (sent) => Response.json({ part: sent.part }, { status: 202 })).with({ kind: "receipt" }, (sent) => Response.json(sent.receipt)).exhaustive();
     } catch (error) {
       const failure = toPeerError(error);
       return Response.json(encodePeerError(failure), { status: failure.status });
@@ -51932,14 +51998,14 @@ function expandScopes(asked) {
 }
 
 // packages/daemon/src/platform/http/render-html.ts
-import { P as P4, match as match12 } from "ts-pattern";
+import { P as P4, match as match14 } from "ts-pattern";
 var MARKUP = Symbol("markup");
 function renderHTML(strings, ...parts) {
   const html = parts.reduce((text, part, index) => `${text}${toHTML(part)}${strings[index + 1] ?? ""}`, strings[0] ?? "");
   return { [MARKUP]: true, html };
 }
 function toHTML(part) {
-  return match12(part).with(P4.string, (text) => escapeHTML(text)).with(P4.array(), (list) => list.map((each) => each.html).join("")).with({ html: P4.string }, (markup) => markup.html).exhaustive();
+  return match14(part).with(P4.string, (text) => escapeHTML(text)).with(P4.array(), (list) => list.map((each) => each.html).join("")).with({ html: P4.string }, (markup) => markup.html).exhaustive();
 }
 function escapeHTML(text) {
   return text.replaceAll("&", "&amp;").replaceAll("<", "&lt;").replaceAll(">", "&gt;").replaceAll('"', "&quot;").replaceAll("'", "&#39;");
@@ -58626,15 +58692,19 @@ log tail`);
       loadTemplateVm: (plan) => runInGeneration(async () => {
         restorePlans.push(plan);
         const vm = await startFakeVm("restore", plan.paths).catch((error) => {
-          throw new TemplateRestoreError("restore failed", true, error);
+          throw new TemplateRestoreError("restore failed", "load", error);
         });
+        if (await chooseOutcome("parkedAgent") !== "ok") {
+          alive.delete(vm.pid);
+          throw new TemplateRestoreError("the parked agent never answered", "agent", null);
+        }
         await plan.diskReady.catch((error) => {
           alive.delete(vm.pid);
-          throw new TemplateRestoreError("disk failed", false, error);
+          throw new TemplateRestoreError("disk failed", null, error);
         });
         if (await chooseOutcome("claim") !== "ok") {
           alive.delete(vm.pid);
-          throw new TemplateRestoreError("claim failed", false, null);
+          throw new TemplateRestoreError("claim failed", null, null);
         }
         restores.push({
           hostname: plan.claim.hostname,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@impz/testing",
-  "version": "6.1.1",
+  "version": "6.2.1",
   "description": "A real impd on stand-ins, for Bun tests of code that drives impd through @impz/client",
   "license": "MIT",
   "repository": {
@@ -43,7 +43,7 @@
     "ts-pattern": "^5.9.2",
     "xstate": "^5.33.3",
     "zod": "^4.6.7",
-    "@impz/client": "6.1.1"
+    "@impz/client": "6.2.1"
   },
   "engines": {
     "bun": ">=1.4.3"