@qverisai/cli 0.4.0 → 0.6.0

package/README.md

@@ -2,53 +2,81 @@
 
 Discover, inspect, and call 10,000+ API capabilities from your terminal.
 
+New users can run the guided first-call wizard:
+
+```bash
+qveris init
+```
+
 ```
 $ qveris discover "weather forecast API"
 Found 5 capabilities matching your query
 
-1. gridpoint_forecast  by Weather.gov
-   weather_gov.gridpoints.forecast.retrieve.v1
-   Returns a textual forecast for a 2.5km grid area
-   relevance: 95%  ·  success: 99.8%  ·  latency: ~180ms  ·  cost: 3 cr
+1. icons
+   weather_gov.icons.retrieve.v3.ad0b4d80
+   Returns a forecast icon. Icon services in API are deprecated.
+   relevance: 99%  ·  success: 100.0%  ·  latency: ~325ms  ·  billing: Charged 5.75 credits per call
 
-2. current_weather  by OpenWeather
-   openweathermap.weather.current.v1
-   Get current weather data for any location
-   relevance: 87%  ·  success: 99.5%  ·  latency: ~200ms  ·  cost: 2 cr
+2. Weather Information Retrieve
+   amap_webservice.weather.weatherinfo.retrieve.v3
+   Query current (base) or future (all) weather information for a specified city using adcode.
+   relevance: 96%  ·  success: 83.0%  ·  latency: ~467ms  ·  billing: Charged 5.75 credits per call
 
 $ qveris inspect 1
-gridpoint_forecast
-Returns a textual forecast for a 2.5km grid area
+icons
+weather_gov.icons.retrieve.v3.ad0b4d80
+Returns a forecast icon. Icon services in API are deprecated.
 
-  Provider:   Weather.gov
-  Latency:    ~180ms
-  Success:    99.8%
-  Cost:       3 credits
+  Provider:   weather.gov
+  Region:     global
+  Latency:    ~325ms
+  Success:    100.0%
+  Billing:    Charged 5.75 credits per call
 
   Parameters:
-    wfo     string   required
-      Forecast office ID
-      values: "LWX", "OKX", "LAX", ...
-    x       integer  required
-      Forecast grid X coordinate
-    y       integer  required
-      Forecast grid Y coordinate
+    set  string  required
+      .
+    timeOfDay  string  required  The time of day for which to retrieve  data (e.g., "morning", "afternoon")
+
+    first  string  required  The first record to retrieve (index or ID)
+
+    size  string  optional
+      Font size
+    fontsize  integer  optional
+      Font size
 
   Example:
-    {"wfo": "LWX", "x": 90, "y": 90}
+    {"set":"land","first":"sct","timeOfDay":"day"}
+
+$ qveris call 1 --params '{"set":"land","first":"sct","timeOfDay":"day"}'
+✓ success  ·  311ms  ·  5.75 credits pre-settlement  ·  (1078.15 remaining)
+tool: amap_webservice.weather.weatherinfo.retrieve.v3  ·  id: d79cd15b-2f36-4ce1-bb3c-6ea28b5ecfa2
 
-$ qveris call 1 --params '{"wfo":"LWX","x":90,"y":90}'
-✓ success  ·  523ms  ·  10 credits  ·  (1368087.93 remaining)
-tool: weather_gov...  ·  id: 7ebcaf9d-...
+Billing:
+  Total estimated pre-settlement charge: 5.75 credits
+  Pre-settlement: 5.75 credits
+Final charge status: qveris usage --mode search --execution-id d79cd15b-2f36-4ce1-bb3c-6ea28b5ecfa2
 
 {
-  "type": "Feature",
-  "properties": {
-    "periods": [
-      { "name": "Today", "temperature": 79, "shortForecast": "Partly Sunny" },
-      ...
-    ]
-  }
+  "status": "1",
+  "count": "1",
+  "info": "OK",
+  "infocode": "10000",
+  "lives": [
+    {
+      "province": "北京",
+      "city": "东城区",
+      "adcode": "110101",
+      "weather": "多云",
+      "temperature": "31",
+      "winddirection": "西南",
+      "windpower": "≤3",
+      "humidity": "50",
+      "reporttime": "2026-05-13 13:33:58",
+      "temperature_float": "31.0",
+      "humidity_float": "50.0"
+    }
+  ]
 }
 ```
 
