@genspark/cli 1.4.1 → 1.5.0

package/README.md

@@ -41,6 +41,7 @@
   - [Media Analysis & Transcription](#media-analysis--transcription)
   - [AI Drive (Cloud Storage)](#ai-drive-cloud-storage)
   - [AI Agents & Tasks](#ai-agents--tasks)
+  - [Connectors (Unified)](#connectors-unified)
   - [Service-Level Tools](#service-level-tools)
   - [AI Phone Calls](#ai-phone-calls)
   - [Stock Prices](#stock-prices)
@@ -84,7 +85,10 @@ Log in with your Genspark account:
 gsk login
 ```
 
-This opens a browser for authentication and saves the API key to `~/.genspark-tool-cli/config.json`.
+This opens a browser for authentication and saves the API key plus the effective
+API base URL to the selected config. The default is
+`~/.genspark-tool-cli/config.json`; use `--config <path>` or `GSK_CONFIG` for a
+separate profile.
 
 Alternatively, provide an API key directly:
 
@@ -138,6 +142,7 @@ Config is loaded from three sources (highest priority first):
 | `--timeout <ms>` | — | `300000` (5 min) | Request timeout |
 | `--output <format>` | — | `json` | Output format: `json` or `text` |
 | `--refresh` | — | — | Force refresh cached tool schemas |
+| `--config <path>` | `GSK_CONFIG` | `~/.genspark-tool-cli/config.json` | Config profile path |
 
 ## Commands
 
@@ -526,10 +531,27 @@ gsk stock AAPL
 gsk stock MSFT
 ```
 
+### Connectors (unified)
+
+One fixed flow discovers and invokes **any** connector — Gmail, Slack, Notion, HubSpot, custom MCP servers, and every connector added after this README was written:
+
+```bash
+gsk connector list                      # what is already connected?
+gsk connector search <keyword>          # does a connector for X exist?
+gsk connector tools <identifier>        # full JSON schema per tool
+gsk connector call <identifier> -t <tool> -a '<json>'   # invoke it
+```
+
+`<identifier>` accepts a connector id (`gmail`, `slack`, `hubspot`), a display name (`"Google Drive"`), or an MCP slug. Prefer this over the per-service commands below — see `skills/gsk-connector/SKILL.md` for the full flow, error codes, and examples.
+
+> **Requirements:** Connect services in [Genspark Account Settings → Integrations](https://www.genspark.ai/settings/integrations).
+
 ### Service-Level Tools
 
 External service integrations are available as **service-level tools** — each service is a single command with an `action` parameter that dispatches to the underlying operation.
 
+> **Deprecated but working:** these per-service commands still work and are documented below for reference, but new integrations only ship in the unified `gsk connector` flow above — prefer that for anything new.
+
 > **Requirements:** Connect services in [Genspark Account Settings → Integrations](https://www.genspark.ai/settings/integrations).
 
 #### gmail

package/dist/config.d.ts

@@ -34,23 +34,26 @@ export declare function setConfigPathOverride(absPath: string | undefined): void
  * Get the path to the config file — honours a `--config` override.
  */
 export declare function getConfigPath(): string;
+/**
+ * Keep one canonical spelling for endpoint persistence and cache keys.
+ */
+export declare function normalizeBaseUrl(baseUrl: string): string;
 /**
  * Load configuration from the config file
  * Returns an empty object if the file doesn't exist or is invalid
  */
 export declare function loadConfigFile(): ConfigFile;
 /**
- * Save configuration to the config file — honours a `--config` override.
+ * Replace the selected config file.
  *
- * Must resolve the filename via `getConfigPath()` (not
- * `path.join(dir, CONFIG_FILE)`) so that when an override like
- * `--config /tmp/my-profile.json` is active, the write lands on
- * `/tmp/my-profile.json`, not `/tmp/config.json`.  Using the raw
- * `CONFIG_FILE` constant here would make `login`/`logout` silently write
- * to the wrong file while reads still target the override — a
- * split-brain state.
+ * Prefer `updateConfigFile` for login/logout-style field changes because this
+ * replacement API intentionally cannot preserve fields absent from `config`.
  */
 export declare function saveConfigFile(config: ConfigFile): void;
+/**
+ * Patch known fields in the selected config without dropping extension fields.
+ */
+export declare function updateConfigFile(updates: Partial<ConfigFile>, removeKeys?: (keyof ConfigFile)[]): void;
 /**
  * Load tools from the cache file.
  * Returns null if cache doesn't exist, is stale (>24h), or base_url doesn't match.

package/dist/config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAKH,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,YAAY,CAAA;AAE5C,MAAM,WAAW,UAAU;IACzB,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,KAAK,CAAC,EAAE,OAAO,CAAA;IACf,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,WAAW,CAAC,EAAE,OAAO,CAAA;IACrB;;;;;;OAMG;IACH,aAAa,CAAC,EAAE,MAAM,CAAA;CACvB;AAYD,eAAO,MAAM,YAAY,+BAA+B,CAAA;AA+BxD;;;;GAIG;AACH,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,MAAM,GAAG,SAAS,GAAG,IAAI,CAEvE;AAYD;;GAEG;AACH,wBAAgB,aAAa,IAAI,MAAM,CAKtC;AAED;;;GAGG;AACH,wBAAgB,cAAc,IAAI,UAAU,CAiC3C;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,cAAc,CAAC,MAAM,EAAE,UAAU,GAAG,IAAI,CASvD;AA0BD;;;GAGG;AACH,wBAAgB,cAAc,CAAC,OAAO,EAAE,MAAM,GAAG,UAAU,EAAE,GAAG,IAAI,CAyCnE;AAED;;GAEG;AACH,wBAAgB,cAAc,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,UAAU,EAAE,GAAG,IAAI,CAmBzE"}
+{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAMH,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,YAAY,CAAA;AAE5C,MAAM,WAAW,UAAU;IACzB,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,KAAK,CAAC,EAAE,OAAO,CAAA;IACf,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,WAAW,CAAC,EAAE,OAAO,CAAA;IACrB;;;;;;OAMG;IACH,aAAa,CAAC,EAAE,MAAM,CAAA;CACvB;AAYD,eAAO,MAAM,YAAY,+BAA+B,CAAA;AA+BxD;;;;GAIG;AACH,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,MAAM,GAAG,SAAS,GAAG,IAAI,CAEvE;AAYD;;GAEG;AACH,wBAAgB,aAAa,IAAI,MAAM,CAKtC;AAED;;GAEG;AACH,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAExD;AAED;;;GAGG;AACH,wBAAgB,cAAc,IAAI,UAAU,CAiC3C;AAmFD;;;;;GAKG;AACH,wBAAgB,cAAc,CAAC,MAAM,EAAE,UAAU,GAAG,IAAI,CAEvD;AAuBD;;GAEG;AACH,wBAAgB,gBAAgB,CAC9B,OAAO,EAAE,OAAO,CAAC,UAAU,CAAC,EAC5B,UAAU,GAAE,CAAC,MAAM,UAAU,CAAC,EAAO,GACpC,IAAI,CASN;AA8BD;;;GAGG;AACH,wBAAgB,cAAc,CAAC,OAAO,EAAE,MAAM,GAAG,UAAU,EAAE,GAAG,IAAI,CAyCnE;AAED;;GAEG;AACH,wBAAgB,cAAc,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,UAAU,EAAE,GAAG,IAAI,CAmBzE"}

package/dist/config.js

@@ -9,6 +9,7 @@
 import * as fs from 'fs';
 import * as path from 'path';
 import * as os from 'os';
+import { randomUUID } from 'crypto';
 // Capability string sent on every request (X-GSK-CLI-Caps) and stamped into
 // the tools cache. The server tailors /tools CLI metadata to it (grouped
 // phone-call view vs the flat legacy view), so a cache written by a CLI with
@@ -66,6 +67,12 @@ export function getConfigPath() {
     }
     return path.join(getConfigDir(), CONFIG_FILE);
 }
+/**
+ * Keep one canonical spelling for endpoint persistence and cache keys.
+ */
+export function normalizeBaseUrl(baseUrl) {
+    return baseUrl.trim().replace(/\/+$/, '');
+}
 /**
  * Load configuration from the config file
  * Returns an empty object if the file doesn't exist or is invalid
@@ -99,23 +106,101 @@ export function loadConfigFile() {
     }
 }
 /**
- * Save configuration to the config file — honours a `--config` override.
+ * Write a complete configuration object atomically with private permissions.
+ *
+ * The temporary file lives beside the destination so rename is atomic. Its
+ * mode is fixed before rename, so an API key is never exposed through the
+ * process umask or a partially written destination.
+ */
+function resolveConfigWriteTarget(configPath, visited = new Set()) {
+    const absolutePath = path.resolve(configPath);
+    if (visited.has(absolutePath)) {
+        throw new Error(`Cannot update config through symlink cycle at ${configPath}`);
+    }
+    let stats;
+    try {
+        stats = fs.lstatSync(absolutePath);
+    }
+    catch (err) {
+        if (err.code === 'ENOENT') {
+            return absolutePath;
+        }
+        throw err;
+    }
+    if (!stats.isSymbolicLink()) {
+        return absolutePath;
+    }
+    visited.add(absolutePath);
+    const linkTarget = fs.readlinkSync(absolutePath);
+    return resolveConfigWriteTarget(path.resolve(path.dirname(absolutePath), linkTarget), visited);
+}
+function writeConfigFileAtomic(configPath, config) {
+    const targetPath = resolveConfigWriteTarget(configPath);
+    const configDir = path.dirname(targetPath);
+    fs.mkdirSync(configDir, { recursive: true, mode: 0o700 });
+    const tempPath = path.join(configDir, `.${path.basename(targetPath)}.${process.pid}.${randomUUID()}.tmp`);
+    let fileDescriptor;
+    try {
+        fileDescriptor = fs.openSync(tempPath, 'wx', 0o600);
+        fs.writeFileSync(fileDescriptor, `${JSON.stringify(config, null, 2)}\n`, 'utf-8');
+        fs.fsyncSync(fileDescriptor);
+        if (process.platform !== 'win32') {
+            fs.fchmodSync(fileDescriptor, 0o600);
+        }
+        fs.closeSync(fileDescriptor);
+        fileDescriptor = undefined;
+        fs.renameSync(tempPath, targetPath);
+    }
+    catch (err) {
+        if (fileDescriptor !== undefined) {
+            fs.closeSync(fileDescriptor);
+        }
+        try {
+            fs.unlinkSync(tempPath);
+        }
+        catch {
+            // The file may not have been created or may already have been renamed.
+        }
+        throw err;
+    }
+}
+/**
+ * Replace the selected config file.
  *
- * Must resolve the filename via `getConfigPath()` (not
- * `path.join(dir, CONFIG_FILE)`) so that when an override like
- * `--config /tmp/my-profile.json` is active, the write lands on
- * `/tmp/my-profile.json`, not `/tmp/config.json`.  Using the raw
- * `CONFIG_FILE` constant here would make `login`/`logout` silently write
- * to the wrong file while reads still target the override — a
- * split-brain state.
+ * Prefer `updateConfigFile` for login/logout-style field changes because this
+ * replacement API intentionally cannot preserve fields absent from `config`.
  */
 export function saveConfigFile(config) {
+    writeConfigFileAtomic(getConfigPath(), { ...config });
+}
+function loadConfigObjectForUpdate(configPath) {
+    if (!fs.existsSync(configPath)) {
+        return {};
+    }
+    const content = fs.readFileSync(configPath, 'utf-8');
+    let parsed;
+    try {
+        parsed = JSON.parse(content);
+    }
+    catch {
+        throw new Error(`Cannot update invalid config JSON at ${configPath}`);
+    }
+    if (parsed === null || Array.isArray(parsed) || typeof parsed !== 'object') {
+        throw new Error(`Cannot update invalid config object at ${configPath}`);
+    }
+    return parsed;
+}
+/**
+ * Patch known fields in the selected config without dropping extension fields.
+ */
+export function updateConfigFile(updates, removeKeys = []) {
     const configPath = getConfigPath();
-    const configDir = path.dirname(configPath);
-    if (!fs.existsSync(configDir)) {
-        fs.mkdirSync(configDir, { recursive: true });
+    const config = loadConfigObjectForUpdate(configPath);
+    for (const key of removeKeys) {
+        delete config[key];
     }
-    fs.writeFileSync(configPath, JSON.stringify(config, null, 2), 'utf-8');
+    Object.assign(config, updates);
+    writeConfigFileAtomic(configPath, config);
 }
 /**
  * Delete a legacy `tools-cache.json` that was written by a caps-bearing CLI
@@ -132,7 +217,9 @@ function healPoisonedLegacyCache() {
             return;
         }
         const legacy = JSON.parse(fs.readFileSync(legacyPath, 'utf-8'));
-        if (legacy && typeof legacy === 'object' && typeof legacy.caps === 'string') {
+        if (legacy &&
+            typeof legacy === 'object' &&
+            typeof legacy.caps === 'string') {
             fs.unlinkSync(legacyPath);
         }
     }

package/dist/config.js.map

@@ -1 +1 @@
-{"version":3,"file":"config.js","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"config.js","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"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"}

package/dist/index.js

@@ -27,12 +27,14 @@ import * as pathModule from 'path';
 import { createRequire } from 'module';
 import { spawn } from 'child_process';
 import { ApiClient, unauthenticatedRequest } from './client.js';
+import { classifyFileArg, awaitLocalFileReady, decideAfterWait, localFileNotReadyError, } from './localFiles.js';
 import { setDebugEnabled, setOutputFormat, debug, info, error as logError, output, } from './logger.js';
-import { loadConfigFile, saveConfigFile, getConfigPath, loadToolsCache, saveToolsCache, setConfigPathOverride, } from './config.js';
+import { loadConfigFile, getConfigPath, loadToolsCache, normalizeBaseUrl, saveToolsCache, setConfigPathOverride, updateConfigFile, } from './config.js';
 import { checkForUpdates } from './updater.js';
+import { getSandboxRuntime } from './runtime.js';
 import { registerDesignCommand } from './commands/design.js';
 import { pickExistingFileOperand } from './commands/aidrive-upload.js';
-import { parseLastSeenIndex, eventStdoutLine, } from './commands/chat-events.js';
+import { parseLastSeenIndex, eventStdoutLine } from './commands/chat-events.js';
 import { mediaItemsKeyFor, mediaSummaryLines } from './mediaSummary.js';
 import { registerMeshCommand, getMeshInvocation, runMesh, } from './commands/mesh.js';
 import { executeCloneUrl, normalizeCloneUrlForGit, } from './commands/sb-git-clone.js';
@@ -104,9 +106,13 @@ function getGlobalOptions() {
     // API key priority: CLI > env > config file
     const apiKey = opts.apiKey || process.env.GSK_API_KEY || fileConfig.api_key;
     // Base URL priority: CLI > env > config file > default
-    const baseUrl = opts.baseUrl !== DEFAULT_BASE_URL
+    const explicitBaseUrl = program.getOptionValueSource('baseUrl') === 'cli'
         ? opts.baseUrl
-        : process.env.GSK_BASE_URL || fileConfig.base_url || DEFAULT_BASE_URL;
+        : undefined;
+    const baseUrl = normalizeBaseUrl(explicitBaseUrl ||
+        process.env.GSK_BASE_URL ||
+        fileConfig.base_url ||
+        DEFAULT_BASE_URL);
     // Timeout priority: CLI > config file > default
     const timeout = opts.timeout !== String(DEFAULT_TIMEOUT)
         ? parseInt(opts.timeout, 10)
@@ -338,9 +344,27 @@ function isLocalFilePath(value) {
         fs.existsSync(value));
 }
 async function resolveFileArg(value, client) {
-    if (!isLocalFilePath(value))
+    // Classify the RAW value: a leading '~' is positive local evidence and must
+    // hit classifyFileArg's relative-marker branch before any expansion.
+    const kind = classifyFileArg(value);
+    if (kind === 'remote' || kind === 'aidrive')
         return value;
-    return await uploadLocalFile(value, client);
+    // fs never expands '~' — expand only for the filesystem operations below.
+    const localPath = expandHome(value);
+    // Tolerate the same-batch create-then-read race (a parallel sibling tool
+    // call may still be writing the file) before deciding what the arg is.
+    const readiness = await awaitLocalFileReady(localPath);
+    switch (decideAfterWait(kind, readiness)) {
+        case 'upload':
+            return await uploadLocalFile(localPath, client);
+        case 'error':
+            throw new Error(localFileNotReadyError(localPath, readiness));
+        case 'passthrough':
+            // No local evidence beyond the parent directory: let the backend try
+            // it as an AI Drive path (its failure mode is a per-URL actionable
+            // error, not a generic one).
+            return value;
+    }
 }
 /**
  * Inline-base64 transport limit for email `attachments`. Anything larger
@@ -547,7 +571,9 @@ function registerToolCommand(parentProgram, tool, clientFactory, vdProjectIdDefa
         const prefix = groupName + '_';
         cmdName =
             tool.cli.subcommand ||
-                (tool.name.startsWith(prefix) ? tool.name.slice(prefix.length) : tool.name);
+                (tool.name.startsWith(prefix)
+                    ? tool.name.slice(prefix.length)
+                    : tool.name);
     }
     const cmd = targetProgram
         .command(cmdName, cmdOpts?.hidden ? { hidden: true } : {})
@@ -569,8 +595,12 @@ function registerToolCommand(parentProgram, tool, clientFactory, vdProjectIdDefa
         // invocation reaches the handler and prints the available actions instead
         // of Commander's terse "missing required argument" error.
         const isServiceAction = tool.cli.primary_arg === 'action' && Array.isArray(param.enum);
-        const bracket = isRequired && !isServiceAction ? '<value>' : '[value]';
-        cmd.argument(bracket, param.description || tool.cli.primary_arg);
+        // Name the positional after the real parameter so Commander's errors and
+        // usage say e.g. "missing required argument 'deck'" instead of 'value'
+        // (#43556: the anonymous form sent agents guessing).
+        const argName = tool.cli.primary_arg;
+        const bracket = isRequired && !isServiceAction ? `<${argName}>` : `[${argName}]`;
+        cmd.argument(bracket, param.description || argName);
     }
     // Add remaining params as --options
     const aliases = tool.cli.parameter_aliases || {};
@@ -1182,8 +1212,7 @@ function registerToolCommand(parentProgram, tool, clientFactory, vdProjectIdDefa
             // web_search payloads are large and agent-consumed — indent-2 here
             // is pure token overhead on every SAS/Claw search
             output(result, {
-                compact: tool.name === 'web_search' ||
-                    Boolean(mediaItemsKeyFor(tool.name)),
+                compact: tool.name === 'web_search' || Boolean(mediaItemsKeyFor(tool.name)),
             });
         }
         catch (err) {
@@ -1360,10 +1389,10 @@ program
             const remainingSec = expires_in - elapsedSec;
             const tokenResp = await unauthenticatedRequest(baseUrl, `/api/cli_auth/token?code=${encodeURIComponent(device_code)}`, 'GET');
             if (tokenResp.status === 'approved' && tokenResp.api_key) {
-                // Save to config
-                const config = loadConfigFile();
-                config.api_key = tokenResp.api_key;
-                saveConfigFile(config);
+                updateConfigFile({
+                    api_key: tokenResp.api_key,
+                    base_url: baseUrl,
+                });
                 info('Login successful! API key saved.');
                 output({
                     status: 'ok',
@@ -1401,8 +1430,7 @@ program
             info('Already logged out (no API key in config).');
             return;
         }
-        delete config.api_key;
-        saveConfigFile(config);
+        updateConfigFile({}, ['api_key']);
         info('Logged out. API key removed.');
         output({
             status: 'ok',
@@ -1435,6 +1463,25 @@ program
         process.exit(1);
     }
 });
+// Runtime - report the sandbox environment this CLI process runs in
+program
+    .command('runtime')
+    .description('Show the Genspark sandbox runtime this CLI is running in ' +
+    '(reads the /opt/genspark template marker; all-null outside a sandbox)')
+    .action(() => {
+    const runtime = getSandboxRuntime();
+    output({
+        status: 'ok',
+        message: 'success',
+        data: {
+            family: runtime.family,
+            version: runtime.version,
+            is_sb_box: runtime.isSbBox,
+            is_super_agent_sandbox: runtime.isSuperAgentSandbox,
+            is_genspark_sandbox: runtime.isGensparkSandbox,
+        },
+    });
+});
 // Init OpenCode - generate opencode.json config
 program
     .command('init-opencode')
@@ -1648,6 +1695,13 @@ function _generateContextMd(projectRoot, relSkillsDir, skillDirs) {
 
 Read [gsk-shared](${sharedSkill}) for authentication, global flags, and output conventions.
 
+## Connectors
+
+For any third-party integration (Gmail, Slack, Notion, HubSpot, custom MCP
+servers, ...), start with [gsk-connector](${relSkillsDir}/gsk-connector/SKILL.md) —
+one fixed \`list\` → \`search\` → \`tools <id>\` → \`call <id>\` flow covers every
+connector instead of memorizing per-service commands below.
+
 ## Available Skills
 
 ${skillList}
@@ -1888,12 +1942,16 @@ _groupCommands.set('chat', chatCmd);
 chatCmd
     .command('events <project_id>')
     .description("Attach to the conversation's in-flight run and stream its events " +
-    'live (one JSON line per event on stdout): buffered events since ' +
-    'run start replay first, then live events follow until the run ' +
-    'ends. Prints no_running_agent when the conversation is idle. ' +
-    'After a disconnect, reattach with --last-seen <highest ' +
-    '_event_index already processed> to skip the replayed prefix.')
-    .option('--last-seen <index>', 'resume cursor: only replay events with _event_index greater than this')
+    'live (one JSON line per event on stdout): the first line is a ' +
+    'project_data snapshot event, buffered events since run start ' +
+    'replay next, then live events follow until the run ends. Every ' +
+    'event line carries an _event_index. Prints no_running_agent when ' +
+    'the conversation is idle. Upstream segment ends during long runs ' +
+    'are reattached automatically; after a real disconnect, reattach ' +
+    'with --last-seen <highest _event_index already processed> to ' +
+    'skip the replayed prefix.')
+    .option('--last-seen <index>', 'resume cursor: only replay events with _event_index greater than ' +
+    'this (take it from the last event line of the previous stream)')
     .action(async (projectId, opts) => {
     try {
         const lastSeen = parseLastSeenIndex(opts.lastSeen);
@@ -1917,6 +1975,11 @@ chatCmd
             else if (msg.heartbeat !== undefined) {
                 debug(`  Heartbeat #${msg.heartbeat}`);
             }
+            else if (msg.debug && typeof msg.message === 'string') {
+                // Server-side notices (e.g. transparent segment reattach)
+                // are context, not payload — stderr, --debug only.
+                debug(`  ${msg.message}`);
+            }
         });
         output(result);
         if (result.status === 'error') {
@@ -1940,11 +2003,12 @@ async function main() {
     if (meshArgs !== null) {
         program.parseOptions(process.argv);
         setDebugEnabled(getGlobalOptions().debug);
-        // Forward an explicit `--base-url` flag only (commander leaves it at
-        // DEFAULT_BASE_URL when unset); env/config/prod-default resolution happens
-        // inside the mesh layer so it doesn't inherit gsk's localhost default.
+        // Forward an explicit `--base-url` flag only; env/config/default resolution
+        // happens inside the mesh layer.
         const rawBase = program.opts().baseUrl;
-        const baseUrlOverride = rawBase && rawBase !== DEFAULT_BASE_URL ? rawBase : undefined;
+        const baseUrlOverride = rawBase && program.getOptionValueSource('baseUrl') === 'cli'
+            ? normalizeBaseUrl(rawBase)
+            : undefined;
         await runMesh(meshArgs, baseUrlOverride);
         return;
     }