direxio-deployer 0.1.7 → 0.1.9

package/scripts/phases/s2_domain.sh

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 # S2 DOMAIN_DECISION — validate the production Matrix server_name.
 #
-# P2P-IM production deployments require a real, long-lived domain. Temporary
+# Direxio production deployments require a real, long-lived domain. Temporary
 # sslip.io/public-IP domains are intentionally not part of this interface.
 #
 # Supported modes:
@@ -9,7 +9,7 @@
 #   DOMAIN_MODE=route53 Route53 hosted zone; ops manages the A record
 #
 # If DOMAIN_MODE is omitted but DOMAIN is present, user mode is assumed.
-# P2P_ASSUME_DEFAULTS never chooses a domain.
+# DIREXIO_ASSUME_DEFAULTS never chooses a domain.
 
 S2_PHASE_DIR=$(cd "$(dirname "${BASH_SOURCE[0]:-$0}")/.." && pwd)
 source "$S2_PHASE_DIR/lib/domain.sh"
@@ -24,7 +24,7 @@ run_phase() {
     if [ -n "$domain" ]; then
       mode=user
     elif [ -t 0 ]; then
-      warn "P2P-IM requires a production domain as the Matrix server_name."
+      warn "Direxio requires a production domain as the Matrix server_name."
       warn "Changing the domain is effectively a new homeserver identity; temporary sslip.io defaults are not supported."
       printf "Enter the final domain (for example __DOMAIN__): " >&2
       read -r domain
@@ -36,7 +36,7 @@ run_phase() {
       mode=user
     else
       phase_set S2_DOMAIN waiting_user "waiting for production domain"
-      warn "Deployment blocked: DOMAIN is missing. P2P-IM no longer supports temporary sslip.io defaults."
+      warn "Deployment blocked: DOMAIN is missing. Direxio no longer supports temporary sslip.io defaults."
       warn "Prepare a production domain such as __DOMAIN__. Matrix server_name binds to that domain; changing it later is effectively a new homeserver identity."
       warn "Example:"
       warn "  DOMAIN=__DOMAIN__ DOMAIN_MODE=user CONFIRM_DOMAIN_BINDING=1 bash scripts/orchestrate.sh"

package/scripts/phases/s3_provision.sh

@@ -18,7 +18,7 @@ run_phase() {
   if [ -z "$instance_type" ]; then
     instance_type=${INSTANCE_TYPE:-}
     if [ -z "$instance_type" ]; then
-      if [ "${P2P_ASSUME_DEFAULTS:-0}" = "1" ]; then
+      if [ "${DIREXIO_ASSUME_DEFAULTS:-0}" = "1" ]; then
         instance_type=t3.small
       elif [ -t 0 ]; then
         warn "Default EC2 instance type is t3.small (2 vCPU / 2GB). Do you need a larger instance?"
@@ -50,10 +50,10 @@ run_phase() {
   vpc=$(res_get vpc_id)
   local message_server_image
   message_server_image=${MESSAGE_SERVER_IMAGE:-direxio/message-server:latest}
-  local scripts_dir=${P2P_INSTALL_SCRIPTS_DIR:-${HERE:-$S3_PHASE_DIR}}
+  local scripts_dir=${DIREXIO_INSTALL_SCRIPTS_DIR:-${HERE:-$S3_PHASE_DIR}}
 
   # 1) Key pair (idempotent).
-  local keyfile="$P2P_WORKDIR/${name}.pem"
+  local keyfile="$DIREXIO_WORKDIR/${name}.pem"
   if [ -z "$(res_get key_name)" ]; then
     log "Creating key pair $name ..."
     aws ec2 create-key-pair --key-name "$name" --query KeyMaterial --output text > "$keyfile"
@@ -69,7 +69,7 @@ run_phase() {
     warn "Security group opens 22/80/443, TURN 3478 tcp/udp, and 49160-49200/udp to 0.0.0.0/0."
     warn "Keep the SSH private key, AWS credentials, and password secure."
     sg=$(aws ec2 create-security-group --group-name "$name" \
-         --description "p2p-matrix $name" --vpc-id "$vpc" --query GroupId --output text)
+         --description "direxio $name" --vpc-id "$vpc" --query GroupId --output text)
     res_set sg_id "$sg"
     local p
     for p in 22 80 443; do
@@ -95,7 +95,7 @@ run_phase() {
     warn "S3 requires a production DOMAIN. Complete S2_DOMAIN first."
     return 2
   fi
-  local userdata="$P2P_WORKDIR/user-data.yaml"
+  local userdata="$DIREXIO_WORKDIR/user-data.yaml"
   log "Rendering cloud-init (domain_mode=$domain_mode)..."
   bash "$scripts_dir/render/render-userdata.sh" \
     --domain "$domain" \
@@ -215,7 +215,7 @@ _upsert_route53_record() {
   change_file=$(mktemp)
   cat > "$change_file" <<EOF
 {
-  "Comment": "p2p-matrix deployment",
+  "Comment": "Direxio deployment",
   "Changes": [
     {
       "Action": "UPSERT",

package/scripts/phases/s5_init_tokens.sh

@@ -8,7 +8,7 @@ run_phase() {
   domain=$(state_get domain)
   pubip=$(res_get public_ip)
   keyfile=$(res_get key_file)
-  local out="$P2P_WORKDIR/outputs.json" raw
+  local out="$DIREXIO_WORKDIR/outputs.json" raw
   raw=$(mktemp)
   trap 'rm -f "${raw:-}"; trap - RETURN' RETURN
 

package/scripts/phases/s6_wire_local.sh

@@ -362,7 +362,7 @@ _validate_agent_platform() {
 }
 
 _agent_install_policy() {
-  local policy=${DIREXIO_AGENT_INSTALL:-recommend}
+  local policy=${DIREXIO_AGENT_INSTALL:-auto}
   case "$policy" in
     skip|recommend|auto) printf '%s\n' "$policy" ;;
     *) fail "DIREXIO_AGENT_INSTALL must be skip, recommend, or auto." ;;
@@ -1125,6 +1125,26 @@ _maybe_auto_install_cc_connect() {
   fi
 }
 
+_maybe_auto_install_mcp() {
+  local policy=$1
+  if [ "$policy" != "auto" ]; then
+    state_set mcp_install_status "$policy" 2>/dev/null || true
+    return 0
+  fi
+  if ! command -v npm >/dev/null 2>&1; then
+    warn "DIREXIO_AGENT_INSTALL=auto requested, but npm is not on PATH. Install Node.js to install direxio-mcp automatically."
+    state_set mcp_install_status "npm_missing" 2>/dev/null || true
+    return 0
+  fi
+  if npm install -g "$(_mcp_npm_package)"; then
+    state_set mcp_install_status "installed" 2>/dev/null || true
+    ok "direxio-mcp installed from npm."
+  else
+    state_set mcp_install_status "install_failed" 2>/dev/null || true
+    warn "direxio-mcp npm install failed. MCP config artifacts and install command are available for manual recovery."
+  fi
+}
+
 _agent_skill_install_path() {
   local runtime=$1
   case "$runtime" in
@@ -1442,12 +1462,14 @@ run_phase() {
   state_set agent_install_policy "$install_policy" 2>/dev/null || true
   state_set agent_install_mode "$install_mode" 2>/dev/null || true
   state_set agent_install_command "$install_command" 2>/dev/null || true
+  state_set mcp_install_policy "$install_policy" 2>/dev/null || true
   state_set agent_skill_install_path "$skill_path" 2>/dev/null || true
   state_set agent_global_skill_install_path "$global_skill_path" 2>/dev/null || true
   state_set direxio_agent_bridge "cc-connect" 2>/dev/null || true
   _print_cc_connect_guidance "$runtime" "$asurl" "$node_cred" "$envfile" "$install_policy" "$install_mode" "$install_command" "$node_id" "$cc_config_local" "$cc_binary" "$cc_agent" "$cc_agent_cmd" "$service_id"
   _print_mcp_guidance "$runtime" "$service_id" "$mcp_server_name" "$node_cred_local" "$mcp_dir_local" "$mcp_codex_config_local" "$mcp_openclaw_config_local" "$mcp_hermes_config_local" "$mcp_install_command" "$mcp_doctor_command"
   _maybe_auto_install_agent "$install_policy" "$runtime" "$cc_agent" "$service_dir" "$cc_config" "$cc_binary" "$service_id"
+  _maybe_auto_install_mcp "$install_policy"
 
   phase_set S6_WIRE_LOCAL done "credentials.json written;node_id=$node_id;service_id=$service_id;env_file=$envfile;runtime=$runtime;install_policy=$install_policy;install_mode=$install_mode;cc_connect_config=$cc_config;mcp_config_dir=$mcp_dir;cc_connect_agent=$cc_agent"
   return 0

package/scripts/reset-app-data.sh

@@ -36,5 +36,5 @@ echo "Application data reset complete on the existing node."
 echo "Caddy TLS storage was preserved."
 echo "Old user confirmations and runtime checks were cleared."
 echo "$bridge_stop_message"
-echo "Local S4-S7 gates were reset; rerun orchestrate with P2P_EXISTING_STATE_ACTION=continue."
+echo "Local S4-S7 gates were reset; rerun orchestrate with DIREXIO_EXISTING_STATE_ACTION=continue."
 echo "operation report: $report"

package/scripts/update.sh

@@ -15,16 +15,8 @@ ops_require_state "$STATE_JSON"
 
 remote_command=$(ops_update_remote_command "${MESSAGE_SERVER_IMAGE:-}")
 ops_ssh "$STATE_JSON" "$remote_command"
-ops_mark_refresh_pending "$STATE_JSON" S4_BOOTSTRAP_STACK
-if ops_stop_scoped_daemon "$STATE_JSON"; then
-  bridge_stop_message="Scoped local bridge daemon was stopped; rerun S6 to install fresh config."
-else
-  bridge_stop_message="Scoped local bridge daemon stop was skipped or not needed."
-fi
-report=$(ops_write_report update update_remote_restart_complete_refresh_pending "$STATE_JSON")
+report=$(ops_write_report update update_remote_restart_complete "$STATE_JSON")
 
 echo "Update remote restart complete."
-echo "Old user confirmations and runtime checks were cleared."
-echo "$bridge_stop_message"
-echo "Local S4-S7 gates were reset; rerun orchestrate with P2P_EXISTING_STATE_ACTION=continue to refresh credentials, MCP, and verification."
+echo "Local credentials, cc-connect daemon state, MCP artifacts, confirmations, and runtime checks were left unchanged."
 echo "operation report: $report"