@@ -57,12 +85,16 @@ tool: weather_gov...  ·  id: 7ebcaf9d-...
 **One-liner (recommended):**
 
 ```bash
+# Linux / macOS
 curl -fsSL https://qveris.ai/cli/install | bash
+
+# Windows (PowerShell)
+irm https://qveris.ai/cli/install.ps1 | iex
 ```
 
 **Or via npm:**
 
-```bash
+```sh
 npm install -g @qverisai/cli
 ```
 
@@ -77,6 +109,10 @@ Requires Node.js 18+.
 ## Quick Start
 
 ```bash
+# Guided path: auth → discover → inspect → call → usage/ledger guidance
+qveris init
+
+# Manual path
 # 1. Authenticate
 qveris login
 
@@ -87,7 +123,7 @@ qveris discover "weather forecast"
 qveris inspect 1
 
 # 4. Call it
-qveris call 1 --params '{"wfo": "LWX", "x": 90, "y": 90}'
+qveris call 1 --params '{"set":"land","first":"sct","timeOfDay":"day"}'
 ```
 
 ## Commands
@@ -96,9 +132,10 @@ qveris call 1 --params '{"wfo": "LWX", "x": 90, "y": 90}'
 
 | Command | Description |
 |---------|-------------|
-| `qveris discover <query>` | Find capabilities by natural language. Shows tool ID, provider, description, relevance, success rate, latency, and cost for each result. |
+| `qveris init` | Guided first-call wizard: auth, discover, inspect, call, and usage/ledger reconciliation guidance. |
+| `qveris discover <query>` | Find capabilities by natural language. Shows tool ID, description, relevance, success rate, latency, billing rule, provider, tags, and region when available. |
 | `qveris inspect <id\|index>` | View full tool details: parameters (type, required, description, enum values), example, provider info, execution history. |
-| `qveris call <id\|index>` | Execute a capability. Shows result data, execution time, cost, and remaining credits. |
+| `qveris call <id\|index>` | Execute a capability. Shows result data, execution time, pre-settlement billing, and remaining credits. |
 
 ### Account
 
@@ -108,6 +145,8 @@ qveris call 1 --params '{"wfo": "LWX", "x": 90, "y": 90}'
 | `qveris logout` | Remove stored key |
 | `qveris whoami` | Show current auth status, key source, and region |
 | `qveris credits` | Check credit balance |
+| `qveris usage` | Context-safe usage audit summary/search/export |
+| `qveris ledger` | Context-safe credits ledger summary/search/export |
 
 ### Utilities
 
@@ -116,10 +155,26 @@ qveris call 1 --params '{"wfo": "LWX", "x": 90, "y": 90}'
 | `qveris interactive` | Launch REPL mode (discover/inspect/call/codegen in one session) |
 | `qveris doctor` | Self-check: Node.js version, API key, region, connectivity |
 | `qveris config <subcommand>` | Manage CLI settings (set, get, list, reset, path) |
+| `qveris mcp configure` | Generate MCP client config for Cursor, Claude Desktop, OpenCode, OpenClaw, or generic stdio; generate a `claude mcp add` command for Claude Code |
+| `qveris mcp validate` | Validate an MCP config file, with optional live stdio tool probing |
 | `qveris completions <shell>` | Generate shell completions (bash/zsh/fish) |
 
 ## Usage
 
+### Init
+
+Run the guided first-call wizard:
+
+```bash
+qveris init
+qveris init --query "weather forecast API"
+qveris init --dry-run
+qveris init --resume --params '{"city": "London"}'
+qveris init --json
+```
+
+`init` discovers a capability, inspects the selected result, calls it with sample parameters when available, and ends with exact `usage` / `ledger` commands so you can reconcile final billing. Use `--resume` after recoverable parameter or provider failures to reuse the last discovery session.
+
 ### Discover
 
 Search for capabilities using natural language. Each result shows the tool name, provider, tool ID, description, and quality metrics to help you choose.
@@ -146,7 +201,7 @@ qveris inspect 1 2 3
 
 ### Call
 
-Execute a tool. Results are automatically truncated for terminal display (4KB). Large results get an OSS download link.
+Execute a tool. Results are automatically truncated for terminal display (4KB). Large results get an OSS download link. Billing shown here is pre-settlement; use `qveris usage` or `qveris ledger` for final charge status.
 
 ```bash
 # Inline params
