@agentshouse/kit 0.1.0-alpha.39 → 0.1.0-alpha.40

package/README.md

@@ -13,13 +13,13 @@ The Skill set Kit installs is Matt Pocock's
 Linux (`amd64`, `arm64`) or macOS (Apple silicon, Intel):
 
 ```sh
-bash <(curl -fsSL https://github.com/agentshouse/kit/releases/download/v0.1.0-alpha.39/connect-linux.sh)
+bash <(curl -fsSL https://github.com/agentshouse/kit/releases/download/v0.1.0-alpha.40/connect-linux.sh)
 ```
 
 Windows 11 (`amd64`), in PowerShell:
 
 ```powershell
-& ([scriptblock]::Create((irm https://github.com/agentshouse/kit/releases/download/v0.1.0-alpha.39/connect-windows.ps1)))
+& ([scriptblock]::Create((irm https://github.com/agentshouse/kit/releases/download/v0.1.0-alpha.40/connect-windows.ps1)))
 ```
 
 The command sets up Docker if it is missing, creates `~/.house-kit` (Kit home)

package/bootstrap.json

@@ -1,12 +1,12 @@
 {
   "schemaVersion": 1,
-  "version": "0.1.0-alpha.39",
+  "version": "0.1.0-alpha.40",
   "hosts": {
     "linux": {
-      "command": "bash <(curl -fsSL https://github.com/agentshouse/kit/releases/download/v0.1.0-alpha.39/connect-linux.sh)",
+      "command": "bash <(curl -fsSL https://github.com/agentshouse/kit/releases/download/v0.1.0-alpha.40/connect-linux.sh)",
       "asset": {
         "name": "connect-linux.sh",
-        "url": "https://github.com/agentshouse/kit/releases/download/v0.1.0-alpha.39/connect-linux.sh"
+        "url": "https://github.com/agentshouse/kit/releases/download/v0.1.0-alpha.40/connect-linux.sh"
       },
       "workspace": {
         "argument": "--workspace",
@@ -14,10 +14,10 @@
       }
     },
     "windows": {
-      "command": "& ([scriptblock]::Create((irm https://github.com/agentshouse/kit/releases/download/v0.1.0-alpha.39/connect-windows.ps1)))",
+      "command": "& ([scriptblock]::Create((irm https://github.com/agentshouse/kit/releases/download/v0.1.0-alpha.40/connect-windows.ps1)))",
       "asset": {
         "name": "connect-windows.ps1",
-        "url": "https://github.com/agentshouse/kit/releases/download/v0.1.0-alpha.39/connect-windows.ps1"
+        "url": "https://github.com/agentshouse/kit/releases/download/v0.1.0-alpha.40/connect-windows.ps1"
       },
       "workspace": {
         "argument": "--workspace",

package/package.json

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

package/src/contract.js

@@ -279,6 +279,7 @@ export const WORKSPACE_LABEL = "house-kit.workspace";
 export const WORKSPACE_KIT_HOME = "/kit-home";
 export const WORKSPACE_DISK_IMAGE = "disk.img";
 export const WORKSPACE_DISK_MOUNT = "mnt";
+export const WORKSPACE_PREVIOUS_SUFFIX = "-previous";
 export const WORKSPACE_DISK_KIT_HOME = "kit-home";
 export const WORKSPACE_DISK_HOUSE = "house";
 export const WORKSPACE_SELECTED_IMAGE = "/opt/house-kit/image";

package/src/conversation-originals.js

@@ -43,9 +43,7 @@ export async function holdConversationFile(context, file, bytes) {
   const path = statePath(context.directory, identity);
   const noted = await readNote(path, null);
   const observed = bytes === null || oversized ? null : describedBytes(bytes);
-  // House fixes a version's descriptor the first time one is declared and refuses
-  // every later one, so a file held again keeps the descriptor its note carries.
-  // Bytes that no longer answer that descriptor are not this original's bytes.
+
   const descriptor = noted?.descriptor ?? observed;
   const beyondBound = descriptor === null && (oversized || noted?.exceeded === true);
   const held = {

package/src/workspace.js

@@ -19,6 +19,7 @@ import {
   WORKSPACE_LOCK_POLL_MS,
   WORKSPACE_OPERATION_WITHDRAWN,
   WORKSPACE_POLL_MS,
+  WORKSPACE_PREVIOUS_SUFFIX,
   WORKSPACE_READY_ATTEMPTS,
   WORKSPACE_READY_POLL_MS,
   WORKSPACE_RELEASE_IMAGE,
@@ -353,17 +354,72 @@ async function heldWorkspace(host, identity) {
   };
 }
 
-async function replaceWorkspace(host, settings, identity, held) {
+function previousName(identity) {
+  return `${identity}${WORKSPACE_PREVIOUS_SUFFIX}`;
+}
+
+async function replaceWorkspace(host, settings, identity, held, running) {
   const mountRefusal = await mountWorkspace(host, settings, identity);
   if (mountRefusal !== null) return mountRefusal;
+  if (running) {
+    const stopped = await docker(host, [
+      "stop",
+      "--timeout",
+      String(WORKSPACE_STOP_TIMEOUT_SECONDS),
+      identity,
+    ]);
+    if (stopped.status !== 0) return `the workspace did not stop: ${stopped.stderr.trim()}`;
+  }
+  let cause;
+  try {
+    cause = await placeReplacement(host, settings, identity, held, running);
+  } catch (error) {
+    if (!(error instanceof KitRefusal)) throw error;
+    cause = error.message;
+  }
+  if (cause === null) {
+    const removed = await docker(host, ["rm", "--force", previousName(identity)]);
+    if (removed.status === 0) return null;
+    cause = `the previous workspace was not removed: ${removed.stderr.trim()}`;
+  }
+  return rollBack(host, identity, running, cause);
+}
+
+async function placeReplacement(host, settings, identity, held, running) {
   await onDisk(host, settings, identity, `rm -f ${updateDrain(`${PROVISIONED_DISK}/${WORKSPACE_DISK_KIT_HOME}`)}`);
-  const removed = await docker(host, ["rm", "--force", identity]);
-  if (removed.status !== 0) return `the workspace was not replaced: ${removed.stderr.trim()}`;
+  const setAside = await docker(host, ["rename", identity, previousName(identity)]);
+  if (setAside.status !== 0) return `the workspace was not set aside: ${setAside.stderr.trim()}`;
   const created = await docker(
     host,
     workspaceCreateArguments(identity, held, settings.image, settings.house, settings.root),
   );
   if (created.status !== 0) return `the workspace was not recreated: ${created.stderr.trim()}`;
+  if (!running) return null;
+  const started = await docker(host, ["start", identity]);
+  if (started.status !== 0) return `the workspace did not start: ${started.stderr.trim()}`;
+  return null;
+}
+
+async function rollBack(host, identity, running, cause) {
+  const unrestored = await restorePrevious(host, identity);
+  if (unrestored !== null) return `${cause}, and ${unrestored}`;
+  if (!running) return cause;
+  const restarted = await docker(host, ["start", identity]);
+  if (restarted.status === 0) return cause;
+  return `${cause}, and the workspace did not start again: ${restarted.stderr.trim()}`;
+}
+
+async function restorePrevious(host, identity) {
+  const previous = previousName(identity);
+  if ((await workspacePresent(host, previous)) === null) return null;
+  if ((await workspacePresent(host, identity)) !== null) {
+    const discarded = await docker(host, ["rm", "--force", identity]);
+    if (discarded.status !== 0) {
+      return `the replacement was not removed: ${discarded.stderr.trim()}`;
+    }
+  }
+  const restored = await docker(host, ["rename", previous, identity]);
+  if (restored.status !== 0) return `the workspace was not restored: ${restored.stderr.trim()}`;
   return null;
 }
 
@@ -381,7 +437,7 @@ export async function startWorkspace(host, settings, operation) {
   const mountRefusal = await mountWorkspace(host, settings, identity);
   if (mountRefusal !== null) return { outcome: "unsupported", refusal: mountRefusal };
   if (STOPPED_STATES.includes(held.state) && held.image !== settings.image) {
-    const refusal = await replaceWorkspace(host, settings, identity, held);
+    const refusal = await replaceWorkspace(host, settings, identity, held, false);
     if (refusal !== null) return { outcome: "failed", refusal };
   }
   const started = await docker(host, ["start", identity]);
@@ -469,14 +525,15 @@ export async function managedWorkspaces(host) {
   if (listed.status !== 0) {
     throw new KitRefusal("kit_workspace_inventory_unavailable", listed.stderr.trim() || null);
   }
-  return listed.stdout
-    .split("\n")
-    .map((line) => line.trim())
-    .filter((line) => line !== "")
-    .map((line) => {
-      const [name, environment, state] = line.split(/\s+/);
-      return { name, environment, state };
-    });
+  const managed = new Map();
+  for (const line of listed.stdout.split("\n").map((entry) => entry.trim()).filter((entry) => entry !== "")) {
+    const [container, environment, state] = line.split(/\s+/);
+    const name = container.endsWith(WORKSPACE_PREVIOUS_SUFFIX)
+      ? container.slice(0, -WORKSPACE_PREVIOUS_SUFFIX.length)
+      : container;
+    if (!managed.has(name)) managed.set(name, { name, environment, state });
+  }
+  return [...managed.values()];
 }
 
 export async function reconcileWorkspaces(host, authorized) {
@@ -487,6 +544,7 @@ export async function reconcileWorkspaces(host, authorized) {
   for (const managed of await managedWorkspaces(host)) {
     if (expected.get(managed.environment) === "running") continue;
     const settled = await exclusively(host, managed.name, async () => {
+      if ((await restorePrevious(host, managed.name)) !== null) return false;
       if ((await workspacePresent(host, managed.name)) !== "running") return false;
       const stopping = await docker(host, [
         "stop",
@@ -528,7 +586,10 @@ async function exclusively(host, identity, act) {
 
 export async function performOperation(host, settings, operation) {
   const selected = operation.kind === "stop" ? settings : { ...settings, image: await selectedImage(host) };
-  return exclusively(host, operation.workspace ?? workspaceIdentity(operation), () => {
+  const identity = operation.workspace ?? workspaceIdentity(operation);
+  return exclusively(host, identity, async () => {
+    const unrestored = await restorePrevious(host, identity);
+    if (unrestored !== null) return { outcome: "failed", refusal: unrestored };
     if (operation.kind === "stop") return stopWorkspace(host, operation);
     if (operation.kind === "create") return createWorkspace(host, selected, operation);
     if (operation.kind === "start") return startWorkspace(host, selected, operation);
@@ -559,6 +620,8 @@ async function hostSettings(options) {
 
 async function updateWorkspace(host, settings, name) {
   try {
+    const unrestored = await restorePrevious(host, name);
+    if (unrestored !== null) return { workspace: name, cause: unrestored };
     const held = await heldWorkspace(host, name);
     if (held === null || held.image === settings.image) return null;
     const running = !STOPPED_STATES.includes(held.state);
@@ -568,14 +631,8 @@ async function updateWorkspace(host, settings, name) {
         return { workspace: name, cause: drained.stdout.trim() || drained.stderr.trim() };
       }
     }
-    const refusal = await replaceWorkspace(host, settings, name, held);
+    const refusal = await replaceWorkspace(host, settings, name, held, running);
     if (refusal !== null) return { workspace: name, cause: refusal };
-    if (running) {
-      const started = await docker(host, ["start", name]);
-      if (started.status !== 0) {
-        return { workspace: name, cause: `the workspace did not start: ${started.stderr.trim()}` };
-      }
-    }
     return { workspace: name, running };
   } catch (error) {
     if (!(error instanceof KitRefusal)) throw error;