mcp-google-api 0.21.0 → 0.22.0

package/dist/cli.js

@@ -2,22 +2,117 @@
 import {
   Logger,
   PlacesSearcher
-} from "./chunk-VCFXCLJF.js";
+} from "./chunk-GRSJKPXN.js";
 
 // src/cli.ts
-import { config as dotenvConfig2 } from "dotenv";
-import { resolve as resolve5 } from "path";
 import yargs from "yargs";
 import { hideBin } from "yargs/helpers";
 
+// src/utils/cliSettings.ts
+import { mkdirSync, readFileSync, renameSync, writeFileSync } from "fs";
+import { join, resolve } from "path";
+var DEFAULT_SETTINGS_HOST = "127.0.0.1";
+var DEFAULT_SETTINGS_PORT = 3e3;
+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);
+}
+function normalizeEnabledTools(value) {
+  if (typeof value !== "string") {
+    return DEFAULT_SETTINGS_ENABLED_TOOLS;
+  }
+  const trimmed = value.trim();
+  return trimmed.length > 0 ? trimmed : DEFAULT_SETTINGS_ENABLED_TOOLS;
+}
+function normalizeHost(value) {
+  if (typeof value !== "string") {
+    return DEFAULT_SETTINGS_HOST;
+  }
+  const trimmed = value.trim();
+  return trimmed.length > 0 ? trimmed : DEFAULT_SETTINGS_HOST;
+}
+function normalizePort(value) {
+  if (typeof value !== "number" || !Number.isInteger(value) || value < 1 || value > 65535) {
+    return DEFAULT_SETTINGS_PORT;
+  }
+  return value;
+}
+function defaultSettings() {
+  return {
+    enabled: [],
+    apiKey: "",
+    autoUpdate: true,
+    enabledTools: DEFAULT_SETTINGS_ENABLED_TOOLS,
+    host: DEFAULT_SETTINGS_HOST,
+    port: DEFAULT_SETTINGS_PORT
+  };
+}
+function isUnsetApiKey(value) {
+  return value === void 0 || value === null || value.trim().length === 0 || value === INSTALL_API_KEY_PLACEHOLDER;
+}
+function uniqueStrings(value) {
+  if (!Array.isArray(value)) return [];
+  const result = [];
+  for (const item of value) {
+    if (typeof item === "string" && item.length > 0 && !result.includes(item)) {
+      result.push(item);
+    }
+  }
+  return result;
+}
+function loadCliSettings(home) {
+  try {
+    const raw = JSON.parse(readFileSync(resolveCliSettingsPath(home), "utf-8"));
+    if (raw === null || typeof raw !== "object" || Array.isArray(raw)) {
+      return defaultSettings();
+    }
+    const record = raw;
+    return {
+      enabled: uniqueStrings(record.enabled),
+      apiKey: typeof record.apiKey === "string" ? record.apiKey : "",
+      autoUpdate: typeof record.autoUpdate === "boolean" ? record.autoUpdate : true,
+      enabledTools: normalizeEnabledTools(record.enabledTools),
+      host: normalizeHost(record.host),
+      port: normalizePort(record.port)
+    };
+  } catch {
+    return defaultSettings();
+  }
+}
+function loadConfiguredApiKey(home) {
+  const apiKey = loadCliSettings(home).apiKey;
+  return isUnsetApiKey(apiKey) ? void 0 : apiKey;
+}
+function saveCliSettings(settings, home) {
+  const path = resolveCliSettingsPath(home);
+  const temporary = `${path}.tmp`;
+  const payload = {
+    enabled: uniqueStrings(settings.enabled),
+    apiKey: typeof settings.apiKey === "string" ? settings.apiKey : "",
+    autoUpdate: settings.autoUpdate === true,
+    enabledTools: normalizeEnabledTools(settings.enabledTools),
+    host: normalizeHost(settings.host),
+    port: normalizePort(settings.port)
+  };
+  try {
+    mkdirSync(join(path, ".."), { recursive: true });
+    writeFileSync(temporary, JSON.stringify(payload, null, 2) + "\n", "utf-8");
+    renameSync(temporary, path);
+  } catch (error) {
+    throw new Error(`settings write failed: ${error instanceof Error ? error.message : String(error)}`);
+  }
+  return path;
+}
+
 // src/utils/configResolver.ts
-import { config as dotenvConfig } from "dotenv";
-import { existsSync } from "fs";
 var NODE_ENGINE_FLOOR = 24;
