@paradigma-inc/flywheel 0.1.51 → 0.1.53

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@paradigma-inc/flywheel",
-  "version": "0.1.51",
+  "version": "0.1.53",
   "description": "One-command setup for Flywheel MCP hosts",
   "type": "module",
   "files": [

package/src/cli.mjs

@@ -39,6 +39,7 @@ import {
   buildGuidedSkillInstallPrompt,
   runMcpModeCommand,
 } from "./setup/modes/mcp-command.mjs";
+import { findFlywheelMcpEntryNames } from "./setup/shared/prior-mode-detect.mjs";
 import { renderSetupSummary } from "./setup/shared/summary.mjs";
 
 export { buildGuidedSkillInstallPrompt };
@@ -532,16 +533,47 @@ async function resolveHostsWithRemainingFlywheelMcpEntries({ scope }) {
   return remainingHosts;
 }
 
-async function isConfiguredForUninstallScope(hostName, scope, serverName) {
+async function findFlywheelServerNamesOnHost(hostName, scope) {
+  // Mirror setup's prior-mode detector: walk every MCP entry on the host and
+  // keep those whose URL is Flywheel-identifying (hostname contains "flywheel"
+  // or path === /mcp-server with a matching target origin). Uninstall must
+  // catch renamed/drifted entries (e.g. `[mcp_servers.flywheel-staging]`) that
+  // setup already detects; otherwise a user whose host has a non-default entry
+  // name is stuck between setup ("already installed") and uninstall ("not
+  // configured").
+  return await findFlywheelMcpEntryNames({ hostName, scope }).catch(() => []);
+}
+
+async function resolveUninstallServerNamesForHost(
+  hostName,
+  scope,
+  { explicitServerName },
+) {
+  if (explicitServerName) {
+    const configured = await isAlreadyConfigured(
+      hostName,
+      scope,
+      explicitServerName,
+    ).catch(() => false);
+    return configured ? [explicitServerName] : [];
+  }
+  return await findFlywheelServerNamesOnHost(hostName, scope);
+}
+
+async function isConfiguredForUninstallScope(
+  hostName,
+  scope,
+  { explicitServerName },
+) {
   const scopes = scopesFromUninstallScope(scope);
   for (const singleScope of scopes) {
     // eslint-disable-next-line no-await-in-loop
-    const configured = await isAlreadyConfigured(
+    const targets = await resolveUninstallServerNamesForHost(
       hostName,
       singleScope,
-      serverName,
-    ).catch(() => false);
-    if (configured) return true;
+      { explicitServerName },
+    );
+    if (targets.length > 0) return true;
   }
   return false;
 }
@@ -563,14 +595,12 @@ async function promptUninstallScope(defaultScope) {
   }
 }
 
-async function promptUninstallHosts(scope, serverName) {
+async function promptUninstallHosts(scope, { explicitServerName }) {
   const choices = await Promise.all(
     ALL_HOST_NAMES.map(async (hostName) => {
-      const configured = await isConfiguredForUninstallScope(
-        hostName,
-        scope,
-        serverName,
-      );
+      const configured = await isConfiguredForUninstallScope(hostName, scope, {
+        explicitServerName,
+      });
       return {
         name: SETUP_HOST_NAMES[hostName],
         value: hostName,
@@ -599,7 +629,7 @@ async function promptUninstallHosts(scope, serverName) {
   }
 }
 
-async function resolveUninstallTargets(options, serverName) {
+async function resolveUninstallTargets(options, { explicitServerName }) {
   const explicitHostsFromFlags = selectedHostsFromOptions(options);
   const explicitHostsFromList =
     explicitHostsFromFlags.length === 0 ? parseHostsList(options.hosts) : [];
@@ -628,7 +658,9 @@ async function resolveUninstallTargets(options, serverName) {
     }
 
     if (!hasExplicitHosts) {
-      const selectedHosts = await promptUninstallHosts(scope, serverName);
+      const selectedHosts = await promptUninstallHosts(scope, {
+        explicitServerName,
+      });
       if (!selectedHosts) {
         log.warn("Uninstall cancelled");
         return null;
@@ -682,8 +714,13 @@ async function removeHostConfig(hostName, scope, serverName) {
 }
 
 async function runUninstallCommand(options) {
-  const serverName = normalizeServerName(options.name || SERVER_NAME);
-  const resolved = await resolveUninstallTargets(options, serverName);
+  const explicitServerName =
+    typeof options.name === "string" && options.name.trim().length > 0
+      ? normalizeServerName(options.name)
+      : null;
+  const resolved = await resolveUninstallTargets(options, {
+    explicitServerName,
+  });
   if (!resolved) return;
   const { scope, hosts } = resolved;
   const scopes = scopesFromUninstallScope(scope);
@@ -693,8 +730,35 @@ async function runUninstallCommand(options) {
   for (const singleScope of scopes) {
     for (const host of hosts) {
       mcpSpinner.text = `Removing from ${getHost(host).displayName} (${singleScope})...`;
+      // Resolve the concrete server name(s) to remove at the host/scope level.
+      // When --name was not given, this iterates every Flywheel-identifying
+      // entry (matching setup's prior-mode detector) so renamed or drifted
+      // entries (e.g. `[mcp_servers.flywheel-staging]`) are actually cleared.
       // eslint-disable-next-line no-await-in-loop
-      mcpResults.push(await removeHostConfig(host, singleScope, serverName));
+      const targetNames = await resolveUninstallServerNamesForHost(
+        host,
+        singleScope,
+        { explicitServerName },
+      );
+      if (targetNames.length === 0) {
+        // eslint-disable-next-line no-await-in-loop
+        const hostForDisplay = getHost(host);
+        // eslint-disable-next-line no-await-in-loop
+        const filePath = await resolveMcpPath(
+          mcpCandidatesForScope(hostForDisplay, singleScope),
+        );
+        mcpResults.push({
+          host: hostForDisplay.displayName,
+          scope: singleScope,
+          filePath,
+          status: "not present",
+        });
+        continue;
+      }
+      for (const targetName of targetNames) {
+        // eslint-disable-next-line no-await-in-loop
+        mcpResults.push(await removeHostConfig(host, singleScope, targetName));
+      }
     }
   }
   mcpSpinner.succeed("MCP uninstall complete");

package/src/runtime/vendor/manifest.json

@@ -1,5 +1,5 @@
 {
-  "sourceCommit": "ffedf6bc3851ff31746837968cf586a6fee876b4",
+  "sourceCommit": "ad9659b3de7545ce1411e819a0643cfe4c38888f",
   "files": [
     "auth/active-key-id.d.ts",
     "auth/active-key-id.js",

package/src/setup/shared/prior-mode-detect.mjs

@@ -172,15 +172,15 @@ async function findFlywheelTomlEntryNames(filePath, targetOrigin) {
   return unique(matches);
 }
 
-async function findFlywheelMcpEntryNames({
+export async function findFlywheelMcpEntryNames({
   hostName,
   scope,
-  cwd,
-  targetOrigin,
-  getHost,
-  resolveMcpPath,
-  readJsonConfig,
-  readYamlConfig,
+  cwd = process.cwd(),
+  targetOrigin = null,
+  getHost = defaultGetHost,
+  resolveMcpPath = defaultResolveMcpPath,
+  readJsonConfig = defaultReadJsonConfig,
+  readYamlConfig = defaultReadYamlConfig,
 }) {
   try {
     const host = getHost(hostName);

package/src/unified-cli.mjs

@@ -1,7 +1,14 @@
+import { readFile } from "node:fs/promises";
+import path from "node:path";
+import { fileURLToPath } from "node:url";
+
 import { runCli as runSetupCli } from "./cli.mjs";
 import { runRuntimeCli } from "./runtime/delegate.mjs";
 import { RUNTIME_ALIASES } from "./runtime/vendor/flywheel-cli-dist/commands/aliases.js";
 
+const __dirname = path.dirname(fileURLToPath(import.meta.url));
+const PACKAGE_JSON_PATH = path.resolve(__dirname, "..", "package.json");
+
 const ALIAS_RESERVED_COMMANDS = new Set([
   "setup",
   "uninstall",
@@ -9,6 +16,7 @@ const ALIAS_RESERVED_COMMANDS = new Set([
   "--help",
   "-h",
 ]);
+const VERSION_REQUEST_TOKENS = new Set(["--version", "-v", "version"]);
 
 const HELP_EXTRAS = [
   {
@@ -49,6 +57,30 @@ function stripFormatTokens(argv) {
   return out;
 }
 
+let cachedPackageVersion = null;
+
+async function loadPackageVersion() {
+  if (cachedPackageVersion !== null) {
+    return cachedPackageVersion;
+  }
+  try {
+    const raw = await readFile(PACKAGE_JSON_PATH, "utf8");
+    const parsed = JSON.parse(raw);
+    if (typeof parsed.version === "string" && parsed.version.trim()) {
+      cachedPackageVersion = parsed.version.trim();
+      return cachedPackageVersion;
+    }
+  } catch {
+    // Fall through to deterministic fallback.
+  }
+  cachedPackageVersion = "0.0.0";
+  return cachedPackageVersion;
+}
+
+function isVersionRequest(argv) {
+  return argv.length === 1 && VERSION_REQUEST_TOKENS.has(argv[0]);
+}
+
 /**
  * Detect a top-level help invocation.
  *
@@ -104,6 +136,12 @@ export async function runUnifiedCli(argv = process.argv.slice(2)) {
     throw new Error("runUnifiedCli expects an argv array.");
   }
 
+  if (isVersionRequest(argv)) {
+    process.stdout.write(`${await loadPackageVersion()}\n`);
+    process.exitCode = 0;
+    return;
+  }
+
   if (isCombinedHelpRequest(argv)) {
     // Preserve any --format token verbatim so the runtime's format validator
     // runs and rejects unsupported values (e.g. `--format=badvalue`) with the