From 2cffcc46c5ebbd2f72d22cb4eb78e834b11f133f Mon Sep 17 00:00:00 2001
From: Godopu <godopu16@gmail.com>
Date: Sun, 21 Jun 2026 06:35:17 +0000
Subject: [PATCH] fix(delegate-job): unify .env loading in Python scripts
 (FW-04) + trap agent bootstrap errors (FW-06)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

FW-04: mqtt_common.py now loads .env at module import via _load_dotenv().
  Walks up from script dir to find workspace .env, sets vars not already
  in os.environ (OS env takes precedence). Uses stdlib only — no
  python-dotenv dependency.

FW-06: bash wrapper sets trap EXIT before tmux new-session to publish
  error event if agent bootstrap fails (non-zero exit). Trap is cleared
  after successful session creation. Only active when job_id is set.
---
 .../scripts/mqtt_common.py                    | 34 +++++++++++++++++++
 .../tmux-agent-orchestrate-delegate-job       |  8 +++++
 2 files changed, 42 insertions(+)

diff --git a/skills/tmux-agent-orchestrate-delegate-job/scripts/mqtt_common.py b/skills/tmux-agent-orchestrate-delegate-job/scripts/mqtt_common.py
index 1bca428..6b918bb 100644
--- a/skills/tmux-agent-orchestrate-delegate-job/scripts/mqtt_common.py
+++ b/skills/tmux-agent-orchestrate-delegate-job/scripts/mqtt_common.py
@@ -33,6 +33,40 @@ import paho.mqtt.client as mqtt
 
 logger = logging.getLogger("delegate_job.mqtt_common")
 
+def _load_dotenv(workspace_dir: str = None) -> None:
+    """Load .env file from workspace if it exists and env var not already set.
+    
+    This ensures Python scripts get the same env vars as the shell wrapper
+    scripts that source .env. Only sets vars that are not already in os.environ
+    (i.e. OS env takes precedence over .env file).
+    """
+    import os
+    if workspace_dir is None:
+        # Walk up from this script to find workspace root
+        d = os.path.dirname(os.path.abspath(__file__))
+        for _ in range(5):
+            if os.path.isfile(os.path.join(d, ".env")):
+                break
+            d = os.path.dirname(d)
+    else:
+        d = workspace_dir
+    env_path = os.path.join(d, ".env")
+    if not os.path.isfile(env_path):
+        return
+    with open(env_path, "r") as f:
+        for line in f:
+            line = line.strip()
+            if not line or line.startswith("#"):
+                continue
+            if "=" in line:
+                key, _, val = line.partition("=")
+                key = key.strip()
+                val = val.strip().strip('"').strip("'")
+                if key and key not in os.environ:
+                    os.environ[key] = val
+
+_load_dotenv()
+
 # --------------------------------------------------------------------------
 # Constants
 # --------------------------------------------------------------------------
diff --git a/skills/tmux-agent-orchestrate-delegate-job/tmux-agent-orchestrate-delegate-job b/skills/tmux-agent-orchestrate-delegate-job/tmux-agent-orchestrate-delegate-job
index cb20253..b5ecc13 100755
--- a/skills/tmux-agent-orchestrate-delegate-job/tmux-agent-orchestrate-delegate-job
+++ b/skills/tmux-agent-orchestrate-delegate-job/tmux-agent-orchestrate-delegate-job
@@ -199,9 +199,17 @@ run_agent() {
     echo "       kill the stale one first:  tmux kill-session -t $sess" >&2
     return 1
   fi
+
+  # Before launching the agent, set up error trap to publish error event
+  if [ -n "${job_id:-}" ] && [ -n "${PY:-}" ]; then
+    local pub_script="$SCRIPT_DIR/scripts/publish_event.py"
+    trap 'rc=$?; if [ $rc -ne 0 ]; then "$PY" "$pub_script" --job "$job_id" --event error --detail "agent bootstrap failed (exit $rc)"; fi' EXIT
+  fi
+
   tmux new-session -d -s "$sess" -c "$WORKDIR" \
     "printf '%s' \"$instructions\" | $bin --dangerously-skip-permissions; echo; echo '--- agent exited (job $job_id); press enter to close ---'; read"
   echo "agent launched in tmux session: $sess (attach with: tmux attach -t $sess)"
+  trap - EXIT
 }
 
 cmd_status() {