@aiwerk/mcp-bridge 1.0.0 → 1.0.2

package/dist/src/types.d.ts

@@ -0,0 +1,72 @@
+export interface Logger {
+    info: (...args: unknown[]) => void;
+    warn: (...args: unknown[]) => void;
+    error: (...args: unknown[]) => void;
+    debug: (...args: unknown[]) => void;
+}
+export interface McpServerConfig {
+    transport: "sse" | "stdio" | "streamable-http";
+    /** Human-readable description for router tool description generation */
+    description?: string;
+    url?: string;
+    headers?: Record<string, string>;
+    command?: string;
+    args?: string[];
+    env?: Record<string, string>;
+    framing?: "auto" | "lsp" | "newline";
+}
+export interface McpClientConfig {
+    servers: Record<string, McpServerConfig>;
+    mode?: "direct" | "router";
+    toolPrefix?: boolean | "auto";
+    reconnectIntervalMs?: number;
+    connectionTimeoutMs?: number;
+    requestTimeoutMs?: number;
+    routerIdleTimeoutMs?: number;
+    routerMaxConcurrent?: number;
+}
+export interface McpTool {
+    name: string;
+    description: string;
+    inputSchema: any;
+}
+export interface McpRequest {
+    jsonrpc: "2.0";
+    id?: number;
+    method: string;
+    params?: any;
+}
+export declare function nextRequestId(): number;
+export interface McpResponse {
+    jsonrpc: "2.0";
+    id: number;
+    result?: any;
+    error?: {
+        code: number;
+        message: string;
+        data?: any;
+    };
+}
+export interface McpTransport {
+    connect(): Promise<void>;
+    disconnect(): Promise<void>;
+    sendRequest(request: McpRequest): Promise<McpResponse>;
+    sendNotification(notification: any): Promise<void>;
+    isConnected(): boolean;
+}
+export interface McpServerConnection {
+    name: string;
+    transport: McpTransport;
+    tools: McpTool[];
+    isInitialized: boolean;
+    registeredToolNames: string[];
+}
+/** Bridge-level config loaded from ~/.mcp-bridge/config.json */
+export interface BridgeConfig extends McpClientConfig {
+    http?: {
+        auth?: {
+            type: "bearer";
+            token: string;
+        };
+    };
+}

package/dist/src/types.js

@@ -0,0 +1,4 @@
+let globalRequestId = 1;
+export function nextRequestId() {
+    return globalRequestId++;
+}

package/dist/src/update-checker.d.ts

@@ -0,0 +1,25 @@
+import { Logger } from "./types.js";
+export interface UpdateInfo {
+    currentVersion: string;
+    latestVersion: string;
+    updateAvailable: boolean;
+    updateCommand: string;
+}
+/**
+ * Check npm registry for a newer version. Non-blocking, best-effort.
+ * Caches result for the lifetime of the process.
+ */
+export declare function checkForUpdate(logger: Logger): Promise<UpdateInfo>;
+/**
+ * Build the notice string to inject into the first tool response.
+ * Returns empty string if no update or already delivered.
+ */
+export declare function getUpdateNotice(): string;
+/**
+ * Reset the notice flag (for testing).
+ */
+export declare function resetNoticeFlag(): void;
+/**
+ * Execute the actual npm update. Returns a result message.
+ */
+export declare function runUpdate(logger: Logger): Promise<string>;

package/dist/src/update-checker.js

