mcp-google-map 0.6.0 → 0.8.0

package/dist/cli.js

@@ -2,7 +2,7 @@
 import {
   Logger,
   PlacesSearcher
-} from "./chunk-NAUIQEK4.js";
+} from "./chunk-OAML6T2D.js";
 
 // src/cli.ts
 import { config as dotenvConfig2 } from "dotenv";
@@ -1594,7 +1594,6 @@ async function checkVersionIdle(deps = {}) {
     case "current":
       lastSuccess = now();
       result.currentVersion = probe.currentVersion;
-      logger.error(red("Version check: no newer version available."));
       break;
     case "newer": {
       lastSuccess = now();
@@ -1653,12 +1652,116 @@ function runPackageManagerCommand(command, deps = {}) {
     return reportSpawnFailure(message);
   }
 }
+function parsePostUpgradeCliOutcomes(raw) {
+  if (raw === void 0) {
+    return void 0;
+  }
+  const start = raw.indexOf("{");
+  if (start < 0) {
+    return void 0;
+  }
+  let parsed;
+  try {
+    parsed = JSON.parse(raw.slice(start));
+  } catch {
+    return void 0;
+  }
+  if (typeof parsed !== "object" || parsed === null) {
+    return void 0;
+  }
+  const summaries = parsed.summaries;
+  const errors = parsed.errors;
+  if (!Array.isArray(summaries)) {
+    return void 0;
+  }
+  const errorTexts = Array.isArray(errors) ? errors.filter((item) => typeof item === "string") : [];
+  const outcomes = [];
+  for (const entry of summaries) {
+    if (typeof entry !== "object" || entry === null) {
+      continue;
+    }
+    const record = entry;
+    const cli = record.cli;
+    if (typeof cli !== "string" || cli.length === 0) {
+      continue;
+    }
+    const lowered = cli.toLowerCase();
+    const failed = errorTexts.some((text) => text.toLowerCase().includes(lowered));
+    outcomes.push({
+      cli,
+      ok: !failed,
+      server: typeof record.server === "number" ? record.server : void 0,
+      skills: typeof record.skills === "number" ? record.skills : void 0
+    });
+  }
+  return outcomes;
+}
 function runPostUpgradeSkillInstall(options, deps = {}) {
   const enabled = loadCliSettings(options.home).enabled;
   if (enabled.length === 0) {
-    return 0;
+    return { exitCode: 0, clis: [] };
+  }
+  const logger = deps.logger ?? Logger;
+  const spawnImpl = deps.spawn ?? spawnSync;
+  const reportSpawnFailure = (message) => {
+    logger.error(`Error executing ${POST_UPGRADE_INSTALL_COMMAND[0]}: ${message}`);
+    logger.log(`Warning: run this command manually: ${POST_UPGRADE_INSTALL_COMMAND.join(" ")}`);
+    return { exitCode: 1, clis: enabled.map((cli) => ({ cli, ok: false })) };
+  };
+  try {
+    const result = spawnImpl(
+      POST_UPGRADE_INSTALL_COMMAND[0],
+      [...POST_UPGRADE_INSTALL_COMMAND.slice(1)],
+      {
+        stdio: ["ignore", "pipe", "inherit"],
+        shell: process.platform === "win32"
+      }
+    );
+    if (result.error) {
+      return reportSpawnFailure(result.error.message);
+    }
+    const exitCode = result.status ?? 1;
+    const stdoutText = result.stdout === void 0 ? void 0 : String(result.stdout);
+    const clis = parsePostUpgradeCliOutcomes(stdoutText) ?? enabled.map((cli) => ({ cli, ok: exitCode === 0 }));
+    return { exitCode, clis };
+  } catch (error) {
+    const message = error instanceof Error ? error.message : String(error);
+    return reportSpawnFailure(message);
+  }
+}
+function renderUpgradeSummary(previousVersion, updatedVersion, outcome) {
+  const lines = [
+    `mcp-google-map upgrade completed: ${previousVersion} -> ${updatedVersion}`
+  ];
+  if (outcome.clis.length === 0) {
+    lines.push(
+      outcome.exitCode === 0 ? "Post-upgrade install: skipped (no CLI enabled)." : `Post-upgrade install: FAILED (exit code ${outcome.exitCode}).`
+    );
+    return `${lines.join("\n")}
+`;
+  }
+  lines.push(
+    outcome.exitCode === 0 ? "Post-upgrade install: completed successfully on the following CLI(s):" : `Post-upgrade install: FAILED (exit code ${outcome.exitCode}) for the following CLI(s):`
+  );
+  for (const entry of outcome.clis) {
+    const counts = entry.server !== void 0 || entry.skills !== void 0 ? ` (server: ${entry.server ?? 0}, skills: ${entry.skills ?? 0})` : "";
+    lines.push(`  - ${entry.cli}: ${entry.ok ? "OK" : "FAILED"}${counts}`);
+  }
+  return `${lines.join("\n")}
+`;
+}
+async function resolveUpdatedVersion(options, deps) {
+  const probe = await probeLatestVersion({
+    ...deps.idleCheck,
+    currentVersion: options.currentVersion
+  });
+  if (probe.status === "newer") {
+    return probe.latestVersion;
   }
-  return runPackageManagerCommand(POST_UPGRADE_INSTALL_COMMAND, deps);
+  if (probe.status === "current") {
+    return probe.currentVersion;
+  }
+  return "unknown";
 }
 async function runVersionCommand(options, deps = {}) {
   await checkVersionIdle({
@@ -1671,12 +1774,16 @@ async function runVersionCommand(options, deps = {}) {
 `);
   return 0;
 }
-function runUpgradeCommand(options, deps = {}) {
+async function runUpgradeCommand(options, deps = {}) {
   const upgraded = runPackageManagerCommand(PACKAGE_UPGRADE_COMMAND, deps);
   if (upgraded !== 0) {
     return upgraded;
   }
-  return runPostUpgradeSkillInstall(options, deps);
+  const updatedVersion = await resolveUpdatedVersion(options, deps);
+  const outcome = runPostUpgradeSkillInstall(options, deps);
+  const stdout = deps.stdout ?? process.stdout;
+  stdout.write(renderUpgradeSummary(options.currentVersion, updatedVersion, outcome));
+  return outcome.exitCode;
 }
 function runUninstallCommand(deps = {}) {
   return runPackageManagerCommand(PACKAGE_UNINSTALL_COMMAND, deps);
@@ -1788,14 +1895,14 @@ function renderClientSnippet(options = {}) {
     const host = options.host ?? SNIPPET_DEFAULT_HOST;
     const port = options.port ?? SNIPPET_DEFAULT_PORT;
     entry = { url: `http://${host}:${port}/mcp` };
-    notes.push(`Start the server first: mcp-google-map --host ${host} --port ${port}.`);
+    notes.push(`Start the server first: mcp-google-map start --host ${host} --port ${port}.`);
   } else {
     const launcher = options.launcher ?? "npx";
     if (launcher === "node" && !options.commandPath) {
       throw new Error("--launcher node requires --command <path> pointing at dist/cli.js");
     }
     const command = launcher === "npx" ? "npx" : launcher === "bin" ? "mcp-google-map" : "node";
-    const args = launcher === "npx" ? ["-y", "mcp-google-map", "--stdio"] : launcher === "bin" ? ["--stdio"] : [options.commandPath, "--stdio"];
+    const args = launcher === "npx" ? ["-y", "mcp-google-map", "start", "--stdio"] : launcher === "bin" ? ["start", "--stdio"] : [options.commandPath, "start", "--stdio"];
     if (launcher === "npx") {
       notes.push("The npx launcher runs the published package; npm must be available on PATH.");
     }
@@ -2068,7 +2175,7 @@ function buildServerRegistration(apiKey) {
   if (apiKey !== void 0 && apiKey.length > 0) {
     env.GOOGLE_MAPS_API_KEY = apiKey;
   }
-  return { command: "npx", args: ["-y", MCP_SERVER_NAME, "--stdio"], env };
+  return { command: "npx", args: ["-y", MCP_SERVER_NAME, "start", "--stdio"], env };
 }
 function resolveSkillsResourcesRoot(packageRoot) {
   const candidate = resolve3(packageRoot, "src", "resources", "skills");
@@ -2834,7 +2941,65 @@ if (isRunDirectly || isMainModule) {
       process.exitCode = 1;
     });
   } else {
-    yargs(hideBin(process.argv)).command(
+    const buildServerCommandOptions = (yargs2) => yargs2.option("port", {
+      alias: "p",
+      type: "number",
+      description: "Port to run the MCP server on",
+      default: process.env.MCP_SERVER_PORT ? parseInt(process.env.MCP_SERVER_PORT) : 3e3
+    }).option("host", {
+      type: "string",
+      description: "Hostname to bind the server to (default 127.0.0.1 loopback; 0.0.0.0 for all interfaces)",
+      default: process.env.MCP_SERVER_HOST || "127.0.0.1"
+    }).option("apikey", {
+      alias: "k",
+      type: "string",
+      description: "Google Maps API key",
+      default: process.env.GOOGLE_MAPS_API_KEY
+    }).option("stdio", {
+      type: "boolean",
+      description: "Use stdio transport instead of HTTP",
+      default: false
+    }).example([
+      ["$0 start", "Start HTTP server with default settings"],
+      ['$0 start --port 3000 --apikey "your_api_key"', "Start HTTP with custom port and API key"],
+      ["$0 start --host 0.0.0.0 --port 3000", "Start HTTP accessible from all interfaces"],
+      ["$0 start --stdio", "Start in stdio mode (for MCP clients)"],
+      ["$0 run --stdio", "Alias: run the server in stdio mode"]
+    ]);
+    const runServerCommand = async (argv) => {
+      if (argv.apikey) {
+        process.env.GOOGLE_MAPS_API_KEY = argv.apikey;
+      }
+      void checkVersionIdle({ currentVersion: packageVersion }).catch(() => void 0);
+      const tools = filterTools(config_default[0].tools);
+      if (argv.stdio) {
+        const server = new BaseMcpServer(config_default[0].name, tools);
+        await server.startStdio();
+      } else {
+        Logger.log("\u{1F5FA}\uFE0F  Google Maps MCP Server");
+        Logger.log("   A Model Context Protocol server for Google Maps services");
+        Logger.log("");
+        if (!argv.apikey) {
+          Logger.log("\u26A0\uFE0F  Google Maps API Key not found!");
+          Logger.log("   Please provide --apikey parameter or set GOOGLE_MAPS_API_KEY in your .env file");
+          Logger.log("");
+        }
+        startServer(argv.port, argv.apikey, argv.host).then((outcome) => {
+          if (outcome.started === 0) {
+            process.exit(1);
+          }
+        }).catch((error) => {
+          Logger.error("\u274C Failed to start server:", error);
+          process.exit(1);
+        });
+      }
+    };
+    const cli = yargs(hideBin(process.argv)).scriptName("mcp-google-map").usage(
+      `mcp-google-map v${packageVersion}
+
+Usage: mcp-google-map <command> [options]
+       mcp-google-map start|run [--stdio] [options]`
+    ).command(
       "doctor",
       "Check standalone CLI readiness without starting an MCP server",
       (yargs2) => yargs2.option("live", {
@@ -3164,67 +3329,34 @@ if (isRunDirectly || isMainModule) {
         process.exit(failed > 0 ? 1 : 0);
       }
     ).command(
-      "$0",
+      "start",
       "Start the MCP server (HTTP by default, --stdio for stdio mode)",
-      (yargs2) => {
-        return yargs2.option("port", {
-          alias: "p",
-          type: "number",
-          description: "Port to run the MCP server on",
-          default: process.env.MCP_SERVER_PORT ? parseInt(process.env.MCP_SERVER_PORT) : 3e3
-        }).option("host", {
-          type: "string",
-          description: "Hostname to bind the server to (default 127.0.0.1 loopback; 0.0.0.0 for all interfaces)",
-          default: process.env.MCP_SERVER_HOST || "127.0.0.1"
-        }).option("apikey", {
-          alias: "k",
-          type: "string",
-          description: "Google Maps API key",
-          default: process.env.GOOGLE_MAPS_API_KEY
-        }).option("stdio", {
-          type: "boolean",
-          description: "Use stdio transport instead of HTTP",
-          default: false
-        }).example([
-          ["$0", "Start HTTP server with default settings"],
-          ['$0 --port 3000 --apikey "your_api_key"', "Start HTTP with custom port and API key"],
-          ["$0 --host 0.0.0.0 --port 3000", "Start HTTP accessible from all interfaces"],
-          ["$0 --stdio", "Start in stdio mode (for Claude Desktop, Cursor, etc.)"]
-        ]);
-      },
-      async (argv) => {
-        if (argv.apikey) {
-          process.env.GOOGLE_MAPS_API_KEY = argv.apikey;
-        }
-        void checkVersionIdle({ currentVersion: packageVersion }).catch(() => void 0);
-        const tools = filterTools(config_default[0].tools);
-        if (argv.stdio) {
-          const server = new BaseMcpServer(config_default[0].name, tools);
-          await server.startStdio();
-        } else {
-          Logger.log("\u{1F5FA}\uFE0F  Google Maps MCP Server");
-          Logger.log("   A Model Context Protocol server for Google Maps services");
-          Logger.log("");
-          if (!argv.apikey) {
-            Logger.log("\u26A0\uFE0F  Google Maps API Key not found!");
-            Logger.log("   Please provide --apikey parameter or set GOOGLE_MAPS_API_KEY in your .env file");
-            Logger.log("");
-          }
-          startServer(argv.port, argv.apikey, argv.host).then((outcome) => {
-            if (outcome.started === 0) {
-              process.exit(1);
-            }
-          }).catch((error) => {
-            Logger.error("\u274C Failed to start server:", error);
-            process.exit(1);
-          });
-        }
+      buildServerCommandOptions,
+      runServerCommand
+    ).command(
+      "run",
+      "Alias of start: run the MCP server (HTTP by default, --stdio for stdio mode)",
+      buildServerCommandOptions,
+      runServerCommand
+    ).command(
+      "$0",
+      "Print the help text (use start or run to launch the MCP server)",
+      (yargs2) => yargs2,
+      () => {
+        cli.showHelp("log");
       }
     ).version(packageVersion).alias("version", "v").option("env-file", {
       type: "string",
       global: true,
       description: "Load environment variables from this exact file (error if missing; no implicit .env fallback)"
-    }).help().parse();
+    }).epilog(
+      `Management commands (single flags, dispatched before subcommands):
+  --ver         Print the installed version and force one update check
+  --version     Alias of --ver
+  --upgrade     Upgrade the global package to the latest version and refresh installed skills
+  --uninstall   Remove the globally installed mcp-google-map package`
+    ).help();
+    cli.parse();
   }
 }
 export {