@agentshouse/kit 0.1.0-alpha.29 → 0.1.0-alpha.30

package/README.md

@@ -12,7 +12,7 @@ The Skill set Kit installs is Matt Pocock's
 On Linux `amd64` or `arm64`, run the published, versioned bootstrap once:
 
 ```sh
-bash <(curl -fsSL https://github.com/agentshouse/kit/releases/download/v0.1.0-alpha.29/connect-linux.sh)
+bash <(curl -fsSL https://github.com/agentshouse/kit/releases/download/v0.1.0-alpha.30/connect-linux.sh)
 ```
 
 The bootstrap first establishes Docker Engine from what it observes on the
@@ -42,7 +42,11 @@ Kit home and `/agents/house`, enrolls through House Login in the host browser,
 and starts the container with Docker's `unless-stopped` lifecycle. Pass
 `--workspace /absolute/path` for one other workspace root or `--manual` for
 the existing URL and one-time-code login route. `--house <origin>` selects
-another House and is retained in Kit home. A repeated invocation reuses the
+another House and is retained in Kit home. A local loopback House,
+`http://127.0.0.1:<port>` or `http://localhost:<port>`, runs the resident
+container on the host network, as the one-shot login, credential check and
+apply containers always run, so the resident reaches the House the host serves;
+an HTTPS House leaves it on Docker's own network. A repeated invocation reuses the
 same container, credential and Environment. Every invocation that is not a
 forwarded command also sets `skills` in Kit's configuration: `--no-skills`
 declines [the Skill set](#the-skill-set) and an invocation without it accepts
@@ -1377,7 +1381,8 @@ copy's recorded position through `POST /kit/door/enumerate`. A changed, new or
 removed authored file becomes a commit on `refs/house/received`, its House
 revision kept in Kit home; changed, new or removed read-only content, such as
 Capture with its provenance sidecar or a House projection, is written into or
-removed from the ignored local tree, and `.gitignore` and `.ignore` follow it.
+removed from the ignored local tree, with each directory a removal leaves empty,
+and `.gitignore` and `.ignore` follow it.
 Delivery never touches the branch, the index or a tracked file, and a push
 waiting for its outcome or its local integration keeps its record. A push takes
 each file's revision from the newest House state in its own base's history that
@@ -1524,7 +1529,10 @@ a Room the User can only read answers `bootstrap`, `pull`, and `rebootstrap`
 with `operation_denied`. Generated `_provenance` files delivered beside authored
 Library paths are House metadata, not authored Library documents. `pull` presents
 each recorded position with its log epoch, applies each enumerated path's whole
-content or removal, and advances those positions. A position older than House's
+content or removal, and advances those positions. A removal, pulled or accepted
+from `submit`, also removes each directory it leaves empty up to the authority,
+so a later file can take that path; a directory still holding a file, such as a
+local draft, stays. A position older than House's
 declared retention, or one of a log epoch before House's database was restored,
 is reported as `position_expired`; only `rebootstrap` rebuilds the directory.
 
@@ -1658,6 +1666,13 @@ House authorizes: a managed workspace House no longer authorizes to run is
 stopped, and a container this Kit did not create is never adopted, started or
 removed.
 
+A pass House does not answer, such as one during a House restart, ends that
+pass only, and the host tries again on the next one; a pass House refuses ends
+the host. Without `--passes` the host serves until SIGINT or SIGTERM. It
+asks House to release its control lease when it ends, after its passes, a
+refusal, SIGINT or SIGTERM; once House has released it, a restarted host is
+admitted at once.
+
 Ceilings are shared ceilings. The ceilings configured across one host may exceed
 that host, nothing is reserved for any workspace, and no workspace is promised
 its maximum while another one runs.
@@ -1766,6 +1781,9 @@ so a restarted gateway never leaves a delivery attempted forever. A Telegram
 the delay Telegram supplied has passed. `--passes <count>` bounds each activity
 to that many passes and is what tests and one-shot runs use; without it the
 command is resident and stops on SIGINT or SIGTERM, printing what it settled.
+Each refused pass is printed as it happens, naming its activity, item and
+refusal code, so a gateway refused on every pass says so while it runs; the
+summary printed when it stops still lists each of them.
 
 Release the bot:
 

package/bin/connect-linux.sh

@@ -44,7 +44,9 @@ login_kit() {
 }
 
 start_resident() {
-  docker run -d --name "$NAME" --restart unless-stopped --user "$(id -u):$(id -g)" --mount "$KIT_HOME_MOUNT" --mount "$WORKSPACE_MOUNT" --label "agentshouse.house=$HOUSE" --env HOME=/kit-home --env HOUSE_KIT_HOME=/kit-home --env HOUSE_KIT_CONTAINER=1 "$IMAGE" resident >/dev/null
+  local network=()
+  [[ "$HOUSE" == https://* ]] || network=(--network host)
+  docker run -d --name "$NAME" --restart unless-stopped "${network[@]}" --user "$(id -u):$(id -g)" --mount "$KIT_HOME_MOUNT" --mount "$WORKSPACE_MOUNT" --label "agentshouse.house=$HOUSE" --env HOME=/kit-home --env HOUSE_KIT_HOME=/kit-home --env HOUSE_KIT_CONTAINER=1 "$IMAGE" resident >/dev/null
 }
 
 docker() {

package/bin/kit.js

@@ -862,12 +862,23 @@ async function runWorkspaceHost(args, directory) {
     throw new Error(WORKSPACE_USAGE);
   }
   const house = await storedHouse(directory);
-  const served = await serveWorkspaces({
-    house,
-    directory,
-    configuration: values["--config"] ?? join(directory, "kit.json"),
-    passes,
-  });
+  const cancellation = new AbortController();
+  const cancel = () => cancellation.abort();
+  process.once("SIGINT", cancel);
+  process.once("SIGTERM", cancel);
+  let served;
+  try {
+    served = await serveWorkspaces({
+      house,
+      directory,
+      configuration: values["--config"] ?? join(directory, "kit.json"),
+      passes,
+      signal: cancellation.signal,
+    });
+  } finally {
+    process.removeListener("SIGINT", cancel);
+    process.removeListener("SIGTERM", cancel);
+  }
   for (const name of served.reconciled) {
     write(`Stopped ${name}; House authorizes no running workspace for it.`);
   }
@@ -934,7 +945,13 @@ async function runTelegramServe(args, directory) {
   process.once("SIGTERM", cancel);
   let served;
   try {
-    served = await serveTelegramGateway({ house, directory, passes, signal: cancellation.signal });
+    served = await serveTelegramGateway({
+      house,
+      directory,
+      passes,
+      signal: cancellation.signal,
+      refused: (failure) => write(refusedPassLine(failure)),
+    });
   } finally {
     process.removeListener("SIGINT", cancel);
     process.removeListener("SIGTERM", cancel);
@@ -954,14 +971,14 @@ async function runTelegramServe(args, directory) {
       `File send ${settled.upload} settled ${settled.outcome}${settled.reason === null ? "" : ` (${settled.reason})`}.`,
     );
   }
-  for (const failure of served.failures) {
-    write(
-      `The ${failure.activity} pass${failure.item === null ? "" : ` for ${failure.item}`} could not finish (${failure.code}).`,
-    );
-  }
+  for (const failure of served.failures) write(refusedPassLine(failure));
   if (served.failures.length > 0) process.exitCode = 1;
 }
 
+function refusedPassLine(failure) {
+  return `The ${failure.activity} pass${failure.item === null ? "" : ` for ${failure.item}`} could not finish (${failure.code}).`;
+}
+
 async function main() {
   const [command, ...args] = process.argv.slice(2);
   const directory = process.env.HOUSE_KIT_HOME ?? join(homedir(), ".house-kit");

package/bootstrap.json

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

package/package.json

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

package/src/bytes.js

@@ -43,7 +43,7 @@ export async function transferBytes(request, dependencies = {}) {
   if (typeof request.url !== "string" || request.url.length === 0) {
     throw new KitRefusal("kit_byte_url_invalid");
   }
-  if (typeof request.operation !== "string" || request.operation.length === 0) {
+  if (request.method === "POST" && (typeof request.operation !== "string" || request.operation.length === 0)) {
     throw new KitRefusal("kit_byte_operation_invalid");
   }
   const framed = request.framed === true;
@@ -57,10 +57,12 @@ export async function transferBytes(request, dependencies = {}) {
   const fetcher = dependencies.fetch ?? fetch;
   const headers = framed
     ? { "content-type": "text/plain; charset=utf-8" }
-    : {
-        [BYTE_GRANT_OPERATION_HEADER]: request.operation,
-        ...(request.method === "POST" ? { "content-type": "application/octet-stream" } : {}),
-      };
+    : request.method === "POST"
+      ? {
+          [BYTE_GRANT_OPERATION_HEADER]: request.operation,
+          "content-type": "application/octet-stream",
+        }
+      : {};
   let response;
   try {
     response = await fetcher(request.url, {

package/src/original.js

@@ -133,9 +133,9 @@ function outcomeOf(answer) {
 
 function grantOf(value, kind) {
   if (value === undefined) return null;
-  if (typeof value?.url !== "string" || typeof value?.operation !== "string") {
-    refuse("kit_original_grant_rejected", kind);
-  }
+  if (typeof value?.url !== "string") refuse("kit_original_grant_rejected", kind);
+  if (kind === "download") return { url: value.url };
+  if (typeof value.operation !== "string") refuse("kit_original_grant_rejected", kind);
   return { url: value.url, operation: value.operation };
 }
 
@@ -148,7 +148,7 @@ function sendBytes(dependencies, grant, body, signal) {
 
 async function receiveBytes(session, grant, signal) {
   const transferred = await transferBytes(
-    { url: grant.url, method: "GET", operation: grant.operation, signal },
+    { url: grant.url, method: "GET", signal },
     session.dependencies,
   );
   return transferred.bytes;

package/src/sync-state.js

@@ -1,6 +1,6 @@
 import { createHash } from "node:crypto";
-import { mkdir, readFile, readdir, realpath, rm } from "node:fs/promises";
-import { join, relative, resolve } from "node:path";
+import { mkdir, readFile, readdir, realpath, rm, rmdir } from "node:fs/promises";
+import { dirname, join, relative, resolve } from "node:path";
 import { EXPLICIT_SYNC_VERSION } from "./contract.js";
 import { KitRefusal } from "./refusal.js";
 import { readNote, writeNote, writeText } from "./state.js";
@@ -85,12 +85,21 @@ export async function writeReplicaFile(path, content, signal) {
   return writeText(path, content, signal, 0o644);
 }
 
-export async function removeReplicaFile(path) {
+export async function removeReplicaFile(replica, rootPath, file) {
+  const root = locate(replica, rootPath);
+  const path = locate(replica, rootPath, file);
   try {
     await rm(path);
   } catch (error) {
     if (error.code !== "ENOENT") throw new KitRefusal("kit_state_unreadable", path);
   }
+  for (let directory = dirname(path); directory.startsWith(`${root}/`); directory = dirname(directory)) {
+    try {
+      await rmdir(directory);
+    } catch (error) {
+      if (error.code !== "ENOENT") return;
+    }
+  }
 }
 
 export async function listFiles(root) {

package/src/sync.js

@@ -110,7 +110,7 @@ function matchedDiscovery(discovery, scope) {
   );
 }
 
-async function writeScope(replica, scope, signal) {
+function scopeContents(replica, scope) {
   if (
     typeof scope?.manifest?.path !== "string" ||
     typeof scope.manifest.position !== "string" ||
@@ -121,11 +121,18 @@ async function writeScope(replica, scope, signal) {
   if (!Array.isArray(scope.contents) || !Array.isArray(scope.manifest.files)) {
     throw new KitRefusal("kit_bootstrap_rejected");
   }
-  const files = [];
   for (const entry of scope.contents) {
     if (typeof entry?.path !== "string" || typeof entry.content !== "string") {
       throw new KitRefusal("kit_bootstrap_rejected");
     }
+    locate(replica, scope.manifest.path, entry.path);
+  }
+  return scope.contents;
+}
+
+async function writeScope(replica, scope, signal) {
+  const files = [];
+  for (const entry of scopeContents(replica, scope)) {
     const meta = scope.manifest.files.find((file) => file.path === entry.path);
     await writeReplicaFile(locate(replica, scope.manifest.path, entry.path), entry.content, signal);
     files.push({
@@ -139,18 +146,21 @@ async function writeScope(replica, scope, signal) {
 }
 
 async function replaceScope(replica, previous, scope, signal) {
-  const next = await writeScope(replica, scope, signal);
-  const kept = new Set(next.map((file) => file.path));
+  const kept = new Set(scopeContents(replica, scope).map((entry) => entry.path));
   const root = locate(replica, scope.manifest.path);
   for (const path of await listFiles(root)) {
-    if (!kept.has(path)) await removeReplicaFile(locate(replica, scope.manifest.path, path));
+    if (!kept.has(path)) await removeReplicaFile(replica, scope.manifest.path, path);
   }
   if (previous !== undefined) {
     for (const file of previous.files) {
-      if (!kept.has(file.path)) await removeReplicaFile(locate(replica, previous.path, file.path));
+      if (!kept.has(file.path)) await removeReplicaFile(replica, previous.path, file.path);
     }
   }
-  return next;
+  return writeScope(replica, scope, signal);
+}
+
+function removalsFirst(entries, removal) {
+  return [...entries.filter(removal), ...entries.filter((entry) => !removal(entry))];
 }
 
 function stringList(value) {
@@ -245,10 +255,10 @@ async function applyEnumeration(options, state, enumeration, signal) {
     if (authority === undefined) throw new KitRefusal("kit_sync_rejected", view.authority);
     const reached = changePosition(view, "enumerate");
     const recorded = new Map(authority.files.map((file) => [file.path, file]));
-    for (const change of view.changes ?? []) {
+    for (const change of removalsFirst(view.changes ?? [], (change) => change?.removed === true)) {
       if (typeof change?.path !== "string") throw new KitRefusal("kit_sync_rejected", "enumerate");
       if (change.removed === true) {
-        await removeReplicaFile(locate(options.replica, authority.path, change.path));
+        await removeReplicaFile(options.replica, authority.path, change.path);
         recorded.delete(change.path);
         continue;
       }
@@ -305,7 +315,7 @@ async function acceptBatch(options, state, outcome, signal, pending = null) {
   const reached = changePosition(outcome, "batch");
   const recorded = new Map(authority.files.map((file) => [file.path, file]));
   const predicted = predictedReplica(authority, pending);
-  for (const file of outcome.contents ?? []) {
+  for (const file of removalsFirst(outcome.contents ?? [], (file) => file?.content === null)) {
     const relative = relativeTo(authority.path, file.path);
     const destination = locate(options.replica, authority.path, relative);
     const local = await replicaText(destination);
@@ -319,7 +329,7 @@ async function acceptBatch(options, state, outcome, signal, pending = null) {
       local !== accepted &&
       local !== expected;
     if (accepted === null) {
-      if (!preserve) await removeReplicaFile(destination);
+      if (!preserve) await removeReplicaFile(options.replica, authority.path, relative);
       recorded.delete(relative);
       continue;
     }

package/src/telegram.js

@@ -736,7 +736,7 @@ async function relayInboundFiles(gateway) {
       gateway.summary.relayed.push({ attachment: file.id, bytes: bytes.length });
     } catch (error) {
       if (cancelled(error) || !(error instanceof KitRefusal)) throw error;
-      gateway.summary.failures.push({ activity: "inbound", item: file.id, code: error.code });
+      refusedPass(gateway, { activity: "inbound", item: file.id, code: error.code });
     }
   }
 }
@@ -914,12 +914,17 @@ async function drainOutboundQueue(gateway) {
   }
 }
 
+function refusedPass(gateway, failure) {
+  gateway.summary.failures.push(failure);
+  gateway.refused(failure);
+}
+
 async function onePass(gateway, activity, work) {
   try {
     await work(gateway);
   } catch (error) {
     if (cancelled(error) || !(error instanceof KitRefusal) || error.code === "kit_update_draining") throw error;
-    gateway.summary.failures.push({ activity, item: null, code: error.code });
+    refusedPass(gateway, { activity, item: null, code: error.code });
   }
 }
 
@@ -1022,6 +1027,7 @@ function gatewayContext(session, options, signal, summary = emptySummary()) {
     passes: options.passes ?? Number.POSITIVE_INFINITY,
     draining: false,
     summary,
+    refused: options.refused,
   };
 }
 
@@ -1115,7 +1121,7 @@ export async function serveTelegramGateway(options, dependencies = {}) {
           gateway.live.heard,
         ).catch((error) => {
           if (cancelled(error)) return;
-          summary.failures.push({ activity: "drafts", item: null, code: error?.code ?? "kit_stream_failed" });
+          refusedPass(gateway, { activity: "drafts", item: null, code: error?.code ?? "kit_stream_failed" });
         });
         try {
           await serveActivities(gateway, stopping);

package/src/working-copy.js

@@ -266,6 +266,11 @@ async function trackedPaths(repository, signal) {
 async function replaceReadOnly(repository, held, written, removed, signal) {
   const tracked = await trackedPaths(repository, signal);
   const holding = new Set(held);
+  for (const path of removed) {
+    if (!held.has(path)) continue;
+    if (!tracked.has(path)) await removeReplicaFile(repository, "", path);
+    holding.delete(path);
+  }
   for (const [path, content] of written) {
     if (tracked.has(path)) continue;
     const target = locate(repository, "", path);
@@ -273,11 +278,6 @@ async function replaceReadOnly(repository, held, written, removed, signal) {
     await writeReplicaFile(target, content, signal);
     holding.add(path);
   }
-  for (const path of removed) {
-    if (!held.has(path)) continue;
-    if (!tracked.has(path)) await removeReplicaFile(locate(repository, "", path));
-    holding.delete(path);
-  }
   return [...holding];
 }
 

package/src/workspace.js

@@ -28,7 +28,7 @@ import {
   releaseControl,
   reportWorkspaceOutcome,
 } from "./house.js";
-import { KitRefusal } from "./refusal.js";
+import { houseFailed, KitRefusal } from "./refusal.js";
 
 const REQUIRED_CONTROLLERS = ["cpu", "memory"];
 const MEMINFO = "/proc/meminfo";
@@ -461,40 +461,48 @@ export async function serveWorkspaces(options, dependencies = {}) {
   const withdrawn = [];
   let reconciled = [];
   const passes = options.passes ?? Number.POSITIVE_INFINITY;
-  for (let pass = 0; pass < passes; pass += 1) {
-    const work = await maintainControl(
-      session,
-      async (signal) => {
-        const acquired = await acquireWorkspaces(session, WORKSPACE_ACQUIRE_MAX, signal);
-        reconciled = await reconcileWorkspaces(host, acquired.workspaces);
-        for (const operation of acquired.operations) {
-          let report;
-          try {
-            report = await performOperation(host, settings, operation);
-          } catch (error) {
-            if (!(error instanceof KitRefusal)) throw error;
-            report = { outcome: "failed", refusal: error.message };
-          }
-          try {
-            await reportWorkspaceOutcome(session, operation.operation, report, signal);
-          } catch (error) {
-            if (!(error instanceof KitRefusal) || error.code !== WORKSPACE_OPERATION_WITHDRAWN) {
-              throw error;
+  try {
+    for (let pass = 0; pass < passes; pass += 1) {
+      const work = await maintainControl(
+        session,
+        async (signal) => {
+          const acquired = await acquireWorkspaces(session, WORKSPACE_ACQUIRE_MAX, signal);
+          reconciled = await reconcileWorkspaces(host, acquired.workspaces);
+          for (const operation of acquired.operations) {
+            let report;
+            try {
+              report = await performOperation(host, settings, operation);
+            } catch (error) {
+              if (!(error instanceof KitRefusal)) throw error;
+              report = { outcome: "failed", refusal: error.message };
             }
-            withdrawn.push({ operation: operation.operation, kind: operation.kind });
-            continue;
+            try {
+              await reportWorkspaceOutcome(session, operation.operation, report, signal);
+            } catch (error) {
+              if (!(error instanceof KitRefusal) || error.code !== WORKSPACE_OPERATION_WITHDRAWN) {
+                throw error;
+              }
+              withdrawn.push({ operation: operation.operation, kind: operation.kind });
+              continue;
+            }
+            settled.push({ operation: operation.operation, kind: operation.kind, ...report });
           }
-          settled.push({ operation: operation.operation, kind: operation.kind, ...report });
-        }
-        return acquired;
-      },
-      options.signal,
-      { release: false },
-    );
-    if (pass + 1 < passes && work.operations.length === 0) {
-      await host.wait(WORKSPACE_POLL_MS);
+          return acquired;
+        },
+        options.signal,
+        { release: false },
+      ).catch((error) => {
+        if (!houseFailed(error)) throw error;
+        return null;
+      });
+      if (pass + 1 < passes && (work === null || work.operations.length === 0)) {
+        await host.wait(WORKSPACE_POLL_MS);
+      }
     }
+  } catch (error) {
+    if (!(error instanceof KitRefusal) || error.code !== "kit_command_cancelled") throw error;
+  } finally {
+    await releaseControl(session);
   }
-  await releaseControl(session);
   return { settled, reconciled, withdrawn };
 }