@agentsdock/server 1.0.7-beta.5 → 1.0.8-beta.2

package/server/uninstall.sh

@@ -1,6 +1,29 @@
 #!/usr/bin/env bash
 set -euo pipefail
 
+UNINSTALL_SCRIPT_DIR="$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" && pwd)"
+# Bare uninstall previews ALL instances and requires their exact names. Keep
+# legacy explicit --yes automation default-scoped; --all opts into bulk removal.
+if (($# == 0)); then
+  exec bash "$UNINSTALL_SCRIPT_DIR/instances.sh" remove --all
+fi
+for uninstall_option in "$@"; do
+  if [[ "$uninstall_option" == "--all" || "$uninstall_option" == "--instance" ]]; then
+    exec bash "$UNINSTALL_SCRIPT_DIR/instances.sh" remove "$@"
+  fi
+done
+INSTANCE_NAME="${AGENTS_SERVER_INSTANCE:-default}"
+MANAGED_REMOVAL="false"
+if [[ "$1" == "--managed-instance" ]]; then
+  MANAGED_REMOVAL="true"
+  INSTANCE_NAME="${2:?missing instance name}"
+  shift 2
+fi
+if [[ ! "$INSTANCE_NAME" =~ ^[a-z][a-z0-9-]{0,31}$ ]]; then
+  echo "Invalid instance name." >&2
+  exit 2
+fi
+
 INSTALL_ROOT="${AGENTS_SERVER_INSTALL_DIR:-$HOME/.local/share/agents-server}"
 CONFIG_ROOT="${AGENTS_SERVER_CONFIG_DIR:-$HOME/.config/agents-server}"
 LEGACY_STATE_ROOT="$HOME/.zenithbot-agent"
@@ -14,10 +37,29 @@ else
   STATE_ROOT="$HOME/.agentsdock"
 fi
 SERVICE_NAME="agents-server"
+LABEL="com.agentsdock.server"
+INSTANCE_LOG_DIR="$HOME/Library/Logs/AgentsServer"
+if [[ "$INSTANCE_NAME" != "default" ]]; then
+  instance_bindings="$(bash "$UNINSTALL_SCRIPT_DIR/instances.sh" _bindings "$INSTANCE_NAME")" || exit 2
+  eval "$instance_bindings"
+fi
 OS_NAME="$(uname -s)"
 
 ASSUME_YES="false"
 PURGE_STATE="false"
+MANAGED_RELEASE_NAME="false"
+UNINSTALL_RED=""
+UNINSTALL_GREEN=""
+UNINSTALL_RESET=""
+if [[ -t 1 && "${TERM:-}" != "dumb" && -z "${NO_COLOR+x}" ]]; then
+  UNINSTALL_RED=$'\033[31m'
+  UNINSTALL_GREEN=$'\033[32m'
+  UNINSTALL_RESET=$'\033[0m'
+fi
+
+uninstall_status() {
+  printf '%s%s%s\n' "$1" "$2" "$UNINSTALL_RESET"
+}
 
 normalize_managed_path() {
   local label="$1"
@@ -97,6 +139,12 @@ usage() {
   cat <<USAGE
 Usage: ./uninstall.sh [--yes] [--purge-state]
 
+With no arguments: show all current-user instances and confirm their exact names.
+  --instance NAME   Remove only NAME (preview + confirmation).
+  --all             Remove all instances (preview + confirmation).
+  --all --exclude default   Keep the original/default server untouched.
+Legacy --yes without --all remains default-scoped for compatibility.
+
 Stops and removes the AgentsServer user service, versioned release runtime,
 and generated configuration (including the access token). Chat history, jobs,
 files, secure-peer credentials, and terminals under $STATE_ROOT are preserved
@@ -117,11 +165,21 @@ while (($#)); do
   case "$1" in
     --yes) ASSUME_YES="true"; shift ;;
     --purge-state) PURGE_STATE="true"; shift ;;
+    --managed-release-name) MANAGED_RELEASE_NAME="true"; shift ;;
     -h|--help) usage; exit 0 ;;
     *) echo "Unknown option: $1" >&2; usage >&2; exit 2 ;;
   esac
 done
 
+# This flag only controls progress text. The manager separately archives state
+# after a successful service removal, using the user's affirmative choice.
+if [[ "$MANAGED_RELEASE_NAME" == "true" \
+  && ( "$MANAGED_REMOVAL" != "true" || "$INSTANCE_NAME" == "default" \
+    || "$ASSUME_YES" != "true" || "$PURGE_STATE" == "true" ) ]]; then
+  echo "--managed-release-name is only for a confirmed named-instance manager removal." >&2
+  exit 2
+fi
+
 # The split lifecycle validates its installed layout, obtains an exact idle
 # execution hold, and owns the shared lock through both native service stops
 # and filesystem removal. Keep legacy uninstall unchanged for old layouts.
@@ -243,14 +301,15 @@ else
   echo "Aborted; nothing was changed." >&2
   exit 1
 fi
+echo
 
 case "$OS_NAME" in
   Darwin)
