@agentshouse/kit 0.1.0-alpha.32 → 0.1.0-alpha.33

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.32/connect-linux.sh)
+bash <(curl -fsSL https://github.com/agentshouse/kit/releases/download/v0.1.0-alpha.33/connect-linux.sh)
 ```
 
 The bootstrap first establishes Docker Engine from what it observes on the
@@ -145,6 +145,37 @@ matching directory beneath `/agents/house`, through the resident's lease when
 the container runs, and refuses a directory outside the workspace before
 anything reaches House.
 
+## Connect a macOS computer
+
+On a Mac with Apple silicon or an Intel chip, run the same
+`bash <(curl -fsSL …/connect-linux.sh)` command as
+[a Linux computer](#connect-a-linux-computer). It runs in macOS's own
+`bash` and reads the chip from the hardware, so it selects `arm64` or `amd64`
+correctly even from a terminal running under Rosetta.
+
+The bootstrap first establishes Docker Desktop from what it observes. A Docker
+Desktop that already answers is used as it is. Without
+`/Applications/Docker.app` it follows Docker's
+[command-line installation](https://docs.docker.com/desktop/setup/install/mac-install/):
+it downloads `Docker.dmg` for the chip from `desktop.docker.com`, attaches it
+through `sudo hdiutil`, runs its `install --user=<account>` through `sudo`, and
+detaches it. `sudo` asks for the password as it ordinarily does, and the
+installer does not accept Docker's Subscription Service Agreement for you. The
+bootstrap then opens Docker Desktop, including one a restart left stopped, and
+waits up to five minutes for its Linux containers to answer while you accept
+its terms or finish what its window asks. If Docker Desktop is still not ready,
+or the download or the installer fails, the bootstrap names the cause and changes
+nothing further; running it again continues from that state. Docker Desktop
+built for the other chip is refused. The bootstrap reaches `docker` in
+Docker Desktop's app bundle when no terminal has added it to `PATH` yet.
+
+Everything after that is the Linux journey above, with `open` as the host
+browser opener. With an HTTPS House, login's container publishes its one
+callback port on the Mac's `127.0.0.1`, so House Login returns from the Mac's
+browser, and no Kit container uses the host network. A loopback House needs
+Docker Desktop's host networking enabled. A `--workspace` root must be a
+directory Docker Desktop shares, such as one under `/Users`.
+
 ## Building the package
 
 The repository checkout is the development source. Build the package that can

package/bin/connect-linux.sh

@@ -15,7 +15,12 @@ FORWARD=()
 UBUNTU_RELEASES=(jammy noble resolute)
 DOCKER_PACKAGES=(docker-ce docker-ce-cli containerd.io docker-buildx-plugin docker-compose-plugin)
 CONFLICTING_PACKAGES=(docker.io docker-compose docker-compose-v2 docker-doc docker-buildx podman-docker containerd runc)
-DOCKER_GROUP=0
+DOCKER_APP=/Applications/Docker.app
+DESKTOP_WAIT_SECONDS=300
+RUNTIME='Docker Engine'
+OPENER=xdg-open
+NETWORK=(--network host)
+PUBLISHED=()
 
 refuse() {
   printf 'kit_bootstrap_refused: %s\n' "$1" >&2
@@ -32,11 +37,11 @@ login_kit() {
     "${DOCKER_RUN[@]:0:2}" -i "${DOCKER_RUN[@]:2}" login "$@"
     return
   fi
-  command -v xdg-open >/dev/null || refuse 'no host browser opener; rerun with --manual'
-  "${DOCKER_RUN[@]}" login "$@" --host-browser | while IFS= read -r line; do
+  command -v "$OPENER" >/dev/null || refuse 'no host browser opener; rerun with --manual'
+  "${DOCKER_RUN[@]:0:2}" ${PUBLISHED[@]+"${PUBLISHED[@]}"} "${DOCKER_RUN[@]:2}" login "$@" --host-browser | while IFS= read -r line; do
     if [[ "$line" == 'Open '* ]]; then
       printf 'Opening House Login in the host browser.\n'
-      xdg-open "${line#Open }" >/dev/null 2>&1 || refuse 'host browser did not open; rerun with --manual'
+      "$OPENER" "${line#Open }" >/dev/null 2>&1 || refuse 'host browser did not open; rerun with --manual'
     else
       printf '%s\n' "$line"
     fi
@@ -46,15 +51,7 @@ login_kit() {
 start_resident() {
   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() {
-  if ((DOCKER_GROUP)); then
-    sudo -u "$(id -un)" docker "$@"
-  else
-    command docker "$@"
-  fi
+  docker run -d --name "$NAME" --restart unless-stopped ${network[@]+"${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
 }
 
 elevated() {
@@ -82,6 +79,41 @@ unanswered() {
   printf '; Docker Engine does not answer: %s' "$(docker_cause)"
 }
 
+install_docker_desktop() {
+  local mount
+  DOWNLOAD=$(mktemp -d) || refuse 'no temporary directory for the Docker Desktop download'
+  trap 'rm -rf "$DOWNLOAD"' EXIT
+  mount="$DOWNLOAD/volume"
+  printf 'Downloading Docker Desktop for %s from docker.com.\n' "$1"
+  curl -fsSL -o "$DOWNLOAD/Docker.dmg" "https://desktop.docker.com/mac/main/$ARCH/Docker.dmg" || refuse 'Docker Desktop could not be downloaded'
+  printf 'Installing Docker Desktop in /Applications; sudo may ask for your password.\n'
+  mkdir "$mount" || refuse 'the Docker Desktop disk image has no mount point'
+  elevated hdiutil attach -nobrowse -readonly -mountpoint "$mount" "$DOWNLOAD/Docker.dmg" >/dev/null || refuse 'the Docker Desktop disk image could not be opened'
+  if ! elevated "$mount/Docker.app/Contents/MacOS/install" "--user=$(id -un)"; then
+    elevated hdiutil detach "$mount" >/dev/null 2>&1 || true
+    refuse 'the Docker Desktop installer did not finish'
+  fi
+  elevated hdiutil detach "$mount" >/dev/null || refuse 'the Docker Desktop disk image could not be closed'
+}
+
+establish_docker_desktop() {
+  PATH="$PATH:$DOCKER_APP/Contents/Resources/bin"
+  docker_answers && return
+  if ((FORWARDING)); then
+    [[ -d "$DOCKER_APP" ]] || refuse 'House Kit is not installed; run this bootstrap without arguments first'
+    refuse "Docker Desktop does not answer: $(docker_cause); start Docker Desktop, then rerun this command"
+  fi
+  [[ -d "$DOCKER_APP" ]] || install_docker_desktop "$1"
+  printf 'Starting Docker Desktop; accept its terms or finish its setup if its window asks.\n'
+  open "$DOCKER_APP" || refuse 'Docker Desktop could not be opened'
+  local waited=0
+  until docker_answers; do
+    ((waited < DESKTOP_WAIT_SECONDS)) || refuse "Docker Desktop is not ready: $(docker_cause); finish what its window asks, then rerun this bootstrap"
+    sleep 2
+    waited=$((waited + 2))
+  done
+}
+
 installed_packages() {
   { dpkg-query -W -f='${db:Status-Status} ${Package}\n' "$@" 2>/dev/null || true; } | awk '$1 == "installed" { print $2 }'
 }
@@ -132,7 +164,7 @@ establish_docker_engine() {
       printf 'Adding %s to the docker group; it applies from your next sign-in, so this run reaches Docker Engine through sudo.\n' "$(id -un)"
       elevated usermod -aG docker "$(id -un)" || refuse "$(id -un) could not be added to the docker group"
     fi
-    docker_member || DOCKER_GROUP=1
+    docker_member || docker() { sudo -u "$(id -un)" docker "$@"; }
   fi
   docker_answers || refuse "Docker Engine does not answer: $(docker_cause)"
 }
@@ -172,20 +204,39 @@ while (($#)); do
 done
 
 [[ "$IMAGE" =~ ^ghcr\.io/agentshouse/kit@sha256:[0-9a-f]{64}$ ]] || refuse 'this bootstrap has not been published with an immutable image digest'
-[[ "$(uname -s)" == Linux ]] || refuse "unsupported host $(uname -s); this bootstrap is for Linux"
-case "$(uname -m)" in
-  x86_64|amd64) ARCH=amd64 ;;
-  aarch64|arm64) ARCH=arm64 ;;
-  *) refuse "unsupported Linux architecture $(uname -m)" ;;
+case "$(uname -s)" in
+  Linux)
+    case "$(uname -m)" in
+      x86_64|amd64) ARCH=amd64 ;;
+      aarch64|arm64) ARCH=arm64 ;;
+      *) refuse "unsupported Linux architecture $(uname -m)" ;;
+    esac
+    ;;
+  Darwin)
+    RUNTIME='Docker Desktop'
+    OPENER=open
+    if [[ "$(sysctl -n hw.optional.arm64 2>/dev/null)" == 1 ]]; then
+      ARCH=arm64
+      CHIP='Apple silicon'
+    else
+      ARCH=amd64
+      CHIP='an Intel chip'
+    fi
+    ;;
+  *) refuse "unsupported host $(uname -s); this bootstrap is for Linux and macOS" ;;
 esac
 [[ "$WORKSPACE" == /* ]] || refuse 'workspace root must be an absolute path'
-establish_docker_engine
+if [[ "$RUNTIME" == 'Docker Desktop' ]]; then
+  establish_docker_desktop "$CHIP"
+else
+  establish_docker_engine
+fi
 case "$DOCKER_PLATFORM" in
   linux/x86_64|linux/amd64) DOCKER_ARCH=amd64 ;;
   linux/aarch64|linux/arm64) DOCKER_ARCH=arm64 ;;
-  *) refuse "unsupported Docker Engine platform $DOCKER_PLATFORM" ;;
+  *) refuse "unsupported $RUNTIME platform $DOCKER_PLATFORM" ;;
 esac
-[[ "$DOCKER_ARCH" == "$ARCH" ]] || refuse "host linux/$ARCH does not match Docker Engine linux/$DOCKER_ARCH"
+[[ "$DOCKER_ARCH" == "$ARCH" ]] || refuse "host linux/$ARCH does not match $RUNTIME linux/$DOCKER_ARCH"
 if ((FORWARDING)); then
   docker container inspect "$NAME" >/dev/null 2>&1 || refuse 'House Kit is not installed; run this bootstrap without arguments first'
   WORKSPACE=$(docker inspect --format '{{range .Mounts}}{{if eq .Destination "/agents/house"}}{{.Source}}{{end}}{{end}}' "$NAME")
@@ -197,7 +248,7 @@ for path in "$KIT_HOME" "$WORKSPACE"; do
   [[ ! -L "$path" ]] || refuse "$path is a symbolic link"
   mkdir -p -m 700 "$path" || refuse "$path could not be created"
   [[ -d "$path" ]] || refuse "$path is not a directory"
-  [[ "$(stat -c %u "$path")" == "$(id -u)" ]] || refuse "$path is not owned by this User"
+  [[ -O "$path" ]] || refuse "$path is not owned by this User"
   chmod 700 "$path" || refuse "$path could not be owner-protected"
 done
 KIT_HOME=$(cd "$KIT_HOME" && pwd -P)
@@ -219,13 +270,19 @@ if ((FORWARDING == 0)); then
   if [[ ! -f "$KIT_HOME/kit.json" ]]; then
     printf '{"availability":"intermittent","execution_authority":"allow","migrators":[],"instances":[],"clients":[],"host":null,"skills":%s}\n' "$SKILLS" > "$KIT_HOME/kit.json"
   elif grep -Eq '"skills"[[:space:]]*:' "$KIT_HOME/kit.json"; then
-    sed -E -i "s/(\"skills\"[[:space:]]*:[[:space:]]*)(true|false)/\\1$SKILLS/" "$KIT_HOME/kit.json" || refuse 'kit.json could not be updated'
+    sed -E -i.old "s/(\"skills\"[[:space:]]*:[[:space:]]*)(true|false)/\\1$SKILLS/" "$KIT_HOME/kit.json" || refuse 'kit.json could not be updated'
   else
-    sed -E -i "1s/^([[:space:]]*)\\{/\\1{\"skills\":$SKILLS,/" "$KIT_HOME/kit.json" || refuse 'kit.json could not be updated'
+    sed -E -i.old "1s/^([[:space:]]*)\\{/\\1{\"skills\":$SKILLS,/" "$KIT_HOME/kit.json" || refuse 'kit.json could not be updated'
   fi
+  rm -f "$KIT_HOME/kit.json.old"
   grep -Eq "\"skills\"[[:space:]]*:[[:space:]]*$SKILLS" "$KIT_HOME/kit.json" || refuse 'kit.json could not be updated'
 fi
-DOCKER_RUN=(docker run --rm --network host --user "$(id -u):$(id -g)" --mount "$KIT_HOME_MOUNT" --mount "$WORKSPACE_MOUNT" --env HOME=/kit-home --env HOUSE_KIT_HOME=/kit-home --env HOUSE_KIT_CONTAINER=1 --env "HOUSE_KIT_HOSTNAME=$(hostname)" "$IMAGE")
+if [[ "$RUNTIME" == 'Docker Desktop' && "$HOUSE" == https://* ]]; then
+  NETWORK=()
+  LOGIN_PORT=$((49152 + RANDOM % 16384))
+  PUBLISHED=(--publish "127.0.0.1:$LOGIN_PORT:$LOGIN_PORT" --env "HOUSE_KIT_LOGIN_PORT=$LOGIN_PORT")
+fi
+DOCKER_RUN=(docker run --rm ${NETWORK[@]+"${NETWORK[@]}"} --user "$(id -u):$(id -g)" --mount "$KIT_HOME_MOUNT" --mount "$WORKSPACE_MOUNT" --env HOME=/kit-home --env HOUSE_KIT_HOME=/kit-home --env HOUSE_KIT_CONTAINER=1 --env "HOUSE_KIT_HOSTNAME=$(hostname)" "$IMAGE")
 
 if docker container inspect "$NAME" >/dev/null 2>&1; then
   INSTALLED_IMAGE=$(docker inspect --format '{{.Config.Image}}' "$NAME")
@@ -240,7 +297,7 @@ if docker container inspect "$NAME" >/dev/null 2>&1; then
   [[ -f "$KIT_HOME/credential" && -f "$KIT_HOME/environment" && -f "$KIT_HOME/house" ]] || refuse 'the installed Kit has no enrolled authority'
   if ((FORWARDING)); then
     if [[ "$FORWARDED" == kit && "${FORWARD[0]:-}" == login ]]; then
-      login_kit "${FORWARD[@]:1}"
+      login_kit ${FORWARD[@]+"${FORWARD[@]:1}"}
       exit 0
     fi
     PLACED=()
@@ -259,9 +316,9 @@ if docker container inspect "$NAME" >/dev/null 2>&1; then
       stty -echo
     fi
     if [[ "$(docker inspect --format '{{.State.Running}}' "$NAME")" == true ]]; then
-      docker exec -i "${TERMINAL[@]}" "${PLACED[@]}" "$NAME" "$FORWARDED" "${FORWARD[@]}"
+      docker exec -i ${TERMINAL[@]+"${TERMINAL[@]}"} ${PLACED[@]+"${PLACED[@]}"} "$NAME" "$FORWARDED" ${FORWARD[@]+"${FORWARD[@]}"}
     else
-      "${DOCKER_RUN[@]:0:2}" -i "${TERMINAL[@]}" "${PLACED[@]}" "${ENTRY[@]}" "${DOCKER_RUN[@]:2}" "${FORWARD[@]}"
+      "${DOCKER_RUN[@]:0:2}" -i ${TERMINAL[@]+"${TERMINAL[@]}"} ${PLACED[@]+"${PLACED[@]}"} ${ENTRY[@]+"${ENTRY[@]}"} "${DOCKER_RUN[@]:2}" ${FORWARD[@]+"${FORWARD[@]}"}
     fi
     exit
   fi
@@ -294,7 +351,7 @@ else
   LOGIN=()
   if ((HOUSE_SELECTED)); then LOGIN+=(--house "$HOUSE"); fi
   if ((MANUAL)); then LOGIN+=(--manual); fi
-  login_kit "${LOGIN[@]}"
+  login_kit ${LOGIN[@]+"${LOGIN[@]}"}
 fi
 
 "${DOCKER_RUN[@]}" apply

package/bin/kit.js

@@ -119,6 +119,7 @@ async function runLogin(args, directory) {
     directory,
     hostBrowser: values["--host-browser"] === true,
     hostname: process.env.HOUSE_KIT_HOSTNAME,
+    loginPort: process.env.HOUSE_KIT_LOGIN_PORT,
     ...(values["--environment"] === undefined ? {} : { environment: values["--environment"] }),
   });
 }

package/bootstrap.json

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

package/package.json

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

package/src/login.js

@@ -216,11 +216,12 @@ export async function login(options, dependencies = {}) {
   return { environment: exchanged.environment };
 }
 
-export async function loopback() {
+export async function loopback(published) {
   const server = createServer();
   await new Promise((resolve, reject) => {
     server.once("error", reject);
-    server.listen(0, "127.0.0.1", resolve);
+    if (published === undefined) server.listen(0, "127.0.0.1", resolve);
+    else server.listen(Number(published), "0.0.0.0", resolve);
   });
   const address = server.address();
   const code = new Promise((resolve, reject) => {
@@ -274,7 +275,7 @@ export async function connectHouse(options, dependencies = {}) {
   refuseDrained(options.directory);
   await prepareLaunchBase(launchBase(dependencies));
   if (options.presentation === "manual") return login(options, dependencies);
-  const callback = await loopback();
+  const callback = await loopback(options.loginPort);
   try {
     return await login(
       { ...options, presentation: "loopback", loopbackUri: callback.uri },