@@ -0,0 +1,132 @@
+import { execSync, exec as execCb } from "child_process";
+import { PACKAGE_VERSION } from "./protocol.js";
+const PACKAGE_NAME = "@aiwerk/mcp-bridge";
+let cachedUpdateInfo = null;
+let noticeDelivered = false;
+/**
+ * Check npm registry for a newer version. Non-blocking, best-effort.
+ * Caches result for the lifetime of the process.
+ */
+export async function checkForUpdate(logger) {
+    if (cachedUpdateInfo)
+        return cachedUpdateInfo;
+    const current = PACKAGE_VERSION;
+    const updateCmd = `npm update -g ${PACKAGE_NAME}`;
+    try {
+        const latest = await npmViewVersion(logger);
+        const updateAvailable = latest !== current && isNewer(latest, current);
+        cachedUpdateInfo = {
+            currentVersion: current,
+            latestVersion: latest,
+            updateAvailable,
+            updateCommand: updateCmd,
+        };
+        if (updateAvailable) {
+            logger.info(`[mcp-bridge] Update available: ${current} → ${latest}`);
+        }
+        else {
+            logger.info(`[mcp-bridge] Version ${current} is up to date`);
+        }
+    }
+    catch (err) {
+        logger.warn(`[mcp-bridge] Version check failed: ${err instanceof Error ? err.message : err}`);
+        cachedUpdateInfo = {
+            currentVersion: current,
+            latestVersion: current,
+            updateAvailable: false,
+            updateCommand: updateCmd,
+        };
+    }
+    return cachedUpdateInfo;
+}
+/**
+ * Build the notice string to inject into the first tool response.
+ * Returns empty string if no update or already delivered.
+ */
+export function getUpdateNotice() {
+    if (noticeDelivered || !cachedUpdateInfo?.updateAvailable)
+        return "";
+    noticeDelivered = true;
+    return (`\n\n---\nUpdate available: ${cachedUpdateInfo.currentVersion} → ${cachedUpdateInfo.latestVersion}\n` +
+        `Run: ${cachedUpdateInfo.updateCommand}`);
+}
+/**
+ * Reset the notice flag (for testing).
+ */
+export function resetNoticeFlag() {
+    noticeDelivered = false;
+}
+/**
+ * Execute the actual npm update. Returns a result message.
+ */
+export async function runUpdate(logger) {
+    const info = cachedUpdateInfo ?? await checkForUpdate(logger);
+    if (!info.updateAvailable) {
+        return `MCP Bridge is already up to date (v${info.currentVersion}).`;
+    }
+    logger.info(`[mcp-bridge] Running update: ${info.updateCommand}`);
+    try {
+        const output = await execAsync(info.updateCommand, 60_000);
+        // Invalidate cache so next check re-fetches
+        cachedUpdateInfo = null;
+        noticeDelivered = false;
+        // Verify new version
+        const newVersion = npmViewVersionSync(logger);
+        return (`MCP Bridge updated: ${info.currentVersion} → ${newVersion}\n` +
+            `A restart is needed to load the new version.\n\n` +
+            `npm output:\n${output.trim()}`);
+    }
+    catch (err) {
+        const msg = err instanceof Error ? err.message : String(err);
+        logger.error(`[mcp-bridge] Update failed: ${msg}`);
+        return (`Update failed. You can try manually:\n` +
+            `${info.updateCommand}\n\nError: ${msg}`);
+    }
+}
+// --- helpers ---
+function npmViewVersion(_logger) {
+    return new Promise((resolve, reject) => {
+        const timeout = setTimeout(() => reject(new Error("npm view timed out")), 10_000);
+        execCb(`npm view ${PACKAGE_NAME} version`, { encoding: "utf-8" }, (err, stdout) => {
+            clearTimeout(timeout);
+            if (err)
+                return reject(err);
+            const ver = (stdout ?? "").trim();
+            if (!ver)
+                return reject(new Error("empty version from npm"));
+            resolve(ver);
+        });
+    });
+}
+function npmViewVersionSync(_logger) {
+    try {
+        return execSync(`npm view ${PACKAGE_NAME} version`, { encoding: "utf-8", timeout: 10_000 }).trim();
+    }
+    catch {
+        return "unknown";
+    }
+}
+function execAsync(cmd, timeoutMs) {
+    return new Promise((resolve, reject) => {
+        const timeout = setTimeout(() => reject(new Error(`Command timed out after ${timeoutMs}ms`)), timeoutMs);
+        execCb(cmd, { encoding: "utf-8", timeout: timeoutMs }, (err, stdout, stderr) => {
+            clearTimeout(timeout);
+            if (err)
+                return reject(new Error(`${err.message}\n${stderr ?? ""}`));
+            resolve(stdout ?? "");
+        });
+    });
+}
+function isNewer(latest, current) {
+    const l = latest.split(".").map(Number);
+    const c = current.split(".").map(Number);
+    for (let i = 0; i < Math.max(l.length, c.length); i++) {
+        const lv = l[i] ?? 0;
+        const cv = c[i] ?? 0;
+        if (lv > cv)
+            return true;
+        if (lv < cv)
+            return false;
+    }
+    return false;
+}