@@ -178,13 +233,14 @@ For terminal use, results larger than 4KB are automatically truncated. The CLI s
 - The response schema so you know the data structure
 
 ```
-✓ success  ·  1200ms  ·  5 credits
+✓ success  ·  1200ms  ·  5 credits pre-settlement
 
 Response truncated (32KB → 4KB preview)
 
 Full content (valid 120 min):
   https://qveris-tool-results-cache-bj.oss-cn-beijing...
-  Download: curl -o result.json '<url>'
+  Download: curl -o result.json '<url>' (Linux/macOS)
+  Download: Invoke-WebRequest -Uri '<url>' -OutFile result.json (Windows PowerShell)
 
 Schema:
   query: string
@@ -199,6 +255,76 @@ Preview:
 
 For agent/script use (`--json` or piped output), the default increases to 20KB (matching the MCP server). Use `--max-size -1` for unlimited.
 
+### MCP Configuration
+
+Generate MCP client config without hand-editing JSON. Print mode is the default and uses `YOUR_QVERIS_API_KEY` placeholders so the output is safe to share. Placeholder output intentionally fails API key validation until you replace it or use `--include-key`. For Claude Code, the command prints a `claude mcp add` command instead of writing a config file.
+
+```bash
+# Print safe config for Cursor
+qveris mcp configure --target cursor
+
+# Write a working Cursor config using your resolved API key
+qveris mcp configure --target cursor --write --include-key
+
+# Other supported targets
+qveris mcp configure --target claude-desktop --write --include-key
+qveris mcp configure --target opencode --write --include-key
+qveris mcp configure --target openclaw --write --include-key
+qveris mcp configure --target claude-code
+qveris mcp configure --target generic --json
+```
+
+Config file locations and destinations:
+- **Cursor**: `~/.cursor/mcp.json` (Linux/macOS) or `%USERPROFILE%\.cursor\mcp.json` (Windows)
+- **Claude Desktop**: `~/Library/Application Support/Claude/claude_desktop_config.json` (macOS) or `%APPDATA%\Claude\claude_desktop_config.json` (Windows)
+- **Claude Code**: no config file is written; `qveris mcp configure --target claude-code` outputs a `claude mcp add` command
+
+Validate an existing config:
+
+```bash
+# Static config validation
+qveris mcp validate --target cursor
+
+# Live stdio probe: starts the MCP server and confirms discover/inspect/call are visible
+qveris mcp validate --target cursor --probe
+```
+
+Supported targets: `cursor`, `claude-desktop`, `claude-code`, `opencode`, `openclaw`, `generic`.
+
+### Usage Audit
+
+Use `qveris usage` to answer whether recent calls succeeded, failed, or charged credits. It defaults to `summary` mode to protect Agent context.
+Summary mode requests service-side `summary=true` aggregates when available and falls back to bounded client-side aggregation for older deployments.
+
+```bash
+# Aggregate recent usage by hour/day/week
+qveris usage --mode summary --bucket hour
+
+# Check one execution precisely
+qveris usage --mode search --execution-id <execution_id> --json
+
+# Find high-cost or suspicious records
+qveris usage --mode search --min-credits 30 --max-credits 100 --json
+qveris usage --mode search --charge-outcome failed_charged_review --json
+
+# Export raw matching rows to a local JSONL file instead of stdout
+qveris usage --mode export-file --start-date 2026-05-01 --end-date 2026-05-04
+```
+
+### Credits Ledger
+
+Use `qveris ledger` to explain final credit balance movements. It also defaults to `summary` mode.
+Summary mode requests service-side `summary=true` aggregates when available and falls back to bounded client-side aggregation for older deployments.
+
+```bash
+qveris ledger --mode summary --bucket day
+qveris ledger --mode search --direction consume --min-credits 50 --json
+qveris ledger --mode search --entry-type consume_tool_execute --json
+qveris ledger --mode export-file --start-date 2026-05-01 --end-date 2026-05-04
+```
+
+`summary` and `search` never print full history. Large record sets are written to `.qveris/exports/*.jsonl` with `--mode export-file`.
+
 ### Interactive Mode
 
 ```bash
@@ -230,12 +356,19 @@ qveris> exit
 ### API Key
 
 ```bash
-# Option 1: Login (saves to ~/.config/qveris/config.json)
+# Option 1: Login (saves to the qveris config file)
 qveris login
 
 # Option 2: Environment variable
+# Linux / macOS
 export QVERIS_API_KEY="sk-1_..."
 
+# Windows (PowerShell)
+$env:QVERIS_API_KEY="sk-1_..."
+
+# Windows (CMD)
+set QVERIS_API_KEY=sk-1_...
+
 # Option 3: Per-command flag
 qveris discover "weather" --api-key "sk-1_..."
 ```
@@ -260,18 +393,34 @@ No extra configuration needed. `qveris login` prompts for region selection inter
 qveris login --token "sk-cn-xxx"
 
 # Or environment variable
+# Linux / macOS
 export QVERIS_REGION=cn
 
+# Windows (PowerShell)
+$env:QVERIS_REGION="cn"
+
+# Windows (CMD)
+set QVERIS_REGION=cn
+
 # Or custom base URL
+# Linux / macOS
 export QVERIS_BASE_URL=https://custom.endpoint/api/v1
 
+# Windows (PowerShell)
+$env:QVERIS_BASE_URL="https://custom.endpoint/api/v1"
+
+# Windows (CMD)
+set QVERIS_BASE_URL=https://custom.endpoint/api/v1
+
 # Or per-command
 qveris discover "weather" --base-url https://qveris.cn/api/v1
 ```
 
 ### Config File
 
-Located at `~/.config/qveris/config.json` (respects `XDG_CONFIG_HOME`).
+Located at:
+- **All platforms**: `$XDG_CONFIG_HOME/qveris/config.json` when `XDG_CONFIG_HOME` is set
+- **Default**: `~/.config/qveris/config.json` (for example, `C:\Users\<user>\.config\qveris\config.json` on Windows)
 
 ```bash
 qveris config list          # View all settings with sources
@@ -302,6 +451,11 @@ qveris completions fish | source
 | `--api-key <key>` | | Override API key |
 | `--timeout <seconds>` | | Request timeout |
 | `--max-size <bytes>` | | Response size limit (-1 = unlimited) |
+| `--target <target>` | | MCP target |
+| `--output <path>` | | MCP config output path |
+| `--write` | | Write MCP config to disk |
+| `--include-key` | | Include resolved API key instead of a placeholder |
+| `--probe` | | Live-probe MCP tools during validation |
 | `--no-color` | | Disable colors |
 | `--version` | `-V` | Print version |
 | `--help` | `-h` | Show help |
@@ -319,8 +473,22 @@ When used by agents or in scripts, the CLI auto-detects non-TTY environments:
 
 ```bash
 # Agent workflow: discover → select → call → parse
+
+# Linux / macOS
 TOOL=$(qveris discover "weather" --json | jq -r '.results[0].tool_id')
 qveris call "$TOOL" --params '{"city":"London"}' --json | jq '.result.data'
+
+# Windows (PowerShell)
+$TOOL = qveris discover "weather" --json | ConvertFrom-Json | Select-Object -ExpandProperty results | Select-Object -First 1 | Select-Object -ExpandProperty tool_id
+qveris call $TOOL --params '{"city":"London"}' --json | ConvertFrom-Json | Select-Object -ExpandProperty result | Select-Object -ExpandProperty data
+
+ # Windows (CMD, interactive) - requires jq for Windows
+for /f "tokens=*" %i in ('qveris discover "weather" --json ^| jq -r ".results[0].tool_id"') do set TOOL=%i
+qveris call %TOOL% --params "{\"city\":\"London\"}" --json | jq ".result.data"
+
+# Windows (.bat/.cmd script) - use %%i instead of %i
+for /f "tokens=*" %%i in ('qveris discover "weather" --json ^| jq -r ".results[0].tool_id"') do set TOOL=%%i
+qveris call %TOOL% --params "{\"city\":\"London\"}" --json | jq ".result.data"
 ```
 
 ## Exit Codes
@@ -343,7 +511,7 @@ QVeris CLI uses only Node.js built-in APIs. No `chalk`, no `commander`, no `yarg
 - Website: https://qveris.ai (global) / https://qveris.cn (China)
 - API Docs: https://qveris.ai/docs
 - Get API Key: https://qveris.ai/account?page=api-keys (global) / https://qveris.cn/account?page=api-keys (China)
-- GitHub: https://github.com/QVerisAI/QVerisAI
+- GitHub: https://github.com/QVerisAI/qveris-agent-toolkit
 
 ## License
 

package/package.json

@@ -1,11 +1,14 @@
 {
   "name": "@qverisai/cli",
-  "version": "0.4.0",
-  "description": "QVeris CLI -- discover, inspect, and call 10,000+ capabilities",
+  "version": "0.6.0",
+  "description": "QVeris CLI for agent capability discovery, inspection, calling, and audit",
   "type": "module",
   "bin": {
     "qveris": "./bin/qveris.mjs"
   },
+  "scripts": {
+    "test": "node --test"
+  },
   "engines": {
     "node": ">=18"
   },
@@ -24,7 +27,7 @@
   ],
   "repository": {
     "type": "git",
-    "url": "https://github.com/QVerisAI/QVerisAI",
+    "url": "https://github.com/QVerisAI/qveris-agent-toolkit",
     "directory": "packages/cli"
   },
   "homepage": "https://qveris.ai",

package/src/client/api.mjs

@@ -36,7 +36,12 @@ async function requestJson(path, { method = "POST", query = {}, body, timeoutMs
         errorDetail = jsonBody.error_message || jsonBody.message || null;
       } catch { /* not JSON */ }
       if (status === 401 || status === 403) throw new CliError("AUTH_INVALID_KEY", errorDetail);
