@agentshouse/kit 0.1.0-alpha.37 → 0.1.0-alpha.38

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.37/connect-linux.sh)
+bash <(curl -fsSL https://github.com/agentshouse/kit/releases/download/v0.1.0-alpha.38/connect-linux.sh)
 ```
 
 Windows 11 (`amd64`), in PowerShell:
 
 ```powershell
-& ([scriptblock]::Create((irm https://github.com/agentshouse/kit/releases/download/v0.1.0-alpha.37/connect-windows.ps1)))
+& ([scriptblock]::Create((irm https://github.com/agentshouse/kit/releases/download/v0.1.0-alpha.38/connect-windows.ps1)))
 ```
 
 The command sets up Docker if it is missing, creates `~/.house-kit` (Kit home)

package/bin/connect-linux.sh

@@ -21,6 +21,15 @@ RUNTIME='Docker Engine'
 OPENER=xdg-open
 NETWORK=(--network host)
 PUBLISHED=()
+AVAILABILITY=intermittent
+NATIVE=0
+NATIVE_RELEASE=26.04
+NATIVE_ARCHITECTURE=amd64
+NATIVE_PACKAGES=(git tmux)
+NATIVE_PREFIX=/opt/house-kit
+NATIVE_SERVICE=house-kit.service
+NATIVE_UNIT=/etc/systemd/system/house-kit.service
+NATIVE_WORKSPACE=/agents/house
 
 refuse() {
   printf 'kit_bootstrap_refused: %s\n' "$1" >&2
@@ -32,13 +41,25 @@ bind_mount() {
   printf 'type=bind,"src=%s",dst=%s' "$source" "$2"
 }
 
+native_kit() {
+  PATH="$NATIVE_PREFIX/bin:$PATH" HOUSE_KIT_HOME="$KIT_HOME" "$NATIVE_PREFIX/bin/node" "$NATIVE_PREFIX/bin/$1" "${@:2}"
+}
+
 login_kit() {
   if [[ " $* " == *' --manual '* ]]; then
-    "${DOCKER_RUN[@]:0:2}" -i "${DOCKER_RUN[@]:2}" login "$@"
+    if ((NATIVE)); then
+      native_kit kit login "$@"
+    else
+      "${DOCKER_RUN[@]:0:2}" -i "${DOCKER_RUN[@]:2}" login "$@"
+    fi
     return
   fi
   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 ((NATIVE)); then
+    native_kit kit login "$@" --host-browser
+  else
+    "${DOCKER_RUN[@]:0:2}" ${PUBLISHED[@]+"${PUBLISHED[@]}"} "${DOCKER_RUN[@]:2}" login "$@" --host-browser
+  fi | while IFS= read -r line; do
     if [[ "$line" == 'Open '* ]]; then
       printf 'Opening House Login in the host browser.\n'
       "$OPENER" "${line#Open }" >/dev/null 2>&1 || refuse 'host browser did not open; rerun with --manual'
@@ -169,6 +190,204 @@ establish_docker_engine() {
   docker_answers || refuse "Docker Engine does not answer: $(docker_cause)"
 }
 
+check_native_host() {
+  local distribution='' release='' described=macOS
+  if [[ "$RUNTIME" == 'Docker Engine' ]]; then
+    described=Linux
+    if [[ -r /etc/os-release ]]; then
+      distribution=$(. /etc/os-release && printf '%s' "${ID:-}")
+      release=$(. /etc/os-release && printf '%s' "${VERSION_ID:-}")
+      described=$(. /etc/os-release && printf '%s' "${PRETTY_NAME:-$described}")
+    fi
+  fi
+  [[ "$distribution" == ubuntu && "$release" == "$NATIVE_RELEASE" && "$ARCH" == "$NATIVE_ARCHITECTURE" ]] ||
+    refuse "--linux runs only on Ubuntu $NATIVE_RELEASE LTS on $NATIVE_ARCHITECTURE, not $described on $ARCH"
+}
+
+
+establish_native_packages() {
+  local present
+  present=$(installed_packages "${NATIVE_PACKAGES[@]}" | wc -l)
+  ((present == ${#NATIVE_PACKAGES[@]})) && return
+  printf 'Installing git and tmux from Ubuntu'\''s apt repository; sudo may ask for your password.\n'
+  elevated apt-get update -qq >/dev/null || refuse 'apt could not refresh its package lists'
+  elevated apt-get install -y -qq "${NATIVE_PACKAGES[@]}" >/dev/null || refuse 'apt could not install git and tmux'
+}
+
+stage_native_kit() {
+  local copy
+  NATIVE_STAGE=$(mktemp -d) || refuse 'no temporary directory for the Kit package'
+  trap 'rm -rf "$NATIVE_STAGE"' EXIT
+  docker pull --quiet --platform "linux/$ARCH" "$IMAGE" >/dev/null
+  copy=$(docker create --platform "linux/$ARCH" "$IMAGE") || refuse 'the Kit image could not be opened'
+  mkdir "$NATIVE_STAGE/bin" "$NATIVE_STAGE/lib"
+  if ! docker cp --quiet "$copy:/usr/local/bin/node" "$NATIVE_STAGE/bin/node" ||
+    ! docker cp --quiet "$copy:/usr/local/lib/node_modules" "$NATIVE_STAGE/lib/node_modules"; then
+    docker rm "$copy" >/dev/null 2>&1 || true
+    refuse 'the Kit package could not be copied from its image'
+  fi
+  docker rm "$copy" >/dev/null
+  ln -s ../lib/node_modules/@agentshouse/kit/bin/kit.js "$NATIVE_STAGE/bin/kit"
+  ln -s ../lib/node_modules/@agentshouse/kit/src/session-bin/house "$NATIVE_STAGE/bin/house"
+  ln -s ../lib/node_modules/npm/bin/npm-cli.js "$NATIVE_STAGE/bin/npm"
+  ln -s ../lib/node_modules/npm/bin/npx-cli.js "$NATIVE_STAGE/bin/npx"
+  printf '%s\n' "$IMAGE" > "$NATIVE_STAGE/image"
+  chmod 0755 "$NATIVE_STAGE" "$NATIVE_STAGE/bin" "$NATIVE_STAGE/lib"
+  chmod 0644 "$NATIVE_STAGE/image"
+}
+
+place_native_kit() {
+  printf 'Installing House Kit in %s; sudo may ask for your password.\n' "$NATIVE_PREFIX"
+  elevated rm -rf "$NATIVE_PREFIX" && elevated mv "$NATIVE_STAGE" "$NATIVE_PREFIX" && elevated chown -R root:root "$NATIVE_PREFIX" ||
+    refuse "House Kit could not be installed in $NATIVE_PREFIX"
+}
+
+start_native_service() {
+  printf '[Unit]\nDescription=House Kit\nWants=network-online.target\nAfter=network-online.target docker.service\n\n[Service]\nUser=%s\nWorkingDirectory=%s\nEnvironment=PATH=%s/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin\nExecStart=%s/bin/node %s/bin/kit resident\nRestart=always\nRestartSec=5\n\n[Install]\nWantedBy=multi-user.target\n' \
+    "$(id -un)" "$NATIVE_WORKSPACE" "$NATIVE_PREFIX" "$NATIVE_PREFIX" "$NATIVE_PREFIX" | elevated tee "$NATIVE_UNIT" >/dev/null &&
+    elevated chmod 0644 "$NATIVE_UNIT" || refuse "$NATIVE_UNIT could not be written"
+  elevated systemctl daemon-reload || refuse 'systemd could not read the House Kit service'
+  elevated systemctl --quiet enable --now "$NATIVE_SERVICE" || refuse 'the House Kit service could not be started'
+}
+
+run_kit() {
+  if ((NATIVE)); then
+    native_kit kit "$@"
+  else
+    "${DOCKER_RUN[@]}" "$@"
+  fi
+}
+
+kit_running() {
+  if ((NATIVE)); then
+    systemctl is-active --quiet "$NATIVE_SERVICE"
+  else
+    [[ "$(docker inspect --format '{{.State.Running}}' "$NAME")" == true ]]
+  fi
+}
+
+kit_installed() {
+  if ((NATIVE)); then
+    [[ -f "$NATIVE_UNIT" ]]
+  else
+    docker container inspect "$NAME" >/dev/null 2>&1
+  fi
+}
+
+installed_image() {
+  if ((NATIVE == 0)); then
+    docker inspect --format '{{.Config.Image}}' "$NAME"
+  elif [[ -f "$NATIVE_PREFIX/image" ]]; then
+    cat "$NATIVE_PREFIX/image"
+  fi
+}
+
+check_installation() {
+  if ((NATIVE)); then
+    grep -qx "User=$(id -un)" "$NATIVE_UNIT" || refuse 'House Kit runs natively on this host for another account'
+    return
+  fi
+  [[ "$(docker inspect --format '{{.HostConfig.RestartPolicy.Name}}' "$NAME")" == unless-stopped ]] || refuse 'the installed Kit has a different lifecycle'
+  [[ "$(docker inspect --format '{{len .Mounts}}' "$NAME")" == 2 ]] || refuse 'the installed Kit has unexpected mounts'
+  [[ "$(docker inspect --format '{{range .Mounts}}{{if eq .Destination "/kit-home"}}{{.Source}}{{end}}{{end}}' "$NAME")" == "$KIT_HOME" ]] || refuse 'the installed Kit uses another Kit home'
+  [[ "$(docker inspect --format '{{range .Mounts}}{{if eq .Destination "/kit-home"}}{{.Type}}/{{.RW}}{{end}}{{end}}' "$NAME")" == bind/true ]] || refuse 'the installed Kit home is not a writable bind mount'
+  [[ "$(docker inspect --format '{{range .Mounts}}{{if eq .Destination "/agents/house"}}{{.Source}}{{end}}{{end}}' "$NAME")" == "$WORKSPACE" ]] || refuse 'the installed Kit uses another workspace root'
+  [[ "$(docker inspect --format '{{range .Mounts}}{{if eq .Destination "/agents/house"}}{{.Type}}/{{.RW}}{{end}}{{end}}' "$NAME")" == bind/true ]] || refuse 'the installed workspace is not a writable bind mount'
+  [[ "$(docker inspect --format '{{index .Config.Labels "agentshouse.house"}}' "$NAME")" == "$HOUSE" ]] || refuse 'the installed Kit uses another House origin'
+}
+
+forward_kit() {
+  if ((NATIVE)); then
+    native_kit "$FORWARDED" ${FORWARD[@]+"${FORWARD[@]}"}
+    return
+  fi
+  local placed=() entry=() terminal=() here
+  if [[ "$FORWARDED" == house ]]; then
+    here=$(pwd -P)
+    [[ "$here" == "$WORKSPACE" || "$here" == "$WORKSPACE"/* ]] || refuse "the current directory is outside the workspace $WORKSPACE"
+    placed=(--workdir "/agents/house${here#"$WORKSPACE"}")
+    entry=(--entrypoint house)
+  fi
+  if [[ -t 0 && -t 1 ]]; then terminal=(-t); fi
+  if [[ -t 0 && ! -t 1 ]]; then
+    ECHOED=$(stty -g)
+    trap 'stty "$ECHOED"' EXIT
+    stty -echo
+  fi
+  if kit_running; then
+    docker exec -i ${terminal[@]+"${terminal[@]}"} ${placed[@]+"${placed[@]}"} "$NAME" "$FORWARDED" ${FORWARD[@]+"${FORWARD[@]}"}
+  else
+    "${DOCKER_RUN[@]:0:2}" -i ${terminal[@]+"${terminal[@]}"} ${placed[@]+"${placed[@]}"} ${entry[@]+"${entry[@]}"} "${DOCKER_RUN[@]:2}" ${FORWARD[@]+"${FORWARD[@]}"}
+  fi
+}
+
+start_kit() {
+  if ((NATIVE)); then
+    start_native_service
+  else
+    start_resident
+  fi
+}
+
+update_kit() {
+  local stopped=0
+  if ((NATIVE)); then
+    stage_native_kit
+  else
+    docker pull --quiet --platform "linux/$ARCH" "$IMAGE" >/dev/null
+  fi
+  if ! kit_running; then
+    stopped=1
+  elif ((NATIVE)); then
+    native_kit kit resident drain
+  else
+    docker exec "$NAME" kit resident drain
+  fi
+  if ((NATIVE)); then
+    elevated systemctl stop "$NATIVE_SERVICE" || refuse 'the House Kit service could not be stopped'
+    place_native_kit
+  else
+    docker rm -f "$NAME" >/dev/null
+  fi
+  rm -f "$KIT_HOME/state/update-drain"
+  ((stopped == 0)) || run_kit credential check
+  start_kit
+  printf 'House Kit updated for Environment %s.\n' "$(cat "$KIT_HOME/environment")"
+}
+
+resume_kit() {
+  run_kit credential check
+  if kit_running; then
+    printf 'House Kit is already running for Environment %s.\n' "$(cat "$KIT_HOME/environment")"
+    return
+  fi
+  if ((NATIVE)); then
+    elevated systemctl start "$NATIVE_SERVICE" || refuse 'the House Kit service could not be started'
+  else
+    docker start "$NAME" >/dev/null
+  fi
+  printf 'House Kit restarted for Environment %s.\n' "$(cat "$KIT_HOME/environment")"
+}
+
+connect_kit() {
+  if [[ -f "$KIT_HOME/credential" ]]; then
+    run_kit credential check
+  else
+    local login=()
+    if ((HOUSE_SELECTED)); then login+=(--house "$HOUSE"); fi
+    if ((MANUAL)); then login+=(--manual); fi
+    login_kit ${login[@]+"${login[@]}"}
+  fi
+  run_kit apply
+  start_kit
+  printf 'House Kit connected for Environment %s.\n' "$(cat "$KIT_HOME/environment")"
+}
+
+if [[ "${1:-}" == --linux && ( "${2:-}" == kit || "${2:-}" == house ) ]]; then
+  NATIVE=1
+  shift
+fi
+
 if [[ "${1:-}" == kit || "${1:-}" == house ]]; then
   FORWARDING=1
   FORWARDED="$1"
@@ -199,9 +418,20 @@ while (($#)); do
       SKILLS=false
       shift
       ;;
+    --linux)
+      NATIVE=1
+      shift
+      ;;
     *) refuse "unknown argument $1" ;;
   esac
 done
+if ((NATIVE)); then
+  ((WORKSPACE_SELECTED == 0)) || refuse "--linux keeps its workspace at $NATIVE_WORKSPACE; --workspace is for a container"
+  WORKSPACE=$NATIVE_WORKSPACE
+  AVAILABILITY=continuous
+elif [[ -e "$NATIVE_UNIT" ]]; then
+  refuse 'House Kit runs natively on this host; rerun this bootstrap with --linux'
+fi
 
 [[ "$IMAGE" =~ ^ghcr\.io/agentshouse/kit@sha256:[0-9a-f]{64}$ ]] || refuse 'this bootstrap has not been published with an immutable image digest'
 case "$(uname -s)" in
@@ -225,21 +455,36 @@ case "$(uname -s)" in
     ;;
   *) refuse "unsupported host $(uname -s); this bootstrap is for Linux and macOS" ;;
 esac
+((NATIVE == 0)) || check_native_host
 [[ "$WORKSPACE" == /* ]] || refuse 'workspace root must be an absolute path'
-if [[ "$RUNTIME" == 'Docker Desktop' ]]; then
-  establish_docker_desktop "$CHIP"
-  DOCKER_SYSTEM=$(docker info --format '{{.OperatingSystem}}' 2>/dev/null) || refuse "Docker Desktop does not answer: $(docker_cause)"
-  [[ "$DOCKER_SYSTEM" == 'Docker Desktop' ]] || refuse "Docker answers from $DOCKER_SYSTEM, not Docker Desktop; stop that engine or switch Docker to Docker Desktop, then rerun this bootstrap"
+if ((NATIVE && FORWARDING)); then
+  [[ -f "$NATIVE_UNIT" ]] || refuse 'House Kit is not installed; run this bootstrap with --linux first'
 else
-  establish_docker_engine
+  if [[ "$RUNTIME" == 'Docker Desktop' ]]; then
+    establish_docker_desktop "$CHIP"
+    DOCKER_SYSTEM=$(docker info --format '{{.OperatingSystem}}' 2>/dev/null) || refuse "Docker Desktop does not answer: $(docker_cause)"
+    [[ "$DOCKER_SYSTEM" == 'Docker Desktop' ]] || refuse "Docker answers from $DOCKER_SYSTEM, not Docker Desktop; stop that engine or switch Docker to Docker Desktop, then rerun this bootstrap"
+  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 $RUNTIME platform $DOCKER_PLATFORM" ;;
+  esac
+  [[ "$DOCKER_ARCH" == "$ARCH" ]] || refuse "host linux/$ARCH does not match $RUNTIME linux/$DOCKER_ARCH"
 fi
-case "$DOCKER_PLATFORM" in
-  linux/x86_64|linux/amd64) DOCKER_ARCH=amd64 ;;
-  linux/aarch64|linux/arm64) DOCKER_ARCH=arm64 ;;
-  *) refuse "unsupported $RUNTIME platform $DOCKER_PLATFORM" ;;
-esac
-[[ "$DOCKER_ARCH" == "$ARCH" ]] || refuse "host linux/$ARCH does not match $RUNTIME linux/$DOCKER_ARCH"
-if ((FORWARDING)); then
+if ((NATIVE)); then
+  if ((FORWARDING == 0)) && docker container inspect "$NAME" >/dev/null 2>&1; then
+    refuse "House Kit runs in the container $NAME on this computer; remove that container, then rerun this bootstrap with --linux"
+  fi
+  [[ ! -L "${NATIVE_WORKSPACE%/*}" ]] || refuse "${NATIVE_WORKSPACE%/*} is a symbolic link"
+  if [[ ! -e "$NATIVE_WORKSPACE" && ! -L "$NATIVE_WORKSPACE" ]]; then
+    printf 'Creating %s for the Agents on this host; sudo may ask for your password.\n' "$NATIVE_WORKSPACE"
+    { [[ -d "${NATIVE_WORKSPACE%/*}" ]] || elevated install -d -m 0755 "${NATIVE_WORKSPACE%/*}"; } &&
+      elevated install -d -m 0700 -o "$(id -u)" -g "$(id -g)" "$NATIVE_WORKSPACE" || refuse "$NATIVE_WORKSPACE could not be created"
+  fi
+elif ((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")
 fi
@@ -270,92 +515,60 @@ fi
 [[ "$HOUSE" == https://* || "$HOUSE" == http://127.0.0.1:* || "$HOUSE" == http://localhost:* ]] || refuse 'House origin must use HTTPS or local loopback HTTP'
 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"
+    printf '{"availability":"%s","execution_authority":"allow","migrators":[],"instances":[],"clients":[],"host":null,"skills":%s}\n' "$AVAILABILITY" "$SKILLS" > "$KIT_HOME/kit.json"
   elif grep -Eq '"skills"[[:space:]]*:' "$KIT_HOME/kit.json"; then
     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.old "1s/^([[:space:]]*)\\{/\\1{\"skills\":$SKILLS,/" "$KIT_HOME/kit.json" || refuse 'kit.json could not be updated'
   fi
+  if ((NATIVE)); then
+    sed -E -i.old "s/(\"availability\"[[:space:]]*:[[:space:]]*)\"[^\"]*\"/\\1\"$AVAILABILITY\"/" "$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'
+  ((NATIVE == 0)) || grep -Eq "\"availability\"[[:space:]]*:[[:space:]]*\"$AVAILABILITY\"" "$KIT_HOME/kit.json" || refuse 'kit.json could not be updated'
 fi
-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")
+
+if ((NATIVE)); then
+  RERUN='with --linux'
+else
+  RERUN='without arguments'
+  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")
 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")
-  ((FORWARDING == 0)) || [[ "$INSTALLED_IMAGE" == "$IMAGE" ]] || refuse 'an installed Kit uses a different image; rerun this bootstrap without arguments to update it'
-  [[ "$(docker inspect --format '{{.HostConfig.RestartPolicy.Name}}' "$NAME")" == unless-stopped ]] || refuse 'the installed Kit has a different lifecycle'
-  [[ "$(docker inspect --format '{{len .Mounts}}' "$NAME")" == 2 ]] || refuse 'the installed Kit has unexpected mounts'
-  [[ "$(docker inspect --format '{{range .Mounts}}{{if eq .Destination "/kit-home"}}{{.Source}}{{end}}{{end}}' "$NAME")" == "$KIT_HOME" ]] || refuse 'the installed Kit uses another Kit home'
-  [[ "$(docker inspect --format '{{range .Mounts}}{{if eq .Destination "/kit-home"}}{{.Type}}/{{.RW}}{{end}}{{end}}' "$NAME")" == bind/true ]] || refuse 'the installed Kit home is not a writable bind mount'
-  [[ "$(docker inspect --format '{{range .Mounts}}{{if eq .Destination "/agents/house"}}{{.Source}}{{end}}{{end}}' "$NAME")" == "$WORKSPACE" ]] || refuse 'the installed Kit uses another workspace root'
-  [[ "$(docker inspect --format '{{range .Mounts}}{{if eq .Destination "/agents/house"}}{{.Type}}/{{.RW}}{{end}}{{end}}' "$NAME")" == bind/true ]] || refuse 'the installed workspace is not a writable bind mount'
-  [[ "$(docker inspect --format '{{index .Config.Labels "agentshouse.house"}}' "$NAME")" == "$HOUSE" ]] || refuse 'the installed Kit uses another House origin'
+if kit_installed; then
+  check_installation
   [[ -f "$KIT_HOME/credential" && -f "$KIT_HOME/environment" && -f "$KIT_HOME/house" ]] || refuse 'the installed Kit has no enrolled authority'
   if ((FORWARDING)); then
+    [[ "$(installed_image)" == "$IMAGE" ]] || refuse "an installed Kit uses a different image; rerun this bootstrap $RERUN to update it"
     if [[ "$FORWARDED" == kit && "${FORWARD[0]:-}" == login ]]; then
       login_kit ${FORWARD[@]+"${FORWARD[@]:1}"}
       exit 0
     fi
-    PLACED=()
-    ENTRY=()
-    if [[ "$FORWARDED" == house ]]; then
-      HERE=$(pwd -P)
-      [[ "$HERE" == "$WORKSPACE" || "$HERE" == "$WORKSPACE"/* ]] || refuse "the current directory is outside the workspace $WORKSPACE"
-      PLACED=(--workdir "/agents/house${HERE#"$WORKSPACE"}")
-      ENTRY=(--entrypoint house)
-    fi
-    TERMINAL=()
-    if [[ -t 0 && -t 1 ]]; then TERMINAL=(-t); fi
-    if [[ -t 0 && ! -t 1 ]]; then
-      ECHOED=$(stty -g)
-      trap 'stty "$ECHOED"' EXIT
-      stty -echo
-    fi
-    if [[ "$(docker inspect --format '{{.State.Running}}' "$NAME")" == true ]]; then
-      docker exec -i ${TERMINAL[@]+"${TERMINAL[@]}"} ${PLACED[@]+"${PLACED[@]}"} "$NAME" "$FORWARDED" ${FORWARD[@]+"${FORWARD[@]}"}
-    else
-      "${DOCKER_RUN[@]:0:2}" -i ${TERMINAL[@]+"${TERMINAL[@]}"} ${PLACED[@]+"${PLACED[@]}"} ${ENTRY[@]+"${ENTRY[@]}"} "${DOCKER_RUN[@]:2}" ${FORWARD[@]+"${FORWARD[@]}"}
-    fi
+    forward_kit
     exit
   fi
-  if [[ "$INSTALLED_IMAGE" != "$IMAGE" ]]; then
-    docker pull --quiet --platform "linux/$ARCH" "$IMAGE" >/dev/null
-    if [[ "$(docker inspect --format '{{.State.Running}}' "$NAME")" == true ]]; then
-      docker exec "$NAME" kit resident drain
-    fi
-    docker rm -f "$NAME" >/dev/null
-    rm -f "$KIT_HOME/state/update-drain"
-    start_resident
-    printf 'House Kit updated for Environment %s.\n' "$(cat "$KIT_HOME/environment")"
-    exit 0
-  fi
-  "${DOCKER_RUN[@]}" credential check
-  if [[ "$(docker inspect --format '{{.State.Running}}' "$NAME")" == true ]]; then
-    printf 'House Kit is already running for Environment %s.\n' "$(cat "$KIT_HOME/environment")"
+  ((NATIVE == 0)) || establish_native_packages
+  if [[ "$(installed_image)" != "$IMAGE" ]]; then
+    update_kit
   else
-    docker start "$NAME" >/dev/null
-    printf 'House Kit restarted for Environment %s.\n' "$(cat "$KIT_HOME/environment")"
+    resume_kit
   fi
   exit 0
 fi
 
-docker pull --quiet --platform "linux/$ARCH" "$IMAGE" >/dev/null
-
-if [[ -f "$KIT_HOME/credential" ]]; then
-  "${DOCKER_RUN[@]}" credential check
+if ((NATIVE)); then
+  establish_native_packages
+  if [[ "$(installed_image)" != "$IMAGE" ]]; then
+    stage_native_kit
+    place_native_kit
+  fi
 else
-  LOGIN=()
-  if ((HOUSE_SELECTED)); then LOGIN+=(--house "$HOUSE"); fi
-  if ((MANUAL)); then LOGIN+=(--manual); fi
-  login_kit ${LOGIN[@]+"${LOGIN[@]}"}
+  docker pull --quiet --platform "linux/$ARCH" "$IMAGE" >/dev/null
 fi
-
-"${DOCKER_RUN[@]}" apply
-start_resident
-printf 'House Kit connected for Environment %s.\n' "$(cat "$KIT_HOME/environment")"
+connect_kit

package/bin/connect-windows.ps1

@@ -364,7 +364,7 @@ function Connect-Kit {
         $entry = @('--entrypoint', 'house')
       }
       $terminal = @()
-      if (-not [Console]::IsInputRedirected -and -not [Console]::IsOutputRedirected) { $terminal = @('-t') }
+      if (-not [Console]::IsInputRedirected) { $terminal = @('-t') }
       if ((Read-Inspect '{{.State.Running}}') -ceq 'true') {
         & docker exec -i @terminal @placed $Name $Forwarded @Forward
       } else {

package/bootstrap.json

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

package/docs/linux.md

@@ -44,3 +44,28 @@ bash <(curl -fsSL …/connect-linux.sh) house git push --owner
 
 `--house http://127.0.0.1:<port>` or `--house http://localhost:<port>` runs Kit
 on the host network so it can reach a House served on this computer.
+
+## An Always-on server that hosts containers
+
+An Always-on Ubuntu server that will run persistent container Environments
+connects natively instead of in a container. Run the command with `--linux`:
+
+```sh
+bash <(curl -fsSL …/connect-linux.sh) --linux
+```
+
+It needs Ubuntu 26.04 LTS on `amd64`; any other host is refused. Every other
+computer takes the ordinary command. It sets up:
+
+- Docker Engine, as above, and `git` and `tmux` from Ubuntu's apt repository.
+- `/opt/house-kit`: House Kit and the Node.js it runs on, copied from the
+  release's image and owned by root.
+- `~/.house-kit`: Kit home, readable only by you.
+- `/agents/house`: your Agents' workspace, readable only by you.
+- `house-kit.service`: the systemd service that runs Kit as you and starts it
+  with the server.
+
+The server connects as a continuous Environment. Put `--linux` before `kit` or
+`house` to run a Kit command, as in
+`bash <(curl -fsSL …/connect-linux.sh) --linux kit apply`, and run a newer
+release's command with `--linux` to update it, as above.

package/docs/windows.md

@@ -30,8 +30,7 @@ refused.
 
 - Append `kit` and a command to run it, as on [Linux](linux.md). Each run
   leaves its exit status in `$LASTEXITCODE`.
-- When a command asks for a secret, such as a Telegram bot token, keep its
-  output on the terminal: with output redirected, what you type is echoed.
+- A command whose output is redirected also writes its prompts and errors there.
 - A House on this computer needs host networking enabled in Docker Desktop's
   settings.
 - This bootstrap has not yet been run on a real Windows computer.

package/package.json

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