-    LABEL="com.agentsdock.server"
+    LABEL="${LABEL:-com.agentsdock.server}"
     PLIST="$HOME/Library/LaunchAgents/$LABEL.plist"
     SERVICE_TARGET="gui/$(id -u)/$LABEL"
     if launchctl print "$SERVICE_TARGET" >/dev/null 2>&1; then
-      echo "Stopping $LABEL"
+      uninstall_status "$UNINSTALL_RED" "Stopping $LABEL"
       if ! launchctl bootout "$SERVICE_TARGET" >/dev/null 2>&1 && \
         launchctl print "$SERVICE_TARGET" >/dev/null 2>&1; then
         echo "Could not stop $LABEL; no files were removed." >&2
@@ -270,12 +329,12 @@ case "$OS_NAME" in
       fi
     fi
     if [[ -f "$PLIST" ]]; then
-      echo "Removing $PLIST"
+      uninstall_status "$UNINSTALL_RED" "Removing $PLIST"
       rm -f "$PLIST"
     fi
-    LOG_DIR="$HOME/Library/Logs/AgentsServer"
+    LOG_DIR="$INSTANCE_LOG_DIR"
     if [[ -d "$LOG_DIR" ]]; then
-      echo "Removing $LOG_DIR"
+      uninstall_status "$UNINSTALL_RED" "Removing $LOG_DIR"
       rm -rf "$LOG_DIR"
     fi
     ;;
@@ -286,7 +345,7 @@ case "$OS_NAME" in
       exit 1
     fi
     if [[ -f "$SERVICE_FILE" ]] || systemctl --user is-active --quiet "$SERVICE_NAME.service"; then
-      echo "Stopping $SERVICE_NAME.service"
+      uninstall_status "$UNINSTALL_RED" "Stopping $SERVICE_NAME.service"
       if ! systemctl --user disable --now "$SERVICE_NAME.service" >/dev/null 2>&1 && \
         systemctl --user is-active --quiet "$SERVICE_NAME.service"; then
         echo "Could not stop $SERVICE_NAME.service; no files were removed." >&2
@@ -306,7 +365,7 @@ case "$OS_NAME" in
       fi
     fi
     if [[ -f "$SERVICE_FILE" ]]; then
-      echo "Removing $SERVICE_FILE"
+      uninstall_status "$UNINSTALL_RED" "Removing $SERVICE_FILE"
       rm -f "$SERVICE_FILE"
       systemctl --user daemon-reload || true
     fi
@@ -318,7 +377,7 @@ case "$OS_NAME" in
 esac
 
 if [[ -d "$INSTALL_ROOT" ]]; then