-      if (status === 402) throw new CliError("CREDITS_INSUFFICIENT", errorDetail);
+      if (status === 402) {
+        const pricingHost = baseUrl.includes("qveris.cn") ? "https://qveris.cn" : "https://qveris.ai";
+        const err = new CliError("CREDITS_INSUFFICIENT", errorDetail);
+        err.hint = `Purchase credits at ${pricingHost}/pricing`;
+        throw err;
+      }
       if (status === 429) throw new CliError("RATE_LIMITED", errorDetail);
       const err = new CliError("API_ERROR", `HTTP ${status}: ${errorDetail || rawText}`);
       if (jsonBody) err.responseData = jsonBody;
@@ -57,6 +62,21 @@ async function requestJson(path, { method = "POST", query = {}, body, timeoutMs
   }
 }
 
+export function unwrapApiResponse(response) {
+  if (
+    response &&
+    typeof response === "object" &&
+    Object.prototype.hasOwnProperty.call(response, "status") &&
+    Object.prototype.hasOwnProperty.call(response, "data")
+  ) {
+    if (response.status === "failure") {
+      throw new CliError("API_ERROR", response.message || "API request failed");
+    }
+    return response.data;
+  }
+  return response;
+}
+
 export async function discoverTools({ apiKey, baseUrl: baseUrlFlag, query, limit = 5, timeoutMs = 30000 }) {
   const baseUrl = getBaseUrl(baseUrlFlag, apiKey);
   return requestJson("/search", { apiKey, baseUrl, body: { query, limit }, timeoutMs });
@@ -91,3 +111,45 @@ export async function callTool({
     timeoutMs,
   });
 }
