refactor: cherry-pick improvements from dev-agent's PR #700
Two wins from the dev-agent's implementation: 1. exec-briefing.sh: rewritten to just call exec-inject.sh with a briefing prompt (57 lines, down from 154). No more duplicated compass/character/context loading. 2. exec-inject.sh: response capture now uses agent_wait_for_claude_ready + pane line diff instead of custom EXEC-RESPONSE-START/END markers. Claude just responds naturally — no special output format needed. Also: matrix listener uses nohup for robustness and validates TOML path before passing to exec-inject.sh.
This commit is contained in:
disinto-exec
parent
8375611244
commit
c3acce7f8f
5 changed files with 111 additions and 230 deletions
|
|
@ -6,26 +6,21 @@
|
|||
# Handles session lifecycle: spawn if needed, inject, capture, post to Matrix.
|
||||
#
|
||||
# Usage:
|
||||
# exec-inject.sh <sender> <message_body> <thread_id> [project_toml]
|
||||
# exec-inject.sh <sender> <message_body> [thread_id] [project_toml]
|
||||
#
|
||||
# Flow:
|
||||
# 1. Check for active exec tmux session → spawn via exec-session.sh if needed
|
||||
# 2. Inject the executive's message into the Claude session
|
||||
# 3. Monitor tmux output for ---EXEC-RESPONSE-START/END--- markers
|
||||
# 4. Post captured response back to Matrix thread
|
||||
# 5. Log the exchange to journal
|
||||
# Response capture uses the idle marker from lib/agent-session.sh — no
|
||||
# special output format required from Claude.
|
||||
# =============================================================================
|
||||
set -euo pipefail
|
||||
|
||||
SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
|
||||
FACTORY_ROOT="$(dirname "$SCRIPT_DIR")"
|
||||
|
||||
SENDER="${1:?Usage: exec-inject.sh <sender> <message> <thread_id> [project.toml]}"
|
||||
SENDER="${1:?Usage: exec-inject.sh <sender> <message> [thread_id] [project.toml]}"
|
||||
MESSAGE="${2:?}"
|
||||
THREAD_ID="${3:?}"
|
||||
PROJECT_TOML="${4:-$FACTORY_ROOT/projects/disinto.toml}"
|
||||
THREAD_ID="${3:-}"
|
||||
export PROJECT_TOML="${4:-$FACTORY_ROOT/projects/disinto.toml}"
|
||||
|
||||
export PROJECT_TOML
|
||||
# shellcheck source=../lib/env.sh
|
||||
source "$FACTORY_ROOT/lib/env.sh"
|
||||
# shellcheck source=../lib/agent-session.sh
|
||||
|
|
@ -33,105 +28,99 @@ source "$FACTORY_ROOT/lib/agent-session.sh"
|
|||
|
||||
LOG_FILE="$SCRIPT_DIR/exec.log"
|
||||
SESSION_NAME="exec-${PROJECT_NAME}"
|
||||
RESPONSE_FILE="/tmp/exec-response-${PROJECT_NAME}.txt"
|
||||
CAPTURE_TIMEOUT="${EXEC_CAPTURE_TIMEOUT:-300}" # 5 min max wait for response
|
||||
RESPONSE_TIMEOUT="${EXEC_RESPONSE_TIMEOUT:-300}"
|
||||
|
||||
log() { echo "[$(date -u +%Y-%m-%dT%H:%M:%S)Z] $*" >> "$LOG_FILE"; }
|
||||
|
||||
# ── Ensure session exists ───────────────────────────────────────────────
|
||||
if ! tmux has-session -t "$SESSION_NAME" 2>/dev/null; then
|
||||
log "no active exec session — spawning"
|
||||
RESULT=$(bash "$SCRIPT_DIR/exec-session.sh" "$PROJECT_TOML" 2>>"$LOG_FILE")
|
||||
if [ "$RESULT" != "STARTED" ] && [ "$RESULT" != "ACTIVE" ]; then
|
||||
log "ERROR: failed to start exec session (got: ${RESULT})"
|
||||
matrix_send "exec" "❌ Could not start executive assistant session" "$THREAD_ID" >/dev/null 2>&1 || true
|
||||
bash "$SCRIPT_DIR/exec-session.sh" "$PROJECT_TOML" 2>>"$LOG_FILE" || {
|
||||
log "ERROR: failed to start exec session"
|
||||
[ -n "$THREAD_ID" ] && matrix_send "exec" "❌ Could not start executive assistant session" "$THREAD_ID" >/dev/null 2>&1 || true
|
||||
exit 1
|
||||
fi
|
||||
# Give Claude a moment to process the initial prompt
|
||||
sleep 3
|
||||
}
|
||||
# Wait for Claude to process the initial prompt
|
||||
agent_wait_for_claude_ready "$SESSION_NAME" 120 || {
|
||||
log "ERROR: session not ready after spawn"
|
||||
exit 1
|
||||
}
|
||||
fi
|
||||
|
||||
# ── Snapshot pane before injection ──────────────────────────────────────
|
||||
BEFORE_LINES=$(tmux capture-pane -t "$SESSION_NAME" -p 2>/dev/null | wc -l)
|
||||
IDLE_MARKER="/tmp/claude-idle-${SESSION_NAME}.ts"
|
||||
rm -f "$IDLE_MARKER"
|
||||
|
||||
# ── Inject message ──────────────────────────────────────────────────────
|
||||
INJECT_MSG="Message from ${SENDER}:
|
||||
|
||||
${MESSAGE}"
|
||||
|
||||
log "injecting message from ${SENDER}: ${MESSAGE:0:100}"
|
||||
agent_inject_into_session "$SESSION_NAME" "$INJECT_MSG"
|
||||
|
||||
INJECT_TMP=$(mktemp /tmp/exec-inject-XXXXXX)
|
||||
printf '%s' "$INJECT_MSG" > "$INJECT_TMP"
|
||||
tmux load-buffer -b "exec-msg" "$INJECT_TMP" || true
|
||||
tmux paste-buffer -t "$SESSION_NAME" -b "exec-msg" || true
|
||||
sleep 0.5
|
||||
tmux send-keys -t "$SESSION_NAME" "" Enter || true
|
||||
tmux delete-buffer -b "exec-msg" 2>/dev/null || true
|
||||
rm -f "$INJECT_TMP"
|
||||
|
||||
# ── Capture response ───────────────────────────────────────────────────
|
||||
# Poll tmux pane content for the response markers
|
||||
log "waiting for response (timeout: ${CAPTURE_TIMEOUT}s)"
|
||||
rm -f "$RESPONSE_FILE"
|
||||
|
||||
# ── Wait for Claude to finish responding ────────────────────────────────
|
||||
ELAPSED=0
|
||||
POLL_INTERVAL=3
|
||||
while [ "$ELAPSED" -lt "$CAPTURE_TIMEOUT" ]; do
|
||||
sleep "$POLL_INTERVAL"
|
||||
ELAPSED=$((ELAPSED + POLL_INTERVAL))
|
||||
POLL=5
|
||||
while [ "$ELAPSED" -lt "$RESPONSE_TIMEOUT" ]; do
|
||||
sleep "$POLL"
|
||||
ELAPSED=$((ELAPSED + POLL))
|
||||
|
||||
# Capture recent pane content (last 200 lines)
|
||||
PANE_CONTENT=$(tmux capture-pane -t "$SESSION_NAME" -p -S -200 2>/dev/null || true)
|
||||
|
||||
if echo "$PANE_CONTENT" | grep -q "EXEC-RESPONSE-END"; then
|
||||
# Extract response between markers
|
||||
RESPONSE=$(echo "$PANE_CONTENT" | sed -n '/---EXEC-RESPONSE-START---/,/---EXEC-RESPONSE-END---/p' \
|
||||
| grep -v "EXEC-RESPONSE-START\|EXEC-RESPONSE-END" \
|
||||
| tail -n +1)
|
||||
|
||||
if [ -n "$RESPONSE" ]; then
|
||||
printf '%s' "$RESPONSE" > "$RESPONSE_FILE"
|
||||
log "response captured (${#RESPONSE} chars)"
|
||||
break
|
||||
fi
|
||||
if [ -f "$IDLE_MARKER" ]; then
|
||||
log "response complete after ${ELAPSED}s"
|
||||
break
|
||||
fi
|
||||
|
||||
# Check if session died
|
||||
if ! tmux has-session -t "$SESSION_NAME" 2>/dev/null; then
|
||||
log "ERROR: exec session died while waiting for response"
|
||||
matrix_send "exec" "❌ Executive assistant session ended unexpectedly" "$THREAD_ID" >/dev/null 2>&1 || true
|
||||
[ -n "$THREAD_ID" ] && matrix_send "exec" "❌ Executive assistant session ended unexpectedly" "$THREAD_ID" >/dev/null 2>&1 || true
|
||||
exit 1
|
||||
fi
|
||||
done
|
||||
|
||||
# ── Post response to Matrix ────────────────────────────────────────────
|
||||
if [ -f "$RESPONSE_FILE" ] && [ -s "$RESPONSE_FILE" ]; then
|
||||
RESPONSE=$(cat "$RESPONSE_FILE")
|
||||
# Truncate if too long for Matrix (64KB limit, keep under 4KB for readability)
|
||||
if [ ${#RESPONSE} -gt 4000 ]; then
|
||||
RESPONSE="${RESPONSE:0:3950}
|
||||
|
||||
(truncated — full response in exec journal)"
|
||||
fi
|
||||
matrix_send "exec" "$RESPONSE" "$THREAD_ID" >/dev/null 2>&1 || true
|
||||
log "response posted to Matrix thread"
|
||||
|
||||
# Journal the exchange
|
||||
JOURNAL_DIR="$PROJECT_REPO_ROOT/exec/journal"
|
||||
mkdir -p "$JOURNAL_DIR"
|
||||
JOURNAL_FILE="$JOURNAL_DIR/$(date -u +%Y-%m-%d).md"
|
||||
{
|
||||
echo ""
|
||||
echo "## $(date -u +%H:%M) UTC — ${SENDER}"
|
||||
echo ""
|
||||
echo "**Q:** ${MESSAGE}"
|
||||
echo ""
|
||||
echo "**A:** ${RESPONSE}"
|
||||
echo ""
|
||||
echo "---"
|
||||
} >> "$JOURNAL_FILE"
|
||||
log "exchange logged to $(basename "$JOURNAL_FILE")"
|
||||
else
|
||||
log "WARNING: no response captured within ${CAPTURE_TIMEOUT}s"
|
||||
matrix_send "exec" "⚠️ Still thinking... (response not ready within ${CAPTURE_TIMEOUT}s, session is still active)" "$THREAD_ID" >/dev/null 2>&1 || true
|
||||
if [ "$ELAPSED" -ge "$RESPONSE_TIMEOUT" ]; then
|
||||
log "WARN: response timeout after ${RESPONSE_TIMEOUT}s"
|
||||
[ -n "$THREAD_ID" ] && matrix_send "exec" "⚠️ Still thinking... (response not ready within ${RESPONSE_TIMEOUT}s)" "$THREAD_ID" >/dev/null 2>&1 || true
|
||||
exit 0
|
||||
fi
|
||||
|
||||
rm -f "$RESPONSE_FILE"
|
||||
# ── Capture response (pane diff) ────────────────────────────────────────
|
||||
RESPONSE=$(tmux capture-pane -t "$SESSION_NAME" -p -S -500 2>/dev/null \
|
||||
| tail -n +"$((BEFORE_LINES + 1))" \
|
||||
| grep -v '^❯' | grep -v '^$' \
|
||||
| head -100)
|
||||
|
||||
if [ -z "$RESPONSE" ]; then
|
||||
log "WARN: empty response captured"
|
||||
RESPONSE="(processed your message but produced no visible output)"
|
||||
fi
|
||||
|
||||
# ── Post response to Matrix ────────────────────────────────────────────
|
||||
if [ ${#RESPONSE} -gt 3500 ]; then
|
||||
RESPONSE="${RESPONSE:0:3500}
|
||||
|
||||
(truncated — full response in exec journal)"
|
||||
fi
|
||||
|
||||
if [ -n "$THREAD_ID" ]; then
|
||||
matrix_send "exec" "$RESPONSE" "$THREAD_ID" >/dev/null 2>&1 || true
|
||||
else
|
||||
matrix_send "exec" "$RESPONSE" "" "exec" >/dev/null 2>&1 || true
|
||||
fi
|
||||
log "response posted to Matrix"
|
||||
|
||||
# ── Journal the exchange ───────────────────────────────────────────────
|
||||
JOURNAL_DIR="$PROJECT_REPO_ROOT/exec/journal"
|
||||
mkdir -p "$JOURNAL_DIR"
|
||||
{
|
||||
echo ""
|
||||
echo "## $(date -u +%H:%M) UTC — ${SENDER}"
|
||||
echo ""
|
||||
echo "**Q:** ${MESSAGE}"
|
||||
echo ""
|
||||
echo "**A:** ${RESPONSE}"
|
||||
echo ""
|
||||
echo "---"
|
||||
} >> "$JOURNAL_DIR/$(date -u +%Y-%m-%d).md"
|
||||
log "exchange logged to journal"
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue