Skip to content

t1162: Worker MCP isolation for Claude CLI dispatch #2102

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
marcusquinn merged 3 commits into from
Feb 21, 2026
Merged

t1162: Worker MCP isolation for Claude CLI dispatch #2102

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
412f2b0
feat: add Claude CLI worker MCP isolation via --mcp-config --strict-m…
marcusquinn Feb 21, 2026
ff4e66a
test: add Worker MCP config generation tests for Claude CLI isolation…
marcusquinn Feb 21, 2026
d149b40
fix: address review feedback for t1162
marcusquinn Feb 21, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .agents/scripts/supervisor/cleanup.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -296,6 +296,10 @@ cleanup_worker_processes() {
"$SUPERVISOR_DIR/pids/${task_id}"-prompt-repeat-wrapper-*.sh; do
[[ -f "$script" ]] && rm -f "$script" || true
done
# t1162: Clean up per-worker MCP config directory (OpenCode XDG override + Claude JSON)
if [[ -d "$SUPERVISOR_DIR/pids/${task_id}-config" ]]; then
rm -rf "$SUPERVISOR_DIR/pids/${task_id}-config"
fi

if [[ "$killed" -gt 0 ]]; then
log_info "Cleaned up worker process for $task_id (PID: $pid)"
Expand Down
23 changes: 14 additions & 9 deletions .agents/scripts/supervisor/deploy.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1307,6 +1307,13 @@ Instructions:
resolved_model=$(resolve_model "$tmodel" "$ai_cli")
fi

mkdir -p "$SUPERVISOR_DIR/pids"

# Generate worker-specific MCP config (t221, t1162)
# Must be generated BEFORE building CLI command for Claude --mcp-config flag
local worker_mcp_config=""
worker_mcp_config=$(generate_worker_mcp_config "$task_id" "$ai_cli" "$work_dir") || true

local -a cmd_parts=()
if [[ "$ai_cli" == "opencode" ]]; then
cmd_parts=(opencode run --format json)
Expand All @@ -1327,23 +1334,21 @@ Instructions:
cmd_parts+=(--title "$fix_title" "$fix_prompt")
else
cmd_parts=(claude -p "$fix_prompt" --output-format json)
# t1162: Worker MCP isolation for Claude CLI
if [[ -n "$worker_mcp_config" ]]; then
cmd_parts+=(--mcp-config "$worker_mcp_config" --strict-mcp-config)
fi
fi

mkdir -p "$SUPERVISOR_DIR/pids"

# Generate worker-specific MCP config with heavy indexers disabled (t221)
local worker_xdg_config=""
worker_xdg_config=$(generate_worker_mcp_config "$task_id" 2>/dev/null) || true

# Write dispatch script with startup sentinel (t183)
local dispatch_script="${SUPERVISOR_DIR}/pids/${task_id}-review-fix.sh"
{
echo '#!/usr/bin/env bash'
echo "echo 'WORKER_STARTED task_id=${task_id} type=review-fix pid=\$\$ timestamp='\$(date -u +%Y-%m-%dT%H:%M:%SZ)"
echo "cd '${work_dir}' || { echo 'WORKER_FAILED: cd to work_dir failed: ${work_dir}'; exit 1; }"
# Redirect worker to use MCP config with heavy indexers disabled (t221)
if [[ -n "$worker_xdg_config" ]]; then
echo "export XDG_CONFIG_HOME='${worker_xdg_config}'"
# t1162: For OpenCode, set XDG_CONFIG_HOME; for Claude, MCP config is in CLI flags
if [[ "$ai_cli" != "claude" && -n "$worker_mcp_config" ]]; then
echo "export XDG_CONFIG_HOME='${worker_mcp_config}'"
fi
printf 'exec '
printf '%q ' "${cmd_parts[@]}"
Expand Down
Loading
Loading