+
+export async function getCredits({ apiKey, baseUrl: baseUrlFlag, timeoutMs = 30000 }) {
+  const baseUrl = getBaseUrl(baseUrlFlag, apiKey);
+  return requestJson("/auth/credits", {
+    method: "GET",
+    apiKey,
+    baseUrl,
+    timeoutMs,
+  });
+}
+
+export async function getUsageHistory({
+  apiKey,
+  baseUrl: baseUrlFlag,
+  query = {},
+  timeoutMs = 30000,
+}) {
+  const baseUrl = getBaseUrl(baseUrlFlag, apiKey);
+  return requestJson("/auth/usage/history/v2", {
+    method: "GET",
+    apiKey,
+    baseUrl,
+    query,
+    timeoutMs,
+  });
+}
+
+export async function getCreditsLedger({
+  apiKey,
+  baseUrl: baseUrlFlag,
+  query = {},
+  timeoutMs = 30000,
+}) {
+  const baseUrl = getBaseUrl(baseUrlFlag, apiKey);
+  return requestJson("/auth/credits/ledger", {
+    method: "GET",
+    apiKey,
+    baseUrl,
+    query,
+    timeoutMs,
+  });
+}

package/src/client/auth.mjs

@@ -16,11 +16,15 @@ export function resolveApiKey(flagValue) {
   }
 
   const trimmed = value.trim();
-  for (const pattern of PLACEHOLDER_PATTERNS) {
-    if (pattern.test(trimmed)) {
-      throw new CliError("AUTH_MISSING_KEY", "API key appears to be a placeholder. Set a real key.");
-    }
+  if (isPlaceholderApiKey(trimmed)) {
+    throw new CliError("AUTH_MISSING_KEY", "API key appears to be a placeholder. Set a real key.");
   }
 
   return trimmed;
 }
+
+export function isPlaceholderApiKey(value) {
+  if (typeof value !== "string") return true;
+  const trimmed = value.trim();
+  return PLACEHOLDER_PATTERNS.some((pattern) => pattern.test(trimmed));
+}

package/src/commands/completions.mjs

