@agentshouse/kit 0.1.0-alpha.12 → 0.1.0-alpha.13

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.12/connect-linux.sh)
+bash <(curl -fsSL https://github.com/agentshouse/kit/releases/download/v0.1.0-alpha.13/connect-linux.sh)
 ```
 
 The release asset pins one immutable multi-architecture image digest. It creates
@@ -27,16 +27,18 @@ installed container runs another image, the bootstrap pulls this release's
 image and asks the running resident Kit to drain with `kit resident drain`. The
 resident stops acquiring Runs, resumptions, setup and agent CLI work, while the
 Sessions it supervises keep their renewal, owner stops, answers and reports.
-While any Agent Session is still running or unreported, the bootstrap names it
-and leaves the container as it is; rerun it once they end. Once nothing remains,
+While any Agent Session is still running or unreported, including one whose Run
+was being acquired when the drain began, the bootstrap names it and leaves the
+container as it is; rerun it once they end. Once nothing remains,
 the resident stops renewing, releases its exact lease and stays quiescent, and
 the bootstrap replaces the container with one on this release's image over the
 same Kit home and workspace. The credential, Environment, Kit-home state and
 everything under the workspace are kept; anything installed elsewhere in the old
 container is not. A stopped container is replaced without a drain.
 
-If House refuses the installed Kit with `kit_upgrade_required`, the resident
-calls House no more, neither to release nor to report. It keeps supervising
+If House refuses the installed Kit with `kit_upgrade_required`, including in
+its answer to a command the resident serves, the resident calls House no more,
+neither to release nor to report. It keeps supervising
 every running Session locally and never stops one to make progress. A Session
 that ends keeps its exact binding, stop observation and outcome in Kit home,
 and the drain answers ready once no supervised process runs. The updated Kit
@@ -1170,8 +1172,13 @@ A resident whose lease House refuses answers the command with that refusal; the
 command never acquires a lease of its own while a resident serves it. While an
 update drains, `state/update-drain` refuses every such command, `kit login` and
 `kit worker run` with `kit_update_draining` before it enrolls, acquires or
-delegates anything, and the drain request ends the delegation of a command
-already served; the bootstrap removes the file when it replaces the container.
+delegates anything. A command already served keeps the resident's lease until
+it ends, while the resident refuses its acquisition of new work and its
+Telegram updates with `kit_update_draining`, which ends a served
+`kit telegram serve` once each of its activities reports the deliveries and
+files it already acquired; until it ends, the drain answers that it waits for
+that command and the bootstrap leaves the container as it is. The bootstrap
+removes the file when it replaces the container.
 
 Interrupting the command cancels the running connector without advancing the
 checkpoint.

package/bin/kit.js

@@ -177,7 +177,9 @@ async function runResidentDrain(args, directory) {
   write(
     answer.sessions.length > 0
       ? `House Kit is draining for its update and waits for Agent Sessions ${answer.sessions.join(", ")}.`
-      : `House Kit is draining for its update; House refused its lease release (${answer.refused}).`,
+      : answer.serving === true
+        ? "House Kit is draining for its update and waits for the Kit command it serves."
+        : `House Kit is draining for its update; House refused its lease release (${answer.refused}).`,
   );
   process.exitCode = 1;
 }

package/bootstrap.json

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

package/package.json

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

package/src/house.js

@@ -56,6 +56,10 @@ async function readCredential(directory) {
   return stored;
 }
 
+function latchRefusal(answer, dependencies) {
+  if (answer?.error?.code === UPGRADE_REQUIRED) dependencies.contractRefused?.();
+}
+
 async function houseAnswer(house, path, init, dependencies, signal) {
   const fetcher = dependencies.fetch ?? fetch;
   let response;
@@ -73,7 +77,7 @@ async function houseAnswer(house, path, init, dependencies, signal) {
   } catch {
     answer = null;
   }
-  if (answer?.error?.code === UPGRADE_REQUIRED) dependencies.contractRefused?.();
+  latchRefusal(answer, dependencies);
   throwHouseAnswer(response.status, answer, path);
   if (answer === null) throw new KitRefusal("kit_house_unavailable", path);
   return answer;
@@ -130,11 +134,18 @@ function residentAnswer(status, code) {
   return { status, type: "application/json", body };
 }
 
-async function residentRelay(session, request, signal) {
+function newWork(path) {
+  return path === "/kit/telegram/updates" || (path.endsWith("/acquire") && path !== "/kit/commands/acquire");
+}
+
+async function residentRelay(session, request, signal, draining) {
   const path = typeof request.path === "string" ? request.path : "";
   if (!path.startsWith("/kit/") || path.startsWith("/kit/lease")) {
     return residentAnswer(403, "kit_resident_route_refused");
   }
+  if (draining && newWork(path)) {
+    return residentAnswer(409, UPDATE_DRAINING);
+  }
   let authorization;
   try {
     authorization = await heldControl(session, signal);
@@ -149,6 +160,7 @@ async function residentRelay(session, request, signal) {
       signal,
     });
     const body = Buffer.from(await response.arrayBuffer());
+    if (response.status === 409) latchRefusal(JSON.parse(body.toString("utf8")), session.dependencies);
     return {
       status: response.status,
       type: response.headers.get("content-type"),
@@ -168,9 +180,7 @@ export async function serveResident(session, directory, signal, drain) {
   let draining = false;
   function answerDrain(connection) {
     draining = true;
-    const answered = drain();
-    holder?.destroy();
-    answered.then(
+    drain(holder !== null).then(
       (answer) => {
         if (!connection.destroyed) writeFrame(connection, answer);
         connection.end();
@@ -181,7 +191,7 @@ export async function serveResident(session, directory, signal, drain) {
   }
   function hold(connection) {
     if (holder !== null || draining || existsSync(updateDrain(directory))) {
-      writeFrame(connection, { refused: holder === null ? UPDATE_DRAINING : LEASE_ACTIVE });
+      writeFrame(connection, { refused: draining || holder === null ? UPDATE_DRAINING : LEASE_ACTIVE });
       connection.end();
       return false;
     }
@@ -218,7 +228,7 @@ export async function serveResident(session, directory, signal, drain) {
         }
         const cancelled = new AbortController();
         relayed.set(request.id, cancelled);
-        void residentRelay(session, request, AbortSignal.any([signal, cancelled.signal])).then(
+        void residentRelay(session, request, AbortSignal.any([signal, cancelled.signal]), draining).then(
           (answer) => {
             relayed.delete(request.id);
             if (!connection.destroyed) writeFrame(connection, { id: request.id, ...answer });

package/src/telegram.js

@@ -863,20 +863,21 @@ async function onePass(gateway, activity, work) {
   try {
     await work(gateway);
   } catch (error) {
-    if (cancelled(error) || !(error instanceof KitRefusal)) throw error;
+    if (cancelled(error) || !(error instanceof KitRefusal) || error.code === "kit_update_draining") throw error;
     gateway.summary.failures.push({ activity, item: null, code: error.code });
   }
 }
 
 async function paceActivity(gateway, stopping, activity, work) {
   try {
-    for (let index = 0; index < gateway.passes; index += 1) {
+    for (let index = 0; index < gateway.passes && !gateway.draining; index += 1) {
       if (gateway.signal?.aborted === true) throw new KitRefusal("kit_command_cancelled");
       await onePass(gateway, activity, work);
       if (index + 1 < gateway.passes) await gateway.wait(TELEGRAM_GATEWAY_POLL_MS, gateway.signal);
     }
   } catch (error) {
-    stopping.abort();
+    if (error.code === "kit_update_draining") gateway.draining = true;
+    else stopping.abort();
     throw error;
   }
 }
@@ -964,6 +965,7 @@ function gatewayContext(session, options, signal, summary = emptySummary()) {
     gate: rateGate(() => session.now().getTime()),
     wait: session.dependencies.wait ?? pause,
     passes: options.passes ?? Number.POSITIVE_INFINITY,
+    draining: false,
     summary,
   };
 }

package/src/worker.js

@@ -177,6 +177,7 @@ async function supervise(context, bound, bridge) {
   while (live) {
     await Promise.race([terminal, delay(WORKER_SUPERVISION_POLL_MS)]);
     if (!live) return null;
+    await context.update?.announce();
     if (Date.now() >= commanded) {
       commanded = Date.now() + WORKER_COMMAND_POLL_MS;
       const polled = await pendingCommands(context, ["stop", "interrupt", "answer"]);
@@ -849,20 +850,26 @@ function residentUpdate(context, wake) {
     get requested() {
       return requested;
     },
-    async request() {
+    async request(serving) {
       if (!requested) {
         requested = true;
         await writeText(updateDrain(context.directory), "");
       }
       wake.notify();
-      if (ready !== null) return ready;
       const sessions = await heldSessions(context);
+      if (ready !== null) return ready;
+      if (serving) return { ready: false, sessions, serving };
       if (sessions.length > 0) return { ready: false, sessions };
       return new Promise((resolve) => waiting.push(resolve));
     },
     answer(answer) {
       for (const resolve of waiting.splice(0)) resolve(answer);
     },
+    async announce() {
+      if (waiting.length === 0) return;
+      const sessions = await heldSessions(context);
+      if (sessions.length > 0) this.answer({ ready: false, sessions });
+    },
     quiesce() {
       ready = { ready: true, sessions: [] };
       this.answer(ready);
@@ -902,7 +909,7 @@ export async function runResident(options, dependencies = {}) {
   const wake = residentWake();
   const update = residentUpdate(context, wake);
   context.update = update;
-  const served = await serveResident(session, context.directory, options.signal, () => update.request());
+  const served = await serveResident(session, context.directory, options.signal, (serving) => update.request(serving));
   const serve = async (signal) => {
     context.busy = true;
     const watcher = new AbortController();