-  echo "Removing release runtime at $INSTALL_ROOT"
+  uninstall_status "$UNINSTALL_RED" "Removing release runtime at $INSTALL_ROOT"
   shopt -s dotglob nullglob
   for install_entry in "$INSTALL_ROOT"/*; do
     [[ "$install_entry" == "$INSTALL_LOCK_DIR" ]] || rm -rf -- "$install_entry"
@@ -327,20 +386,30 @@ if [[ -d "$INSTALL_ROOT" ]]; then
 fi
 
 if [[ -d "$CONFIG_ROOT" ]]; then
-  echo "Removing configuration at $CONFIG_ROOT"
+  uninstall_status "$UNINSTALL_RED" "Removing configuration at $CONFIG_ROOT"
   rm -rf "$CONFIG_ROOT"
 fi
 
 if [[ "$PURGE_STATE" == "true" ]]; then
   if [[ -e "$STATE_ROOT" || -L "$LEGACY_STATE_ROOT" ]]; then
-    [[ ! -L "$LEGACY_STATE_ROOT" ]] || rm -f "$LEGACY_STATE_ROOT"
+    if [[ "$INSTANCE_NAME" == "default" ]]; then
+      [[ ! -L "$LEGACY_STATE_ROOT" ]] || rm -f "$LEGACY_STATE_ROOT"
+    fi
     [[ ! -e "$STATE_ROOT" ]] || rm -rf "$STATE_ROOT"
-    echo "Deleted $STATE_ROOT"
+    uninstall_status "$UNINSTALL_RED" "Deleted $STATE_ROOT"
+  fi
+elif [[ -e "$STATE_ROOT" && "$MANAGED_RELEASE_NAME" != "true" ]]; then
+  echo
+  uninstall_status "$UNINSTALL_GREEN" "Preserved chat history, jobs, files, tokens, and secure-peer credentials at $STATE_ROOT."
+  echo
+  if [[ "$INSTANCE_NAME" == "default" ]]; then
+    echo "Re-running ./install.sh will pick ordinary AgentsServer state back up. Pass --purge-state to also delete it."
+  else
+    echo "To reuse this named history, run ./install.sh --instance $INSTANCE_NAME --port PORT (choose an available port)."
+    echo "Do not use bare ./install.sh for this instance; it targets the default server. Pass --purge-state to also delete history."
   fi
-elif [[ -e "$STATE_ROOT" ]]; then
-  echo "Preserved chat history, jobs, files, tokens, and secure-peer credentials at $STATE_ROOT."
-  echo "Re-running ./install.sh will pick ordinary AgentsServer state back up. Pass --purge-state to also delete it."
   if [[ -e "$STATE_ROOT/team-hub/team-hub.sqlite3" || -L "$STATE_ROOT/team-hub/team-hub.sqlite3" ]]; then
+    echo
     echo "Preserved Team Hub state is not auto-reactivated in this beta; use a signed managed recovery or support-assisted restoration."
   fi
 fi
@@ -354,6 +423,15 @@ if [[ -d "$INSTALL_ROOT" ]] && ! rmdir "$INSTALL_ROOT"; then
   exit 1
 fi
 
-echo "AgentsServer service, release runtime, and configuration removed."
-echo "Note: any persistent chat terminals (tmux sessions named zd_*) keep running"
-echo "independently and are not touched by this script. List them with: tmux ls"
+echo
+if [[ "$INSTANCE_NAME" == "default" ]]; then
+  echo "Note: any persistent chat terminals (tmux sessions named zd_*) keep running"
+  echo "independently and are not touched by this script. List them with: tmux ls"
+else
+  echo "Note: persistent chat terminals for $INSTANCE_NAME keep running independently and are not touched by this script."
+  echo "List only this instance's terminals with: tmux -L agents-server-$INSTANCE_NAME ls"
+fi
+if [[ "$MANAGED_REMOVAL" != "true" ]]; then
+  echo
+  uninstall_status "$UNINSTALL_GREEN" "Successful!"
+fi

package/server/update_preparation.py

@@ -217,7 +217,10 @@ def run_preparation(*, status_path: Path, root: Path, public_key: Path, preparat
                 archive.write_bytes(data)
                 source = updates.safe_extract(archive, work / "extracted",
                     npm_manifest=manifest if manifest.get("schema") == 2 else None)
-                if not (source / "execution_preparation.py").is_file():
+                instance_arguments = updates.instance_installer_arguments(source)
+                if instance_arguments or not (source / "execution_preparation.py").is_file():
+                    # Named instances use their isolated legacy service, not the
+                    # default-only split gateway preparation/activation protocol.
                     # Older signed releases retain their established installer.
                     prepared = {"mode": "legacy", "preparation_id": preparation_id, "envelope": envelope}
                 else:

package/server/update_runner.py

@@ -335,6 +335,21 @@ def installer_environment() -> dict[str, str]:
     return environment
 
 
+def instance_installer_arguments(source: Path) -> list[str]:
+    """Never let a named server run an old default-only installer."""
+    from server_instances import instance_name
+    name = instance_name(os.environ.get("AGENTS_SERVER_INSTANCE", "default"))
+    if name == "default":
+        return []  # Preserve older signed default installers.
+    helper = source / "server_instances.py"
+    installer = source / "install.sh"
+    if (not helper.is_file() or helper.is_symlink()
+            or "INSTANCE_PROTOCOL = 1" not in helper.read_text()
+            or '--instance)' not in installer.read_text()):
+        raise RuntimeError("This release does not support named instances; the existing server was not replaced.")
+    return ["--instance", name]
+
+
 def run_installer(
     command: list[str],
     *,
@@ -1549,6 +1564,7 @@ def run_update(args: argparse.Namespace) -> None:
             command.extend(["--execution-handoff-file", handoff_file])
         if manifest.get("schema") == 2 or prepared_update is not None:
             command.extend(["--expected-api-contract", str(manifest["api_contract_version"])])
+        command.extend(instance_installer_arguments(source))
         if expected_team_hub_id is not None:
             command.extend(
                 [

package/server/uv.lock

@@ -30,6 +30,7 @@ dependencies = [
     { name = "croniter" },
     { name = "cryptography" },
     { name = "fastapi" },
+    { name = "httpx" },
     { name = "pydantic" },
     { name = "python-dateutil" },
     { name = "python-multipart" },
@@ -44,6 +45,7 @@ requires-dist = [
     { name = "croniter", specifier = ">=6,<7" },
     { name = "cryptography", specifier = ">=50.0.1,<51" },
     { name = "fastapi", specifier = ">=0.115,<1" },
+    { name = "httpx", specifier = ">=0.28.1,<1" },
     { name = "pydantic", specifier = ">=2.10,<3" },
     { name = "python-dateutil", specifier = ">=2.9,<3" },
     { name = "python-multipart", specifier = ">=0.0.20,<1" },
@@ -326,7 +328,7 @@ name = "exceptiongroup"
 version = "1.3.1"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
-    { name = "typing-extensions", marker = "python_full_version < '3.11'" },
+    { name = "typing-extensions" },
 ]
 sdist = { url = "https://files.pythonhosted.org/packages/50/79/66800aadf48771f6b62f7eb014e352e5d06856655206165d775e675a02c9/exceptiongroup-1.3.1.tar.gz", hash = "sha256:8b412432c6055b0b7d14c310000ae93352ed6754f70fa8f7c34141f91c4e3219", size = 30371, upload-time = "2025-11-21T23:01:54.787Z" }
 wheels = [