@agentshouse/kit 0.1.0-alpha.41 → 0.1.0-alpha.42

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.41/connect-linux.sh)
+bash <(curl -fsSL https://github.com/agentshouse/kit/releases/download/v0.1.0-alpha.42/connect-linux.sh)
 ```
 
 Windows 11 (`amd64`), in PowerShell:
 
 ```powershell
-& ([scriptblock]::Create((irm https://github.com/agentshouse/kit/releases/download/v0.1.0-alpha.41/connect-windows.ps1)))
+& ([scriptblock]::Create((irm https://github.com/agentshouse/kit/releases/download/v0.1.0-alpha.42/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.41",
+  "version": "0.1.0-alpha.42",
   "hosts": {
     "linux": {
-      "command": "bash <(curl -fsSL https://github.com/agentshouse/kit/releases/download/v0.1.0-alpha.41/connect-linux.sh)",
+      "command": "bash <(curl -fsSL https://github.com/agentshouse/kit/releases/download/v0.1.0-alpha.42/connect-linux.sh)",
       "asset": {
         "name": "connect-linux.sh",
-        "url": "https://github.com/agentshouse/kit/releases/download/v0.1.0-alpha.41/connect-linux.sh"
+        "url": "https://github.com/agentshouse/kit/releases/download/v0.1.0-alpha.42/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.41/connect-windows.ps1)))",
+      "command": "& ([scriptblock]::Create((irm https://github.com/agentshouse/kit/releases/download/v0.1.0-alpha.42/connect-windows.ps1)))",
       "asset": {
         "name": "connect-windows.ps1",
-        "url": "https://github.com/agentshouse/kit/releases/download/v0.1.0-alpha.41/connect-windows.ps1"
+        "url": "https://github.com/agentshouse/kit/releases/download/v0.1.0-alpha.42/connect-windows.ps1"
       },
       "workspace": {
         "argument": "--workspace",

package/package.json

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

package/src/workspace.js

@@ -401,7 +401,7 @@ async function placeReplacement(host, settings, identity, held, running) {
 }
 
 async function rollBack(host, identity, running, cause) {
-  const unrestored = await restorePrevious(host, identity);
+  const unrestored = await restorePrevious(host, identity, true);
   if (unrestored !== null) return `${cause}, and ${unrestored}`;
   if (!running) return cause;
   const restarted = await docker(host, ["start", identity]);
@@ -409,10 +409,16 @@ async function rollBack(host, identity, running, cause) {
   return `${cause}, and the workspace did not start again: ${restarted.stderr.trim()}`;
 }
 
-async function restorePrevious(host, identity) {
+async function restorePrevious(host, identity, rollingBack = false) {
   const previous = previousName(identity);
   if ((await workspacePresent(host, previous)) === null) return null;
-  if ((await workspacePresent(host, identity)) !== null) {
+  const current = await workspacePresent(host, identity);
+  if (current === "running" && !rollingBack) {
+    const removed = await docker(host, ["rm", "--force", previous]);
+    if (removed.status !== 0) return `the previous workspace was not removed: ${removed.stderr.trim()}`;
+    return null;
+  }
+  if (current !== null) {
     const discarded = await docker(host, ["rm", "--force", identity]);
     if (discarded.status !== 0) {
       return `the replacement was not removed: ${discarded.stderr.trim()}`;