@kokorolx/ai-sandbox-wrapper 3.3.0 → 3.4.1

package/bin/ai-run

@@ -791,6 +791,7 @@ fi
 HOST_CHROME_CDP=false
 HOST_CHROME_CDP_PORT=19222
 PLAYWRIGHT_MCP_NAME=""
+CHROME_DEVTOOLS_MCP_NAME=""
 # Portable symlink-resolving SCRIPT_DIR (macOS readlink has no -f).
 # Needed because ai-run is typically invoked via the ~/bin/ai-run symlink.
 _pmcp_resolve_script_dir() {
@@ -822,7 +823,17 @@ if [[ "$TOOL" == "opencode" ]] && command -v jq &>/dev/null && [[ -f "$AI_SANDBO
     # Deterministic port per container name
     CONTAINER_HASH=$(echo "$CONTAINER_NAME_VALUE" | md5sum | cut -c1-4)
     HOST_CHROME_CDP_PORT=$((19222 + 0x$CONTAINER_HASH % 100))
-    PLAYWRIGHT_MCP_NAME="playwright_port_${HOST_CHROME_CDP_PORT}"
+
+    # Only register entries for MCP binaries actually present in the image
+    # (tracked in $AI_SANDBOX_CONFIG by setup.sh). Otherwise opencode would
+    # try to spawn a missing binary and fail. (is_mcp_installed is defined
+    # later in the file, so use jq inline here.)
+    if jq -e '.mcp.installed // [] | index("playwright") != null' "$AI_SANDBOX_CONFIG" &>/dev/null; then
+      PLAYWRIGHT_MCP_NAME="playwright_port_${HOST_CHROME_CDP_PORT}"
+    fi
+    if jq -e '.mcp.installed // [] | index("chrome-devtools") != null' "$AI_SANDBOX_CONFIG" &>/dev/null; then
+      CHROME_DEVTOOLS_MCP_NAME="chrome-devtools_port_${HOST_CHROME_CDP_PORT}"
+    fi
 
     # Reuse-if-alive: probe before launching
     if pmcp::probe_chrome "$HOST_CHROME_CDP_PORT"; then
@@ -850,23 +861,29 @@ if [[ "$TOOL" == "opencode" ]] && command -v jq &>/dev/null && [[ -f "$AI_SANDBO
         HOST_CHROME_CDP=false
         kill "$CHROME_PID" 2>/dev/null || true
         PLAYWRIGHT_MCP_NAME=""
+        CHROME_DEVTOOLS_MCP_NAME=""
       fi
     fi
 
-    # Locked sweep+append on the shared OpenCode config
+    # Locked sweep+register on the shared OpenCode config — both
+    # playwright-mcp and chrome-devtools-mcp point at the same host Chrome.
     if [[ "$HOST_CHROME_CDP" == "true" ]]; then
       OPENCODE_CONFIG_FILE="$HOME/.config/opencode/opencode.json"
       LOCK_FILE="$HOME/.config/opencode/.playwright.lock"
       mkdir -p "$(dirname "$OPENCODE_CONFIG_FILE")"
       [[ -f "$OPENCODE_CONFIG_FILE" ]] || echo '{}' > "$OPENCODE_CONFIG_FILE"
-      pmcp::with_lock "$LOCK_FILE" pmcp::sweep_and_append "$OPENCODE_CONFIG_FILE" "$PLAYWRIGHT_MCP_NAME" "$HOST_CHROME_CDP_PORT"
+      pmcp::with_lock "$LOCK_FILE" pmcp::register_host_chrome \
+        "$OPENCODE_CONFIG_FILE" "$HOST_CHROME_CDP_PORT" \
+        "$PLAYWRIGHT_MCP_NAME" "$CHROME_DEVTOOLS_MCP_NAME"
       rc=$?
       if [[ "$rc" == "99" ]]; then
         echo "  ⚠️  Could not acquire MCP config lock within 5s; skipping registration."
         PLAYWRIGHT_MCP_NAME=""
+        CHROME_DEVTOOLS_MCP_NAME=""
       elif [[ "$rc" != "0" ]]; then
         echo "  ⚠️  MCP config update failed (rc=$rc); skipping registration."
         PLAYWRIGHT_MCP_NAME=""
+        CHROME_DEVTOOLS_MCP_NAME=""
       fi
     fi
   fi
@@ -2103,9 +2120,16 @@ configure_opencode_mcp() {
       for tool in "${all_tools[@]}"; do
         case "$tool" in
           chrome-devtools)
-            if add_mcp_config "chrome-devtools" "[\"chrome-devtools-mcp\", \"--headless\", \"--isolated\", \"--executablePath\", \"$CHROMIUM_PATH\", \"--chrome-arg=--no-sandbox\"]"; then
-              echo "  ✓ Configured Chrome DevTools MCP"
+            # Skip static entry under host Chrome mode — per-container
+            # chrome-devtools_port_<port> entry is registered at runtime.
+            if [[ -n "$PLAYWRIGHT_HOST_CHROME" ]] && [[ -f "$PLAYWRIGHT_HOST_CHROME" ]]; then
+              echo "  ℹ️  Chrome DevTools MCP entry will be registered per-container at runtime (host Chrome mode)."
               configured_any=true
+            else
+              if add_mcp_config "chrome-devtools" "[\"chrome-devtools-mcp\", \"--headless\", \"--isolated\", \"--executablePath\", \"$CHROMIUM_PATH\", \"--chrome-arg=--no-sandbox\"]"; then
+                echo "  ✓ Configured Chrome DevTools MCP"
+                configured_any=true
+              fi
             fi
             ;;
           playwright)
@@ -2147,8 +2171,13 @@ configure_opencode_mcp() {
         if [[ "$tool_choice" =~ ^[Yy]$ ]]; then
           case "$tool" in
             chrome-devtools)
-              if add_mcp_config "chrome-devtools" "[\"chrome-devtools-mcp\", \"--headless\", \"--isolated\", \"--executablePath\", \"$CHROMIUM_PATH\", \"--chrome-arg=--no-sandbox\"]"; then
-                echo "    ✓ Configured"
+              if [[ -n "$PLAYWRIGHT_HOST_CHROME" ]] && [[ -f "$PLAYWRIGHT_HOST_CHROME" ]]; then
+                echo "    ℹ️  Chrome DevTools MCP entry will be registered per-container at runtime (host Chrome mode)."
+                configured_any=true
+              else
+                if add_mcp_config "chrome-devtools" "[\"chrome-devtools-mcp\", \"--headless\", \"--isolated\", \"--executablePath\", \"$CHROMIUM_PATH\", \"--chrome-arg=--no-sandbox\"]"; then
+                  echo "    ✓ Configured"
+                fi
               fi
               ;;
             playwright)
@@ -2726,6 +2755,9 @@ if [[ -n "${PLAYWRIGHT_MCP_NAME:-}" ]]; then
   DOCKER_ARGS+=(-e "PLAYWRIGHT_MCP_NAME=$PLAYWRIGHT_MCP_NAME")
   DOCKER_ARGS+=(-e "PLAYWRIGHT_PORT=$HOST_CHROME_CDP_PORT")
 fi
+if [[ -n "${CHROME_DEVTOOLS_MCP_NAME:-}" ]]; then
+  DOCKER_ARGS+=(-e "CHROME_DEVTOOLS_MCP_NAME=$CHROME_DEVTOOLS_MCP_NAME")
+fi
 DOCKER_ARGS+=($TERMINAL_SIZE)
 
 DOCKER_ARGS+=("$IMAGE")

package/lib/playwright-mcp-config.sh

@@ -29,6 +29,86 @@ pmcp::probe_chrome() {
 # Host address from container (Docker Desktop on Mac).
 PMCP_DOCKER_HOST_IP="${PMCP_DOCKER_HOST_IP:-192.168.65.254}"
 
+# Probe and remove .mcp.<prefix>* entries whose CDP port is no longer alive.
+# Used to garbage-collect stale per-container Chrome MCP entries.
+# Args: $1 = config file path, $2 = key prefix (e.g. "playwright_", "chrome-devtools_")
+pmcp::sweep_dead() {
+  local cfg="$1" prefix="$2"
+  [[ -f "$cfg" ]] || return 0
+
+  local keys dead_keys=()
+  keys=$(jq -r --arg p "$prefix" '(.mcp // {}) | keys[] | select(startswith($p))' "$cfg" 2>/dev/null || true)
+  while IFS= read -r key; do
+    [[ -z "$key" ]] && continue
+    # Find an http:// or ws:// URL in the command — any flag name works.
+    local cmd_url
+    cmd_url=$(jq -r --arg k "$key" \
+      '.mcp[$k].command[]? | select(startswith("http://") or startswith("ws://"))' \
+      "$cfg" 2>/dev/null | head -1)
+    [[ -z "$cmd_url" ]] && continue
+    # Extract port from http://host:port[/path] or ws://host:port[/path]
+    local hostport="${cmd_url#*://}"   # host:port[/path]
+    hostport="${hostport%%/*}"          # host:port
+    local entry_port="${hostport##*:}" # port
+    if ! pmcp::probe_chrome "$entry_port"; then
+      dead_keys+=("$key")
+    fi
+  done <<< "$keys"
+
+  (( ${#dead_keys[@]} == 0 )) && return 0
+
+  local tmp="$cfg.tmp.$$"
+  local args=()
+  local i=0
+  for k in "${dead_keys[@]+"${dead_keys[@]}"}"; do
+    args+=(--arg "k$i" "$k")
+    i=$((i + 1))
+  done
+  jq "${args[@]+"${args[@]}"}" \
+    'reduce ([$ARGS.named | to_entries[] | select(.key|startswith("k")) | .value][]) as $k (.; del(.mcp[$k]))' \
+    "$cfg" > "$tmp"
+  mv "$tmp" "$cfg"
+  chmod 600 "$cfg"
+
+  echo "  🧹 pmcp: removed ${#dead_keys[@]} stale ${prefix}* entr$([ ${#dead_keys[@]} -eq 1 ] && echo y || echo ies): ${dead_keys[*]}"
+}
+
+# Register (or overwrite) an MCP entry.
+# Args: $1 = config file path, $2 = key, $3 = command as JSON array string
+#   e.g. pmcp::register cfg playwright_port_19222 '["playwright-mcp","--cdp-endpoint","http://192.168.65.254:19222"]'
+pmcp::register() {
+  local cfg="$1" key="$2" cmd_json="$3"
+  [[ -f "$cfg" ]] || echo '{}' > "$cfg"
+  local tmp="$cfg.tmp.$$"
+  jq --arg key "$key" --argjson cmd "$cmd_json" \
+    '.mcp = (.mcp // {}) | .mcp[$key] = {"type":"local","command":$cmd}' \
+    "$cfg" > "$tmp"
+  mv "$tmp" "$cfg"
+  chmod 600 "$cfg"
+  echo "  ➕ pmcp: registered $key"
+}
+
+# Register playwright-mcp and/or chrome-devtools-mcp for a host Chrome on
+# a given CDP port. Sweeps dead entries of both prefixes first, then writes
+# the requested entries. Pass empty string for a key to skip that one.
+# MUST be called inside a flock.
+# Args: $1 = cfg, $2 = port, $3 = playwright key (or ""), $4 = chrome-devtools key (or "")
+pmcp::register_host_chrome() {
+  local cfg="$1" port="$2" pw_key="$3" cd_key="$4"
+  local url="http://$PMCP_DOCKER_HOST_IP:$port"
+
+  pmcp::sweep_dead "$cfg" "playwright_"
+  pmcp::sweep_dead "$cfg" "chrome-devtools_"
+  if [[ -n "$pw_key" ]]; then
+    pmcp::register "$cfg" "$pw_key" \
+      "[\"playwright-mcp\",\"--cdp-endpoint\",\"$url\"]"
+  fi
+  if [[ -n "$cd_key" ]]; then
+    pmcp::register "$cfg" "$cd_key" \
+      "[\"chrome-devtools-mcp\",\"--browserUrl\",\"$url\"]"
+  fi
+}
+
 # Sweep dead playwright_* entries and append a new one. MUST be called inside
 # a flock by the caller. Does not acquire the lock itself, by design — locking
 # happens around a larger critical section in the caller.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kokorolx/ai-sandbox-wrapper",
-  "version": "3.3.0",
+  "version": "3.4.1",
   "description": "Docker-based security sandbox for AI coding agents. Isolate Claude, Gemini, Aider, and other AI tools from your host system.",
   "keywords": [
     "ai",