@thirdfy/agent-cli 0.2.86 → 0.4.0

package/src/cli/manifest.mjs

@@ -10,7 +10,6 @@
  * @property {string} [description]
  * @property {object} [args] - Commander arguments, e.g. { email: '<address>' }
  * @property {string} [trackKind] - for commandTrackList: 'actions' | 'events'
- * @property {boolean} [jeffAlias] - maps jeff * to root handlers
  */
 
 /** @type {ManifestEntry[]} */
@@ -72,13 +71,13 @@ export const CLI_MANIFEST = [
   {
     path: ['help', 'onboarding'],
     handler: 'commandHelpOnboarding',
-    options: ['chains'],
+    options: ['chains', 'onboardingHelp'],
     description: 'Structured onboarding help (JSON envelope)',
   },
   {
     path: ['onboarding', 'help'],
     handler: 'commandHelpOnboarding',
-    options: ['chains'],
+    options: ['chains', 'onboardingHelp'],
     description: 'Structured onboarding help (JSON envelope)',
   },
   { path: ['wallet', 'list'], handler: 'commandWalletList', description: 'List configured wallets' },
@@ -113,7 +112,7 @@ export const CLI_MANIFEST = [
     path: ['venue', 'setup'],
     handler: 'commandVenueSetup',
     options: ['auth', 'venue'],
-    description: 'Prepare or complete venue onboarding via shared API contract',
+    description: 'Prepare or complete venue onboarding. Thirdfy also runs the one-time setup by itself with the first order (no funds move)',
     args: { query: '<venue>' },
     tier: 'online',
   },
@@ -121,7 +120,7 @@ export const CLI_MANIFEST = [
     path: ['venue', 'fund'],
     handler: 'commandVenueFund',
     options: ['auth', 'venue'],
-    description: 'Return venue funding plan (does not move funds implicitly)',
+    description: 'Return the venue funding plan. Nothing moves here: each funding step is a write you send with `run` and confirm',
     args: { query: '<venue>' },
     tier: 'online',
   },
@@ -200,27 +199,6 @@ export const CLI_MANIFEST = [
     options: ['auth', 'delegation', 'bootstrap'],
     description: 'Managed wallet + delegation setup',
   },
-  {
-    path: ['jeff', 'trade'],
-    handler: 'commandRun',
-    tier: 'online',
-    options: ['auth', 'execution'],
-    description: 'Execute intent (jeff alias)',
-  },
-  {
-    path: ['jeff', 'preflight'],
-    handler: 'commandPreflight',
-    tier: 'online',
-    options: ['auth', 'execution'],
-    description: 'Governance preflight (jeff alias)',
-  },
-  {
-    path: ['jeff', 'status'],
-    handler: 'commandIntentStatus',
-    tier: 'online',
-    options: ['execution'],
-    description: 'Intent status (jeff alias)',
-  },
   { path: ['catalogs', 'list'], handler: 'commandCatalogsList', tier: 'online', description: 'List action catalogs' },
   {
     path: ['credits', 'balance'],
@@ -229,6 +207,13 @@ export const CLI_MANIFEST = [
     options: ['auth'],
     description: 'Credits balance',
   },
+  {
+    path: ['credits', 'buy'],
+    handler: 'commandCreditsBuy',
+    tier: 'online',
+    options: ['auth', 'creditsBuy'],
+    description: "Buy the agent's Thirdfy credits with USDC from its wallet on Base (gas sponsored): --usd <whole dollars>",
+  },
   {
     path: ['credits', 'transactions'],
     handler: 'commandCreditsTransactions',
@@ -541,6 +526,27 @@ export const CLI_MANIFEST = [
     options: ['auth'],
     description: 'Rotate agent API key',
   },
+  {
+    path: ['wallet-control', 'state'],
+    handler: 'commandWalletControlState',
+    tier: 'online',
+    options: ['auth'],
+    description: 'Owner: read the user-owned agent wallet state',
+  },
+  {
+    path: ['wallet-control', 'request'],
+    handler: 'commandWalletControlRequest',
+    tier: 'online',
+    options: ['auth', 'walletControl'],
+    description: 'Owner: get the unsigned request for an owner action (update_policy, stop_agent, resume_agent, change_payout, export)',
+  },
+  {
+    path: ['wallet-control', 'submit'],
+    handler: 'commandWalletControlSubmit',
+    tier: 'online',
+    options: ['auth', 'walletControl'],
+    description: 'Owner: relay the signed owner request',
+  },
   {
     path: ['agent', 'key', 'revoke'],
     handler: 'commandAgentKeyRevoke',
@@ -624,7 +630,7 @@ export const CLI_MANIFEST = [
     path: ['actions'],
     handler: 'commandActions',
     tier: 'online',
-    options: ['auth', 'execution', 'dataCategory'],
+    options: ['auth', 'actionList', 'dataCategory'],
     description: 'List allowed actions',
   },
   {
@@ -634,6 +640,20 @@ export const CLI_MANIFEST = [
     options: ['signals'],
     description: 'List data provider apps and the signals they publish (fields, units, freshness, roles, credits)',
   },
+  {
+    path: ['readiness'],
+    handler: 'commandReadiness',
+    tier: 'online',
+    options: ['auth', 'chains'],
+    description: 'Can the agent act? agent_wallet: its execution wallet, funding, gas and wallet control; self/hybrid/thirdfy: the delegation check',
+  },
+  {
+    path: ['chains'],
+    handler: 'commandChains',
+    tier: 'online',
+    options: ['chainList'],
+    description: 'Chains Thirdfy acts on (from the API): chain ids, CAIP-2 ids, execution lanes and the Solana contract',
+  },
   {
     path: ['preflight'],
     handler: 'commandPreflight',
@@ -641,6 +661,13 @@ export const CLI_MANIFEST = [
     options: ['auth', 'execution'],
     description: 'Governance preflight',
   },
+  {
+    path: ['preview'],
+    handler: 'commandPreview',
+    tier: 'online',
+    options: ['auth', 'execution'],
+    description: 'Preview a write (agent_wallet): would Thirdfy sign it, order and risk preview, and the run command. Nothing is sent',
+  },
   { path: ['run'], handler: 'commandRun', tier: 'online', options: ['auth', 'execution'], description: 'Execute intent' },
   {
     path: ['self-exec'],

package/src/cli/options/bootstrap.mjs

@@ -1,7 +1,17 @@
-/** Commander 13+ rejects multi-character short flags; keep the historical `-ni` spelling working. */
+/**
+ * Commander 13+ rejects multi-character short flags; keep the historical `-ni` spelling working, and
+ * `--ni`, the spelling the README and onboarding help use.
+ */
+const NOT_INTERACTIVE_ALIASES = new Set(['-ni', '--ni']);
+
 export function normalizeLegacyShortFlags(argv) {
   const end = argv.indexOf('--');
-  return argv.map((arg, index) => (arg === '-ni' && (end === -1 || index < end) ? '--not-interactive' : arg));
+  return argv.map((arg, index) => (NOT_INTERACTIVE_ALIASES.has(arg) && (end === -1 || index < end) ? '--not-interactive' : arg));
+}
+
+/** `help onboarding --path`: one path, as thirdfy-mcp `describeOnboardingPath`. */
+export function attachOnboardingHelpOptions(cmd) {
+  return cmd.option('--path <id>', 'one path: email_otp | wallet_sign | existing_credentials | mcp_bootstrap | all');
 }
 
 export function attachBootstrapOptions(cmd) {
@@ -16,9 +26,11 @@ export function attachBootstrapOptions(cmd) {
     .option('--otp <otp>', 'email OTP alias')
     .option('--accept-terms', 'accept terms for email login')
     .option('--key-name <name>', 'Privy key name')
-    .option('--not-interactive', 'fail fast when required login input is missing (alias: -ni)')
+    .option('--not-interactive', 'fail fast when required login input is missing (aliases: --ni, -ni)')
     .option('--no-bootstrap-agent', 'skip agent bootstrap on email login')
     .option('--rotate-agent-key', 'rotate agent key')
+    .option('--owner-payout-address <addr>', 'owner payout address for exits from a wallet under wallet control (API 4.0+)')
+    .option('--allowed-actions <list>', "comma-separated catalog action names for the agent's action template (API 4.0+)")
     .option('--login-attempt-id <id>', 'email login attempt id')
     .option('--all', 'logout all sessions')
     .option('--clear-agent-key', 'clear stored agent key on logout');

package/src/cli/options/chains.mjs

@@ -1,3 +1,8 @@
 export function attachChainOptions(cmd) {
   return cmd.option('--chain-id <id>', 'chain id');
 }
+
+/** Options for `chains` (thirdfy-mcp getChainCapabilities / getNonEvmCapabilities). */
+export function attachChainListOptions(cmd) {
+  return cmd.option('--non-evm', 'only the non-EVM (Solana) execution contract');
+}

package/src/cli/options/credits.mjs

@@ -13,3 +13,12 @@ export function attachCreditsOptions(cmd) {
     )
     .option('--surface <surface>', 'billing surface (console, automation, cli, agent_api)', 'cli');
 }
+
+/** `credits buy` only: no catalog or pricing flags, and no --action / --params to override. */
+export function attachCreditsBuyOptions(cmd) {
+  return cmd
+    .option('--usd <dollars>', 'whole US dollars of credits to buy with USDC from the agent wallet')
+    .option('--tx-hash <hash>', 'resume a purchase whose USDC payment was already sent (after WRITE_OUTCOME_UNKNOWN)')
+    .option('--chain-id <id>', 'chain the USDC is paid on (default 8453 Base; 84532 Base Sepolia on test APIs)')
+    .option('--idempotency-key <key>', 'idempotency key for this purchase');
+}

package/src/cli/options/data.mjs

@@ -1,4 +1,4 @@
-/** Options of the data commands: `signals`, and the data-category filter of `actions`. */
+/** Options of the discovery and data commands: `actions` filters and `signals`. */
 
 export function attachSignalsOptions(cmd) {
   return cmd
@@ -12,3 +12,15 @@ export function attachDataCategoryOptions(cmd) {
     'only data reads of this category (market_data, signal, research, wallet); comma-separated for several',
   );
 }
+
+/** `actions` filters. It lists actions only, so it takes none of the `run` / `preflight` options. */
+export function attachActionListOptions(cmd) {
+  return cmd
+    .option('--provider <id>', 'only this provider (hyperliquid, polymarket, earn, ...)')
+    .option('--chain-id <id>', 'only actions on this chain')
+    .option('--catalog <id>', 'only this actions catalog')
+    .option('--search <text>', 'only actions whose name, description or aliases contain this text (one page)')
+    .option('--limit <n>', 'page size (concise: 50 by default, at most 100; detailed: 10, at most 25)')
+    .option('--offset <n>', 'skip this many matching actions (default 0)')
+    .option('--view <view>', 'concise (default with paging) or detailed (full entries with paramsSchema)');
+}

package/src/cli/options/index.mjs

@@ -4,20 +4,21 @@ import { attachExecutionOptions } from './execution.mjs';
 import { attachDelegationOptions } from './delegation.mjs';
 import { attachTrackingOptions } from './tracking.mjs';
 import { attachWalletOptions } from './wallet.mjs';
-import { attachBootstrapOptions } from './bootstrap.mjs';
+import { attachBootstrapOptions, attachOnboardingHelpOptions } from './bootstrap.mjs';
 import { attachCredentialsOptions } from './credentials.mjs';
 import { attachAnalyticsOptions } from './analytics.mjs';
 import { attachPolymarketOptions } from './polymarket.mjs';
 import { attachHummingbotOptions } from './hummingbot.mjs';
 import { attachCondorOptions } from './condor.mjs';
 import { attachAgentRegisterOptions } from './agent.mjs';
-import { attachChainOptions } from './chains.mjs';
-import { attachCreditsOptions } from './credits.mjs';
+import { attachChainListOptions, attachChainOptions } from './chains.mjs';
+import { attachCreditsBuyOptions, attachCreditsOptions } from './credits.mjs';
 import { attachChatOptions } from './chat.mjs';
 import { attachVenueOptions } from './venue.mjs';
 import { attachBrainOptions } from './brain.mjs';
 import { attachCertificationOptions } from './certification.mjs';
-import { attachDataCategoryOptions, attachSignalsOptions } from './data.mjs';
+import { attachActionListOptions, attachDataCategoryOptions, attachSignalsOptions } from './data.mjs';
+import { attachWalletControlOptions } from './walletControl.mjs';
 
 const BUNDLES = {
   auth: attachAuthOptions,
@@ -26,6 +27,7 @@ const BUNDLES = {
   tracking: attachTrackingOptions,
   wallet: attachWalletOptions,
   bootstrap: attachBootstrapOptions,
+  onboardingHelp: attachOnboardingHelpOptions,
   credentials: attachCredentialsOptions,
   analytics: attachAnalyticsOptions,
   polymarket: attachPolymarketOptions,
@@ -33,13 +35,17 @@ const BUNDLES = {
   condor: attachCondorOptions,
   agent: attachAgentRegisterOptions,
   chains: attachChainOptions,
+  chainList: attachChainListOptions,
   credits: attachCreditsOptions,
+  creditsBuy: attachCreditsBuyOptions,
   chat: attachChatOptions,
   venue: attachVenueOptions,
   brain: attachBrainOptions,
   certification: attachCertificationOptions,
   signals: attachSignalsOptions,
   dataCategory: attachDataCategoryOptions,
+  actionList: attachActionListOptions,
+  walletControl: attachWalletControlOptions,
 };
 
 /** @param {import('commander').Command} cmd */

package/src/cli/options/walletControl.mjs

@@ -0,0 +1,8 @@
+/** Options of `wallet-control request|submit` (owner actions on a user-owned agent wallet). */
+export function attachWalletControlOptions(cmd) {
+  return cmd
+    .option('--action <action>', 'owner action: update_policy, stop_agent, resume_agent, change_payout, export')
+    .option('--payout-address <addr>', 'new owner payout address (change_payout)')
+    .option('--recipient-public-key <key>', 'HPKE recipient public key (export)')
+    .option('--signature-input <json>', 'the signatureInput of the request the owner signed (submit)');
+}

package/src/commands/bootstrap.mjs

@@ -1,4 +1,4 @@
-import { requireFlag, isNonInteractive } from '../core/args.mjs';
+import { requireFlag, isNonInteractive, usageError } from '../core/args.mjs';
 import { createCliError } from '../core/envelope.mjs';
 import { PROFILE_DEFAULTS } from '../core/constants.mjs';
 import {
@@ -16,6 +16,7 @@ import {
   getProfileConfigPath,
 } from '../core/context.mjs';
 import { apiGet, apiPost, requestWithRouteFallback } from '../core/http.mjs';
+import { isEvmAddress, isSolanaAddress } from '../core/chainRegistry.mjs';
 import { createRequire } from 'module';
 
 const require = createRequire(import.meta.url);
@@ -153,12 +154,24 @@ async function commandConfigSet(ctx, flags) {
 }
 
 
+const ONBOARDING_PATHS = ['email_otp', 'wallet_sign', 'existing_credentials', 'mcp_bootstrap'];
+
+/** `help onboarding [--path <id>]`: every path, or one with `selectedPath` (thirdfy-mcp `describeOnboardingPath`). */
 async function commandHelpOnboarding(ctx, flags) {
+  const help = buildOnboardingHelp(ctx, flags);
+  const selectedPath = String(flags.path || 'all').trim().toLowerCase();
+  if (selectedPath !== 'all' && !ONBOARDING_PATHS.includes(selectedPath)) {
+    throw usageError(`--path must be one of ${ONBOARDING_PATHS.join(', ')} or all`, 'path');
+  }
+  const data =
+    selectedPath === 'all'
+      ? { selectedPath, ...help }
+      : { selectedPath, ...help.paths.find((entry) => entry.id === selectedPath), nonInteractive: help.nonInteractive, gas: help.gas, apiBase: help.apiBase };
   printEnvelope({
     success: true,
     code: 'ONBOARDING_HELP_OK',
-    message: 'Thirdfy onboarding help',
-    data: buildOnboardingHelp(ctx, flags),
+    message: selectedPath === 'all' ? 'Thirdfy onboarding help' : `Thirdfy onboarding help: ${selectedPath}`,
+    data,
     meta: { apiBase: ctx.apiBase },
   });
 }
@@ -289,6 +302,16 @@ async function commandLogin(ctx, flags) {
 
   let bootstrapAgentApiKey = '';
   let bootstrapPerformed = false;
+  // API 4.0: where exits from a wallet under wallet control may pay, and the agent's action
+  // template. The API validates both and answers ownerPayout / actionTemplate (thirdfy-mcp
+  // bootstrapSelfIdentity parity).
+  const ownerPayoutAddress = String(flags.ownerPayoutAddress || '').trim();
+  const allowedActions = String(flags.allowedActions || '')
+    .split(',')
+    .map((entry) => entry.trim())
+    .filter(Boolean);
+  let ownerPayout;
+  let actionTemplate;
   const requestedAgentApiKey = String(flags.agentApiKey || '').trim();
   const bootstrapAgentKey = String(flags.agentKey || '').trim();
   if (!requestedAgentApiKey && bootstrapAgentKey) {
@@ -308,11 +331,15 @@ async function commandLogin(ctx, flags) {
           custodyMode,
           ...(flags.walletAddress ? { walletAddress: String(flags.walletAddress).trim() } : {}),
           rotate: parseBooleanFlag(flags.rotateAgentKey, false),
+          ...(ownerPayoutAddress ? { ownerPayoutAddress } : {}),
+          ...(allowedActions.length ? { allowedActions } : {}),
         },
       });
       bootstrapAgentApiKey = String(
         bootstrapResponse?.agentApiKey || bootstrapResponse?.data?.agentApiKey || ''
       ).trim();
+      ownerPayout = bootstrapResponse?.ownerPayout || bootstrapResponse?.data?.ownerPayout;
+      actionTemplate = bootstrapResponse?.actionTemplate || bootstrapResponse?.data?.actionTemplate;
       bootstrapPerformed = true;
     }
   }
@@ -355,6 +382,8 @@ async function commandLogin(ctx, flags) {
       hasOwnerSessionToken: Boolean(ownerSessionToken),
       hasAgentApiKey: Boolean(requestedAgentApiKey || bootstrapAgentApiKey),
       bootstrapPerformed,
+      ...(ownerPayout ? { ownerPayout } : {}),
+      ...(actionTemplate ? { actionTemplate } : {}),
       runMode: loginRunMode,
       custodyMode,
       configPath: getProfileConfigPath(),
@@ -499,12 +528,15 @@ async function commandLoginEmail(ctx, flags) {
   // Persist first so operators keep session tokens even when wallet provisioning failed.
   persistProfileConfig(next);
 
+  // An EVM (0x) or Solana (base58) execution wallet counts; an agent may have only a Solana one.
   const executionWalletAddresses = Object.values(executionWallets)
     .map((row) => (row && typeof row === 'object' ? String(row.walletAddress || '').trim() : ''))
-    .filter((addr) => /^0x[a-fA-F0-9]{40}$/.test(addr));
+    .filter((addr) => isEvmAddress(addr) || isSolanaAddress(addr));
   const hasExecutionWallet = executionWalletAddresses.length > 0;
   if (runMode === 'agent_wallet' && (executionWalletsError || !hasExecutionWallet)) {
-    const fundHint = executionWalletAddresses[0] || 'the managed execution wallet address for each chain';
+    const fundHint = executionWalletAddresses.length
+      ? executionWalletAddresses.join(', ')
+      : 'the managed execution wallet address for each chain';
     throw createCliError(
       'LOGIN_EMAIL_INCOMPLETE',
       executionWalletsError
@@ -538,6 +570,13 @@ async function commandLoginEmail(ctx, flags) {
         ? {
             fundingReminder:
               'Fund executionWallets addresses for agent_wallet. Do not fund the owner embedded wallet for Path A trading.',
+            ...(executionWalletAddresses.some((addr) => isSolanaAddress(addr))
+              ? {
+                  solanaFundingReminder: `Fund the Solana execution wallet ${executionWalletAddresses
+                    .filter((addr) => isSolanaAddress(addr))
+                    .join(', ')} (base58; give the user this address, not the EVM one) with the SPL tokens (such as USDC) the agent trades. Thirdfy sponsors Solana network fees; keep a little SOL only for rent on new token accounts (about 0.002 SOL each).`,
+                }
+              : {}),
           }
         : {}),
     },

package/src/commands/chat.mjs

@@ -16,6 +16,9 @@ const NETWORK_CHAIN_IDS = {
   'arc-testnet': 5042002,
   'arc-mainnet': 5042,
   'arc': 5042,
+  // Solana (svm). Without these, --network sol-mainnet fell through to the Base default.
+  'sol-mainnet': 101,
+  'sol-devnet': 103,
 };
 
 const DEFAULT_CHAT_CHAIN_ID = 8453;

package/src/commands/credits.mjs

@@ -1,9 +1,10 @@
-import { requireFlag } from '../core/args.mjs';
+import { requireFlag, usageError } from '../core/args.mjs';
 import { apiGet, apiPost } from '../core/http.mjs';
 import { toAvantisSpelling } from '../core/venueBrand.mjs';
 import {
   formatCreditsEstimateSummary,
   formatCreditsModelsSummary,
+  stripUsdFields,
 } from '../lib/creditsUsdSummary.mjs';
 
 function resolveToolCallsEstimate(flags) {
@@ -32,7 +33,38 @@ function resolveToolCallsEstimate(flags) {
   };
 }
 
-export function createCreditsCommands({ printEnvelope, getAuthToken }) {
+/** Thirdfy credits are bought on Base with USDC from the agent's wallet (thirdfy-api-v2 `buy-agent-credits`). */
+const CREDITS_PURCHASE_CHAIN_ID = 8453;
+
+export function createCreditsCommands({ printEnvelope, getAuthToken, commandWalletExecute }) {
+  /**
+   * `credits buy --usd <n>`: buy the agent's Thirdfy credits with USDC from its execution wallet on
+   * Base (gas sponsored), as thirdfy-mcp's `walletExecute buy-agent-credits` does. A shortcut for
+   * `wallet execute --action buy-agent-credits --params '{"usdAmount":n}' --chain-id 8453`; the API
+   * sets the allowed range (whole dollars, $2 to $1,000 today). A purchase whose claim did not
+   * finish answers WRITE_OUTCOME_UNKNOWN: check `credits balance`, do not buy again; `--tx-hash`
+   * resumes that purchase without paying twice. `--chain-id` defaults to Base (84532 on test APIs).
+   */
+  async function commandCreditsBuy(ctx, flags, capabilities) {
+    const raw = String(requireFlag(flags, 'usd', 'Missing --usd (whole US dollars, for example --usd 10)')).trim();
+    if (!/^\d+$/.test(raw) || Number(raw) <= 0) throw usageError('--usd must be a whole number of US dollars, for example 10', 'usd');
+    const usdAmount = Number(raw);
+    const txHash = String(flags.txHash || '').trim();
+    await commandWalletExecute(
+      ctx,
+      {
+        ...flags,
+        action: 'buy-agent-credits',
+        // txHash resumes a purchase whose payment was already sent (the catalog row takes it).
+        params: JSON.stringify({ usdAmount, ...(txHash ? { txHash } : {}) }),
+        chainId: String(flags.chainId || CREDITS_PURCHASE_CHAIN_ID),
+        estimatedAmountUsd: String(usdAmount),
+        runMode: 'agent_wallet',
+      },
+      capabilities,
+    );
+  }
+
   async function commandCreditsTransactions(ctx, flags) {
     const authToken = getAuthToken(flags, 'Missing --auth-token (or THIRDFY_AUTH_TOKEN) for credits transactions');
     const page = Number(flags.page || 1);
@@ -127,13 +159,16 @@ export function createCreditsCommands({ printEnvelope, getAuthToken }) {
     printEnvelope({
       success: true,
       code: 'OK',
-      message: 'Action pricing quote generated',
-      data: response,
+      // wouldBePaidBy (agent_credits | free_request | owner_credits | none), when the API sends it.
+      message: response?.wouldBePaidBy ? `Action pricing quote generated; would be paid by ${response.wouldBePaidBy}` : 'Action pricing quote generated',
+      // An action's cost is in credits only, never dollars (thirdfy-mcp quoteActionPricing).
+      data: stripUsdFields(response),
       meta: { apiBase: ctx.apiBase, action },
     });
   }
 
   return {
+    commandCreditsBuy,
     commandCreditsTransactions,
     commandCreditsUsage,
     commandModelsList,

package/src/commands/delegation.mjs

@@ -426,9 +426,11 @@ async function commandDelegationRedeem(ctx, flags, capabilities) {
   if (!['thirdfy', 'hybrid', 'agent_wallet'].includes(selectedRunMode)) {
     throw createCliError('DELEGATION_REDEEM_MODE_INVALID', 'delegation redeem supports only --run-mode thirdfy|hybrid|agent_wallet');
   }
+  // Pass the run mode on only when it was given: a profile / config default must still be able to
+  // switch to agent_wallet on a Solana action (commandRun resolves the effective mode itself).
   const delegatedFlags = {
     ...flags,
-    runMode: selectedRunMode,
+    ...(flags.runMode ? { runMode: selectedRunMode } : {}),
   };
   if (!delegatedFlags.estimatedAmountUsd) {
     delegatedFlags.estimatedAmountUsd = '5';