@impz/testing 6.9.0 → 6.10.0

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(),
@@ -20210,6 +20211,7 @@ var SystemInfoSchema = z33.object({
   ramCommittedMib: z33.int().nonnegative(),
   ramPriorityKeptMib: z33.int().nonnegative().optional(),
   ramSleepingMib: z33.int().nonnegative().optional(),
+  ramPrioritySleepingMib: z33.int().nonnegative().optional(),
   awakeCount: z33.int().nonnegative(),
   impCount: z33.int().nonnegative(),
   sessionCount: z33.int().nonnegative(),
@@ -20305,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 });
@@ -20424,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),
@@ -21992,7 +21994,7 @@ import { join as join48 } from "path";
 // packages/daemon/package.json
 var package_default = {
   name: "@impz/daemon",
-  version: "6.9.0",
+  version: "6.10.0",
   private: true,
   description: "impd: the imp host daemon",
   type: "module",
@@ -22246,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", {
@@ -30103,7 +30111,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))),
@@ -30559,7 +30567,7 @@ async function readSystemInfo(deps) {
     deps.images.findDefaultImage()
   ]);
   const running = imps.filter((imp) => imp.state === "running");
-  const sleeping = imps.filter((imp) => imp.state === "sleeping");
+  const sleeping = imps.filter((imp) => imp.state === "sleeping" && !deps.governor.isAdmitted(imp.id));
   return {
     version: package_default.version,
     ramBudgetMib: deps.config.ramBudgetMib,
@@ -30568,6 +30576,7 @@ async function readSystemInfo(deps) {
     ramCommittedMib: running.reduce((sum, imp) => sum + imp.maxMemoryMib, 0),
     ramPriorityKeptMib: usage.priorityKeptMib,
     ramSleepingMib: sleeping.reduce((sum, imp) => sum + imp.memoryMib, 0),
+    ramPrioritySleepingMib: sleeping.filter((imp) => deps.governor.isPriority(imp.name)).reduce((sum, imp) => sum + imp.memoryMib, 0),
     awakeCount: running.length,
     impCount: imps.length,
     sessionCount: imps.reduce((sum, imp) => sum + (deps.imps.countSessions(imp) ?? 0), 0),
@@ -37946,7 +37955,7 @@ function createRamGovernor(deps) {
     }
     emitAdmission(request, "admitted", usedMib);
   };
-  const readReservation = (id) => {
+  const getReservationMib = (id) => {
     const reservation = reservations.get(id);
     if (reservation === undefined) {
       return 0;
@@ -37978,7 +37987,7 @@ function createRamGovernor(deps) {
     const readings = await Promise.all(awake.map((imp) => readVm(imp.pid, imp.apiSocket)));
     const live = [...reservations.keys()].filter((id) => id !== excludeId).map((id) => ({
       id,
-      mib: readReservation(id),
+      mib: getReservationMib(id),
       isPriority: admittedPriority.has(id),
       isOnPool: pendingHugePages.has(id)
     }));
@@ -38206,6 +38215,8 @@ function createRamGovernor(deps) {
         reservations.set(id, reservation.beforeGrow);
       }
     },
+    isPriority,
+    isAdmitted: (id) => getReservationMib(id) > 0,
     readUsage: async () => {
       const usage = await readEffectiveUsage(null);
       return {
@@ -38796,7 +38807,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) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@impz/testing",
-  "version": "6.9.0",
+  "version": "6.10.0",
   "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.9.0"
+    "@impz/client": "6.10.0"
   },
   "engines": {
     "bun": ">=1.4.3"