diff --git a/skills/kugetsu/scripts/kugetsu b/skills/kugetsu/scripts/kugetsu
index b4a0231..29348bc 100755
--- a/skills/kugetsu/scripts/kugetsu
+++ b/skills/kugetsu/scripts/kugetsu
@@ -564,12 +564,13 @@ cmd_delegate() {
     local log_file="$LOGS_DIR/delegate-$(date +%s).log"
     
     mkdir -p "$ENV_DIR"
-    local env_sh=""
+    local env_sh="set -a; "
     if [ -f "$ENV_DIR/pm-agent.env" ]; then
-        env_sh="source '$ENV_DIR/pm-agent.env'; "
+        env_sh="${env_sh}source '$ENV_DIR/pm-agent.env'; "
     elif [ -f "$ENV_DIR/default.env" ]; then
-        env_sh="source '$ENV_DIR/default.env'; "
+        env_sh="${env_sh}source '$ENV_DIR/default.env'; "
     fi
+    env_sh="${env_sh}set +a; "
     
     nohup sh -c "${env_sh}opencode run '$message' --continue --session '$pm_session' >> '$log_file' 2>&1" > /dev/null 2>&1 &
     disown
@@ -951,9 +952,10 @@ EOF
     if [ ! -f "$ENV_DIR/default.env" ]; then
         cat > "$ENV_DIR/default.env" << 'EOF'
 # Default environment variables for all agents
-# Add variables that all agents should have access to
+# Variables here are exported to subagents
+# Use 'export' prefix for variables that subagents need
 # Example:
-# GITEA_TOKEN=your_token_here
+# export GITEA_TOKEN=your_token_here
 EOF
         echo "Created default env file: $ENV_DIR/default.env"
     fi
@@ -961,7 +963,9 @@ EOF
         cat > "$ENV_DIR/pm-agent.env" << 'EOF'
 # PM Agent environment variables
 # These override default.env for the PM agent
-# GITEA_TOKEN=your_gitea_token_here
+# Use 'export' prefix for variables that subagents need
+# Example:
+# export GITEA_TOKEN=your_gitea_token_here
 EOF
         echo "Created pm-agent env file: $ENV_DIR/pm-agent.env"
     fi