mcp-squared 0.3.3 → 0.3.4

package/dist/index.js

@@ -1872,18 +1872,32 @@ function readManifestFile(manifestUrl) {
 }
 function readBundledManifestFile() {
   const require2 = createRequire(import.meta.url);
-  return require2("../package.json");
+  const candidates = ["../package.json", "../../package.json"];
+  for (const candidate of candidates) {
+    try {
+      return require2(candidate);
+    } catch {}
+  }
+  throw new Error("Unable to resolve bundled package.json");
+}
+function getDefaultManifestUrls() {
+  return [
+    new URL("../package.json", import.meta.url),
+    new URL("../../package.json", import.meta.url)
+  ];
 }
 function resolveVersion(options = {}) {
   const readManifest = options.readManifest ?? readManifestFile;
-  const manifestUrl = options.manifestUrl ?? new URL("../package.json", import.meta.url);
-  try {
-    const manifest = readManifest(manifestUrl);
-    const manifestVersion = normalizeVersion(manifest.version);
-    if (manifestVersion) {
-      return manifestVersion;
-    }
-  } catch {}
+  const manifestUrls = options.manifestUrls ? [...options.manifestUrls] : options.manifestUrl ? [options.manifestUrl] : getDefaultManifestUrls();
+  for (const manifestUrl of manifestUrls) {
+    try {
+      const manifest = readManifest(manifestUrl);
+      const manifestVersion = normalizeVersion(manifest.version);
+      if (manifestVersion) {
+        return manifestVersion;
+      }
+    } catch {}
+  }
   const envVersion = normalizeVersion((options.env ?? process.env)["npm_package_version"]);
   if (envVersion) {
     return envVersion;

package/dist/tui/config.js

@@ -1006,18 +1006,32 @@ function readManifestFile(manifestUrl) {
 }
 function readBundledManifestFile() {
   const require2 = createRequire(import.meta.url);
-  return require2("../package.json");
+  const candidates = ["../package.json", "../../package.json"];
+  for (const candidate of candidates) {
+    try {
+      return require2(candidate);
+    } catch {}
+  }
+  throw new Error("Unable to resolve bundled package.json");
+}
+function getDefaultManifestUrls() {
+  return [
+    new URL("../package.json", import.meta.url),
+    new URL("../../package.json", import.meta.url)
+  ];
 }
 function resolveVersion(options = {}) {
   const readManifest = options.readManifest ?? readManifestFile;
-  const manifestUrl = options.manifestUrl ?? new URL("../package.json", import.meta.url);
-  try {
-    const manifest = readManifest(manifestUrl);
-    const manifestVersion = normalizeVersion(manifest.version);
-    if (manifestVersion) {
-      return manifestVersion;
-    }
-  } catch {}
+  const manifestUrls = options.manifestUrls ? [...options.manifestUrls] : options.manifestUrl ? [options.manifestUrl] : getDefaultManifestUrls();
+  for (const manifestUrl of manifestUrls) {
+    try {
+      const manifest = readManifest(manifestUrl);
+      const manifestVersion = normalizeVersion(manifest.version);
+      if (manifestVersion) {
+        return manifestVersion;
+      }
+    } catch {}
+  }
   const envVersion = normalizeVersion((options.env ?? process.env)["npm_package_version"]);
   if (envVersion) {
     return envVersion;
@@ -2241,6 +2255,132 @@ async function testUpstreamConnection(name, config, options = {}) {
     log("Done");
   }
 }
+// src/tui/upstream-edit.ts
+function hasNameConflict(upstreams, nextName, existingName) {
+  return Boolean(existingName && nextName !== existingName && typeof upstreams[nextName] !== "undefined");
+}
+function parseKeyValuePairsInput(input) {
+  const result = {};
+  if (!input.trim())
+    return result;
+  const pairs = input.split(",").map((s) => s.trim()).filter(Boolean);
+  for (const pair of pairs) {
+    const eqIndex = pair.indexOf("=");
+    if (eqIndex > 0) {
+      const key = pair.substring(0, eqIndex).trim();
+      const value = pair.substring(eqIndex + 1).trim();
+      if (key) {
+        result[key] = value;
+      }
+    }
+  }
+  return result;
+}
+function stringifyKeyValuePairsInput(pairs) {
+  const entries = Object.entries(pairs || {});
+  if (entries.length === 0) {
+    return "";
+  }
+  return entries.map(([key, value]) => `${key}=${value}`).join(", ");
+}
+function saveStdioUpstreamFromForm(input) {
+  const trimmedName = input.name.trim();
+  const trimmedCommand = input.commandLine.trim();
+  if (!trimmedName) {
+    return { ok: false, reason: "name_required" };
+  }
+  if (!trimmedCommand) {
+    return { ok: false, reason: "command_required" };
+  }
+  if (hasNameConflict(input.upstreams, trimmedName, input.existingName)) {
+    return { ok: false, reason: "name_conflict" };
+  }
+  const parts = trimmedCommand.split(/\s+/);
+  const command = parts[0] || "";
+  const args = parts.slice(1);
+  const env = parseKeyValuePairsInput(input.envInput);
+  if (input.existingName && input.existingName !== trimmedName) {
+    delete input.upstreams[input.existingName];
+  }
+  input.upstreams[trimmedName] = {
+    transport: "stdio",
+    enabled: input.existingUpstream?.enabled ?? true,
+    env,
+    stdio: { command, args }
+  };
+  return { ok: true, savedName: trimmedName };
+}
+function saveSseUpstreamFromForm(input) {
+  const trimmedName = input.name.trim();
+  const trimmedUrl = input.url.trim();
+  if (!trimmedName) {
+    return { ok: false, reason: "name_required" };
+  }
+  if (!trimmedUrl) {
+    return { ok: false, reason: "url_required" };
+  }
+  try {
+    new URL(trimmedUrl);
+  } catch {
+    return { ok: false, reason: "invalid_url" };
+  }
+  if (hasNameConflict(input.upstreams, trimmedName, input.existingName)) {
+    return { ok: false, reason: "name_conflict" };
+  }
+  const headers = parseKeyValuePairsInput(input.headersInput);
+  const env = parseKeyValuePairsInput(input.envInput);
+  if (input.existingName && input.existingName !== trimmedName) {
+    delete input.upstreams[input.existingName];
+  }
+  input.upstreams[trimmedName] = {
+    transport: "sse",
+    enabled: input.existingUpstream?.enabled ?? true,
+    env,
+    sse: {
+      url: trimmedUrl,
+      headers,
+      auth: input.authEnabled ? true : undefined
+    }
+  };
+  return { ok: true, savedName: trimmedName };
+}
+function deleteUpstreamByName(upstreams, name) {
+  if (typeof upstreams[name] === "undefined") {
+    return false;
+  }
+  delete upstreams[name];
+  return true;
+}
+function getUpstreamEditMenuOptions(upstream) {
+  return [
+    {
+      name: "Edit Configuration",
+      description: "Update connection details and environment",
+      value: "edit"
+    },
+    {
+      name: "Test Connection",
+      description: "Connect and list available tools",
+      value: "test"
+    },
+    {
+      name: upstream.enabled ? "Disable" : "Enable",
+      description: upstream.enabled ? "Stop using this upstream" : "Start using this upstream",
+      value: "toggle"
+    },
+    {
+      name: "Delete",
+      description: "Remove this upstream configuration",
+      value: "delete"
+    },
+    {
+      name: "\u2190 Back",
+      description: "",
+      value: "back"
+    }
+  ];
+}
+
 // src/tui/config.ts
 var PROJECT_DESCRIPTION = "Mercury Control Plane";
 async function runConfigTui() {
@@ -2572,12 +2712,13 @@ class ConfigTuiApp {
     menu.focus();
     this.addInstructions("\u2191\u2193 Navigate | Enter Select | Esc Back");
   }
-  showAddStdioScreen() {
+  showAddStdioScreen(existingName, existingUpstream) {
     this.state.currentScreen = "add-stdio";
     this.clearScreen();
     this.addHeader();
     if (!this.container)
       return;
+    const isEditMode = Boolean(existingName && existingUpstream);
     const formBox = new BoxRenderable(this.renderer, {
       id: "add-stdio-box",
       width: 60,
@@ -2585,7 +2726,7 @@ class ConfigTuiApp {
       border: true,
       borderStyle: "single",
       borderColor: "#475569",
-      title: "Add Stdio Upstream",
+      title: isEditMode ? `Edit Stdio Upstream: ${existingName}` : "Add Stdio Upstream",
       titleAlignment: "center",
       backgroundColor: "#1e293b",
       flexDirection: "column",
@@ -2612,6 +2753,7 @@ class ConfigTuiApp {
       }
     });
     formBox.add(nameInput);
+    nameInput.value = existingName ?? "";
     const commandLabel = new TextRenderable(this.renderer, {
       id: "command-label",
       content: "Command (with arguments):",
@@ -2631,6 +2773,7 @@ class ConfigTuiApp {
       }
     });
     formBox.add(commandInput);
+    commandInput.value = existingUpstream ? [existingUpstream.stdio.command, ...existingUpstream.stdio.args].filter(Boolean).join(" ") : "";
     const envLabel = new TextRenderable(this.renderer, {
       id: "env-label",
       content: "Environment variables (optional, comma-separated):",
@@ -2651,6 +2794,7 @@ class ConfigTuiApp {
       }
     });
     formBox.add(envInput);
+    envInput.value = stringifyKeyValuePairsInput(existingUpstream?.env);
     const submitOptions = [
       { name: "[ Save Upstream ]", description: "", value: "save" },
       { name: "[ Cancel ]", description: "", value: "cancel" }
@@ -2675,44 +2819,28 @@ class ConfigTuiApp {
       if (field)
         field.focus();
     };
-    const parseEnvVars = (input) => {
-      const env = {};
-      if (!input.trim())
-        return env;
-      const pairs = input.split(",").map((s) => s.trim()).filter(Boolean);
-      for (const pair of pairs) {
-        const eqIndex = pair.indexOf("=");
-        if (eqIndex > 0) {
-          const key = pair.substring(0, eqIndex).trim();
-          const value = pair.substring(eqIndex + 1).trim();
-          if (key) {
-            env[key] = value;
-          }
-        }
-      }
-      return env;
-    };
     const saveUpstream = () => {
-      const trimmedName = nameInput.value?.trim() || "";
-      const trimmedCommand = commandInput.value?.trim() || "";
-      if (!trimmedName) {
-        nameInput.focus();
-        return;
-      }
-      if (!trimmedCommand) {
-        commandInput.focus();
-        return;
+      const result = saveStdioUpstreamFromForm({
+        upstreams: this.state.config.upstreams,
+        name: nameInput.value || "",
+        commandLine: commandInput.value || "",
+        envInput: envInput.value || "",
+        existingName: isEditMode ? existingName : undefined,
+        existingUpstream
+      });
+      if (!result.ok) {
+        switch (result.reason) {
+          case "name_required":
+          case "name_conflict":
+            nameInput.focus();
+            return;
+          case "command_required":
+            commandInput.focus();
+            return;
+          default:
+            return;
+        }
       }
-      const envVars = parseEnvVars(envInput.value || "");
-      const parts = trimmedCommand.split(/\s+/);
-      const command = parts[0] || "";
-      const args = parts.slice(1);
-      this.state.config.upstreams[trimmedName] = {
-        transport: "stdio",
-        enabled: true,
-        env: envVars,
-        stdio: { command, args }
-      };
       this.state.isDirty = true;
       cleanup();
       this.showUpstreamsScreen();
@@ -2722,13 +2850,21 @@ class ConfigTuiApp {
         saveUpstream();
       } else {
         cleanup();
-        this.showAddUpstreamScreen();
+        if (isEditMode && existingName) {
+          this.showEditUpstreamScreen(existingName);
+        } else {
+          this.showAddUpstreamScreen();
+        }
       }
     });
     const handleKeypress = (key) => {
       if (key.name === "escape") {
         cleanup();
-        this.showAddUpstreamScreen();
+        if (isEditMode && existingName) {
+          this.showEditUpstreamScreen(existingName);
+        } else {
+          this.showAddUpstreamScreen();
+        }
         return;
       }
       if (key.name === "tab" && !key.shift) {
@@ -2745,14 +2881,15 @@ class ConfigTuiApp {
     };
     this.renderer.keyInput.on("keypress", handleKeypress);
     focusField(0);
-    this.addInstructions("Tab: next field | Shift+Tab: prev | Esc: cancel");
+    this.addInstructions("Tab: next field | Shift+Tab: prev | Esc: back");
   }
-  showAddSseScreen() {
+  showAddSseScreen(existingName, existingUpstream) {
     this.state.currentScreen = "add-sse";
     this.clearScreen();
     this.addHeader();
     if (!this.container)
       return;
+    const isEditMode = Boolean(existingName && existingUpstream);
     const formBox = new BoxRenderable(this.renderer, {
       id: "add-sse-box",
       width: 60,
@@ -2760,7 +2897,7 @@ class ConfigTuiApp {
       border: true,
       borderStyle: "single",
       borderColor: "#475569",
-      title: "Add HTTP/SSE Upstream",
+      title: isEditMode ? `Edit HTTP/SSE Upstream: ${existingName}` : "Add HTTP/SSE Upstream",
       titleAlignment: "center",
       backgroundColor: "#1e293b",
       flexDirection: "column",
@@ -2787,6 +2924,7 @@ class ConfigTuiApp {
       }
     });
     formBox.add(nameInput);
+    nameInput.value = existingName ?? "";
     const urlLabel = new TextRenderable(this.renderer, {
       id: "url-label",
       content: "Server URL:",
@@ -2806,6 +2944,7 @@ class ConfigTuiApp {
       }
     });
     formBox.add(urlInput);
+    urlInput.value = existingUpstream?.sse.url ?? "";
     const headersLabel = new TextRenderable(this.renderer, {
       id: "headers-label",
       content: "HTTP Headers (optional, comma-separated):",
@@ -2826,6 +2965,7 @@ class ConfigTuiApp {
       }
     });
     formBox.add(headersInput);
+    headersInput.value = stringifyKeyValuePairsInput(existingUpstream?.sse.headers);
     const authLabel = new TextRenderable(this.renderer, {
       id: "auth-label",
       content: "OAuth Authentication:",
@@ -2833,7 +2973,14 @@ class ConfigTuiApp {
       marginBottom: 0
     });
     formBox.add(authLabel);
-    const authOptions = [
+    const authOptions = existingUpstream?.sse.auth ? [
+      {
+        name: "Enabled (default port 8089)",
+        description: "",
+        value: "enabled"
+      },
+      { name: "Disabled", description: "", value: "disabled" }
+    ] : [
       { name: "Disabled", description: "", value: "disabled" },
       {
         name: "Enabled (default port 8089)",
@@ -2874,6 +3021,7 @@ class ConfigTuiApp {
       }
     });
     formBox.add(envInput);
+    envInput.value = stringifyKeyValuePairsInput(existingUpstream?.env);
     const submitOptions = [
       { name: "[ Save Upstream ]", description: "", value: "save" },
       { name: "[ Cancel ]", description: "", value: "cancel" }
@@ -2899,63 +3047,41 @@ class ConfigTuiApp {
       submitSelect
     ];
     let focusIndex = 0;
-    let selectedAuthIndex = 0;
+    let selectedAuthValue = String(authOptions[0]?.value ?? "disabled");
     const focusField = (index) => {
       focusIndex = index;
       const field = fields[index];
       if (field)
         field.focus();
     };
-    authSelect.on(SelectRenderableEvents.ITEM_SELECTED, (index, _opt) => {
-      selectedAuthIndex = index;
-    });
-    const parseKeyValuePairs = (input) => {
-      const result = {};
-      if (!input.trim())
-        return result;
-      const pairs = input.split(",").map((s) => s.trim()).filter(Boolean);
-      for (const pair of pairs) {
-        const eqIndex = pair.indexOf("=");
-        if (eqIndex > 0) {
-          const key = pair.substring(0, eqIndex).trim();
-          const value = pair.substring(eqIndex + 1).trim();
-          if (key) {
-            result[key] = value;
-          }
-        }
-      }
-      return result;
-    };
+    authSelect.on(SelectRenderableEvents.ITEM_SELECTED, (_index, opt) => {
+      selectedAuthValue = String(opt.value);
+    });
     const saveUpstream = () => {
-      const trimmedName = nameInput.value?.trim() || "";
-      const trimmedUrl = urlInput.value?.trim() || "";
-      if (!trimmedName) {
-        nameInput.focus();
-        return;
-      }
-      if (!trimmedUrl) {
-        urlInput.focus();
-        return;
-      }
-      try {
-        new URL(trimmedUrl);
-      } catch {
-        urlInput.focus();
-        return;
-      }
-      const envVars = parseKeyValuePairs(envInput.value || "");
-      const headers = parseKeyValuePairs(headersInput.value || "");
-      const authEnabled = selectedAuthIndex === 1;
-      this.state.config.upstreams[trimmedName] = {
-        transport: "sse",
-        enabled: true,
-        env: envVars,
-        sse: {
-          url: trimmedUrl,
-          headers,
-          auth: authEnabled ? true : undefined
+      const result = saveSseUpstreamFromForm({
+        upstreams: this.state.config.upstreams,
+        name: nameInput.value || "",
+        url: urlInput.value || "",
+        headersInput: headersInput.value || "",
+        envInput: envInput.value || "",
+        authEnabled: selectedAuthValue === "enabled",
+        existingName: isEditMode ? existingName : undefined,
+        existingUpstream
+      });
+      if (!result.ok) {
+        switch (result.reason) {
+          case "name_required":
+          case "name_conflict":
+            nameInput.focus();
+            return;
+          case "url_required":
+          case "invalid_url":
+            urlInput.focus();
+            return;
+          default:
+            return;
         }
-      };
+      }
       this.state.isDirty = true;
       cleanup();
       this.showUpstreamsScreen();
@@ -2965,13 +3091,21 @@ class ConfigTuiApp {
         saveUpstream();
       } else {
         cleanup();
-        this.showAddUpstreamScreen();
+        if (isEditMode && existingName) {
+          this.showEditUpstreamScreen(existingName);
+        } else {
+          this.showAddUpstreamScreen();
+        }
       }
     });
     const handleKeypress = (key) => {
       if (key.name === "escape") {
         cleanup();
-        this.showAddUpstreamScreen();
+        if (isEditMode && existingName) {
+          this.showEditUpstreamScreen(existingName);
+        } else {
+          this.showAddUpstreamScreen();
+        }
         return;
       }
       if (key.name === "tab" && !key.shift) {
@@ -2988,7 +3122,7 @@ class ConfigTuiApp {
     };
     this.renderer.keyInput.on("keypress", handleKeypress);
     focusField(0);
-    this.addInstructions("Tab: next field | Shift+Tab: prev | Esc: cancel");
+    this.addInstructions("Tab: next field | Shift+Tab: prev | Esc: back");
   }
   showEditUpstreamScreen(name) {
     this.state.currentScreen = "edit-upstream";
@@ -3091,28 +3225,7 @@ class ConfigTuiApp {
       });
       menuBox.add(noEnvText);
     }
-    const options = [
-      {
-        name: "Test Connection",
-        description: "Connect and list available tools",
-        value: "test"
-      },
-      {
-        name: upstream.enabled ? "Disable" : "Enable",
-        description: upstream.enabled ? "Stop using this upstream" : "Start using this upstream",
-        value: "toggle"
-      },
-      {
-        name: "Delete",
-        description: "Remove this upstream configuration",
-        value: "delete"
-      },
-      {
-        name: "\u2190 Back",
-        description: "",
-        value: "back"
-      }
-    ];
+    const options = getUpstreamEditMenuOptions(upstream);
     const menu = new SelectRenderable(this.renderer, {
       id: "edit-menu",
       width: "100%",
@@ -3129,6 +3242,13 @@ class ConfigTuiApp {
     menuBox.add(menu);
     menu.on(SelectRenderableEvents.ITEM_SELECTED, (_index, option) => {
       switch (option.value) {
+        case "edit":
+          if (upstream.transport === "stdio") {
+            this.showAddStdioScreen(name, upstream);
+          } else {
+            this.showAddSseScreen(name, upstream);
+          }
+          break;
         case "test":
           this.showTestScreen(name, upstream);
           break;
@@ -3138,8 +3258,7 @@ class ConfigTuiApp {
           this.showEditUpstreamScreen(name);
           break;
         case "delete":
-          delete this.state.config.upstreams[name];
-          this.state.isDirty = true;
+          this.state.isDirty = deleteUpstreamByName(this.state.config.upstreams, name) || this.state.isDirty;
           this.showUpstreamsScreen();
           break;
         case "back":

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mcp-squared",
-  "version": "0.3.3",
+  "version": "0.3.4",
   "description": "MCP² (Mercury Control Plane) - A local-first meta-server and proxy for the Model Context Protocol",
   "author": "aditzel",
   "license": "Apache-2.0",