-var DEFAULT_HTTP_HOST = "127.0.0.1";
-var DEFAULT_HTTP_PORT = 3e3;
-function resolveRuntimeConfig(env = process.env, overrides = {}) {
-  const envPort = env.MCP_SERVER_PORT?.trim() || void 0;
+function resolveRuntimeConfig(settings, overrides = {}) {
+  const settingsPort = Number.isInteger(settings.port) && settings.port >= 1 && settings.port <= 65535 ? settings.port : void 0;
   let port;
   let portRaw;
   let portSource;
@@ -25,30 +120,30 @@ function resolveRuntimeConfig(env = process.env, overrides = {}) {
     port = overrides.port;
     portRaw = String(overrides.port);
     portSource = "flag";
-  } else if (envPort !== void 0) {
-    const parsed = Number(envPort);
-    port = Number.isFinite(parsed) ? parsed : void 0;
-    portRaw = envPort;
-    portSource = "environment";
+  } else if (settingsPort !== void 0) {
+    port = settingsPort;
+    portRaw = String(settingsPort);
+    portSource = "settings";
   } else {
-    port = DEFAULT_HTTP_PORT;
-    portRaw = void 0;
-    portSource = "default";
-  }
-  const apiKey = overrides.apiKey ?? env.GOOGLE_MAPS_API_KEY;
-  const enabledToolsRaw = env.GOOGLE_MAPS_ENABLED_TOOLS?.trim() || void 0;
+    port = void 0;
+    portRaw = String(settings.port);
+    portSource = "settings";
+  }
+  const flagApiKey = overrides.apiKey !== void 0 ? overrides.apiKey.trim() : void 0;
+  const settingsApiKey = isUnsetApiKey(settings.apiKey) ? void 0 : settings.apiKey;
+  const apiKey = flagApiKey !== void 0 && flagApiKey.length > 0 ? flagApiKey : settingsApiKey;
+  const apiKeySource = flagApiKey !== void 0 && flagApiKey.length > 0 ? "flag" : settingsApiKey !== void 0 ? "settings" : "none";
   return {
     apiKey,
-    apiKeySource: overrides.apiKey !== void 0 ? "flag" : apiKey ? "environment" : "none",
-    host: overrides.host ?? env.MCP_SERVER_HOST ?? DEFAULT_HTTP_HOST,
-    hostSource: overrides.host !== void 0 ? "flag" : env.MCP_SERVER_HOST ? "environment" : "default",
+    apiKeySource,
+    host: overrides.host ?? settings.host,
+    hostSource: overrides.host !== void 0 ? "flag" : "settings",
     port,
     portRaw,
     portSource,
-    enabledToolsRaw,
-    enabledToolsSource: enabledToolsRaw ? "environment" : "default",
-    autoUpdateDisabled: overrides.autoUpdateDisabled === true,
-    envFile: overrides.envFile
+    enabledToolsRaw: settings.enabledTools,
+    enabledToolsSource: "settings",
+    autoUpdateDisabled: settings.autoUpdate !== true
   };
 }
 function maskSecret(value) {
@@ -69,9 +164,8 @@ function describeRuntimeConfig(config) {
       raw: config.portRaw ?? null,
       source: config.portSource
     },
-    enabledTools: { value: config.enabledToolsRaw ?? "*", source: config.enabledToolsSource },
-    autoUpdateCheck: { enabled: !config.autoUpdateDisabled },
-    envFile: { value: config.envFile ?? null }
+    enabledTools: { value: config.enabledToolsRaw, source: config.enabledToolsSource },
+    autoUpdateCheck: { enabled: !config.autoUpdateDisabled }
   };
 }
 function formatConfigDiagnostics(diagnostics) {
@@ -83,13 +177,6 @@ function formatConfigDiagnostics(diagnostics) {
     `updateCheck=${diagnostics.autoUpdateCheck.enabled ? "enabled" : "disabled"}`
   ].join("; ");
 }
