mcp-google-api 0.22.0 → 0.23.0

package/dist/cli.js

@@ -17,7 +17,6 @@ var DEFAULT_SETTINGS_ENABLED_TOOLS = "*";
 var SETTINGS_PROGRAM_NAME = "mcp-google-api";
 var CLI_SETTINGS_RELATIVE = [".config", SETTINGS_PROGRAM_NAME, "config.json"];
 var MCP_SERVER_NAME = "mcp-google-api";
-var INSTALL_API_KEY_PLACEHOLDER = "__RUN_mcp-google-api_api-key_TO_CONFIGURE_YOUR_API_KEY__";
 function resolveCliSettingsPath(home) {
   const root = home ?? (process.env.HOME ?? process.cwd());
   return resolve(root, ...CLI_SETTINGS_RELATIVE);
@@ -53,7 +52,7 @@ function defaultSettings() {
   };
 }
 function isUnsetApiKey(value) {
-  return value === void 0 || value === null || value.trim().length === 0 || value === INSTALL_API_KEY_PLACEHOLDER;
+  return value === void 0 || value === null || value.trim().length === 0;
 }
 function uniqueStrings(value) {
   if (!Array.isArray(value)) return [];
@@ -1501,6 +1500,7 @@ var AUTO_UPDATE_DISABLED_ENV = "MCP_AUTO_UPDATE_DISABLED";
 var DEFAULT_PACKAGE_NAME = "mcp-google-api";
 var DEFAULT_REGISTRY_BASE_URL = "https://registry.npmjs.org";
 var DEFAULT_UPDATE_CHECK_TIMEOUT_MS = 2e3;
+var DEFAULT_PACKUMENT_ACCEPT_HEADER = "application/vnd.npm.install-v1+json";
 async function probeLatestVersion(deps = {}) {
   const env = deps.env;
   if (env !== void 0 && isAutoUpdateDisabled(env)) {
@@ -1541,6 +1541,48 @@ async function probeLatestVersion(deps = {}) {
     return { status: "error", message };
   }
 }
+async function probeLatestManifestVersion(deps = {}) {
+  const env = deps.env;
+  if (env !== void 0 && isAutoUpdateDisabled(env)) {
+    return { status: "disabled" };
+  }
+  const currentVersion = deps.currentVersion;
+  if (!currentVersion) {
+    return { status: "unknown-version" };
+  }
+  const packageName = deps.packageName ?? DEFAULT_PACKAGE_NAME;
+  const registryBaseUrl = deps.registryBaseUrl ?? DEFAULT_REGISTRY_BASE_URL;
+  const timeoutMs = deps.timeoutMs ?? DEFAULT_UPDATE_CHECK_TIMEOUT_MS;
+  const fetchImpl = deps.fetchImpl ?? fetch;
+  try {
+    const response = await fetchImpl(`${registryBaseUrl}/${packageName}`, {
+      headers: { accept: DEFAULT_PACKUMENT_ACCEPT_HEADER },
+      signal: AbortSignal.timeout(timeoutMs)
+    });
+    if (!response.ok) {
+      return {
+        status: "error",
+        message: `registry manifest responded with HTTP ${response.status}.`
+      };
+    }
+    const payload = await response.json();
+    const distTags = payload?.["dist-tags"];
+    const latest = distTags !== null && typeof distTags === "object" ? distTags.latest : void 0;
+    if (typeof latest !== "string" || latest.trim() === "") {
+      return {
+        status: "error",
+        message: "registry manifest has no dist-tags.latest field."
+      };
+    }
+    if (!isNewerVersion(latest, currentVersion)) {
+      return { status: "current", currentVersion };
+    }
+    return { status: "newer", currentVersion, latestVersion: latest };
+  } catch (error) {
+    const message = error instanceof Error ? error.message : String(error);
+    return { status: "error", message };
+  }
+}
 function isAutoUpdateDisabled(env = process.env) {
   const raw = env[AUTO_UPDATE_DISABLED_ENV];
   return typeof raw === "string" && /^(1|true|yes)$/i.test(raw.trim());
@@ -1595,7 +1637,7 @@ async function probeLatestGitHubVersion(deps = {}) {
     if (!version) {
       return { status: "error", message: "GitHub release tag carries no version." };
     }
-    return { status: "ok", version };
+    return { status: "ok", version, tag: payload.tag_name };
   } catch (error) {
     const message = error instanceof Error ? error.message : String(error);
     return { status: "error", message };
@@ -1618,6 +1660,10 @@ var PACKAGE_UPGRADE_COMMAND = [
   "-g",
   `${DEFAULT_PACKAGE_NAME}@latest`
 ];
+var GITHUB_UPGRADE_REPOSITORY = "Ogekuri/mcp-google-api";
+function buildDevelopUpgradeCommand(tag) {
+  return ["npm", "install", "-g", `github:${GITHUB_UPGRADE_REPOSITORY}#${tag}`];
+}
 var PACKAGE_UNINSTALL_COMMAND = [
   "npm",
   "uninstall",
@@ -1724,15 +1770,25 @@ async function checkVersionIdle(deps = {}) {
   return result;
 }
 function parseManagementCommand(args) {
-  if (args.length !== 1) {
+  if (args.length === 1) {
+    const arg = args[0];
+    if (arg === "--ver" || arg === "--version" || arg === "--upgrade" || arg === "--uninstall") {
+      return arg;
+    }
     return void 0;
   }
-  const arg = args[0];
-  if (arg === "--ver" || arg === "--version" || arg === "--upgrade" || arg === "--uninstall") {
-    return arg;
+  if (args.length === 2) {
+    const hasUpgrade = args.includes("--upgrade");
+    const hasDevelop = args.includes("--develop") || args.includes("--dev");
+    if (hasUpgrade && hasDevelop) {
+      return "--upgrade";
+    }
   }
   return void 0;
 }
+function parseUpgradeChannel(args) {
+  return args.includes("--develop") || args.includes("--dev") ? "develop" : "npm";
+}
 function runPackageManagerCommand(command, deps = {}) {
   const logger = deps.logger ?? Logger;
   const spawnImpl = deps.spawn ?? spawnSync;
@@ -1743,6 +1799,7 @@ function runPackageManagerCommand(command, deps = {}) {
   };
   try {
     const result = spawnImpl(command[0], [...command.slice(1)], {
+      cwd: homedir(),
       stdio: "inherit",
       shell: process.platform === "win32"
     });
@@ -1755,6 +1812,50 @@ function runPackageManagerCommand(command, deps = {}) {
     return reportSpawnFailure(message);
   }
 }
+var REIFY_ENOENT_SIGNATURE = /\bENOENT\b/;
+function toStreamText(value) {
+  return typeof value === "string" ? value : value?.toString("utf8") ?? "";
+}
+function runCapturedPackageManagerCommand(command, deps) {
+  const logger = deps.logger ?? Logger;
+  const spawnImpl = deps.spawn ?? spawnSync;
+  const reportSpawnFailure = (message) => {
+    logger.error(`Error executing ${command[0]}: ${message}`);
+    logger.log(`Warning: run this command manually: ${command.join(" ")}`);
+    return { code: 1, stderr: "" };
+  };
+  try {
+    const result = spawnImpl(command[0], [...command.slice(1)], {
+      cwd: homedir(),
+      stdio: ["inherit", "pipe", "pipe"],
+      shell: process.platform === "win32",
+      maxBuffer: 16 * 1024 * 1024
+    });
+    if (result.error) {
+      return reportSpawnFailure(result.error.message);
+    }
+    const stdoutText = toStreamText(result.stdout).replace(/\n+$/, "");
+    const stderrText = toStreamText(result.stderr).replace(/\n+$/, "");
+    if (stdoutText.length > 0) {
+      logger.log(stdoutText);
+    }
+    if (stderrText.length > 0) {
+      logger.error(stderrText);
+    }
+    return { code: result.status ?? 1, stderr: toStreamText(result.stderr) };
+  } catch (error) {
+    const message = error instanceof Error ? error.message : String(error);
+    return reportSpawnFailure(message);
+  }
+}
+function runPackageUpdateCommand(command, deps) {
+  const first = runCapturedPackageManagerCommand(command, deps);
+  if (first.code === 0 || !REIFY_ENOENT_SIGNATURE.test(first.stderr)) {
+    return first.code;
+  }
+  runPackageManagerCommand(PACKAGE_UNINSTALL_COMMAND, deps);
+  return runCapturedPackageManagerCommand(command, deps).code;
+}
 function parsePostUpgradeCliOutcomes(raw) {
   if (raw === void 0 || !raw.includes("install report:")) {
     return void 0;
@@ -1853,7 +1954,7 @@ async function resolveUpdatedVersion(options, deps) {
 }
 async function runVersionCommand(options, deps = {}) {
   const [npmProbe, githubProbe] = await Promise.all([
-    probeLatestVersion({ ...deps.idleCheck, currentVersion: options.currentVersion }),
+    probeLatestManifestVersion({ ...deps.idleCheck, currentVersion: options.currentVersion }),
     probeLatestGitHubVersion(deps.githubCheck)
   ]);
   const installedVersion = options.currentVersion || "unknown";
@@ -1866,23 +1967,23 @@ GitHub latest: ${githubLatest}
 `);
   return 0;
 }
-function isUpgradeNecessary(status) {
-  return status !== "current";
-}
 async function runUpgradeCommand(options, deps = {}) {
-  const precheck = await probeLatestVersion({
-    ...deps.idleCheck,
-    currentVersion: options.currentVersion
-  });
-  if (!isUpgradeNecessary(precheck.status)) {
+  if ((options.channel ?? "npm") === "develop") {
+    const githubProbe = await probeLatestGitHubVersion(deps.githubCheck);
+    if (githubProbe.status !== "ok") {
+      (deps.logger ?? Logger).error(`GitHub upgrade channel probe failed: ${githubProbe.message}`);
+      return 1;
+    }
+    const upgraded2 = runPackageUpdateCommand(buildDevelopUpgradeCommand(githubProbe.tag), deps);
+    if (upgraded2 !== 0) {
+      return upgraded2;
+    }
+    const outcome2 = runPostUpgradeSkillInstall(options, deps);
     const stdout2 = deps.stdout ?? process.stdout;
-    stdout2.write(
-      `${DEFAULT_PACKAGE_NAME} ${options.currentVersion} is already the latest available version.
-`
-    );
-    return 0;
+    stdout2.write(renderUpgradeSummary(options.currentVersion, githubProbe.version, outcome2));
+    return outcome2.exitCode;
   }
-  const upgraded = runPackageManagerCommand(PACKAGE_UPGRADE_COMMAND, deps);
+  const upgraded = runPackageUpdateCommand(PACKAGE_UPGRADE_COMMAND, deps);
   if (upgraded !== 0) {
     return upgraded;
   }
@@ -2066,12 +2167,19 @@ var CLAUDE_TARGET = {
   mcpConfigPath: (home) => join3(homeRoot(home), ".claude.json"),
   skillsDir: (home) => join3(homeRoot(home), ".claude", "skills")
 };
+var COPILOT_TARGET = {
+  id: "copilot",
+  configFormat: "json",
+  mcpConfigPath: (home) => join3(homeRoot(home), ".copilot", "mcp.json"),
+  skillsDir: (home) => join3(homeRoot(home), ".copilot", "skills")
+};
 var CLI_TARGETS = {
   pi: PI_TARGET,
   openclaw: OPENCLAW_TARGET,
   codex: CODEX_TARGET,
   antigravity: ANTIGRAVITY_TARGET,
-  claude: CLAUDE_TARGET
+  claude: CLAUDE_TARGET,
+  copilot: COPILOT_TARGET
 };
 function resolveCliTarget(name) {
   return CLI_TARGETS[name.trim().toLowerCase()];
@@ -2570,24 +2678,24 @@ function installShutdownHandlers(servers) {
   process.on("SIGTERM", () => void handler("SIGTERM"));
 }
 var EXEC_TOOLS = [
-  "geocode",
-  "reverse-geocode",
-  "search-nearby",
-  "search-places",
-  "place-details",
-  "directions",
-  "distance-matrix",
-  "elevation",
-  "timezone",
-  "weather",
-  "explore-area",
-  "plan-route",
-  "compare-places",
-  "air-quality",
-  "static-map",
-  "batch-geocode-tool",
-  "search-along-route",
-  "local-rank-tracker"
+  "maps_geocode",
+  "maps_reverse_geocode",
+  "maps_search_nearby",
+  "maps_search_places",
+  "maps_place_details",
+  "maps_directions",
+  "maps_distance_matrix",
+  "maps_elevation",
+  "maps_timezone",
+  "maps_weather",
+  "maps_explore_area",
+  "maps_plan_route",
+  "maps_compare_places",
+  "maps_air_quality",
+  "maps_static_map",
+  "maps_batch_geocode",
+  "maps_search_along_route",
+  "maps_local_rank_tracker"
 ];
 function isExecFailureResponse(result) {
   return typeof result === "object" && result !== null && "success" in result && result.success === false;
@@ -2604,17 +2712,12 @@ function getExecFailureMessage(toolName, result) {
 async function execTool(toolName, params, apiKey) {
   const searcher = new PlacesSearcher(apiKey);
   switch (toolName) {
-    case "geocode":
     case "maps_geocode":
       return searcher.geocode(params.address);
-    case "reverse-geocode":
     case "maps_reverse_geocode":
       return searcher.reverseGeocode(params.latitude, params.longitude);
-    case "search-nearby":
-    case "search_nearby":
     case "maps_search_nearby":
       return searcher.searchNearby(params);
-    case "search-places":
     case "maps_search_places":
       return searcher.searchText({
         query: params.query,
@@ -2629,11 +2732,8 @@ async function execTool(toolName, params, apiKey) {
         languageCode: params.languageCode,
         includeRaw: params.includeRaw
       });
-    case "place-details":
-    case "get_place_details":
     case "maps_place_details":
       return searcher.getPlaceDetails(params.placeId, params.maxPhotos || 0, params.includeRaw || false);
-    case "directions":
     case "maps_directions":
       return searcher.getDirections(
         params.origin,
@@ -2644,7 +2744,6 @@ async function execTool(toolName, params, apiKey) {
         params.avoid_tolls,
         params.avoid_highways
       );
-    case "distance-matrix":
     case "maps_distance_matrix":
       return searcher.calculateDistanceMatrix(
         params.origins,
@@ -2654,13 +2753,10 @@ async function execTool(toolName, params, apiKey) {
         params.avoid_tolls,
         params.avoid_highways
       );
-    case "elevation":
     case "maps_elevation":
       return searcher.getElevation(params.locations);
-    case "timezone":
     case "maps_timezone":
       return searcher.getTimezone(params.latitude, params.longitude, params.timestamp);
-    case "weather":
     case "maps_weather":
       return searcher.getWeather(
         params.latitude,
@@ -2669,16 +2765,12 @@ async function execTool(toolName, params, apiKey) {
         params.forecastDays,
         params.forecastHours
       );
-    case "explore-area":
     case "maps_explore_area":
       return searcher.exploreArea(params);
-    case "plan-route":
     case "maps_plan_route":
       return searcher.planRoute(params);
-    case "compare-places":
     case "maps_compare_places":
       return searcher.comparePlaces(params);
-    case "air-quality":
     case "maps_air_quality":
       return searcher.getAirQuality(
         params.latitude,
@@ -2686,10 +2778,8 @@ async function execTool(toolName, params, apiKey) {
         params.includeHealthRecommendations,
         params.includePollutants
       );
-    case "static-map":
     case "maps_static_map":
       return searcher.getStaticMap(params);
-    case "batch-geocode-tool":
     case "maps_batch_geocode": {
       const results = await Promise.all(
         params.addresses.map(async (address) => {
@@ -2707,10 +2797,8 @@ async function execTool(toolName, params, apiKey) {
         data: { total: params.addresses.length, succeeded, failed: params.addresses.length - succeeded, results }
       };
     }
-    case "search-along-route":
     case "maps_search_along_route":
       return searcher.searchAlongRoute(params);
-    case "local-rank-tracker":
     case "maps_local_rank_tracker":
       return searcher.localRankTracker(params);
     default:
@@ -2734,12 +2822,12 @@ async function runExecCommand(toolName, params, apiKey, runner = execTool, strea
   }
 }
 var DOCTOR_PROBES = [
-  { id: "geocoding", name: "geocoding-api", tool: "geocode", params: { address: "Tokyo Tower" } },
-  { id: "places-new", name: "places-api-new", tool: "search-places", params: { query: "Tokyo Tower" } },
+  { id: "geocoding", name: "geocoding-api", tool: "maps_geocode", params: { address: "Tokyo Tower" } },
+  { id: "places-new", name: "places-api-new", tool: "maps_search_places", params: { query: "Tokyo Tower" } },
   {
     id: "routes",
     name: "routes-api",
-    tool: "directions",
+    tool: "maps_directions",
     params: { origin: "Tokyo Tower", destination: "Tokyo Station", mode: "walking" }
   }
 ];
@@ -3112,9 +3200,34 @@ function isEntryMainModule() {
     return false;
   }
 }
-var isRunDirectly = process.argv[1] && (process.argv[1].endsWith("cli.ts") || process.argv[1].endsWith("cli.js") || process.argv[1].endsWith("mcp-google-api") || process.argv[1].includes("mcp-google-api"));
+function describeUndispatchedServerStart(args) {
+  const isServerStart = (args.includes("start") || args.includes("run")) && args.includes("--stdio");
+  if (!isServerStart) {
+    return void 0;
+  }
+  return "CLI dispatch was skipped for this server-start launch: the running artifact is not the mcp-google-api entrypoint (stale build after a distribution rename). Rebuild the local artifact with 'npm run build' (or 'npm run verify'), or refresh the global installation with 'npm install -g mcp-google-api@latest', then reconnect the MCP client.";
+}
+function handleUndispatchedEntry(args, streams = process) {
+  const error = describeUndispatchedServerStart(args);
+  if (error === void 0) {
+    return 0;
+  }
+  streams.stderr.write(
+    JSON.stringify(
+      {
+        error,
+        requestedEntry: process.argv[1] ?? null,
+        modulePath: fileURLToPath(import.meta.url),
+        remediation: ["npm run build", "npm install -g mcp-google-api@latest"]
+      },
+      null,
+      2
+    ) + "\n"
+  );
+  return 1;
+}
 var isMainModule = isEntryMainModule();
-if (isRunDirectly || isMainModule) {
+if (isMainModule) {
   let packageVersion = "0.0.0";
   try {
     const packageJsonPath = resolve5(__dirname, "../package.json");
@@ -3125,7 +3238,8 @@ if (isRunDirectly || isMainModule) {
   }
   const managementCommand = parseManagementCommand(hideBin(process.argv));
   if (managementCommand !== void 0) {
-    void runManagementCommand(managementCommand, { currentVersion: packageVersion }).then((code) => {
+    const upgradeChannel = parseUpgradeChannel(hideBin(process.argv));
+    void runManagementCommand(managementCommand, { currentVersion: packageVersion, channel: upgradeChannel }).then((code) => {
       process.exitCode = code;
     }).catch((error) => {
       const message = error instanceof Error ? error.message : String(error);
@@ -3138,11 +3252,11 @@ if (isRunDirectly || isMainModule) {
       return yargs2.option("port", {
         alias: "p",
         type: "number",
-        description: "Port to run the MCP server on (default: persisted 'port' setting)",
+        description: "Port to run the MCP server on (default: configured 'port' setting or 3000)",
         default: settings.port
       }).option("host", {
         type: "string",
-        description: "Hostname to bind the server to (default: persisted 'host' setting; 0.0.0.0 for all interfaces)",
+        description: "Hostname to bind the server to (default: configured 'host' setting or 127.0.0.1; 0.0.0.0 for all interfaces)",
         default: settings.host
       }).option("stdio", {
         type: "boolean",
@@ -3215,7 +3329,7 @@ Usage: mcp-google-api <command> [options]
       }).option("apikey", {
         alias: "k",
         type: "string",
-        description: "Google Maps API key override for live probes (default: persisted api-key setting)"
+        description: "Google Maps API key override for live probes (default: configured api-key setting)"
       }).example([
         ["$0 doctor", "Check local runtime and API key configuration without network calls"],
         ["$0 doctor --live", "Also verify three Google Maps APIs with billable requests"],
@@ -3256,7 +3370,7 @@ Usage: mcp-google-api <command> [options]
         description: "stdio launcher command"
       }).option("command", {
         type: "string",
-        description: "Absolute path to dist/cli.js (required for --launcher node)"
+        description: "Absolute path to the CLI entry script (required for --launcher node)"
       }).option("host", {
         type: "string",
         default: "127.0.0.1",
@@ -3293,7 +3407,7 @@ Usage: mcp-google-api <command> [options]
         describe: `CLI name: ${supportedCliNames()}`
       }).option("home", {
         type: "string",
-        description: "Home-directory override for the settings file (default: user home)"
+        description: "Home-directory override (default: user home)"
       }).example([["$0 enable pi", "Enable pi for install/uninstall/show"]]),
       (argv) => {
         process.exitCode = runEnableDisableCliCommand(argv.cli, true, {
@@ -3308,7 +3422,7 @@ Usage: mcp-google-api <command> [options]
         describe: `CLI name: ${supportedCliNames()}`
       }).option("home", {
         type: "string",
-        description: "Home-directory override for the settings file (default: user home)"
+        description: "Home-directory override (default: user home)"
       }).example([["$0 disable claude", "Disable claude for install/uninstall/show"]]),
       (argv) => {
         process.exitCode = runEnableDisableCliCommand(argv.cli, false, {
@@ -3317,16 +3431,16 @@ Usage: mcp-google-api <command> [options]
       }
     ).command(
       "auto-update <state>",
-      "Enable or disable the automatic update check in the persisted configuration",
+      "Enable or disable the automatic update check at startup",
       (yargs2) => yargs2.positional("state", {
         type: "string",
         describe: "New state: enable or disable (1 and 0 accepted)"
       }).option("home", {
         type: "string",
-        description: "Home-directory override for the settings file (default: user home)"
+        description: "Home-directory override (default: user home)"
       }).example([[
         "$0 auto-update disable",
-        "Disable the automatic update check in the persisted configuration"
+        "Disable the automatic update check"
       ]]),
       (argv) => {
         process.exitCode = runAutoUpdateCommand(argv.state, {
@@ -3335,13 +3449,13 @@ Usage: mcp-google-api <command> [options]
       }
     ).command(
       "tools <tools>",
-      "Persist the enabled-tool allowlist in the configuration file ('*' = all 18 tools)",
+      "Set the enabled tools ('*' = all 18 tools)",
       (yargs2) => yargs2.positional("tools", {
         type: "string",
         describe: "Comma-separated tool names (e.g. maps_geocode,maps_search_places) or '*' for all"
       }).option("home", {
         type: "string",
-        description: "Home-directory override for the settings file (default: user home)"
+        description: "Home-directory override (default: user home)"
       }).example([
         ["$0 tools '*'", "Expose every registered tool (default)"],
         ["$0 tools maps_geocode,maps_search_places", "Expose only the named tools"]
@@ -3353,13 +3467,13 @@ Usage: mcp-google-api <command> [options]
       }
     ).command(
       "host <host>",
-      "Persist the HTTP bind host in the configuration file (default 127.0.0.1)",
+      "Set the HTTP bind host (default 127.0.0.1)",
       (yargs2) => yargs2.positional("host", {
         type: "string",
         describe: "Bind hostname (e.g. 127.0.0.1 loopback; 0.0.0.0 for all interfaces)"
       }).option("home", {
         type: "string",
-        description: "Home-directory override for the settings file (default: user home)"
+        description: "Home-directory override (default: user home)"
       }).example([["$0 host 0.0.0.0", "Bind the HTTP server on all interfaces"]]),
       (argv) => {
         process.exitCode = runHostCommand(argv.host, {
@@ -3368,13 +3482,13 @@ Usage: mcp-google-api <command> [options]
       }
     ).command(
       "port <port>",
-      "Persist the HTTP listen port in the configuration file (default 3000)",
+      "Set the HTTP listen port (default 3000)",
       (yargs2) => yargs2.positional("port", {
         type: "number",
         describe: "Listen port (integer 1-65535)"
       }).option("home", {
         type: "string",
-        description: "Home-directory override for the settings file (default: user home)"
+        description: "Home-directory override (default: user home)"
       }).example([["$0 port 3100", "Serve Streamable HTTP on port 3100"]]),
       (argv) => {
         process.exitCode = runPortCommand(argv.port === void 0 ? void 0 : String(argv.port), {
@@ -3383,13 +3497,13 @@ Usage: mcp-google-api <command> [options]
       }
     ).command(
       "api-key <key>",
-      "Save the Google Maps API key in the user settings and refresh every enabled CLI registration",
+      "Save the Google Maps API key and refresh every enabled CLI registration",
       (yargs2) => yargs2.positional("key", {
         type: "string",
         describe: "Google Maps API key (20-50 characters: letters, digits, hyphens, underscores)"
       }).option("home", {
         type: "string",
-        description: "Home-directory override for CLI configuration paths (default: user home)"
+        description: "Home-directory override (default: user home)"
       }).example([["$0 api-key AIzaSy...", "Save the key and reinstall every enabled CLI"]]),
       (argv) => {
         process.exitCode = runApiKeyCommand(argv.key, {
@@ -3402,7 +3516,7 @@ Usage: mcp-google-api <command> [options]
       "Register the mcp-google-api stdio server and install packaged skills for every enabled CLI",
       (yargs2) => yargs2.option("home", {
         type: "string",
-        description: "Home-directory override for CLI configuration paths (default: user home)"
+        description: "Home-directory override (default: user home)"
       }).option("debug-skills", {
         type: "boolean",
         description: "Append each skill's packaged debug overlay to the installed SKILL.md",
@@ -3423,7 +3537,7 @@ Usage: mcp-google-api <command> [options]
       "Remove the mcp-google-api server entry and managed skills from every enabled CLI",
       (yargs2) => yargs2.option("home", {
         type: "string",
-        description: "Home-directory override for CLI configuration paths (default: user home)"
+        description: "Home-directory override (default: user home)"
       }).example([["$0 uninstall", "Reciprocal removal of install for every enabled CLI"]]),
       (argv) => {
         process.exitCode = runInstallUninstallCommand("uninstall", {
@@ -3436,7 +3550,7 @@ Usage: mcp-google-api <command> [options]
       "Show CLI configuration and installation status tables (human-readable)",
       (yargs2) => yargs2.option("home", {
         type: "string",
-        description: "Home-directory override for CLI configuration paths (default: user home)"
+        description: "Home-directory override (default: user home)"
       }).example([["$0 show", "Print CLI Configuration and Installation Status tables"]]),
       (argv) => {
         process.exitCode = runShowCommand({
@@ -3455,12 +3569,12 @@ Usage: mcp-google-api <command> [options]
           type: "string",
           describe: "JSON parameters string"
         }).example([
-          [`$0 exec geocode '{"address":"Tokyo Tower"}'`, "Geocode an address"],
+          [`$0 exec maps_geocode '{"address":"Tokyo Tower"}'`, "Geocode an address"],
           [
-            `$0 exec search-nearby '{"center":{"value":"35.68,139.74","isCoordinates":true},"keyword":"restaurant"}'`,
+            `$0 exec maps_search_nearby '{"center":{"value":"35.68,139.74","isCoordinates":true},"keyword":"restaurant"}'`,
             "Search nearby"
           ],
-          [`$0 exec search-places '{"query":"ramen in Tokyo"}'`, "Text search"]
+          [`$0 exec maps_search_places '{"query":"ramen in Tokyo"}'`, "Text search"]
         ]);
       },
       async (argv) => {
@@ -3597,20 +3711,25 @@ Usage: mcp-google-api <command> [options]
         cli.showHelp("log");
       }
     ).version(packageVersion).alias("version", "v").epilog(
-      `Management commands (single flags, dispatched before subcommands):
-  --ver         Print the installed version and force one update check
+      `Management commands (single flags):
+  --ver         Print the installed, npmjs-latest, and GitHub-latest versions
   --version     Alias of --ver
   --upgrade     Upgrade the global package to the latest version and refresh installed skills
+                --develop | --dev: install the latest tagged GitHub release (any branch)
   --uninstall   Remove the globally installed mcp-google-api package`
     ).help();
     cli.parse();
   }
+} else {
+  process.exitCode = handleUndispatchedEntry(process.argv.slice(2));
 }
 export {
   DOCTOR_PROBES,
   EXEC_TOOLS,
   createShutdownHandler,
+  describeUndispatchedServerStart,
   execTool,
+  handleUndispatchedEntry,
   installShutdownHandlers,
   parseDoctorProbes,
   runApiKeyCommand,