mcp-for-i 0.1.13 → 0.2.0

package/dist/controlplane/serviceManager.js

@@ -4,7 +4,7 @@ import path from "path";
 import { spawn } from "child_process";
 import { getConfigDir } from "../config/store.js";
 import { getPlatformDescriptor } from "./platform.js";
-import { isControlPlaneRunning } from "./serverShared.js";
+import { getControlPlanePort, isControlPlaneRunning } from "./serverShared.js";
 const SERVICE_ID = "mcp-for-i-controlplane";
 const MAC_LABEL = "com.mcpfori.controlplane";
 const RC_BEGIN = "# >>> mcp-for-i control >>>";
@@ -121,6 +121,7 @@ async function enableWindowsStartup(scriptPath, nodePath) {
     const startupScript = [
         "@echo off",
         "setlocal",
+        `set "MCP_FOR_I_CONTROL_PORT=${getControlPlanePort()}"`,
         `start \"\" /MIN ${command}`,
         "exit /b 0"
     ].join("\r\n");
@@ -133,28 +134,28 @@ async function enableMacLaunchAgent(scriptPath, nodePath) {
     const errPath = path.join(configDir, "controlplane.err.log");
     await fs.mkdir(path.dirname(agentPath), { recursive: true });
     await fs.mkdir(configDir, { recursive: true });
-    const plist = `<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-  <key>Label</key>
-  <string>${MAC_LABEL}</string>
-  <key>ProgramArguments</key>
-  <array>
-    <string>${escapeXml(nodePath)}</string>
-    <string>${escapeXml(scriptPath)}</string>
-    <string>serve</string>
-  </array>
-  <key>RunAtLoad</key>
-  <true/>
-  <key>KeepAlive</key>
-  <true/>
-  <key>StandardOutPath</key>
-  <string>${escapeXml(outPath)}</string>
-  <key>StandardErrorPath</key>
-  <string>${escapeXml(errPath)}</string>
-</dict>
-</plist>
+    const plist = `<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+  <key>Label</key>
+  <string>${MAC_LABEL}</string>
+  <key>ProgramArguments</key>
+  <array>
+    <string>${escapeXml(nodePath)}</string>
+    <string>${escapeXml(scriptPath)}</string>
+    <string>serve</string>
+  </array>
+  <key>RunAtLoad</key>
+  <true/>
+  <key>KeepAlive</key>
+  <true/>
+  <key>StandardOutPath</key>
+  <string>${escapeXml(outPath)}</string>
+  <key>StandardErrorPath</key>
+  <string>${escapeXml(errPath)}</string>
+</dict>
+</plist>
 `;
     await fs.writeFile(agentPath, plist, "utf8");
     await runQuiet("launchctl", ["unload", agentPath]);
@@ -170,20 +171,21 @@ async function enableLinuxSystemdService(scriptPath, nodePath) {
     const configDir = getConfigDir();
     await fs.mkdir(path.dirname(unitPath), { recursive: true });
     await fs.mkdir(configDir, { recursive: true });
-    const unit = `[Unit]
-Description=MCP-for-i control plane
-After=network.target
-
-[Service]
-Type=simple
-ExecStart=${systemdQuote(nodePath)} ${systemdQuote(scriptPath)} serve
-Restart=on-failure
-RestartSec=3
-WorkingDirectory=${systemdQuote(path.dirname(scriptPath))}
-Environment=MCP_FOR_I_CONTROL_HOST=127.0.0.1
-
-[Install]
-WantedBy=default.target
+    const unit = `[Unit]
+Description=MCP-for-i control plane
+After=network.target
+
+[Service]
+Type=simple
+ExecStart=${systemdQuote(nodePath)} ${systemdQuote(scriptPath)} serve
+Restart=on-failure
+RestartSec=3
+WorkingDirectory=${systemdQuote(path.dirname(scriptPath))}
+Environment=MCP_FOR_I_CONTROL_HOST=127.0.0.1
+Environment=MCP_FOR_I_CONTROL_PORT=${getControlPlanePort()}
+
+[Install]
+WantedBy=default.target
 `;
     await fs.writeFile(unitPath, unit, "utf8");
     await runOrThrow("systemctl", ["--user", "daemon-reload"]);
@@ -214,73 +216,84 @@ async function disableBashRcHook() {
     }
 }
 async function writeBashLauncher(launcherPath, scriptPath, nodePath) {
-    const configDir = getConfigDir();
-    const logFile = path.join(configDir, "controlplane.log");
-    const pythonHealthUrl = JSON.stringify("http://127.0.0.1:3980/api/health");
-    const script = `#!/usr/bin/env bash
-set -euo pipefail
-
-URL="http://127.0.0.1:3980/api/health"
-LOG_FILE=${shellQuote(logFile)}
-LOCK_DIR="\${XDG_RUNTIME_DIR:-/tmp}/${SERVICE_ID}.lock"
-
-mkdir -p "$(dirname "$LOG_FILE")"
-
-health_check() {
-  if command -v curl >/dev/null 2>&1; then
-    curl -fsS --max-time 1 "$URL" >/dev/null 2>&1
-    return $?
-  fi
-
-  if command -v wget >/dev/null 2>&1; then
-    wget -q -T 1 -O - "$URL" >/dev/null 2>&1
-    return $?
-  fi
-
-  if command -v python3 >/dev/null 2>&1; then
-    python3 - <<'PY' >/dev/null 2>&1
-import sys, urllib.request
-try:
-    with urllib.request.urlopen(${pythonHealthUrl}, timeout=1) as response:
-        sys.exit(0 if response.status == 200 else 1)
-except Exception:
-    sys.exit(1)
-PY
-    return $?
-  fi
-
-  return 1
-}
-
-if health_check; then
-  exit 0
-fi
-
-if mkdir "$LOCK_DIR" 2>/dev/null; then
-  trap 'rmdir "$LOCK_DIR" >/dev/null 2>&1 || true' EXIT
-else
-  exit 0
-fi
-
-if health_check; then
-  exit 0
-fi
-
-nohup ${shellQuote(nodePath)} ${shellQuote(scriptPath)} serve >>"$LOG_FILE" 2>&1 </dev/null &
-`;
+    const logFile = path.join(getConfigDir(), "controlplane.log");
+    const script = buildBashLauncherScript({ scriptPath, nodePath, logFile, port: getControlPlanePort() });
     await fs.writeFile(launcherPath, script, { encoding: "utf8", mode: 0o755 });
 }
+/**
+ * Builds the Bash launcher. The port defaults to the one configured when the
+ * service was enabled and can be overridden with MCP_FOR_I_CONTROL_PORT.
+ */
+export function buildBashLauncherScript(opts) {
+    const { scriptPath, nodePath, logFile } = opts;
+    const port = Number.isInteger(opts.port) && opts.port > 0 && opts.port <= 65535 ? opts.port : 3980;
+    return `#!/usr/bin/env bash
+set -euo pipefail
+
+PORT="\${MCP_FOR_I_CONTROL_PORT:-${port}}"
+case "$PORT" in
+  ""|*[!0-9]*) PORT=${port} ;;
+esac
+URL="http://127.0.0.1:\${PORT}/api/health"
+LOG_FILE=${shellQuote(logFile)}
+LOCK_DIR="\${XDG_RUNTIME_DIR:-/tmp}/${SERVICE_ID}.lock"
+
+mkdir -p "$(dirname "$LOG_FILE")"
+
+health_check() {
+  if command -v curl >/dev/null 2>&1; then
+    curl -fsS --max-time 1 "$URL" >/dev/null 2>&1
+    return $?
+  fi
+
+  if command -v wget >/dev/null 2>&1; then
+    wget -q -T 1 -O - "$URL" >/dev/null 2>&1
+    return $?
+  fi
+
+  if command -v python3 >/dev/null 2>&1; then
+    HEALTH_URL="$URL" python3 - <<'PY' >/dev/null 2>&1
+import os, sys, urllib.request
+try:
+    with urllib.request.urlopen(os.environ["HEALTH_URL"], timeout=1) as response:
+        sys.exit(0 if response.status == 200 else 1)
+except Exception:
+    sys.exit(1)
+PY
+    return $?
+  fi
+
+  return 1
+}
+
+if health_check; then
+  exit 0
+fi
+
+if mkdir "$LOCK_DIR" 2>/dev/null; then
+  trap 'rmdir "$LOCK_DIR" >/dev/null 2>&1 || true' EXIT
+else
+  exit 0
+fi
+
+if health_check; then
+  exit 0
+fi
+
+MCP_FOR_I_CONTROL_PORT="$PORT" nohup ${shellQuote(nodePath)} ${shellQuote(scriptPath)} serve >>"$LOG_FILE" 2>&1 </dev/null &
+`;
+}
 function createBashRcBlock(launcherPath, wslOnly) {
     const guard = wslOnly ? 'if [ -n "${WSL_DISTRO_NAME:-}" ]' : "if true";
-    return `${RC_BEGIN}
-case $- in
-  *i*) ;;
-  *) return ;;
-esac
-
-${guard} && [ -x ${shellQuote(launcherPath)} ]; then
-  ${shellQuote(launcherPath)} >/dev/null 2>&1 &
-fi
+    return `${RC_BEGIN}
+case $- in
+  *i*) ;;
+  *) return ;;
+esac
+
+${guard} && [ -x ${shellQuote(launcherPath)} ]; then
+  ${shellQuote(launcherPath)} >/dev/null 2>&1 &
+fi
 ${RC_END}`;
 }
 async function hasManagedRcBlock(rcPath) {