From a0cdf87a21dbaf29afef8d60a16b337b59fd40cb Mon Sep 17 00:00:00 2001
From: openhands <openhands@all-hands.dev>
Date: Wed, 25 Mar 2026 00:35:20 +0000
Subject: [PATCH] fix: move setup_matrix after compose up, use Python for .env
 writes

- Critical: setup_matrix now runs after docker compose up -d so Dendrite
  is actually running when provisioning is attempted
- Minor: replace sed with Python for .env credential writes to avoid
  delimiter collisions with opaque Matrix access tokens
- Info: update matrix_listener.sh header to mention container mode

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
---
 bin/disinto            | 15 +++++++++++----
 lib/matrix_listener.sh |  3 ++-
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/bin/disinto b/bin/disinto
index a9850c5..cf05ad2 100755
--- a/bin/disinto
+++ b/bin/disinto
@@ -1032,7 +1032,14 @@ setup_matrix() {
   for var_line in "${matrix_vars[@]}"; do
     local var_name="${var_line%%=*}"
     if grep -q "^${var_name}=" "$env_file" 2>/dev/null; then
-      sed -i "s|^${var_name}=.*|${var_line}|" "$env_file"
+      # Use Python to avoid sed delimiter collisions with opaque tokens
+      python3 -c "
+import sys, re, pathlib
+p = pathlib.Path(sys.argv[1])
+text = p.read_text()
+text = re.sub(r'^' + re.escape(sys.argv[2]) + r'=.*$', sys.argv[3], text, flags=re.MULTILINE)
+p.write_text(text)
+" "$env_file" "$var_name" "$var_line"
     else
       printf '%s\n' "$var_line" >> "$env_file"
     fi
@@ -1216,9 +1223,6 @@ p.write_text(text)
     fi
   fi
 
-  # Provision Matrix homeserver (compose mode only)
-  setup_matrix
-
   # Create labels on remote
   create_labels "$forge_repo" "$forge_url"
 
@@ -1255,6 +1259,9 @@ p.write_text(text)
     echo "── Starting full stack ────────────────────────────────"
     docker compose -f "${FACTORY_ROOT}/docker-compose.yml" up -d
     echo "Stack:   running (forgejo + woodpecker + dendrite + agents)"
+
+    # Provision Matrix now that Dendrite is running
+    setup_matrix
   fi
 
   echo ""
diff --git a/lib/matrix_listener.sh b/lib/matrix_listener.sh
index de9d202..3c1b5c8 100755
--- a/lib/matrix_listener.sh
+++ b/lib/matrix_listener.sh
@@ -12,7 +12,8 @@
 #   Thread reply to [vault] message      → APPROVE/REJECT dispatched via vault-fire/vault-reject
 #   Thread reply to [action] message     → injected into action tmux session
 #
-# Run as systemd service (see matrix_listener.service) or manually:
+# In compose mode, started by docker/agents/entrypoint.sh as a background process.
+# On bare metal, run as systemd service (see matrix_listener.service) or manually:
 #   ./matrix_listener.sh
 
 set -euo pipefail