@@ -1,6 +1,6 @@
 const COMMANDS = [
   "discover", "inspect", "call",
-  "login", "logout", "whoami", "credits",
+  "login", "logout", "whoami", "credits", "usage", "ledger",
   "config", "interactive", "history", "doctor", "completions",
 ];
 

package/src/commands/credits.mjs

@@ -1,5 +1,5 @@
 import { resolveApiKey } from "../client/auth.mjs";
-import { discoverTools } from "../client/api.mjs";
+import { getCredits, unwrapApiResponse } from "../client/api.mjs";
 import { resolveBaseUrl, getSiteUrl } from "../config/region.mjs";
 import { bold, dim, cyan, yellow, green } from "../output/colors.mjs";
 import { outputJson } from "../output/json.mjs";
@@ -13,16 +13,19 @@ export async function runCredits(flags) {
   const spinner = flags.json ? { stop() {} } : createSpinner("Checking credits...");
 
   try {
-    // The backend returns remaining_credits in every /search response
-    const result = await discoverTools({ apiKey, baseUrl: flags.baseUrl, query: "credit balance", limit: 1, timeoutMs: 10000 });
+    const result = unwrapApiResponse(await getCredits({ apiKey, baseUrl, timeoutMs: 10000 }));
     spinner.stop();
 
     const credits = result.remaining_credits;
 
     if (flags.json) {
-      outputJson({ remaining_credits: credits ?? null });
+      outputJson(result);
     } else if (credits !== undefined && credits !== null) {
       console.log(`\n  ${green("\u2713")} Credits remaining: ${bold(yellow(String(credits)))}`);
+      printBucket("Daily free", result.daily_free, "remaining", "total");
+      printBucket("Invite reward", result.invite_reward, "remaining", "total");
+      printBucket("Welcome bonus", result.welcome_bonus, "remaining", "initial");
+      printBucket("Purchased", result.purchased, "remaining", "total");
       console.log(`  ${dim("Manage at:")} ${cyan(accountUrl)}\n`);
     } else {
       console.log(`\n  ${dim("Credit balance not available in API response.")}`);
@@ -33,3 +36,14 @@ export async function runCredits(flags) {
     throw err;
   }
 }
+
+function printBucket(label, bucket, remainingKey, totalKey) {
+  if (!bucket || typeof bucket !== "object") return;
+  const remaining = bucket[remainingKey];
+  const total = bucket[totalKey];
+  if (remaining === undefined && total === undefined) return;
+  const parts = [];
+  if (remaining !== undefined) parts.push(`remaining ${yellow(String(remaining))}`);
+  if (total !== undefined) parts.push(`${dim("of")} ${String(total)}`);
+  console.log(`  ${dim(label + ":")} ${parts.join(" ")}`);
+}

package/src/commands/discover.mjs

@@ -8,6 +8,7 @@ import { createSpinner } from "../output/spinner.mjs";
 
 export async function runDiscover(query, flags) {
   const apiKey = resolveApiKey(flags.apiKey);
+  const { region, baseUrl: resolvedBaseUrl } = resolveBaseUrl({ baseUrlFlag: flags.baseUrl, apiKey });
   const limit = parseInt(flags.limit, 10) || 5;
   const timeoutMs = (parseInt(flags.timeout, 10) || 30) * 1000;
 
@@ -16,7 +17,7 @@ export async function runDiscover(query, flags) {
   try {
     const result = await discoverTools({
       apiKey,
-      baseUrl: flags.baseUrl,
+      baseUrl: resolvedBaseUrl,
       query,
       limit,
       timeoutMs,
@@ -26,7 +27,6 @@ export async function runDiscover(query, flags) {
 
     // Store richer session data for index resolution
     const tools = result.results ?? [];
-    const { region, baseUrl: resolvedBaseUrl } = resolveBaseUrl({ baseUrlFlag: flags.baseUrl, apiKey });
     writeSession({
       discoveryId: result.search_id,
       query,

package/src/commands/doctor.mjs

@@ -30,7 +30,7 @@ export async function runDoctor(flags) {
     // Test connectivity
     process.stderr.write(`  \u2026 Testing API connectivity...\r`);
     try {
-      await discoverTools({ apiKey, baseUrl: flags.baseUrl, query: "test", limit: 1, timeoutMs: 10000 });
+      await discoverTools({ apiKey, baseUrl, query: "test", limit: 1, timeoutMs: 10000 });
       console.log(`  ${green("\u2713")} API connectivity OK                `);
     } catch (err) {
       console.log(`  ${red("\u2718")} API connectivity failed: ${err.message}  `);