@impz/testing 6.9.1 → 6.10.1

package/dist/index.js

@@ -20188,7 +20188,8 @@ var SystemFeaturesSchema = z33.object({
   execDropSysAdmin: z33.boolean().optional(),
   guestScratch: z33.boolean().optional(),
   imagePins: z33.boolean().optional(),
-  buildContextUpload: z33.boolean().optional()
+  buildContextUpload: z33.boolean().optional(),
+  destroyIdCheck: z33.boolean().optional()
 });
 var GuestInfoSchema = z33.object({
   scratchDir: z33.string(),
@@ -20306,7 +20307,7 @@ var ResourceKindSchema = z34.enum([
 var ResourceDataSchema = z34.object({
   kind: ResourceKindSchema,
   name: z34.string(),
-  reason: z34.enum(["binding_changed"]).optional()
+  reason: z34.enum(["binding_changed", "id_changed"]).optional()
 });
 var ForbiddenReasonSchema = z34.enum(["imp_out_of_scope", "not_grantable", "scope"]);
 var ForbiddenDataSchema = z34.object({ reason: ForbiddenReasonSchema });
@@ -20425,7 +20426,7 @@ var impsContract = {
   create: contractBase.meta(ACCESS.manageImp).input(ImpCreateInputSchema).output(ImpSchema),
   list: contractBase.meta(ACCESS.readAny).input(z40.object({ builders: z40.boolean().optional() }).optional()).output(z40.array(ImpSchema)),
   get: contractBase.meta(ACCESS.readImp).input(NameInputSchema).output(ImpSchema),
-  destroy: contractBase.meta(ACCESS.manageImp).input(NameInputSchema).output(EmptySchema),
+  destroy: contractBase.meta(ACCESS.manageImp).input(z40.object({ name: NameSchema, id: z40.string().optional() })).output(EmptySchema),
   start: contractBase.meta(ACCESS.execImp).input(NameInputSchema).output(ImpSchema),
   stop: contractBase.meta(ACCESS.execImp).input(ForceInputSchema).output(ImpSchema),
   sleep: contractBase.meta(ACCESS.execImp).input(ForceInputSchema).output(ImpSchema),
@@ -21993,7 +21994,7 @@ import { join as join48 } from "path";
 // packages/daemon/package.json
 var package_default = {
   name: "@impz/daemon",
-  version: "6.9.1",
+  version: "6.10.1",
   private: true,
   description: "impd: the imp host daemon",
   type: "module",
@@ -22247,6 +22248,12 @@ function buildConflictError(kind, name, message) {
     data: { kind, name }
   });
 }
+function buildIdChangedError(name, id) {
+  return new ImpdError("CONFLICT", {
+    message: `imp ${name} is no longer the imp with id ${id}`,
+    data: { kind: "imp", name, reason: "id_changed" }
+  });
+}
 var NOT_BACKED_UP_REASON = "created with backup off";
 function buildNotBackedUpError(name, refusal) {
   return new ImpdError("PRECONDITION_FAILED", {
@@ -26286,6 +26293,11 @@ function handleUnknownOp(feature) {
   };
 }
 
+// packages/daemon/src/vm/agent-client/agent-wait-error.ts
+class AgentWaitError extends Error {
+  name = "AgentWaitError";
+}
+
 // packages/daemon/src/vm/agent-client/is-agent-session-state.ts
 function isAgentSessionState(state) {
   return state === "running" || state === "exited";
@@ -26412,7 +26424,7 @@ async function sendThaw(vsockPath) {
   decodeAgentMessage(OKSchema, response);
 }
 function readFrameWithin(connection, wait) {
-  return requireWithin(connection.next(), wait.timeoutMs, () => new Error(`agent at ${wait.vsockPath} sent no ${wait.call} within ${String(wait.timeoutMs)} ms`));
+  return requireWithin(connection.next(), wait.timeoutMs, () => new AgentWaitError(`agent at ${wait.vsockPath} sent no ${wait.call} within ${String(wait.timeoutMs)} ms`));
 }
 
 // packages/daemon/src/imps/imps/consistent-disk.ts
@@ -30104,7 +30116,7 @@ function createImpRoutes(os, deps, views) {
     }),
     get: os.imps.get.handler((context) => views.readCallerImp(context.context.caller, deps.imps.readImp(context.input.name))),
     destroy: os.imps.destroy.handler(async (context) => {
-      await deps.imps.destroyImp(context.input.name);
+      await deps.imps.destroyImp(context.input.name, { id: context.input.id });
       return {};
     }),
     start: os.imps.start.handler((context) => views.readCallerImp(context.context.caller, deps.imps.startImp(context.input.name))),
@@ -37896,6 +37908,29 @@ function pickSleepVictims(candidates, needMib) {
   return { victims, enough: false };
 }
 
+// packages/daemon/src/imp-ops/governor/priority-admissions.ts
+function createPriorityAdmissions(priority) {
+  const admitted = new Set;
+  const isPriority = (name) => priority !== null && name !== null && isImpAllowed(priority.patterns, name);
+  const isPriorityRequest = (request) => isPriority(request.priorityName ?? request.name);
+  return {
+    isPriority,
+    isPriorityRequest,
+    isPriorityImp: (imp) => admitted.has(imp.id) || isPriority(imp.name),
+    isAdmittedPriority: (id) => admitted.has(id),
+    recordAdmission: (request) => {
+      if (isPriorityRequest(request)) {
+        admitted.add(request.id);
+      } else {
+        admitted.delete(request.id);
+      }
+    },
+    release: (id) => {
+      admitted.delete(id);
+    }
+  };
+}
+
 // packages/daemon/src/imp-ops/governor/ram-governor.ts
 var RESERVATION_TTL_MS = 20000;
 var ENFORCE_INTERVAL_MS = 5000;
@@ -37906,11 +37941,12 @@ function createRamGovernor(deps) {
   const reservations = new Map;
   const now = deps.now ?? Date.now;
   const priority = deps.priority ?? null;
-  const isPriority = (name) => priority !== null && name !== null && isImpAllowed(priority.patterns, name);
+  const admittedPriority = createPriorityAdmissions(priority);
+  const isPriority = admittedPriority.isPriority;
+  const isPriorityImp = admittedPriority.isPriorityImp;
   const buildKept = (mib) => priority === null || mib === 0 ? null : { mib, patterns: priority.patterns };
   let stuckOver = false;
   const pendingHugePages = new Map;
-  const admittedPriority = new Set;
   const emitDecision = (decision) => {
     deps.events?.publish({
       v: EVENT_VERSION,
@@ -37941,11 +37977,7 @@ function createRamGovernor(deps) {
     if ((request.hugePagesMib ?? 0) > 0) {
       pendingHugePages.set(request.id, request.hugePagesMib ?? 0);
     }
-    if (isPriority(request.name)) {
-      admittedPriority.add(request.id);
-    } else {
-      admittedPriority.delete(request.id);
-    }
+    admittedPriority.recordAdmission(request);
     emitAdmission(request, "admitted", usedMib);
   };
   const getReservationMib = (id) => {
@@ -37981,14 +38013,14 @@ function createRamGovernor(deps) {
     const live = [...reservations.keys()].filter((id) => id !== excludeId).map((id) => ({
       id,
       mib: getReservationMib(id),
-      isPriority: admittedPriority.has(id),
+      isPriority: admittedPriority.isAdmittedPriority(id),
       isOnPool: pendingHugePages.has(id)
     }));
-    const pendingPool = [...pendingHugePages].filter(([id]) => id !== excludeId).map(([id, mib]) => ({ id, mib, isPriority: admittedPriority.has(id) }));
+    const pendingPool = [...pendingHugePages].filter(([id]) => id !== excludeId).map(([id, mib]) => ({ id, mib, isPriority: admittedPriority.isAdmittedPriority(id) }));
     const headroom = deps.readHeadroomMib?.(awake.map((imp) => imp.pid)) ?? Promise.resolve(0);
     const headroomMib = await headroom;
     const totals = buildUsageTotals({
-      awake: awake.map((imp) => ({ ...imp, isPriority: isPriority(imp.name) })),
+      awake: awake.map((imp) => ({ ...imp, isPriority: isPriorityImp(imp) })),
       readings,
       reservations: live,
       pendingPool,
@@ -38024,7 +38056,7 @@ function createRamGovernor(deps) {
       const shortfall = options.findShortfall(usage);
       const missingMib = shortfall.missingMib;
       const isOrdinary = shortfall.budget === "ordinary";
-      const sleepable = usage.awake.filter((imp) => !isOrdinary || imp.hugePagesMib === 0).filter((imp) => !options.sparesPriority || !isPriority(imp.name));
+      const sleepable = usage.awake.filter((imp) => !isOrdinary || imp.hugePagesMib === 0).filter((imp) => !options.sparesPriority || !isPriorityImp(imp));
       if (missingMib <= 0) {
         return {
           fits: true,
@@ -38110,12 +38142,12 @@ function createRamGovernor(deps) {
         });
       }
       const bound = await readEffectiveUsage(request.id, deps.readResidentRam);
-      const isPriorityRequest = isPriority(request.name);
+      const isPriorityAdmission = admittedPriority.isPriorityRequest(request);
       if (hugePagesMib > 0) {
-        const kept = isPriorityRequest ? null : buildKept(bound.kept.poolMib);
+        const kept = isPriorityAdmission ? null : buildKept(bound.kept.poolMib);
         await checkHugePool(request, hugePagesMib, kept);
       }
-      const findReserveShortfall = (usage) => pickEffectiveShortfall(usage, budgets, request.reserveMib, isPriorityRequest);
+      const findReserveShortfall = (usage) => pickEffectiveShortfall(usage, budgets, request.reserveMib, isPriorityAdmission);
       if (findReserveShortfall(bound).missingMib <= 0) {
         recordAdmission(request, bound.effectiveMib);
         return;
@@ -38125,7 +38157,7 @@ function createRamGovernor(deps) {
         reason: `to make room for ${request.name ?? request.id}`,
         whenShort: "giveUp",
         findShortfall: findReserveShortfall,
-        sparesPriority: !isPriorityRequest
+        sparesPriority: !isPriorityAdmission
       });
       const diskFull = room.diskFull ? deps.readDiskFullError?.() ?? null : null;
       if (!room.fits && diskFull !== null) {
@@ -38155,7 +38187,7 @@ function createRamGovernor(deps) {
     release: (id) => {
       reservations.delete(id);
       pendingHugePages.delete(id);
-      admittedPriority.delete(id);
+      admittedPriority.release(id);
     },
     admitGrow: (request) => admission.run("background", async () => {
       const listed = await deps.listAwake();
@@ -38163,14 +38195,15 @@ function createRamGovernor(deps) {
         return false;
       }
       const budgets = readBudgets();
-      const findGrowShortfall = (usage) => pickEffectiveShortfall(usage, budgets, request.mib, isPriority(request.name));
+      const isPriorityGrow = isPriorityImp(request);
+      const findGrowShortfall = (usage) => pickEffectiveShortfall(usage, budgets, request.mib, isPriorityGrow);
       const room = await makeRoom({
         excludeId: null,
         reason: `to grow ${request.name}`,
         whenShort: "giveUp",
         findShortfall: findGrowShortfall,
         protectedId: request.id,
-        sparesPriority: !isPriority(request.name)
+        sparesPriority: !isPriorityGrow
       });
       const usage = await readEffectiveUsage(null);
       const shortfall = findGrowShortfall(usage);
@@ -38674,6 +38707,7 @@ function createImpCommands(parts) {
     const checkpoints = await listCheckpoints(context.db, imp.id);
     await removeImpFiles(context, imp.id, checkpoints.map((checkpoint) => checkpoint.id));
     context.admission.release(imp.id);
+    context.priorityNames.delete(imp.id);
     await removeImp(context.db, imp.id);
   };
   return {
@@ -38692,6 +38726,9 @@ function createImpCommands(parts) {
       await context.diskBudget.requireRoom(0);
       return lock.withNewImp(id, writeRecord, async (imp) => {
         const paths = context.findPaths(imp.id);
+        if (input.priorityName !== undefined) {
+          context.priorityNames.set(imp.id, input.priorityName);
+        }
         context.sessionLogs.admitImp(imp.id);
         const started = performance.now();
         const recordMs = Math.round(started - received);
@@ -38764,6 +38801,7 @@ function createImpCommands(parts) {
         } catch (error) {
           await Promise.allSettled([sizing]);
           if (isRamBudgetError(error)) {
+            context.priorityNames.delete(imp.id);
             await removeImpFiles(context, imp.id, []);
             await removeImp(context.db, imp.id);
           }
@@ -38800,7 +38838,12 @@ function createImpCommands(parts) {
       return presenter.readApi(after);
     }),
     destroyImp: async (name, options = {}) => {
-      await lock.withImp(name, removeLockedImp, options);
+      await lock.withImp(name, async (imp) => {
+        if (options.id !== undefined && imp.id !== options.id) {
+          throw buildIdChangedError(name, options.id);
+        }
+        await removeLockedImp(imp);
+      }, options);
     },
     destroyImpId: async (id, kind) => {
       await lock.withImpId(id, async (imp) => {
@@ -41362,8 +41405,15 @@ function createImpContext(deps) {
     growFilesystem: deps.growFilesystem,
     kernelOops: deps.kernelOops
   };
+  const priorityNames = new Map;
   const memory = {
-    admission: deps.admission,
+    admission: {
+      ...deps.admission,
+      admit: (request) => deps.admission.admit({
+        ...request,
+        priorityName: request.priorityName ?? priorityNames.get(request.id)
+      })
+    },
     readRamMib: deps.readRamMib,
     readRssMib: deps.readRssMib,
     readSleepRamMib: deps.config.ksm === null ? deps.readRamMib : deps.readUnsharedRamMib,
@@ -41371,6 +41421,7 @@ function createImpContext(deps) {
     probeUffdDevice: deps.probeUffdDevice,
     mergeFlags: createMergeFlags(),
     memoryLimit: deps.memoryLimit ?? NO_MEMORY_LIMIT,
+    priorityNames,
     pluggedSizes: deps.pluggedSizes ?? createPluggedSizes(),
     resources: createResourceSampler({
       now,
@@ -48464,6 +48515,11 @@ async function waitForEngine(exec, signal, clock) {
     const info = await exec(["docker", "info", "--format", "{{.ServerVersion}}"], {
       signal,
       timeoutMs: ENGINE_READY_MS
+    }).catch((error) => {
+      if (!(error instanceof AgentWaitError)) {
+        throw error;
+      }
+      return { exitCode: -1, stdout: "", stderr: error.message };
     });
     if (info.exitCode === 0) {
       return;
@@ -48478,9 +48534,16 @@ async function waitForEngine(exec, signal, clock) {
 var ENGINE_LOG_PATH = "/var/log/imp/docker.log";
 var ENGINE_LOG_LINES = 20;
 async function readEngineLog(exec, signal) {
-  const tail = await exec(["tail", "-n", String(ENGINE_LOG_LINES), ENGINE_LOG_PATH], { signal });
-  const lines = tail.stdout.trim();
-  if (tail.exitCode !== 0 || lines === "") {
+  const tail = await exec(["tail", "-n", String(ENGINE_LOG_LINES), ENGINE_LOG_PATH], {
+    signal
+  }).catch((error) => {
+    if (!(error instanceof AgentWaitError)) {
+      throw error;
+    }
+    return null;
+  });
+  const lines = tail?.stdout.trim() ?? "";
+  if (tail?.exitCode !== 0 || lines === "") {
     return "";
   }
   return `
@@ -48551,7 +48614,8 @@ function createBuilders(deps) {
     }
   };
   return {
-    withBuilder: async (signal, run) => {
+    withBuilder: async (builderRequest, run) => {
+      const signal = builderRequest.signal;
       await deps.ensureImage(signal);
       signal.throwIfAborted();
       const id = Bun.randomUUIDv7();
@@ -48565,7 +48629,8 @@ function createBuilders(deps) {
           memoryMib: deps.config.build.memoryMib,
           diskMib: Math.ceil(deps.config.build.diskBytes / 1024 ** 2),
           policy: { mode: "public", allow: [] },
-          kind: "builder"
+          kind: "builder",
+          priorityName: builderRequest.imageName
         });
         const exec = createGuestExec((request) => deps.imps.openBuilderExec(name, request));
         await waitForEngine(exec, signal, clock);
@@ -50793,7 +50858,7 @@ function createImageBuilds(deps, writer) {
         if (builders === null) {
           throw new ImpdError("SERVICE_UNAVAILABLE", { message: "impd is starting; try again" });
         }
-        return builders.withBuilder(signal, async (exec, builderName) => {
+        return builders.withBuilder({ signal, imageName }, async (exec, builderName) => {
           options.setBuilder?.(builderName);
           const started = deps.clock.now();
           await writePinnedContext(createBuildEngine(toEngineRun(exec)));
@@ -51291,7 +51356,7 @@ function createImageAdds(deps, writer) {
       throw new ImpdError("SERVICE_UNAVAILABLE", { message: "impd is starting; try again" });
     }
     const explicitRef = formatExplicitRef(ref);
-    return builders.withBuilder(signal, async (exec) => {
+    return builders.withBuilder({ signal, imageName }, async (exec) => {
       const started = deps.clock.now();
       const platform = await createBuildEngine(toEngineRun(exec)).readPlatform(signal);
       const pulled = await loadGuestImage(exec, { ref: explicitRef, platform, signal });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@impz/testing",
-  "version": "6.9.1",
+  "version": "6.10.1",
   "description": "A real impd on stand-ins, for Bun tests of code that drives impd through @impz/client",
   "license": "MIT",
   "repository": {
@@ -29,7 +29,7 @@
     "@orpc/openapi-client": "^1.16.1",
     "@orpc/server": "^1.16.1",
     "@peculiar/x509": "^2.2.0",
-    "@zgeoff/kysely-bun-sqlite": "^0.3.0",
+    "@zgeoff/kysely-bun-sqlite": "^0.3.1",
     "better-auth": "^1.7.14",
     "dns-packet": "^5.6.1",
     "elysia": "^1.4.30",
@@ -43,7 +43,7 @@
     "ts-pattern": "^5.9.2",
     "xstate": "^5.33.3",
     "zod": "^4.6.7",
-    "@impz/client": "6.9.1"
+    "@impz/client": "6.10.1"
   },
   "engines": {
     "bun": ">=1.4.3"