package/package.json

@@ -1,12 +1,26 @@
 {
   "name": "@aiwerk/mcp-bridge",
-  "version": "1.0.0",
+  "version": "1.0.2",
   "description": "Standalone MCP server that multiplexes multiple MCP servers into one interface",
   "type": "module",
-  "main": "./src/index.ts",
+  "main": "./dist/src/index.js",
+  "types": "./dist/src/index.d.ts",
+  "exports": {
+    ".": {
+      "types": "./dist/src/index.d.ts",
+      "import": "./dist/src/index.js"
+    }
+  },
   "bin": {
-    "mcp-bridge": "./bin/mcp-bridge.js"
+    "mcp-bridge": "./dist/bin/mcp-bridge.js"
   },
+  "files": [
+    "dist/",
+    "servers/",
+    "scripts/",
+    "LICENSE",
+    "README.md"
+  ],
   "license": "MIT",
   "author": "AIWerk <kontakt@aiwerk.ch>",
   "homepage": "https://github.com/AIWerk/mcp-bridge#readme",
@@ -29,7 +43,8 @@
   "scripts": {
     "build": "tsc",
     "test": "node --import tsx --test tests/*.test.ts",
-    "typecheck": "tsc --noEmit"
+    "typecheck": "tsc --noEmit",
+    "prepublishOnly": "npm run build"
   },
   "dependencies": {
     "@sinclair/typebox": "^0.34.0"

package/scripts/install-server.ps1

@@ -1,9 +1,9 @@
 $ErrorActionPreference = "Stop"
 
 $ScriptDir = Split-Path -Parent $MyInvocation.MyCommand.Path
-$OpenclawDir = Join-Path $env:USERPROFILE ".openclaw"
-$EnvFile = Join-Path $OpenclawDir ".env"
-$OpenclawJson = Join-Path $OpenclawDir "openclaw.json"
+$McpBridgeDir = Join-Path $env:USERPROFILE ".mcp-bridge"
+$EnvFile = Join-Path $McpBridgeDir ".env"
+$McpBridgeJson = Join-Path $McpBridgeDir "config.json"
 
 if ($args.Count -eq 0) {
     Write-Host "Usage: install-server.ps1 <server-name> [--dry-run] [--remove]"
@@ -133,26 +133,26 @@ if ($Remove) {
     Write-Host "Removing $ServerTitle MCP Server"
     Write-Host "========================================"
 
-    if (-not (Test-Path $OpenclawJson)) {
-        Write-Host "❌ Config not found: $OpenclawJson" -ForegroundColor Red
+    if (-not (Test-Path $McpBridgeJson)) {
+        Write-Host "❌ Config not found: $McpBridgeJson" -ForegroundColor Red
         exit 1
     }
 
-    $cfg = Get-Content $OpenclawJson -Raw | ConvertFrom-Json
-    $servers = $cfg.plugins.entries.'openclaw-mcp-bridge'.config.servers
+    $cfg = Get-Content $McpBridgeJson -Raw | ConvertFrom-Json
+    $servers = $cfg.servers
     if (-not ($servers.PSObject.Properties.Name -contains $ServerName)) {
         Write-Host "ℹ️  Server '$ServerName' not found in config. Nothing to remove." -ForegroundColor Yellow
         exit 0
     }
 
     # Backup
-    $backupFile = "$OpenclawJson.bak-$(Get-Date -Format 'yyyyMMddHHmmss')"
-    Copy-Item $OpenclawJson $backupFile
+    $backupFile = "$McpBridgeJson.bak-$(Get-Date -Format 'yyyyMMddHHmmss')"
+    Copy-Item $McpBridgeJson $backupFile
     Write-Host "Backup: $backupFile"
 
     # Remove server entry
     $servers.PSObject.Properties.Remove($ServerName)
-    $cfg | ConvertTo-Json -Depth 10 | Set-Content $OpenclawJson -Encoding UTF8
+    $cfg | ConvertTo-Json -Depth 10 | Set-Content $McpBridgeJson -Encoding UTF8
     Write-Host "✅ Removed $ServerName from config" -ForegroundColor Green
     Write-Host "ℹ️  Server recipe kept in servers\$ServerName\ (reinstall anytime)" -ForegroundColor Cyan
 
@@ -168,17 +168,7 @@ if ($Remove) {
         }
     }
 
-    $restart = Read-Host "Restart gateway now? [Y/n]"
-    if ([string]::IsNullOrEmpty($restart) -or $restart -match '^[Yy]$') {
-        try {
-            Restart-Service openclaw-gateway -ErrorAction Stop
-            Write-Host "✅ Gateway restarted. $ServerTitle removed." -ForegroundColor Green
-        } catch {
-            Write-Host "⚠️  Auto-restart failed. Run: Restart-Service openclaw-gateway" -ForegroundColor Yellow
-        }
-    } else {
-        Write-Host "⏭️  Run manually: Restart-Service openclaw-gateway"
-    }
+    Write-Host "✅ $ServerTitle removed. Restart mcp-bridge to apply." -ForegroundColor Green
     exit 0
 }
 
@@ -218,7 +208,7 @@ while ([string]::IsNullOrWhiteSpace($Token)) {
 }
 
 # 4. Write to .env
-New-Item -ItemType Directory -Force -Path $OpenclawDir | Out-Null
+New-Item -ItemType Directory -Force -Path $McpBridgeDir | Out-Null
 if (-not (Test-Path $EnvFile)) { New-Item -ItemType File -Force -Path $EnvFile | Out-Null }
 
 $envExists = Select-String -Path $EnvFile -Pattern "^$([regex]::Escape($EnvVarName))=" -Quiet
@@ -237,14 +227,14 @@ if ($envExists) {
     Write-Host "Saved $EnvVarName to $EnvFile"
 }
 
-# 5. Backup and merge openclaw.json
-if (-not (Test-Path $OpenclawJson)) { Set-Content -Path $OpenclawJson -Value "{}" -Encoding UTF8 }
+# 5. Backup and merge config.json
+if (-not (Test-Path $McpBridgeJson)) { Set-Content -Path $McpBridgeJson -Value "{}" -Encoding UTF8 }
 
 $timestamp = Get-Date -Format "yyyyMMddHHmmss"
-Copy-Item -Path $OpenclawJson -Destination "$OpenclawJson.bak-$timestamp" -Force
-Write-Host "Backup: $OpenclawJson.bak-$timestamp"
+Copy-Item -Path $McpBridgeJson -Destination "$McpBridgeJson.bak-$timestamp" -Force
+Write-Host "Backup: $McpBridgeJson.bak-$timestamp"
 
-$cfgRaw = Get-Content -Path $OpenclawJson -Raw
+$cfgRaw = Get-Content -Path $McpBridgeJson -Raw
 if ([string]::IsNullOrWhiteSpace($cfgRaw)) { $cfgRaw = "{}" }
 $cfg = $cfgRaw | ConvertFrom-Json
 $serverConfig = Get-Content -Path $ServerConfigFile -Raw | ConvertFrom-Json
@@ -258,43 +248,20 @@ if ($pathOverride -and $serverConfig.args -and $serverConfig.args.Count -gt 0) {
     }
 }
 
-$plugins = Ensure-Property -Object $cfg -Name "plugins" -DefaultValue ([PSCustomObject]@{})
-$allow = Ensure-Property -Object $plugins -Name "allow" -DefaultValue @()
-if ($allow -notcontains "openclaw-mcp-bridge") { $plugins.allow = @($allow) + "openclaw-mcp-bridge" }
-$entries = Ensure-Property -Object $plugins -Name "entries" -DefaultValue ([PSCustomObject]@{})
-
-if (-not ($entries.PSObject.Properties.Name -contains "openclaw-mcp-bridge")) {
-    $entries | Add-Member -NotePropertyName "openclaw-mcp-bridge" -NotePropertyValue ([PSCustomObject]@{})
-}
-$mcpClient = $entries."openclaw-mcp-bridge"
-if (-not ($mcpClient.PSObject.Properties.Name -contains "enabled")) {
-    $mcpClient | Add-Member -NotePropertyName "enabled" -NotePropertyValue $true
-}
-$mcpConfig = Ensure-Property -Object $mcpClient -Name "config" -DefaultValue ([PSCustomObject]@{})
-if (-not ($mcpConfig.PSObject.Properties.Name -contains "toolPrefix")) { $mcpConfig | Add-Member -NotePropertyName "toolPrefix" -NotePropertyValue $true }
-if (-not ($mcpConfig.PSObject.Properties.Name -contains "reconnectIntervalMs")) { $mcpConfig | Add-Member -NotePropertyName "reconnectIntervalMs" -NotePropertyValue 30000 }
-if (-not ($mcpConfig.PSObject.Properties.Name -contains "connectionTimeoutMs")) { $mcpConfig | Add-Member -NotePropertyName "connectionTimeoutMs" -NotePropertyValue 10000 }
-if (-not ($mcpConfig.PSObject.Properties.Name -contains "requestTimeoutMs")) { $mcpConfig | Add-Member -NotePropertyName "requestTimeoutMs" -NotePropertyValue 60000 }
-$servers = Ensure-Property -Object $mcpConfig -Name "servers" -DefaultValue ([PSCustomObject]@{})
+if (-not ($cfg.PSObject.Properties.Name -contains "toolPrefix")) { $cfg | Add-Member -NotePropertyName "toolPrefix" -NotePropertyValue $true }
+if (-not ($cfg.PSObject.Properties.Name -contains "reconnectIntervalMs")) { $cfg | Add-Member -NotePropertyName "reconnectIntervalMs" -NotePropertyValue 30000 }
+if (-not ($cfg.PSObject.Properties.Name -contains "connectionTimeoutMs")) { $cfg | Add-Member -NotePropertyName "connectionTimeoutMs" -NotePropertyValue 10000 }
+if (-not ($cfg.PSObject.Properties.Name -contains "requestTimeoutMs")) { $cfg | Add-Member -NotePropertyName "requestTimeoutMs" -NotePropertyValue 60000 }
+$servers = Ensure-Property -Object $cfg -Name "servers" -DefaultValue ([PSCustomObject]@{})
 
 if ($servers.PSObject.Properties.Name -contains $ServerName) {
     $servers.PSObject.Properties.Remove($ServerName)
 }
 $servers | Add-Member -NotePropertyName $ServerName -NotePropertyValue $serverConfig
 
-$cfg | ConvertTo-Json -Depth 30 | Set-Content -Path $OpenclawJson -Encoding UTF8
+$cfg | ConvertTo-Json -Depth 30 | Set-Content -Path $McpBridgeJson -Encoding UTF8
 Write-Host "Configuration merged for: $ServerName"
 
-# 6. Gateway restart
 Write-Host ""
-$restart = Read-Host "Restart gateway now? [Y/n]"
-if ([string]::IsNullOrWhiteSpace($restart) -or $restart -match "^[Yy]$") {
-    try {
-        openclaw gateway restart 2>$null
-        Write-Host "Gateway restarting... Check 'openclaw gateway status' in a moment."
-    } catch {
-        Write-Host "Could not restart automatically. Run: openclaw gateway restart"
-    }
-} else {
-    Write-Host "Run manually: openclaw gateway restart"
-}
+Write-Host "$ServerTitle MCP Server installed."
+Write-Host "Restart mcp-bridge to pick up the new server configuration."

package/scripts/install-server.sh

@@ -2,9 +2,9 @@
 set -e
 
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-OPENCLAW_DIR="${HOME}/.openclaw"
-OPENCLAW_JSON="${OPENCLAW_DIR}/openclaw.json"
-ENV_FILE="${OPENCLAW_DIR}/.env"
+MCP_BRIDGE_DIR="${HOME}/.mcp-bridge"
+MCP_BRIDGE_JSON="${MCP_BRIDGE_DIR}/config.json"
+ENV_FILE="${MCP_BRIDGE_DIR}/.env"
 
 usage() {
     echo "Usage: $0 <server-name> [--dry-run] [--remove]"
@@ -128,17 +128,17 @@ if [[ "$REMOVE" == "true" ]]; then
     echo "Removing ${SERVER_TITLE} MCP Server"
     echo "========================================"
 
-    if [[ ! -f "$OPENCLAW_JSON" ]]; then
-        echo "❌ Config not found: $OPENCLAW_JSON"
+    if [[ ! -f "$MCP_BRIDGE_JSON" ]]; then
+        echo "❌ Config not found: $MCP_BRIDGE_JSON"
         exit 1
     fi
 
     # Check if server exists in config
     HAS_SERVER=$(python3 -c "
 import json
-with open('$OPENCLAW_JSON') as f:
+with open('$MCP_BRIDGE_JSON') as f:
     cfg = json.load(f)
-servers = cfg.get('plugins',{}).get('entries',{}).get('openclaw-mcp-bridge',{}).get('config',{}).get('servers',{})
+servers = cfg.get('servers',{})
 print('yes' if '$SERVER_NAME' in servers else 'no')
 " 2>/dev/null)
 
@@ -148,18 +148,18 @@ print('yes' if '$SERVER_NAME' in servers else 'no')
     fi
 
     # Backup
-    BACKUP_FILE="${OPENCLAW_JSON}.bak-$(date +%Y%m%d%H%M%S)"
-    cp "$OPENCLAW_JSON" "$BACKUP_FILE"
+    BACKUP_FILE="${MCP_BRIDGE_JSON}.bak-$(date +%Y%m%d%H%M%S)"
+    cp "$MCP_BRIDGE_JSON" "$BACKUP_FILE"
     echo "Backup: ${BACKUP_FILE}"
 
     # Remove server entry from config (keep servers/<name>/ directory)
     python3 -c "
 import json
-with open('$OPENCLAW_JSON') as f:
+with open('$MCP_BRIDGE_JSON') as f:
     cfg = json.load(f)
-servers = cfg['plugins']['entries']['openclaw-mcp-bridge']['config']['servers']
+servers = cfg.get('servers', {})
 del servers['$SERVER_NAME']
-with open('$OPENCLAW_JSON', 'w') as f:
+with open('$MCP_BRIDGE_JSON', 'w') as f:
     json.dump(cfg, f, indent=2)
     f.write('\n')
 print('✅ Removed $SERVER_NAME from config')
@@ -182,21 +182,21 @@ print('ℹ️  Server recipe kept in servers/$SERVER_NAME/ (reinstall anytime)')
         read -r -p "Restart gateway now? [Y/n]: " RESTART </dev/tty
     fi
     if [[ -z "$RESTART" || "$RESTART" =~ ^[Yy]$ ]]; then
-        systemctl --user restart openclaw-gateway 2>/dev/null || {
-            echo "⚠️  Auto-restart failed. Run: systemctl --user restart openclaw-gateway"
+        systemctl --user restart mcp-bridge 2>/dev/null || {
+            echo "⚠️  Auto-restart failed. Run: systemctl --user restart mcp-bridge"
             exit 0
         }
         sleep 3
-        if systemctl --user is-active --quiet openclaw-gateway 2>/dev/null; then
-            echo "✅ Gateway restarted. ${SERVER_TITLE} removed."
+        if systemctl --user is-active --quiet mcp-bridge 2>/dev/null; then
+            echo "✅ Service restarted. ${SERVER_TITLE} removed."
         else
-            echo "❌ Gateway failed to start! Restoring backup..."
-            cp "$BACKUP_FILE" "$OPENCLAW_JSON"
-            systemctl --user restart openclaw-gateway 2>/dev/null
+            echo "❌ Service failed to start! Restoring backup..."
+            cp "$BACKUP_FILE" "$MCP_BRIDGE_JSON"
+            systemctl --user restart mcp-bridge 2>/dev/null
             echo "Restored from backup."
         fi
     else
-        echo "⏭️  Run manually: systemctl --user restart openclaw-gateway"
+        echo "⏭️  Run manually: systemctl --user restart mcp-bridge"
     fi
     exit 0
 fi
@@ -235,7 +235,7 @@ if [[ -f "$ENV_VARS_FILE" ]] && [[ -s "$ENV_VARS_FILE" ]]; then
     done
 
     # Write to .env
-    mkdir -p "$OPENCLAW_DIR"
+    mkdir -p "$MCP_BRIDGE_DIR"
     touch "$ENV_FILE"
     chmod 600 "$ENV_FILE"
 
@@ -255,22 +255,22 @@ if [[ -f "$ENV_VARS_FILE" ]] && [[ -s "$ENV_VARS_FILE" ]]; then
     fi
 fi
 
-# 4. Backup and merge openclaw.json
-mkdir -p "$(dirname "$OPENCLAW_JSON")"
-[[ ! -f "$OPENCLAW_JSON" ]] && echo "{}" > "$OPENCLAW_JSON"
+# 4. Backup and merge config.json
+mkdir -p "$(dirname "$MCP_BRIDGE_JSON")"
+[[ ! -f "$MCP_BRIDGE_JSON" ]] && echo "{}" > "$MCP_BRIDGE_JSON"
 
-BACKUP_FILE="${OPENCLAW_JSON}.bak-$(date +%Y%m%d%H%M%S)"
-cp "$OPENCLAW_JSON" "$BACKUP_FILE"
+BACKUP_FILE="${MCP_BRIDGE_JSON}.bak-$(date +%Y%m%d%H%M%S)"
+cp "$MCP_BRIDGE_JSON" "$BACKUP_FILE"
 echo "Backup: ${BACKUP_FILE}"
 
 PATH_OVERRIDE="$(resolve_path_override)"
 
-python3 - "$OPENCLAW_JSON" "$SERVER_CONFIG_FILE" "$SERVER_NAME" "$PATH_OVERRIDE" <<'PY'
+python3 - "$MCP_BRIDGE_JSON" "$SERVER_CONFIG_FILE" "$SERVER_NAME" "$PATH_OVERRIDE" <<'PY'
 import json, sys
 
-openclaw_path, server_cfg_path, server_name, path_override = sys.argv[1:5]
+config_path, server_cfg_path, server_name, path_override = sys.argv[1:5]
 
-with open(openclaw_path, "r", encoding="utf-8") as f:
+with open(config_path, "r", encoding="utf-8") as f:
     raw = f.read().strip()
     cfg = json.loads(raw) if raw else {}
 
@@ -284,22 +284,14 @@ if path_override:
             if isinstance(value, str) and value.startswith("path/to/"):
                 args[idx] = path_override
 
-plugins = cfg.setdefault("plugins", {})
-allow = plugins.setdefault("allow", [])
-if "openclaw-mcp-bridge" not in allow:
-    allow.append("openclaw-mcp-bridge")
-entries = plugins.setdefault("entries", {})
-mcp_client = entries.setdefault("openclaw-mcp-bridge", {})
-mcp_client.setdefault("enabled", True)
-mcp_cfg = mcp_client.setdefault("config", {})
-mcp_cfg.setdefault("toolPrefix", True)
-mcp_cfg.setdefault("reconnectIntervalMs", 30000)
-mcp_cfg.setdefault("connectionTimeoutMs", 10000)
-mcp_cfg.setdefault("requestTimeoutMs", 60000)
-servers = mcp_cfg.setdefault("servers", {})
+cfg.setdefault("toolPrefix", True)
+cfg.setdefault("reconnectIntervalMs", 30000)
+cfg.setdefault("connectionTimeoutMs", 10000)
+cfg.setdefault("requestTimeoutMs", 60000)
+servers = cfg.setdefault("servers", {})
 servers[server_name] = server_cfg
 
-with open(openclaw_path, "w", encoding="utf-8") as f:
+with open(config_path, "w", encoding="utf-8") as f:
     json.dump(cfg, f, indent=2)
     f.write("\n")
 
@@ -308,50 +300,5 @@ PY
 
 # 5. Gateway restart
 echo ""
-read -r -p "Restart gateway now? [Y/n]: " RESTART </dev/tty
-if [[ -z "$RESTART" || "$RESTART" =~ ^[Yy]$ ]]; then
-    systemctl --user restart openclaw-gateway 2>/dev/null || {
-        echo "⚠️  Auto-restart failed. Run: systemctl --user restart openclaw-gateway"
-        exit 0
-    }
-    echo "Waiting for gateway startup..."
-    CONFIRMED=false
-    ROUTER_MODE=false
-    for i in 1 2 3 4 5 6; do
-        sleep 5
-        if ! systemctl --user is-active --quiet openclaw-gateway 2>/dev/null; then
-            echo "❌ Gateway failed to start!"
-            journalctl --user -u openclaw-gateway --since "1 min ago" --no-pager 2>/dev/null | grep -iE "error|fail|missing" | head -5
-            echo "Full logs: journalctl --user -u openclaw-gateway --since '1 min ago' --no-pager"
-            exit 1
-        fi
-        # Router mode: servers connect lazily, just check plugin loaded
-        if journalctl --user -u openclaw-gateway --since "1 min ago" --no-pager 2>/dev/null | grep -qi "Plugin activated with.*servers configured"; then
-            CONFIRMED=true
-            ROUTER_MODE=true
-            break
-        fi
-        # Direct mode: server connects at boot
-        if journalctl --user -u openclaw-gateway --since "1 min ago" --no-pager 2>/dev/null | grep -qi "Server ${SERVER_NAME} initialized"; then
-            CONFIRMED=true
-            break
-        fi
-        # Check if server explicitly failed
-        if journalctl --user -u openclaw-gateway --since "1 min ago" --no-pager 2>/dev/null | grep -qi "Startup failed: ${SERVER_NAME}"; then
-            echo "❌ ${SERVER_TITLE} MCP Server failed to start!"
-            journalctl --user -u openclaw-gateway --since "1 min ago" --no-pager 2>/dev/null | grep -i "$SERVER_NAME" | tail -5
-            exit 1
-        fi
-    done
-    if $CONFIRMED; then
-        if $ROUTER_MODE; then
-            echo "✅ ${SERVER_TITLE} configured! (Router mode — server connects on first use)"
-        else
-            echo "✅ ${SERVER_TITLE} MCP Server installed and running!"
-        fi
-    else
-        echo "⚠️  Gateway running but plugin not confirmed after 30s. Check: journalctl --user -u openclaw-gateway -f"
-    fi
-else
-    echo "⏭️  Run manually: systemctl --user restart openclaw-gateway"
-fi
+echo "✅ ${SERVER_TITLE} MCP Server installed."
+echo "Restart mcp-bridge to pick up the new server configuration."

package/servers/apify/README.md

@@ -10,21 +10,21 @@ Hosted Apify MCP endpoint for actors, scraping, and docs search.
 
 ### Linux / macOS
 ```bash
-cd ~/.openclaw/extensions/mcp-client/servers/apify
-chmod +x install.sh && ./install.sh
+# Using mcp-bridge CLI:
+mcp-bridge install apify
 ```
 
 ### Windows (PowerShell)
 ```powershell
-cd $env:USERPROFILE\.openclaw\extensions\mcp-client\servers\apify
-.\install.ps1
+# Using mcp-bridge CLI:
+mcp-bridge install apify
 ```
 
 ### Manual Setup
 1. Get your token: https://console.apify.com/settings/integrations
 2. Add to .env: `APIFY_TOKEN=your_token`
-3. Add config to openclaw.json (see config.json)
-4. Restart gateway
+3. Add config to ~/.mcp-bridge/config.json (see config.json)
+4. Restart mcp-bridge
 
 ## What you get
 - Actor discovery and execution