-function applyExplicitEnvFile(path) {
-  if (!existsSync(path)) {
-    return { ok: false, error: `env file not found: ${path}` };
-  }
-  dotenvConfig({ path });
-  return { ok: true };
-}
 function resolveEnabledToolNames(allToolNames, raw) {
   const trimmed = raw?.trim();
   if (!trimmed || trimmed === "*") {
@@ -1067,7 +1154,6 @@ var MAPS_TOOL_ANNOTATIONS = {
 var serverConfigs = [
   {
     name: "MCP-Server",
-    portEnvVar: "MCP_SERVER_PORT",
     tools: [
       {
         name: SearchNearby.NAME,
@@ -1198,17 +1284,17 @@ var serverConfigs = [
     ]
   }
 ];
-function filterTools(tools) {
+function filterTools(tools, raw = loadCliSettings().enabledTools) {
   const resolution = resolveEnabledToolNames(
     tools.map((tool) => tool.name),
-    process.env.GOOGLE_MAPS_ENABLED_TOOLS
+    raw
   );
   if (resolution.fallback) {
-    Logger.error(`GOOGLE_MAPS_ENABLED_TOOLS matched 0 tools. Available: ${tools.map((t) => t.name).join(", ")}`);
+    Logger.error(`enabledTools matched 0 tools. Available: ${tools.map((t) => t.name).join(", ")}`);
     return tools;
   }
   if (resolution.matched !== tools.length) {
-    Logger.log(`GOOGLE_MAPS_ENABLED_TOOLS: ${resolution.matched}/${tools.length} tools active`);
+    Logger.log(`enabledTools: ${resolution.matched}/${tools.length} tools active`);
   }
   const enabled = new Set(resolution.names);
   return tools.filter((tool) => enabled.has(tool.name));
@@ -1400,8 +1486,8 @@ var BaseMcpServer = class {
 
 // src/cli.ts
 import { fileURLToPath } from "url";
-import { dirname as dirname3 } from "path";
-import { readFileSync as readFileSync5, writeFileSync as writeFileSync4, existsSync as existsSync4 } from "fs";
+import { dirname as dirname3, resolve as resolve5 } from "path";
+import { readFileSync as readFileSync5, writeFileSync as writeFileSync4, existsSync as existsSync3, realpathSync } from "fs";
 import { createInterface } from "readline";
 
 // src/utils/upgradeManager.ts
@@ -1516,68 +1602,6 @@ async function probeLatestGitHubVersion(deps = {}) {
   }
 }
 
-// src/utils/cliSettings.ts
-import { mkdirSync, readFileSync, renameSync, writeFileSync } from "fs";
-import { join, resolve } from "path";
-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);
-}
-function uniqueStrings(value) {
-  if (!Array.isArray(value)) return [];
-  const result = [];
-  for (const item of value) {
-    if (typeof item === "string" && item.length > 0 && !result.includes(item)) {
-      result.push(item);
-    }
-  }
-  return result;
-}
-function isUnsetApiKey(value) {
-  return value === void 0 || value === null || value.trim().length === 0 || value === INSTALL_API_KEY_PLACEHOLDER;
-}
-function loadCliSettings(home) {
-  try {
-    const raw = JSON.parse(readFileSync(resolveCliSettingsPath(home), "utf-8"));
-    if (raw === null || typeof raw !== "object" || Array.isArray(raw)) {
-      return { enabled: [], apiKey: "", autoUpdate: true };
-    }
-    const record = raw;
-    return {
-      enabled: uniqueStrings(record.enabled),
-      apiKey: typeof record.apiKey === "string" ? record.apiKey : "",
-      autoUpdate: typeof record.autoUpdate === "boolean" ? record.autoUpdate : true
-    };
-  } catch {
-    return { enabled: [], apiKey: "", autoUpdate: true };
-  }
-}
-function loadConfiguredApiKey(home) {
-  const apiKey = loadCliSettings(home).apiKey;
-  return isUnsetApiKey(apiKey) ? void 0 : apiKey;
-}
-function saveCliSettings(settings, home) {
-  const path = resolveCliSettingsPath(home);
-  const temporary = `${path}.tmp`;
-  const payload = {
-    enabled: uniqueStrings(settings.enabled),
-    apiKey: typeof settings.apiKey === "string" ? settings.apiKey : "",
-    autoUpdate: settings.autoUpdate === true
-  };
-  try {
-    mkdirSync(join(path, ".."), { recursive: true });
-    writeFileSync(temporary, JSON.stringify(payload, null, 2) + "\n", "utf-8");
-    renameSync(temporary, path);
-  } catch (error) {
-    throw new Error(`settings write failed: ${error instanceof Error ? error.message : String(error)}`);
-  }
-  return path;
-}
-
 // src/utils/upgradeManager.ts
 var ANSI_GREEN = "\x1B[92m";
 var ANSI_RED = "\x1B[91m";
@@ -1732,46 +1756,28 @@ function runPackageManagerCommand(command, deps = {}) {
   }
 }
 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 {
+  if (raw === void 0 || !raw.includes("install report:")) {
     return void 0;
   }
-  if (typeof parsed !== "object" || parsed === null) {
-    return void 0;
+  const lines = raw.split(/\r?\n/);
+  const cliLine = /^\s{2,}([a-z][a-z0-9-]*):\s+/;
+  const outcomes = [];
+  for (const line of lines) {
+    const match = cliLine.exec(line);
+    if (match) {
+      outcomes.push({ cli: match[1], ok: true });
+    }
   }
-  const summaries = parsed.summaries;
-  const errors = parsed.errors;
-  if (!Array.isArray(summaries)) {
+  if (outcomes.length === 0) {
     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 errorBlockIndex = lines.findIndex((line) => line.trim() === "Errors:");
+  const errorTexts = errorBlockIndex >= 0 ? lines.slice(errorBlockIndex + 1).filter((line) => line.trim().length > 0) : [];
+  for (const outcome of outcomes) {
+    const lowered = outcome.cli.toLowerCase();
+    if (errorTexts.some((text) => text.toLowerCase().includes(lowered))) {
+      outcome.ok = false;
     }
-    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;
 }
@@ -1976,7 +1982,6 @@ function describeToolsProfile(toolNames) {
 }
 
 // src/utils/clientSnippets.ts
-var API_KEY_PLACEHOLDER = "<your-google-maps-api-key>";
 var SNIPPET_DEFAULT_HOST = "127.0.0.1";
 var SNIPPET_DEFAULT_PORT = 3e3;
 var SNIPPET_CLIENT_TARGETS = {
@@ -2007,15 +2012,8 @@ function renderClientSnippet(options = {}) {
     if (launcher === "npx") {
       notes.push("The npx launcher runs the published package; npm must be available on PATH.");
     }
-    const apiKeyValue = options.envKey ? `\${${options.envKey}}` : API_KEY_PLACEHOLDER;
-    entry = { command, args, env: { GOOGLE_MAPS_API_KEY: apiKeyValue } };
-    if (options.envKey) {
-      notes.push(
-        `Variable references (\${${options.envKey}}) are client-specific: confirm your client expands environment variables before relying on them.`
-      );
-    } else {
-      notes.push(`Replace ${API_KEY_PLACEHOLDER} with your Google Maps API key.`);
-    }
+    entry = { command, args };
+    notes.push("The registration carries no API key: configure it once with 'mcp-google-api api-key <key>'.");
   }
   const json = JSON.stringify({ mcpServers: { [serverName]: entry } }, null, 2);
   return { json, notes };
@@ -2025,7 +2023,7 @@ function renderClientSnippet(options = {}) {
 import {
   appendFileSync,
   cpSync,
-  existsSync as existsSync2,
+  existsSync,
   mkdirSync as mkdirSync3,
   readFileSync as readFileSync3,
   readdirSync,
@@ -2082,7 +2080,7 @@ function supportedCliNames() {
   return Object.keys(CLI_TARGETS).join(", ");
 }
 function readJsonConfig(configPath) {
-  if (!existsSync2(configPath)) return {};
+  if (!existsSync(configPath)) return {};
   const parsed = JSON.parse(readFileSync3(configPath, "utf-8"));
   if (parsed === null || typeof parsed !== "object" || Array.isArray(parsed)) {
     throw new Error(`configuration is not a JSON object: ${configPath}`);
@@ -2106,7 +2104,7 @@ function writeJsonMcpServerEntry(configPath, serverName, entry) {
   writeJsonConfig(configPath, config);
 }
 function removeJsonMcpServerEntry(configPath, serverName) {
-  if (!existsSync2(configPath)) return false;
+  if (!existsSync(configPath)) return false;
   const config = readJsonConfig(configPath);
   const mcpServers = config.mcpServers;
   if (mcpServers === void 0) return false;
@@ -2179,7 +2177,7 @@ function registrationToTomlLines(entry) {
   return lines;
 }
 function writeTomlMcpServerSection(configPath, serverName, entry) {
-  const previous = existsSync2(configPath) ? readFileSync3(configPath, "utf-8") : "";
+  const previous = existsSync(configPath) ? readFileSync3(configPath, "utf-8") : "";
   const base = removeTomlSection(previous, serverName);
   const table = [tomlSectionHeader(serverName), ...registrationToTomlLines(entry), ""].join("\n");
   const content = base.length > 0 ? base.replace(/\n*$/, "\n") + table : table;
@@ -2189,7 +2187,7 @@ function writeTomlMcpServerSection(configPath, serverName, entry) {
   renameSync2(temporary, configPath);
 }
 function removeTomlMcpServerSection(configPath, serverName) {
-  if (!existsSync2(configPath)) return false;
+  if (!existsSync(configPath)) return false;
   const previous = readFileSync3(configPath, "utf-8");
   if (!hasTomlSection(previous, serverName)) return false;
   const content = removeTomlSection(previous, serverName);
@@ -2199,11 +2197,11 @@ function removeTomlMcpServerSection(configPath, serverName) {
   return true;
 }
 function hasTomlMcpServerSection(configPath, serverName) {
-  if (!existsSync2(configPath)) return false;
+  if (!existsSync(configPath)) return false;
   return hasTomlSection(readFileSync3(configPath, "utf-8"), serverName);
 }
 function listFilesRecursive(root) {
-  if (!existsSync2(root)) return [];
+  if (!existsSync(root)) return [];
   const files = [];
   const walk = (dir) => {
     for (const entry of readdirSync(dir)) {
@@ -2246,10 +2244,10 @@ function removeSkillDir(skillDir) {
 function compareSkillTree(source, destination, layout = {}) {
   const packaged = listFilesRecursive(source).filter((rel) => rel !== layout.debugPath);
   if (packaged.length === 0) return "MISSING";
-  if (!existsSync2(destination)) return "MISSING";
+  if (!existsSync(destination)) return "MISSING";
   for (const rel of packaged) {
     const target = join3(destination, ...rel.split("/"));
-    if (!existsSync2(target)) return "MISSING";
+    if (!existsSync(target)) return "MISSING";
     const packagedText = readFileSync3(join3(source, ...rel.split("/"))).toString("utf-8");
     const installedText = readFileSync3(target).toString("utf-8");
     if (installedText === packagedText) continue;
@@ -2286,21 +2284,21 @@ function applyServerRegistration(target, serverName, entry, home) {
 }
 
 // src/utils/cliInstaller.ts
-import { existsSync as existsSync3, readFileSync as readFileSync4 } from "fs";
+import { existsSync as existsSync2, readFileSync as readFileSync4 } from "fs";
 import { dirname as dirname2, join as join4, resolve as resolve3 } from "path";
 function buildServerRegistration() {
   return { command: "npx", args: ["-y", MCP_SERVER_NAME, "start", "--stdio"] };
 }
 function resolveSkillsResourcesRoot(packageRoot) {
   const candidate = resolve3(packageRoot, "src", "resources", "skills");
-  if (!existsSync3(candidate)) {
+  if (!existsSync2(candidate)) {
     throw new Error(`skills resources root not found: ${candidate}`);
   }
   return candidate;
 }
 function loadSkillsManifest(resourcesRoot) {
   const manifestPath = join4(resourcesRoot, "manifest.json");
-  if (!existsSync3(manifestPath)) {
+  if (!existsSync2(manifestPath)) {
     throw new Error(`skills manifest not found: ${manifestPath}`);
   }
   let parsed;
@@ -2319,14 +2317,14 @@ function loadSkillsManifest(resourcesRoot) {
       throw new Error(`skills manifest entry is missing id or path: ${manifestPath}`);
     }
     const skillFile = join4(resourcesRoot, skill.path);
-    if (!existsSync3(skillFile)) {
+    if (!existsSync2(skillFile)) {
       throw new Error(`manifest skill file not found: ${skillFile}`);
     }
     if (skill.debug !== void 0 && (typeof skill.debug !== "string" || skill.debug.trim() === "")) {
       throw new Error(`manifest skill debug path is invalid: ${manifestPath}`);
     }
     const debugPath = typeof skill.debug === "string" ? skill.debug : void 0;
-    if (debugPath !== void 0 && !existsSync3(join4(dirname2(resolve3(skillFile)), debugPath))) {
+    if (debugPath !== void 0 && !existsSync2(join4(dirname2(resolve3(skillFile)), debugPath))) {
       throw new Error(`manifest skill debug file not found: ${join4(dirname2(resolve3(skillFile)), debugPath)}`);
     }
     return {
@@ -2506,40 +2504,9 @@ function buildCliShowReport(options) {
 // src/cli.ts
 var __filename = fileURLToPath(import.meta.url);
 var __dirname = dirname3(__filename);
-function extractEnvFileOption(argv) {
-  for (let i = 0; i < argv.length; i++) {
-    const arg = argv[i];
-    if (arg === "--env-file" && i + 1 < argv.length) {
-      return argv[i + 1];
-    }
-    if (arg.startsWith("--env-file=")) {
-      return arg.slice("--env-file=".length);
-    }
-  }
-  return void 0;
-}
-function loadEnvironment(envFile) {
-  if (envFile !== void 0) {
-    const result = applyExplicitEnvFile(envFile);
-    if (!result.ok) {
-      process.stderr.write(JSON.stringify({ error: result.error }, null, 2) + "\n");
-      process.exit(1);
-    }
-    return;
-  }
-  dotenvConfig2({ path: resolve5(process.cwd(), ".env") });
-  dotenvConfig2({ path: resolve5(__dirname, "../.env") });
-}
-async function startServer(port, apiKey, host) {
-  if (port) {
-    process.env.MCP_SERVER_PORT = port.toString();
-  }
+async function startServer(port, apiKey, host = "127.0.0.1") {
   ApiKeyManager.getInstance().setDefaultApiKey(apiKey);
-  if (host) {
-    process.env.MCP_SERVER_HOST = host;
-  }
-  Logger.log("\u{1F680} Starting Google Maps MCP Server...");
-  Logger.log("\u{1F4CD} 18 tools registered (set GOOGLE_MAPS_ENABLED_TOOLS to limit)");
+  Logger.log("\u{1F680} Starting MCP Google API server...");
   Logger.log(
     "\u2139\uFE0F  Reminder: enable Places API (New) in https://console.cloud.google.com before using the new Place features."
   );
@@ -2549,26 +2516,20 @@ async function startServer(port, apiKey, host) {
   let failed = 0;
   await Promise.all(
     config_default.map(async (config) => {
-      const portString = process.env[config.portEnvVar];
-      if (!portString) {
-        Logger.error(`\u26A0\uFE0F  [${config.name}] Port environment variable ${config.portEnvVar} not set.`);
-        Logger.log(`\u{1F4A1} Please set ${config.portEnvVar} in your .env file or use --port parameter.`);
-        Logger.log(`   Example: ${config.portEnvVar}=3000 or --port 3000`);
-        failed++;
-        return;
-      }
-      const serverPort = Number(portString);
+      const serverPort = port;
       if (!Number.isInteger(serverPort) || serverPort < 1 || serverPort > 65535) {
         Logger.error(
-          `\u274C [${config.name}] Invalid port number "${portString}" defined in ${config.portEnvVar} (expected integer 1-65535).`
+          `\u274C [${config.name}] Invalid port number "${serverPort}" (expected integer 1-65535).`
         );
+        Logger.log("\u{1F4A1} Fix the persisted port with 'mcp-google-api port <number>' or pass --port.");
         failed++;
         return;
       }
       try {
         const activeTools = filterTools(config.tools);
+        Logger.log(`\u{1F4CD} ${activeTools.length} tools registered (configure with 'mcp-google-api tools')`);
         const server = new BaseMcpServer(config.name, activeTools);
-        const serverHost = process.env.MCP_SERVER_HOST || "127.0.0.1";
+        const serverHost = host;
         Logger.log(`\u{1F527} [${config.name}] Initializing MCP Server in HTTP mode on ${serverHost}:${serverPort}...`);
         await server.startHttpServer(serverPort, serverHost);
         servers.push(server);
@@ -2814,7 +2775,7 @@ function parseDoctorProbes(raw) {
 async function runDoctor(packageVersion, apiKey, live = false, runner = execTool, options = {}) {
   const nodeVersion = options.nodeVersion ?? process.versions.node;
   const nodeMajor = Number.parseInt(nodeVersion.split(".")[0] ?? "0", 10);
-  const config = options.config ?? resolveRuntimeConfig(process.env);
+  const config = options.config ?? resolveRuntimeConfig(loadCliSettings());
   const allToolNames = options.allToolNames ?? config_default[0].tools.map((tool) => tool.name);
   const toolsResolution = resolveEnabledToolNames(allToolNames, config.enabledToolsRaw);
   const diagnostics = describeRuntimeConfig(config);
@@ -2833,17 +2794,12 @@ async function runDoctor(packageVersion, apiKey, live = false, runner = execTool
     {
       name: "api-key",
       status: apiKey ? "pass" : "fail",
-      detail: apiKey ? "GOOGLE_MAPS_API_KEY is configured (value hidden)." : "GOOGLE_MAPS_API_KEY is not configured. Set it in the environment before making API calls."
+      detail: apiKey ? "Google Maps API key is configured via 'mcp-google-api api-key' (value hidden)." : "Google Maps API key is not configured. Run 'mcp-google-api api-key <your-api-key>' to configure it."
     },
     {
       name: "config",
       status: toolsResolution.fallback ? "fail" : "pass",
-      detail: toolsResolution.fallback ? `GOOGLE_MAPS_ENABLED_TOOLS matched 0 tools; the server falls back to all ${allToolNames.length} tools. Effective configuration: ${formatConfigDiagnostics(diagnostics)}` : `Effective configuration: ${formatConfigDiagnostics(diagnostics)}`
-    },
-    {
-      name: "env-file",
-      status: "pass",
-      detail: config.envFile ? `Explicit environment file loaded: ${config.envFile}` : "No explicit --env-file requested; implicit .env discovery (current directory, then package directory) applies."
+      detail: toolsResolution.fallback ? `enabledTools matched 0 tools; the server falls back to all ${allToolNames.length} tools. Effective configuration: ${formatConfigDiagnostics(diagnostics)}` : `Effective configuration: ${formatConfigDiagnostics(diagnostics)}`
     },
     {
       name: "tools",
@@ -2861,7 +2817,7 @@ async function runDoctor(packageVersion, apiKey, live = false, runner = execTool
     checks.push({
       name: "live-api",
       status: "skip",
-      detail: "Live API checks require GOOGLE_MAPS_API_KEY."
+      detail: "Live API checks require a configured Google Maps API key."
     });
   } else {
     const selected = options.probes ? DOCTOR_PROBES.filter((probe) => options.probes.includes(probe.id)) : DOCTOR_PROBES;
@@ -2897,78 +2853,6 @@ async function runDoctor(packageVersion, apiKey, live = false, runner = execTool
     checks
   };
 }
-async function runSetup(options, deps = {}) {
-  const fsImpl = deps.fs ?? {
-    existsSync: (path) => existsSync4(path),
-    readFileSync: (path, encoding) => readFileSync5(path, encoding),
-    writeFileSync: (path, data, encoding) => writeFileSync4(path, data, encoding)
-  };
-  const nodeVersion = deps.nodeVersion ?? process.versions.node;
-  const nodeMajor = Number.parseInt(nodeVersion.split(".")[0] ?? "0", 10);
-  const config = deps.config ?? resolveRuntimeConfig(process.env);
-  const examplePath = resolve5(options.packageDir, ".env.example");
-  const envPath = resolve5(options.targetDir, ".env");
-  const checks = [
-    {
-      name: "node",
-      status: nodeMajor >= NODE_ENGINE_FLOOR ? "pass" : "fail",
-      detail: `Node.js ${nodeVersion} detected; version ${NODE_ENGINE_FLOOR} or newer is required (package.json engines).`
-    },
-    {
-      name: "env-template",
-      status: fsImpl.existsSync(examplePath) ? "pass" : "fail",
-      detail: fsImpl.existsSync(examplePath) ? `Template found: ${examplePath}` : `Template missing: ${examplePath} (expected next to the installed package).`
-    }
-  ];
-  let created = false;
-  if (options.writeEnv) {
-    if (fsImpl.existsSync(envPath)) {
-      checks.push({
-        name: "env-file",
-        status: "pass",
-        detail: `${envPath} already exists; left untouched (no overwrite).`
-      });
-    } else if (!fsImpl.existsSync(examplePath)) {
-      checks.push({
-        name: "env-file",
-        status: "fail",
-        detail: `Cannot create ${envPath}: template ${examplePath} is missing.`
-      });
-    } else {
-      try {
-        fsImpl.writeFileSync(envPath, fsImpl.readFileSync(examplePath, "utf-8"), "utf-8");
-        created = true;
-        checks.push({
-          name: "env-file",
-          status: "pass",
-          detail: `Created ${envPath} from template; edit it and set GOOGLE_MAPS_API_KEY.`
-        });
-      } catch (error) {
-        checks.push({
-          name: "env-file",
-          status: "fail",
-          detail: `Failed to create ${envPath}: ${error instanceof Error ? error.message : String(error)}`
-        });
-      }
-    }
-  } else {
-    checks.push({
-      name: "env-file",
-      status: fsImpl.existsSync(envPath) ? "pass" : "skip",
-      detail: fsImpl.existsSync(envPath) ? `${envPath} found.` : `${envPath} not found; rerun with --write-env to create it from the template.`
-    });
-  }
-  checks.push({
-    name: "api-key",
-    status: config.apiKey ? "pass" : "fail",
-    detail: config.apiKey ? `GOOGLE_MAPS_API_KEY is configured (source: ${config.apiKeySource}, value hidden).` : "GOOGLE_MAPS_API_KEY is not configured. Set it in the environment or in .env after scaffolding."
-  });
-  return {
-    success: checks.every((check) => check.status !== "fail"),
-    created,
-    checks
-  };
-}
 function runSnippetCommand(options, streams = { stdout: process.stdout, stderr: process.stderr }) {
   try {
     const snippet = renderClientSnippet(options);
@@ -3083,21 +2967,95 @@ function runAutoUpdateCommand(rawState, options = {}) {
   streams.stdout.write(enabled ? "Auto-update check enabled.\n" : "Auto-update check disabled.\n");
   return 0;
 }
+function runToolsCommand(raw, options = {}) {
+  const streams = options.streams ?? { stdout: process.stdout, stderr: process.stderr };
+  const allToolNames = config_default[0].tools.map((tool) => tool.name);
+  const trimmed = (raw ?? "").trim();
+  if (trimmed.length === 0) {
+    streams.stderr.write(
+      `tools: missing or empty tool list. Use '*' for all tools or a comma-separated subset of: ${allToolNames.join(", ")}.
+`
+    );
+    return 1;
+  }
+  let value;
+  if (trimmed === "*") {
+    value = "*";
+  } else {
+    const requested = trimmed.split(",").map((item) => item.trim()).filter(Boolean);
+    const unknown = requested.filter((item) => !allToolNames.includes(item));
+    if (requested.length === 0 || unknown.length > 0) {
+      streams.stderr.write(
+        `tools: unknown tool name(s): ${unknown.join(", ") || "(none)"}. Accepted: ${allToolNames.join(", ")} (or '*').
+`
+      );
+      return 1;
+    }
+    value = requested.join(",");
+  }
+  try {
+    const settings = loadCliSettings(options.home);
+    settings.enabledTools = value;
+    saveCliSettings(settings, options.home);
+  } catch (error) {
+    const message = error instanceof Error ? error.message : String(error);
+    streams.stderr.write(`tools: failed to persist the setting: ${message}
+`);
+    return 1;
+  }
+  const count = value === "*" ? allToolNames.length : value.split(",").length;
+  streams.stdout.write(`Enabled tools set to ${value === "*" ? `* (all ${count})` : value}.
+`);
+  return 0;
+}
+function runHostCommand(raw, options = {}) {
+  const streams = options.streams ?? { stdout: process.stdout, stderr: process.stderr };
+  const trimmed = (raw ?? "").trim();
+  if (trimmed.length === 0) {
+    streams.stderr.write("host: missing or empty hostname. Example: mcp-google-api host 127.0.0.1\n");
+    return 1;
+  }
+  try {
+    const settings = loadCliSettings(options.home);
+    settings.host = trimmed;
+    saveCliSettings(settings, options.home);
+  } catch (error) {
+    const message = error instanceof Error ? error.message : String(error);
+    streams.stderr.write(`host: failed to persist the setting: ${message}
+`);
+    return 1;
+  }
+  streams.stdout.write(`HTTP bind host set to ${trimmed}.
+`);
+  return 0;
+}
+function runPortCommand(raw, options = {}) {
+  const streams = options.streams ?? { stdout: process.stdout, stderr: process.stderr };
+  const trimmed = (raw ?? "").trim();
+  const parsed = Number(trimmed);
+  if (trimmed.length === 0 || !Number.isInteger(parsed) || parsed < 1 || parsed > 65535) {
+    streams.stderr.write(`port: invalid port "${trimmed || "(none)"}" (expected integer 1-65535).
+`);
+    return 1;
+  }
+  try {
+    const settings = loadCliSettings(options.home);
+    settings.port = parsed;
+    saveCliSettings(settings, options.home);
+  } catch (error) {
+    const message = error instanceof Error ? error.message : String(error);
+    streams.stderr.write(`port: failed to persist the setting: ${message}
+`);
+    return 1;
+  }
+  streams.stdout.write(`HTTP port set to ${parsed}.
+`);
+  return 0;
+}
 function runInstallUninstallCommand(operation, options) {
   const streams = options.streams ?? { stdout: process.stdout, stderr: process.stderr };
   if (loadCliSettings(options.home).enabled.length === 0) {
-    streams.stdout.write(
-      JSON.stringify(
-        {
-          success: true,
-          message: "No CLI enabled. Use 'mcp-google-api enable <cli name>' first.",
-          summaries: [],
-          errors: []
-        },
-        null,
-        2
-      ) + "\n"
-    );
+    streams.stdout.write("No CLI agent enabled. Run 'mcp-google-api enable <cli name>' first.\n");
     return 0;
   }
   let result;
@@ -3109,13 +3067,26 @@ function runInstallUninstallCommand(operation, options) {
     }) : uninstallEnabledCliResources({ home: options.home, resourcesRoot: options.resourcesRoot });
   } catch (error) {
     streams.stderr.write(
-      JSON.stringify({ success: false, errors: [error instanceof Error ? error.message : String(error)] }, null, 2) + "\n"
+      `${operation} failed: ${error instanceof Error ? error.message : String(error)}
+`
     );
     return 1;
   }
-  streams.stdout.write(
-    JSON.stringify({ success: result.errors.length === 0, operation, summaries: result.summaries, errors: result.errors }, null, 2) + "\n"
-  );
+  streams.stdout.write(`mcp-google-api ${operation} report:
+`);
+  for (const summary of result.summaries) {
+    streams.stdout.write(
+      `  ${summary.cli}: MCP server ${operation === "install" ? "registered" : "removed"}, ${summary.skills} skill(s) ${operation === "install" ? "installed" : "removed"}
+`
+    );
+  }
+  if (result.errors.length > 0) {
+    streams.stdout.write("Errors:\n");
+    for (const error of result.errors) {
+      streams.stdout.write(`  ${error}
+`);
+    }
+  }
   return result.errors.length > 0 ? 1 : 0;
 }
 function runShowCommand(options) {
@@ -3130,10 +3101,20 @@ function runShowCommand(options) {
     return 1;
   }
 }
+function isEntryMainModule() {
+  const entryPath = process.argv[1];
+  if (entryPath === void 0 || entryPath === "") {
+    return false;
+  }
+  try {
+    return realpathSync(entryPath) === realpathSync(fileURLToPath(import.meta.url));
+  } catch {
+    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"));
-var isMainModule = import.meta.url === `file://${process.argv[1]}`;
+var isMainModule = isEntryMainModule();
 if (isRunDirectly || isMainModule) {
-  loadEnvironment(extractEnvFileOption(process.argv));
   let packageVersion = "0.0.0";
   try {
     const packageJsonPath = resolve5(__dirname, "../package.json");
@@ -3152,25 +3133,28 @@ if (isRunDirectly || isMainModule) {
       process.exitCode = 1;
     });
   } else {
-    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("stdio", {
-      type: "boolean",
-      description: "Use stdio transport instead of HTTP",
-      default: false
-    }).example([
-      ["$0 start", "Start HTTP server with default settings"],
-      ["$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 buildServerCommandOptions = (yargs2) => {
+      const settings = loadCliSettings();
+      return yargs2.option("port", {
+        alias: "p",
+        type: "number",
+        description: "Port to run the MCP server on (default: persisted 'port' setting)",
+        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)",
+        default: settings.host
+      }).option("stdio", {
+        type: "boolean",
+        description: "Use stdio transport instead of HTTP",
+        default: false
+      }).example([
+        ["$0 start", "Start HTTP server with default settings"],
+        ["$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) => {
       const effectiveApiKey = loadConfiguredApiKey();
       ApiKeyManager.getInstance().setDefaultApiKey(effectiveApiKey);
@@ -3195,8 +3179,8 @@ if (isRunDirectly || isMainModule) {
         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("\u{1F5FA}\uFE0F  MCP Google API server");
+        Logger.log("   Google APIs for AI agents over the Model Context Protocol");
         Logger.log("");
         if (effectiveApiKey === void 0) {
           Logger.log("\u26A0\uFE0F  Google Maps API Key not found!");
@@ -3231,8 +3215,7 @@ Usage: mcp-google-api <command> [options]
       }).option("apikey", {
         alias: "k",
         type: "string",
-        description: "Google Maps API key (prefer GOOGLE_MAPS_API_KEY to avoid shell history exposure)",
-        default: process.env.GOOGLE_MAPS_API_KEY
+        description: "Google Maps API key override for live probes (default: persisted 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"],
@@ -3245,33 +3228,10 @@ Usage: mcp-google-api <command> [options]
           process.exitCode = 1;
           return;
         }
-        const report = await runDoctor(packageVersion, argv.apikey, argv.live, void 0, {
+        const effectiveKey = (argv.apikey ?? "").trim() || loadConfiguredApiKey();
+        const report = await runDoctor(packageVersion, effectiveKey, argv.live, void 0, {
           probes: parsedProbes.probes,
-          config: resolveRuntimeConfig(process.env, { envFile: extractEnvFileOption(process.argv) })
-        });
-        process.stdout.write(JSON.stringify(report, null, 2) + "\n");
-        process.exitCode = report.success ? 0 : 1;
-      }
-    ).command(
-      "setup",
-      "Non-interactive onboarding: verify local readiness, optionally scaffold .env",
-      (yargs2) => yargs2.option("write-env", {
-        type: "boolean",
-        default: false,
-        description: "Create .env from .env.example in --env-dir when it does not exist (never overwrites)"
-      }).option("env-dir", {
-        type: "string",
-        default: process.cwd(),
-        description: "Directory where .env is looked up / created"
-      }).example([
-        ["$0 setup", "Check readiness without writing anything"],
-        ["$0 setup --write-env", "Also scaffold .env from the package template"]
-      ]),
-      async (argv) => {
-        const report = await runSetup({
-          packageDir: resolve5(__dirname, ".."),
-          targetDir: argv.envDir,
-          writeEnv: argv.writeEnv
+          config: resolveRuntimeConfig(loadCliSettings())
         });
         process.stdout.write(JSON.stringify(report, null, 2) + "\n");
         process.exitCode = report.success ? 0 : 1;
@@ -3305,9 +3265,6 @@ Usage: mcp-google-api <command> [options]
         type: "number",
         default: 3e3,
         description: "Port used in the URL (transport http)"
-      }).option("env-key", {
-        type: "string",
-        description: "Emit a ${NAME} variable reference instead of a literal placeholder (expansion is client-specific)"
       }).option("name", {
         type: "string",
         default: "mcp-google-api",
@@ -3325,7 +3282,6 @@ Usage: mcp-google-api <command> [options]
           commandPath: argv.command,
           host: argv.host,
           port: argv.port,
-          envKey: argv.envKey,
           serverName: argv.name
         });
       }
@@ -3377,6 +3333,54 @@ Usage: mcp-google-api <command> [options]
           home: argv.home
         });
       }
+    ).command(
+      "tools <tools>",
+      "Persist the enabled-tool allowlist in the configuration file ('*' = 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)"
+      }).example([
+        ["$0 tools '*'", "Expose every registered tool (default)"],
+        ["$0 tools maps_geocode,maps_search_places", "Expose only the named tools"]
+      ]),
+      (argv) => {
+        process.exitCode = runToolsCommand(argv.tools, {
+          home: argv.home
+        });
+      }
+    ).command(
+      "host <host>",
+      "Persist the HTTP bind host in the configuration file (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)"
+      }).example([["$0 host 0.0.0.0", "Bind the HTTP server on all interfaces"]]),
+      (argv) => {
+        process.exitCode = runHostCommand(argv.host, {
+          home: argv.home
+        });
+      }
+    ).command(
+      "port <port>",
+      "Persist the HTTP listen port in the configuration file (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)"
+      }).example([["$0 port 3100", "Serve Streamable HTTP on port 3100"]]),
+      (argv) => {
+        process.exitCode = runPortCommand(argv.port === void 0 ? void 0 : String(argv.port), {
+          home: argv.home
+        });
+      }
     ).command(
       "api-key <key>",
       "Save the Google Maps API key in the user settings and refresh every enabled CLI registration",
@@ -3521,7 +3525,7 @@ Usage: mcp-google-api <command> [options]
             if (trimmed) lines.push(trimmed);
           }
         } else {
-          if (!existsSync4(argv.input)) {
+          if (!existsSync3(argv.input)) {
             console.error(`Error: File not found: ${argv.input}`);
             process.exit(1);
           }
@@ -3592,11 +3596,7 @@ Usage: mcp-google-api <command> [options]
       () => {
         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)"
-    }).epilog(
+    ).version(packageVersion).alias("version", "v").epilog(
       `Management commands (single flags, dispatched before subcommands):
   --ver         Print the installed version and force one update check
   --version     Alias of --ver
@@ -3611,7 +3611,6 @@ export {
   EXEC_TOOLS,
   createShutdownHandler,
   execTool,
-  extractEnvFileOption,
   installShutdownHandlers,
   parseDoctorProbes,
   runApiKeyCommand,
@@ -3619,10 +3618,12 @@ export {
   runDoctor,
   runEnableDisableCliCommand,
   runExecCommand,
+  runHostCommand,
   runInstallUninstallCommand,
-  runSetup,
+  runPortCommand,
   runShowCommand,
   runSnippetCommand,
+  runToolsCommand,
   startServer
 };
 //# sourceMappingURL=cli.js.map