@agentshouse/kit 0.1.0-alpha.10 → 0.1.0-alpha.11

package/README.md

@@ -10,7 +10,7 @@ On Linux `amd64` or `arm64` with a working Docker Engine, run the published,
 versioned bootstrap once:
 
 ```sh
-bash <(curl -fsSL https://github.com/agentshouse/kit/releases/download/v0.1.0-alpha.10/connect-linux.sh)
+bash <(curl -fsSL https://github.com/agentshouse/kit/releases/download/v0.1.0-alpha.11/connect-linux.sh)
 ```
 
 The release asset pins one immutable multi-architecture image digest. It creates
@@ -1130,10 +1130,9 @@ retained references still waiting to be saved.
 Every command that changes or reads installation state takes this
 installation's exclusive Environment control lease for the length of its run
 and renews it before it expires, so two Kit commands never work against the
-same installation at once. A command that ends, or is interrupted once its work
-has stopped, releases that exact lease so the next command acquires at once; a
-refused command leaves it to expire. A `kit login` credential is presented only to take
-that lease.
+same installation at once. A command that ends, is refused, or is interrupted
+once its work has stopped releases that exact lease so the next command acquires
+at once. A `kit login` credential is presented only to take that lease.
 
 While `kit resident` holds that lease, a command runs through it instead: the
 command presents no credential, the resident confirms its current lease with

package/bootstrap.json

@@ -1,12 +1,12 @@
 {
   "schemaVersion": 1,
-  "version": "0.1.0-alpha.10",
+  "version": "0.1.0-alpha.11",
   "hosts": {
     "linux": {
-      "command": "bash <(curl -fsSL https://github.com/agentshouse/kit/releases/download/v0.1.0-alpha.10/connect-linux.sh)",
+      "command": "bash <(curl -fsSL https://github.com/agentshouse/kit/releases/download/v0.1.0-alpha.11/connect-linux.sh)",
       "asset": {
         "name": "connect-linux.sh",
-        "url": "https://github.com/agentshouse/kit/releases/download/v0.1.0-alpha.10/connect-linux.sh"
+        "url": "https://github.com/agentshouse/kit/releases/download/v0.1.0-alpha.11/connect-linux.sh"
       },
       "workspace": {
         "argument": "--workspace",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agentshouse/kit",
-  "version": "0.1.0-alpha.10",
+  "version": "0.1.0-alpha.11",
   "license": "MIT",
   "repository": {
     "type": "git",

package/src/host.js

@@ -1,7 +1,7 @@
 import { readFile, statfs } from "node:fs/promises";
 import { readConfiguration } from "./configuration.js";
 import { HOST_CPU_SAMPLE_MS } from "./contract.js";
-import { openSession, reportHostCapacity } from "./house.js";
+import { maintainControl, openSession, reportHostCapacity } from "./house.js";
 import { KitRefusal } from "./refusal.js";
 
 const PROC_STAT = "/proc/stat";
@@ -116,6 +116,10 @@ export async function reportHost(options, dependencies = {}) {
       ? observed
       : { ...observed, maxima: declaredMaxima(configuration.host.maxima) };
   const session = await openSession(options, dependencies);
-  await reportHostCapacity(session, declaration);
+  await maintainControl(
+    session,
+    (signal) => reportHostCapacity(session, declaration, signal),
+    options.signal,
+  );
   return declaration;
 }

package/src/house.js

@@ -438,20 +438,14 @@ export async function maintainControl(session, operation, signal, { release = tr
     }
   })();
   const running = Promise.resolve().then(() => operation(operationSignal));
-  let ended = false;
   try {
-    const answer = await Promise.race([running, failure, cancellation]);
-    ended = true;
-    return answer;
-  } catch (error) {
-    ended = error instanceof KitRefusal && error.code === "kit_command_cancelled";
-    throw error;
+    return await Promise.race([running, failure, cancellation]);
   } finally {
     stopped = true;
     maintenance.abort();
     signal?.removeEventListener("abort", cancelOperation);
     await Promise.all([renewal, running.catch(() => undefined)]);
-    if (ended && release) await releaseControl(session);
+    if (release) await releaseControl(session);
   }
 }
 

package/src/source.js

@@ -204,18 +204,24 @@ export async function captureSource(options, dependencies = {}) {
   const googleOAuthClient =
     instance.preset === "google" ? dependencies.googleOAuthClient() : null;
   const session = await openSession(options, dependencies);
-  const context = {
-    instance,
+  return maintainControl(
     session,
-    directory: options.directory,
-    signal: options.signal,
-    now: session.now,
-    dependencies,
-    googleOAuthClient,
-  };
-  const delivered = [];
-  for (const service of services) delivered.push(await deliverService(context, service));
-  return { instance: instance.id, services: delivered };
+    async (signal) => {
+      const context = {
+        instance,
+        session,
+        directory: options.directory,
+        signal,
+        now: session.now,
+        dependencies,
+        googleOAuthClient,
+      };
+      const delivered = [];
+      for (const service of services) delivered.push(await deliverService(context, service));
+      return { instance: instance.id, services: delivered };
+    },
+    options.signal,
+  );
 }
 
 export async function sourceStatus(options) {
@@ -255,23 +261,27 @@ export async function retrySourceOriginals(options, dependencies = {}) {
   const configuration = await readConfiguration(options.configuration);
   const instance = sourceInstance(configuration, options.instance);
   const services = declaredServices(instance, options.service ?? null);
-  const context = { instance, directory: options.directory, signal: options.signal };
   const outstanding = [];
   for (const service of services) {
     outstanding.push((await readSourceOriginals(options.directory, instance.id, service.service)).length);
   }
-  if (outstanding.some((count) => count > 0)) context.session = await openSession(options, dependencies);
-  const retried = [];
-  for (const [position, service] of services.entries()) {
-    retried.push({
-      service: service.service,
-      originals:
-        outstanding[position] === 0
-          ? []
-          : await saveSourceOriginals(context, serviceBinding(context, service)),
-    });
-  }
-  return { instance: instance.id, services: retried };
+  const retry = async (context) => {
+    const retried = [];
+    for (const [position, service] of services.entries()) {
+      retried.push({
+        service: service.service,
+        originals:
+          outstanding[position] === 0
+            ? []
+            : await saveSourceOriginals(context, serviceBinding(context, service)),
+      });
+    }
+    return { instance: instance.id, services: retried };
+  };
+  const context = { instance, directory: options.directory, signal: options.signal };
+  if (outstanding.every((count) => count === 0)) return retry(context);
+  const session = await openSession(options, dependencies);
+  return maintainControl(session, (signal) => retry({ ...context, session, signal }), options.signal);
 }
 
 export async function resetSource(options, dependencies = {}) {