@thirdfy/agent-cli 0.4.1 → 0.4.3

package/CHANGELOG.md

@@ -4,6 +4,45 @@ All notable changes to `@thirdfy/agent-cli` are documented here. The format is b
 
 ## Unreleased
 
+## [0.4.3] - 2026-10-14
+
+Bitfinex support is removed, ethers loads again for local signing and RPC checks, and an unreachable RPC no longer floods `--json` output. Older `credentials upsert` scripts keep working: the removed flags are accepted and ignored.
+
+### Removed
+
+- **Bitfinex support.** It was unused and extra code to maintain. Removed:
+  - the Bitfinex static provider hint (`actions --provider bitfinex` no longer carries one; thirdfy-mcp removed its hint too, thirdfy/thirdfy-mcp#270);
+  - the `credentials upsert` permission probe, and the `bitfinex:funding-primary` / `bitfinex:spot-primary` credential-ref defaults (pass `--credential-ref` yourself);
+  - the Bitfinex onboarding hint (`data.onboardingHint` on error envelopes and on `preflight` / `run` results);
+  - `src/runtime/bitfinexProbe.mjs`, `src/runtime/onboardingHints.mjs`, `src/runtime/execution/runners/fallbackHints.mjs`, and the Bitfinex docs.
+
+  `credentials upsert` and `credentials status` stay for the other venues (Hummingbot connectors, Polymarket, Hyperliquid, Lighter, Avantis). The probe's flags (`--permission-profile`, `--verify-permissions`, `--skip-permissions-probe`, `--bitfinex-base-url`) are still accepted, ignored, and named in `meta.warnings`, so older scripts keep working; they go in the next minor version. The API still serves the Bitfinex catalog rows until it removes them.
+
+### Fixed
+
+- **`loadEthers` loads ethers again.** `src/runtime/owsSigning.mjs` called `require` in an ES module, where it is undefined, and the `ReferenceError` was swallowed. So ethers never loaded, and these failed: `doctor self`'s `ethers-runtime` and `rpc-connectivity` checks, OWS sign-and-broadcast, the self lane's effect-check balance reads, and `wallet submit`. It now loads through `createRequire(import.meta.url)`.
+- **RPC calls fail once instead of retrying forever.** Every RPC connection (`doctor self`, OWS broadcast, `wallet submit`, effect-check balance reads) is now pinned to its chain id (`pinnedRpcProvider` in `src/core/chainRegistry.mjs`). An unreachable RPC is one error, not an ethers retry line on stdout every second that breaks `--json` output and keeps the process running. `doctor self`'s `rpc-chain-id` check asks the RPC itself (`eth_chainId`), so a wrong RPC is still reported. Tests: `test/runtime/owsSigning.test.cjs`.
+
+## [0.4.2] - 2026-10-14
+
+A cleanup release: two small `wallet profile` / `pricing quote` fixes from the 0.4.1 review, and source files moved into domain folders. Commands answer as in 0.4.1, apart from the two fixes.
+
+### Fixed
+
+- **`wallet profile` and `readiness` report the agent key in lowercase** whether it came from `--agent-key` or from env/config. Before, a checksummed config key was echoed as stored, so one agent could appear with two spellings.
+- **`pricing quote` on an API without the agent quote route** names the agent only from `--agent-key`. The branch that took the configured agent could not be reached (a stored owner token already puts the quote on the owner ledger) and is removed.
+
+### Changed
+
+- **Source files moved into domain subfolders (no behavior change).** The `thirdfy-agent` command is unchanged. Code that deep-imports package files must use the new paths:
+  - `src/runtime/execution/runners.mjs` → `src/runtime/execution/runners/` (one file per lane; `createExecutionRunners` is in `createExecutionRunners.mjs`).
+  - `src/core/{actionTimeouts,executionContext,fundingTokenIn,hostedRuntimeIdempotency,readOnlyActions,signedTx,walletExecuteChainId}.mjs` → `src/core/execution/`.
+  - `src/commands/{avantis,condor,hummingbot,hyperliquid,lighter,polymarket,venue}.mjs` → `src/commands/venues/`; `{bootstrap,consoleMandate,credentials,delegation}.mjs` → `src/commands/onboarding/`; `{agent,credits,wallet,walletControl}.mjs` → `src/commands/account/`.
+  - `src/cli/options/` uses the same `venues/`, `onboarding/` and `account/` subfolders.
+  - `src/core/index.mjs` and `src/commands/index.mjs` export the same names as before.
+- `wallet profile` uses the same owner/agent precedence code as the credits commands (`resolveCreditsLedger`) instead of its own copy. Same behavior.
+- `validate:provider-parity` names the files it looked in when it finds no MCP provider-hints file.
+
 ## [0.4.1] - 2026-10-14
 
 The last MCP tool with no CLI command (`wallet profile`), who pays for an action (`pricing quote`), owner session tokens for credits, and a parity check that follows thirdfy-mcp's new file layout.

package/README.md

@@ -22,7 +22,6 @@ If you want the full developer docs, start here:
 - [Action inventory and compatibility](./docs/action-inventory-and-compatibility.md)
 - [Command reference](./docs/command-reference.md)
 - [DogeOS quickstart (repo)](./docs/dogeos-quickstart.md)
-- [Bitfinex CEX workflow (repo)](./docs/bitfinex-cex-workflow.md)
 - [Action onboarding standard](./docs/action-onboarding-standard.md)
 - [Provider docs governance model](./docs/provider-docs-governance.md)
 - [Skill integration RFC](./docs/skill-integration-rfc.md)
@@ -40,12 +39,11 @@ Run without global install:
 npx @thirdfy/agent-cli --help
 ```
 
-## What's new in v0.4.1
+## What's new in v0.4.3
 
-- **`wallet profile`:** the live wallet profile from the API. With owner auth, the owner's onboarding profile; with an agent key, the agent's execution wallet with `ready`, wallet control and the next step. Every thirdfy-mcp tool that applies to a CLI now has a command.
-- **`pricing quote` says who would pay:** the agent's credits, a free request, the owner's credits, or nobody (`wouldBePaidBy`), in credits only.
-- **Owner session tokens** work for `credits balance` and `pricing quote`, and both pick the agent or owner ledger the same way as `wallet profile`.
-- **Safer agent identity:** with an explicit `--agent-api-key`, `readiness`, `wallet profile` and `pricing quote` name the agent from `--agent-key`, never a configured agent that may belong to another key.
+- **Local signing works again:** ethers now loads, so `doctor self`, OWS sign-and-broadcast, `wallet submit` and the self lane's balance checks run as documented.
+- **A dead RPC is one clear error:** every RPC call is pinned to its chain, so an unreachable RPC no longer prints retry lines into `--json` output or keeps the command running.
+- **Bitfinex support removed from the CLI:** no Bitfinex provider hint, credential permission probe or docs any more. The Thirdfy API still serves the Bitfinex actions for now. `credentials upsert` still works for the other venues, and its old Bitfinex flags are accepted and ignored with a warning.
 - Older versions: see [CHANGELOG.md](./CHANGELOG.md).
 
 ## Quick start
@@ -347,7 +345,6 @@ thirdfy-agent run --agent-api-key "$THIRDFY_AGENT_API_KEY" --action swap \
 Provider and venue guides are kept outside `README` so this page stays stable as integrations grow.
 
 - Provider index: [`docs/providers/index.md`](./docs/providers/index.md)
-- Bitfinex runbook: [`docs/providers/bitfinex.md`](./docs/providers/bitfinex.md)
 - DogeOS runbook: [`docs/providers/dogeos.md`](./docs/providers/dogeos.md)
 
 ## Command groups

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@thirdfy/agent-cli",
-  "version": "0.4.1",
+  "version": "0.4.3",
   "description": "Thirdfy Agent CLI for onboarding, governance preflight, execute-intent, and status polling.",
   "type": "module",
   "bin": {
@@ -22,8 +22,8 @@
     "LICENSE"
   ],
   "scripts": {
-    "test": "node --test test/*.test.cjs",
-    "lint": "node --check ./bin/thirdfy-agent.mjs && node --check ./src/core/*.mjs && node --check ./src/commands/*.mjs && node --check ./src/commands/signals/*.mjs && node --check ./src/cli/*.mjs && node --check ./src/cli/options/*.mjs && node --check ./src/runtime/*.mjs && node --check ./src/runtime/execution/*.mjs && node --check ./src/runtime/actions/*.mjs && node --check ./src/runtime/validation/*.mjs && node --check ./src/runtime/certification/*.mjs && node --check ./src/runtime/providerHints/*.mjs && node --check ./src/runtime/risk/*.mjs",
+    "test": "node --test test/*/*.test.cjs test/*/*/*.test.cjs",
+    "lint": "node --check ./bin/thirdfy-agent.mjs && node --check ./src/core/*.mjs && node --check ./src/core/execution/*.mjs && node --check ./src/commands/*.mjs && node --check ./src/commands/venues/*.mjs && node --check ./src/commands/onboarding/*.mjs && node --check ./src/commands/account/*.mjs && node --check ./src/commands/signals/*.mjs && node --check ./src/cli/*.mjs && node --check ./src/cli/options/*.mjs && node --check ./src/cli/options/venues/*.mjs && node --check ./src/cli/options/onboarding/*.mjs && node --check ./src/cli/options/account/*.mjs && node --check ./src/runtime/*.mjs && node --check ./src/runtime/execution/*.mjs && node --check ./src/runtime/execution/runners/*.mjs && node --check ./src/runtime/actions/*.mjs && node --check ./src/runtime/validation/*.mjs && node --check ./src/runtime/certification/*.mjs && node --check ./src/runtime/providerHints/*.mjs && node --check ./src/runtime/risk/*.mjs",
     "validate:cli-manifest-handlers": "node ./scripts/validate-cli-manifest-handlers.mjs",
     "validate:runtime-boundaries": "node ./scripts/validate-runtime-boundaries.mjs",
     "validate:npm-pack": "node ./scripts/validate-npm-pack.mjs",
@@ -36,6 +36,8 @@
     "e2e:local-api:smoke": "node ./scripts/e2e/local-api-smoke.mjs",
     "e2e:base:simulate": "node ./scripts/e2e/base-simulate.mjs",
     "e2e:base:real": "node ./scripts/e2e/base-realtx.mjs",
+    "e2e:agent-wallet:simulate": "node ./scripts/e2e/agent-wallet/run.mjs",
+    "e2e:agent-wallet:real": "node ./scripts/e2e/agent-wallet/run.mjs --real",
     "e2e:delegation:discovery": "node ./scripts/e2e/delegation-discovery.mjs",
     "e2e:delegation:lifecycle": "node ./scripts/e2e/delegation-lifecycle.mjs",
     "e2e:delegation:commands": "node ./scripts/e2e/delegation-command-parity.mjs",

package/src/cli/help.mjs

@@ -54,7 +54,7 @@ Core commands:
   thirdfy-agent wallet sign --agent-api-key <key> --action <id> --params <json> [--chain-id <id>] [--json]
   thirdfy-agent wallet submit --signed-tx-hex <hex> [--chain-id <id>] [--rpc-url <url>] [--json]
   thirdfy-agent agent run --agent-api-key <key> --action <id> --params <json> [--signer-method managed_wallet_server|byow|fanout_intent] [--strategy-intent single_wallet|fanout] [--run-mode <mode>] [--user-did <did>] [--json]
-  thirdfy-agent credentials upsert --auth-token <token> --venue <id> --api-key <key> --api-secret <secret> [--permission-profile funding|spot] [--credential-ref <ref>] [--verify-permissions] [--skip-permissions-probe] [--bitfinex-base-url <url>] [--json]
+  thirdfy-agent credentials upsert --auth-token <token> --venue <id> --api-key <key> --api-secret <secret> [--credential-ref <ref>] [--json]
   thirdfy-agent credentials status --auth-token <token> [--venue <id>] [--json]
   thirdfy-agent agent auth challenge --agent-key <key> [--wallet-address <addr>] [--chain-id <id>] [--json]
   thirdfy-agent agent auth verify --challenge-id <id> --signature <hex> --agent-key <key> [--wallet-address <addr>] [--json]

package/src/cli/options/index.mjs

@@ -1,24 +1,24 @@
 import { attachGlobalOptions } from './global.mjs';
 import { attachAuthOptions } from './auth.mjs';
 import { attachExecutionOptions } from './execution.mjs';
-import { attachDelegationOptions } from './delegation.mjs';
+import { attachDelegationOptions } from './onboarding/delegation.mjs';
 import { attachTrackingOptions } from './tracking.mjs';
-import { attachWalletOptions } from './wallet.mjs';
-import { attachBootstrapOptions, attachOnboardingHelpOptions } from './bootstrap.mjs';
-import { attachCredentialsOptions } from './credentials.mjs';
+import { attachWalletOptions } from './account/wallet.mjs';
+import { attachBootstrapOptions, attachOnboardingHelpOptions } from './onboarding/bootstrap.mjs';
+import { attachCredentialsOptions } from './onboarding/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 { attachPolymarketOptions } from './venues/polymarket.mjs';
+import { attachHummingbotOptions } from './venues/hummingbot.mjs';
+import { attachCondorOptions } from './venues/condor.mjs';
+import { attachAgentRegisterOptions } from './account/agent.mjs';
 import { attachChainListOptions, attachChainOptions } from './chains.mjs';
-import { attachCreditsBuyOptions, attachCreditsOptions } from './credits.mjs';
+import { attachCreditsBuyOptions, attachCreditsOptions } from './account/credits.mjs';
 import { attachChatOptions } from './chat.mjs';
-import { attachVenueOptions } from './venue.mjs';
+import { attachVenueOptions } from './venues/venue.mjs';
 import { attachBrainOptions } from './brain.mjs';
 import { attachCertificationOptions } from './certification.mjs';
 import { attachActionListOptions, attachDataCategoryOptions, attachSignalsOptions } from './data.mjs';
-import { attachWalletControlOptions } from './walletControl.mjs';
+import { attachWalletControlOptions } from './account/walletControl.mjs';
 
 const BUNDLES = {
   auth: attachAuthOptions,

package/src/cli/options/onboarding/credentials.mjs

@@ -0,0 +1,17 @@
+export function attachCredentialsOptions(cmd) {
+  return cmd
+    .option('--venue <id>', 'credential venue')
+    .option('--api-key <key>', 'exchange API key')
+    .option('--api-secret <secret>', 'exchange API secret')
+    .option('--credential-ref <ref>', 'credential reference')
+    .option('--credential-type <type>', 'credential type')
+    .option('--passphrase <value>', 'exchange passphrase')
+    .option('--metadata <json>', 'credential metadata JSON')
+    .option('--policy <json>', 'credential policy JSON')
+    // Accepted and ignored since Bitfinex support was removed, so older scripts keep working; the
+    // command says so in meta.warnings. Drop them in the next minor version.
+    .option('--permission-profile <profile>', 'ignored (Bitfinex support was removed)')
+    .option('--verify-permissions', 'ignored (Bitfinex support was removed)')
+    .option('--skip-permissions-probe', 'ignored (Bitfinex support was removed)')
+    .option('--bitfinex-base-url <url>', 'ignored (Bitfinex support was removed)');
+}

package/src/cli/program.mjs

@@ -3,4 +3,4 @@ import { buildCliProgram } from './register.mjs';
 export { buildCliProgram };
 export { collectRootFlags, collectLegacyFlags } from './flags.mjs';
 export { configureCommanderErrors, handleRootOnlyFlows, collectVersionFlagsFromArgv } from './errors.mjs';
-export { normalizeLegacyShortFlags } from './options/bootstrap.mjs';
+export { normalizeLegacyShortFlags } from './options/onboarding/bootstrap.mjs';

package/src/commands/{agent.mjs → account/agent.mjs}

@@ -1,11 +1,11 @@
 import { createRequire } from 'module';
-import { requireFlag, parseJsonFlag } from '../core/args.mjs';
-import { apiPost, safeJsonParse } from '../core/http.mjs';
-import { createCliError } from '../core/envelope.mjs';
-import { DEFAULT_TIMEOUT_MS } from '../core/constants.mjs';
+import { requireFlag, parseJsonFlag } from '../../core/args.mjs';
+import { apiPost, safeJsonParse } from '../../core/http.mjs';
+import { createCliError } from '../../core/envelope.mjs';
+import { DEFAULT_TIMEOUT_MS } from '../../core/constants.mjs';
 
 const require = createRequire(import.meta.url);
-const { version: CLI_VERSION } = require('../../package.json');
+const { version: CLI_VERSION } = require('../../../package.json');
 export function createAgentCommands({ printEnvelope, extractAgentApiKey, extractAgentKey, buildOwnerAuthHeaders }) {
 async function commandAgentRegister(ctx, flags, capabilities) {
   const ownerHeaders = buildOwnerAuthHeaders(

package/src/commands/{credits.mjs → account/credits.mjs}

@@ -1,13 +1,13 @@
-import { requireFlag, usageError } from '../core/args.mjs';
-import { apiGet, apiPost } from '../core/http.mjs';
-import { loadProfileConfig, resolveCreditsLedger } from '../core/context.mjs';
-import { createCliError } from '../core/envelope.mjs';
-import { toAvantisSpelling } from '../core/venueBrand.mjs';
+import { requireFlag, usageError } from '../../core/args.mjs';
+import { apiGet, apiPost } from '../../core/http.mjs';
+import { resolveCreditsLedger } from '../../core/context.mjs';
+import { createCliError } from '../../core/envelope.mjs';
+import { toAvantisSpelling } from '../../core/venueBrand.mjs';
 import {
   formatCreditsEstimateSummary,
   formatCreditsModelsSummary,
   stripUsdFields,
-} from '../lib/creditsUsdSummary.mjs';
+} from '../../lib/creditsUsdSummary.mjs';
 
 function resolveToolCallsEstimate(flags) {
   const raw = flags.toolCalls ?? flags.toolCallsList;
@@ -151,14 +151,13 @@ export function createCreditsCommands({ printEnvelope, getAuthToken, buildOwnerA
    * (thirdfy-api-v2#887). The ledger follows `resolveCreditsLedger`. Agent: `POST /agent/credits/quote`
    * with the agent's key. Owner (session token or auth token): `/credits/pricing/quote`, for one of the
    * owner's agents with --agent-key. An API without the agent route (404, before #887) is quoted
-   * through the owner route when owner auth is set and the key's agent is known: --agent-key, or the
-   * configured agent when the key also comes from env or config. Credits only.
+   * through the owner route when owner auth is set and --agent-key names the key's agent. Credits only.
    */
   async function commandPricingQuote(ctx, flags) {
     const action = requireFlag(flags, 'action', 'Missing --action for pricing quote');
     // Veranta names price as their Avantis spelling, which every API deployment knows.
     const body = { actionKey: toAvantisSpelling(action), chainId: Number(flags.chainId || 8453) };
-    const { ledger: requestedLedger, agentApiKey, agentApiKeyExplicit } = resolveCreditsLedger(flags);
+    const { ledger: requestedLedger, agentApiKey } = resolveCreditsLedger(flags);
     const flagAgentKey = String(flags.agentKey || '').trim();
     const ownerHeaders = () =>
       buildOwnerAuthHeaders(flags, 'Missing --owner-session-token or --auth-token (or THIRDFY_OWNER_SESSION_TOKEN / THIRDFY_AUTH_TOKEN), or an agent key, for pricing quote');
@@ -191,8 +190,9 @@ export function createCreditsCommands({ printEnvelope, getAuthToken, buildOwnerA
             { blockedStage: 'auth' },
           );
         }
-        const pairedAgentKey = flagAgentKey || (agentApiKeyExplicit ? '' : String(process.env.THIRDFY_AGENT_KEY || loadProfileConfig()?.agent?.agentKey || '').trim());
-        if (!pairedAgentKey) {
+        // Only --agent-key can name the key's agent here. The agent ledger without --agent-api-key means
+        // no owner auth is stored, and then the owner check above has already refused.
+        if (!flagAgentKey) {
           throw createCliError(
             'AGENT_IDENTITY_UNAVAILABLE',
             'This Thirdfy API has no agent quote route yet; to quote through the owner route, pass --agent-key (the agent of this API key).',
@@ -200,8 +200,8 @@ export function createCreditsCommands({ printEnvelope, getAuthToken, buildOwnerA
           );
         }
         ledger = 'owner';
-        quotedAgentKey = pairedAgentKey;
-        response = await ownerQuote(pairedAgentKey);
+        quotedAgentKey = flagAgentKey;
+        response = await ownerQuote(flagAgentKey);
       }
     } else {
       response = await ownerQuote(flagAgentKey);
@@ -223,8 +223,6 @@ export function createCreditsCommands({ printEnvelope, getAuthToken, buildOwnerA
     });
   }
 
-
-
   return {
     commandCreditsBuy,
     commandCreditsTransactions,

package/src/commands/{wallet.mjs → account/wallet.mjs}

@@ -1,15 +1,14 @@
-import { requireFlag, usageError } from '../core/args.mjs';
-import { createCliError, exitAfterOutput } from '../core/envelope.mjs';
-import { findAgentApiKey, loadProfileConfig } from '../core/context.mjs';
-import { DEFAULT_CHAIN_ID, chainGasNote, isSvmChainId, parseChainIdFlag, resolveChainRpcUrl } from '../core/chainRegistry.mjs';
-import { apiGet } from '../core/http.mjs';
-import { getEffectiveRunMode } from '../core/runMode.mjs';
-import { readWalletControl } from '../runtime/execution/walletControl.mjs';
-import { blockedResultFields } from '../core/errorEnvelope.mjs';
-import { assertSvmChainRunByApi } from '../runtime/execution/svmLane.mjs';
-import { applySvmLane } from '../runtime/execution/svmLane.mjs';
-import { readSignedTxChainId } from '../core/signedTx.mjs';
-import { runNotionalWarnings } from '../runtime/risk/notional.mjs';
+import { requireFlag, usageError } from '../../core/args.mjs';
+import { createCliError, exitAfterOutput } from '../../core/envelope.mjs';
+import { findAgentApiKey, loadProfileConfig, resolveCreditsLedger } from '../../core/context.mjs';
+import { DEFAULT_CHAIN_ID, chainGasNote, isSvmChainId, parseChainIdFlag, resolveChainRpcUrl } from '../../core/chainRegistry.mjs';
+import { apiGet } from '../../core/http.mjs';
+import { getEffectiveRunMode } from '../../core/runMode.mjs';
+import { readWalletControl } from '../../runtime/execution/walletControl.mjs';
+import { blockedResultFields } from '../../core/errorEnvelope.mjs';
+import { applySvmLane, assertSvmChainRunByApi } from '../../runtime/execution/svmLane.mjs';
+import { readSignedTxChainId } from '../../core/execution/signedTx.mjs';
+import { runNotionalWarnings } from '../../runtime/risk/notional.mjs';
 
 export function createWalletCommands(deps) {
   const {
@@ -182,12 +181,6 @@ function resolveReadinessChain(flags) {
   };
 }
 
-/**
- * The agent's execution wallet on a chain, read with its own key (`GET /agent/execution-wallet`, as
- * thirdfy-mcp agentWalletBootstrap): the API answer, the chain's gas note, wallet control (API 4.0),
- * whether it holds the funding token, and whether it can sign (`ready`). Used by `readiness` and
- * `wallet profile`.
- */
 /**
  * The agent an agent API key acts for. With an explicit --agent-api-key, only --agent-key or
  * --user-did name it: an agent from env or config may belong to another key. Otherwise the env or
@@ -196,7 +189,7 @@ function resolveReadinessChain(flags) {
  */
 function resolveAgentIdentity(flags) {
   const explicitKey = Boolean(String(flags.agentApiKey || '').trim());
-  const agentKey = explicitKey ? String(flags.agentKey || '').trim().toLowerCase() : String(resolveAgentKey(flags) || '').trim();
+  const agentKey = String((explicitKey ? flags.agentKey : resolveAgentKey(flags)) || '').trim().toLowerCase();
   const explicitDid = String(flags.userDid || '').trim();
   const userDid = explicitKey
     ? explicitDid || (agentKey ? `did:wallet:${agentKey}` : '')
@@ -213,6 +206,12 @@ function resolveAgentIdentity(flags) {
   return { agentKey: agentKey || null, userDid };
 }
 
+/**
+ * The agent's execution wallet on a chain, read with its own key (`GET /agent/execution-wallet`, as
+ * thirdfy-mcp agentWalletBootstrap): the API answer, the chain's gas note, wallet control (API 4.0),
+ * whether it holds the funding token, and whether it can sign (`ready`). Used by `readiness` and
+ * `wallet profile`.
+ */
 async function readAgentExecutionWallet(ctx, flags, agentApiKey, chainId) {
   const { agentKey, userDid } = resolveAgentIdentity(flags);
   const query = new URLSearchParams({ chainId: String(chainId), runMode: 'agent_wallet' });
@@ -236,20 +235,17 @@ async function readAgentExecutionWallet(ctx, flags, agentApiKey, chainId) {
  */
 async function commandWalletProfile(ctx, flags, capabilities) {
   const meta = { apiBase: ctx.apiBase, capabilitiesVersion: capabilities?.contractVersion || null };
-  const ownerHeaders = (() => {
-    try {
-      return buildOwnerAuthHeaders(flags, 'no owner auth');
-    } catch {
-      return null;
-    }
-  })();
-  const agentApiKey = findAgentApiKey(flags);
-  // An owner flag the caller passed wins (as thirdfy-mcp), then an explicit --agent-api-key, then
-  // owner auth from env or config, then an agent key from env or config.
-  const explicitOwner = Boolean(String(flags.ownerSessionToken || flags.authToken || '').trim());
-  const explicitAgent = Boolean(String(flags.agentApiKey || '').trim());
-  const agentPath = !explicitOwner && (explicitAgent || (!ownerHeaders && Boolean(agentApiKey)));
-  if (!agentPath) {
+  // Same precedence as the credits commands (as thirdfy-mcp): an owner flag the caller passed, then an
+  // explicit --agent-api-key, then owner auth from env or config, then an agent key from env or config.
+  const { ledger, agentApiKey } = resolveCreditsLedger(flags);
+  if (ledger !== 'agent') {
+    const ownerHeaders = (() => {
+      try {
+        return buildOwnerAuthHeaders(flags, 'no owner auth');
+      } catch {
+        return null;
+      }
+    })();
     if (!ownerHeaders) {
       throw createCliError(
         'OWNER_AUTH_REQUIRED',

package/src/commands/{walletControl.mjs → account/walletControl.mjs}

@@ -1,6 +1,6 @@
-import { loadProfileConfig } from '../core/context.mjs';
-import { parseJsonFlag, requireFlag } from '../core/args.mjs';
-import { apiGet, apiPost } from '../core/http.mjs';
+import { loadProfileConfig } from '../../core/context.mjs';
+import { parseJsonFlag, requireFlag } from '../../core/args.mjs';
+import { apiGet, apiPost } from '../../core/http.mjs';
 
 /**
  * The owner's side of API 4.0 wallet control (`/api/v1/agent/:agentKey/wallet-control/*`), for a

package/src/commands/discovery.mjs

@@ -52,7 +52,7 @@ function solanaExecutionContract() {
       'Solana execution runs only with --run-mode agent_wallet on chain 101 (103 devnet where a provider supports it). self, hybrid and thirdfy stay EVM-only. Check `actions --chain-id 101` (supportedChains) for each action\'s chains.',
   };
 }
-export function createDiscoveryCommands({ printEnvelope, applyActionFilters, getProviderHintForActions, resolveChainSupport, getAuthToken, buildOwnerAuthHeaders, resolveAgentApiKey }) {
+export function createDiscoveryCommands({ printEnvelope, applyActionFilters, getProviderHintForActions, resolveChainSupport, buildOwnerAuthHeaders, resolveAgentApiKey }) {
 async function commandCatalogsList(ctx, flags, capabilities) {
   const response = await apiGet(ctx, '/api/v1/agent/actions/catalog');
   const actions = extractActions(response);

package/src/commands/doctor.mjs

@@ -3,7 +3,7 @@ import { requireFlag } from '../core/args.mjs';
 import { apiGet, requestWithRouteFallback } from '../core/http.mjs';
 import { loadProfileConfig, getProfileConfigPath, getCachedActionsCatalog } from '../core/context.mjs';
 import { DEFAULT_API_BASE, PROFILE_DEFAULTS } from '../core/constants.mjs';
-import { describeChainGas, parseChainIdFlag, resolveChainRpcUrl } from '../core/chainRegistry.mjs';
+import { DEFAULT_CHAIN_ID, describeChainGas, parseChainIdFlag, pinnedRpcProvider, resolveChainRpcUrl } from '../core/chainRegistry.mjs';
 import { exitAfterOutput } from '../core/envelope.mjs';
 import { normalizeRunMode, normalizeManagedRunMode } from '../core/runMode.mjs';
 import { buildExecutionCertificationReport } from '../runtime/certification/executionCertify.mjs';
@@ -63,13 +63,13 @@ async function commandDoctorSelf(ctx, flags) {
   try {
     if (!rpcUrl) throw new Error(`no known RPC for chain ${flags.chainId}; pass --rpc-url <url>`);
     const ethers = await loadEthers();
-    const provider = new ethers.JsonRpcProvider(rpcUrl);
+    const expectedChainId = parseChainIdFlag(flags.chainId);
+    const provider = pinnedRpcProvider(ethers, { rpcUrl, chainId: expectedChainId || DEFAULT_CHAIN_ID });
     const block = await provider.getBlockNumber();
     checks.push({ name: 'rpc-connectivity', ok: Number.isFinite(block), detail: `latestBlock=${block}` });
-    const expectedChainId = parseChainIdFlag(flags.chainId);
     if (expectedChainId) {
-      const network = await provider.getNetwork();
-      const rpcChainId = Number(network.chainId);
+      // The provider's network is pinned, so ask the RPC itself which chain it serves.
+      const rpcChainId = Number(await provider.send('eth_chainId', []));
       checks.push({
         name: 'rpc-chain-id',
         ok: rpcChainId === expectedChainId,

package/src/commands/execute.mjs

@@ -8,8 +8,8 @@ import {
 } from '../core/runMode.mjs';
 import { apiGet } from '../core/http.mjs';
 import { applySvmLane } from '../runtime/execution/svmLane.mjs';
-import { isReadOnlyResolvedAction } from '../core/readOnlyActions.mjs';
-import { resolveWalletExecuteChainId } from '../core/walletExecuteChainId.mjs';
+import { isReadOnlyResolvedAction } from '../core/execution/readOnlyActions.mjs';
+import { resolveWalletExecuteChainId } from '../core/execution/walletExecuteChainId.mjs';
 import { resolveExecuteEstimatedAmountUsd } from '../runtime/execution/payloads.mjs';
 import { assertPreviewSized, buildPreviewOrder, shapeOrderPreview } from '../runtime/risk/orderPreview.mjs';
 import { actionNameForApi } from '../runtime/actions/selection.mjs';
@@ -33,7 +33,6 @@ export function createExecuteCommands(deps) {
     runPreflightByMode,
     runExecutionByMode,
     resolveManagedExecutionPreflight,
-    applyExecutionFallbackHints,
     performSelfBroadcast,
     executeManagedWalletRun,
     executeSelfRun,
@@ -57,11 +56,7 @@ async function commandPreflight(ctx, flags, capabilities) {
     || (await applyLighterAgentWalletAddressDefault(ctx, flags, resolved, runMode))
     || (await applyAvantisAgentWalletAddressDefault(ctx, flags, resolved, runMode));
   const backendResult = await runPreflightByMode(runMode, ctx, flags, resolved, { hybridWalletMode, managedPreflight });
-  const normalized = applyExecutionFallbackHints(backendResult.normalized, {
-    flags,
-    runMode,
-    resolvedAction: resolved.resolvedAction,
-  });
+  const normalized = backendResult.normalized;
   const data = flags.__polymarketSetupGuide
     ? {
         ...normalized,
@@ -195,11 +190,7 @@ async function commandRun(ctx, flags, capabilities) {
     hybridWalletMode,
     managedPreflight,
   });
-  const normalized = applyExecutionFallbackHints(backendResult.normalized, {
-    flags,
-    runMode,
-    resolvedAction: resolved.resolvedAction,
-  });
+  const normalized = backendResult.normalized;
   if (runMode === 'self' && parseBooleanFlag(flags.broadcast, false) && normalized?.success) {
     const executed = await performSelfBroadcast(ctx, flags, resolved.resolvedAction, normalized);
     printEnvelope({

package/src/commands/index.mjs

@@ -1,10 +1,10 @@
-export { createPolymarketCommands, resolveConfigAgentKey } from './polymarket.mjs';
-export { createHyperliquidHelpers } from './hyperliquid.mjs';
-export { createLighterHelpers } from './lighter.mjs';
-export { createAvantisHelpers } from './avantis.mjs';
-export { createHummingbotCommands } from './hummingbot.mjs';
-export { createCondorCommands } from './condor.mjs';
+export { createPolymarketCommands, resolveConfigAgentKey } from './venues/polymarket.mjs';
+export { createHyperliquidHelpers } from './venues/hyperliquid.mjs';
+export { createLighterHelpers } from './venues/lighter.mjs';
+export { createAvantisHelpers } from './venues/avantis.mjs';
+export { createHummingbotCommands } from './venues/hummingbot.mjs';
+export { createCondorCommands } from './venues/condor.mjs';
 export { createExecuteCommands } from './execute.mjs';
-export { createWalletCommands } from './wallet.mjs';
-export { createDelegationCommands } from './delegation.mjs';
-export { createBootstrapCommands } from './bootstrap.mjs';
+export { createWalletCommands } from './account/wallet.mjs';
+export { createDelegationCommands } from './onboarding/delegation.mjs';
+export { createBootstrapCommands } from './onboarding/bootstrap.mjs';

package/src/commands/{bootstrap.mjs → onboarding/bootstrap.mjs}

@@ -1,26 +1,26 @@
-import { requireFlag, isNonInteractive, usageError } from '../core/args.mjs';
-import { createCliError } from '../core/envelope.mjs';
-import { PROFILE_DEFAULTS } from '../core/constants.mjs';
+import { requireFlag, isNonInteractive, usageError } from '../../core/args.mjs';
+import { createCliError } from '../../core/envelope.mjs';
+import { PROFILE_DEFAULTS } from '../../core/constants.mjs';
 import {
   normalizeRunMode,
   normalizeProfileName,
   normalizeCustodyMode,
   defaultCustodyModeForRunMode,
   parseBooleanFlag,
-} from '../core/runMode.mjs';
+} from '../../core/runMode.mjs';
 import {
   loadProfileConfig,
   persistProfileConfig,
   clonePlainConfigTree,
   setNestedConfigValue,
   getProfileConfigPath,
-} from '../core/context.mjs';
-import { apiGet, apiPost, requestWithRouteFallback } from '../core/http.mjs';
-import { isEvmAddress, isSolanaAddress } from '../core/chainRegistry.mjs';
+} 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);
-const { version: CLI_VERSION } = require('../../package.json');
+const { version: CLI_VERSION } = require('../../../package.json');
 
 export function createBootstrapCommands(deps) {
   const {

package/src/commands/{consoleMandate.mjs → onboarding/consoleMandate.mjs}

@@ -1,5 +1,5 @@
-import { requireFlag } from '../core/args.mjs';
-import { apiGet, apiPost } from '../core/http.mjs';
+import { requireFlag } from '../../core/args.mjs';
+import { apiGet, apiPost } from '../../core/http.mjs';
 
 /** Aligned with chat.mjs NETWORK_CHAIN_IDS and thirdfy-mcp consoleMandateChains. */
 const CONSOLE_MANDATE_NETWORK_CHAIN_IDS = {

package/src/commands/{credentials.mjs → onboarding/credentials.mjs}

@@ -1,48 +1,35 @@
 import { createRequire } from 'module';
-import { requireFlag, parseJsonFlag } from '../core/args.mjs';
-import { requestWithRouteFallback } from '../core/http.mjs';
-import { createCliError } from '../core/envelope.mjs';
-import { BITFINEX_PERMISSION_PROFILES, DEFAULT_BITFINEX_BASE_URL } from '../core/constants.mjs';
-import { parseBooleanFlag } from '../core/runMode.mjs';
+import { requireFlag, parseJsonFlag } from '../../core/args.mjs';
+import { requestWithRouteFallback } from '../../core/http.mjs';
+import { createCliError } from '../../core/envelope.mjs';
 
 const require = createRequire(import.meta.url);
-const { normalizeCredentialStatus } = require('../utils/cli/delegationNormalization.cjs');
-export function createCredentialsCommands({ printEnvelope, getAuthToken, buildOwnerAuthHeaders, probeBitfinexPermissions }) {
+const { normalizeCredentialStatus } = require('../../utils/cli/delegationNormalization.cjs');
+/** `credentials upsert` flags of the removed Bitfinex permission probe: accepted, ignored, and named in a warning. */
+const REMOVED_BITFINEX_FLAGS = [
+  ['permissionProfile', '--permission-profile'],
+  ['verifyPermissions', '--verify-permissions'],
+  ['skipPermissionsProbe', '--skip-permissions-probe'],
+  ['bitfinexBaseUrl', '--bitfinex-base-url'],
+];
+
+export function createCredentialsCommands({ printEnvelope, getAuthToken, buildOwnerAuthHeaders }) {
 async function commandCredentialsUpsert(ctx, flags, capabilities) {
   const authToken = getAuthToken(flags, 'Missing --auth-token (or THIRDFY_AUTH_TOKEN) for credentials upsert');
   const venue = requireFlag(flags, 'venue', 'Missing --venue');
-  const permissionProfile = String(flags.permissionProfile || 'funding').trim().toLowerCase();
-  const bitfinexProfile =
-    String(venue).trim().toLowerCase() === 'bitfinex'
-      ? BITFINEX_PERMISSION_PROFILES[permissionProfile] || BITFINEX_PERMISSION_PROFILES.funding
-      : null;
   const payload = {
     venue,
     apiKey: requireFlag(flags, 'apiKey', 'Missing --api-key'),
     apiSecret: requireFlag(flags, 'apiSecret', 'Missing --api-secret'),
     credentialType: String(flags.credentialType || 'api_key'),
-    credentialRef: String(flags.credentialRef || bitfinexProfile?.credentialRef || ''),
+    credentialRef: String(flags.credentialRef || ''),
   };
   if (flags.passphrase) payload.passphrase = String(flags.passphrase);
   if (flags.metadata) payload.metadata = parseJsonFlag(flags, 'metadata');
   if (flags.policy) payload.policy = parseJsonFlag(flags, 'policy');
   if (flags.agentKey) payload.agentKey = String(flags.agentKey).trim();
   if (flags.chainId) payload.chainId = Number(flags.chainId);
-  const probeEnabled =
-    String(venue).trim().toLowerCase() === 'bitfinex' &&
-    !parseBooleanFlag(flags.skipPermissionsProbe, false) &&
-    parseBooleanFlag(flags.verifyPermissions, true);
-  let permissionProbe = null;
-  if (probeEnabled) {
-    permissionProbe = await probeBitfinexPermissions({
-      apiKey: payload.apiKey,
-      apiSecret: payload.apiSecret,
-      permissionProfile: bitfinexProfile?.id || 'funding',
-      timeoutMs: ctx.timeoutMs,
-      baseUrl: String(flags.bitfinexBaseUrl || process.env.BITFINEX_BASE_URL || DEFAULT_BITFINEX_BASE_URL),
-    });
-  }
-
+  const ignoredFlags = REMOVED_BITFINEX_FLAGS.filter(([key]) => flags[key] !== undefined).map(([, flag]) => flag);
   const response = await requestWithRouteFallback(ctx, {
     method: 'POST',
     routes: ['/api/v1/agent/delegation/credentials/upsert', '/api/v1/agent/agent/delegation/credentials/upsert'],
@@ -58,8 +45,8 @@ async function commandCredentialsUpsert(ctx, flags, capabilities) {
     data: response,
     meta: {
       apiBase: ctx.apiBase,
-      permissionProbe,
       capabilitiesVersion: capabilities?.contractVersion || null,
+      ...(ignoredFlags.length ? { warnings: [`Ignored ${ignoredFlags.join(', ')}: Bitfinex support was removed. Drop these flags; they will stop being accepted in the next minor version.`] } : {}),
     },
   });
 }