@thirdfy/agent-cli 0.4.1 → 0.4.2

package/CHANGELOG.md

@@ -4,6 +4,26 @@ All notable changes to `@thirdfy/agent-cli` are documented here. The format is b
 
 ## Unreleased
 
+## [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

@@ -40,12 +40,11 @@ Run without global install:
 npx @thirdfy/agent-cli --help
 ```
 
-## What's new in v0.4.1
+## What's new in v0.4.2
 
-- **`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.
+- **One spelling per agent:** `wallet profile` and `readiness` report the agent key in lowercase, whether it came from `--agent-key` or from your config.
+- **`pricing quote` on an older API** (no agent quote route) names the agent only from `--agent-key`.
+- **Reorganized source** (no behavior change): source files moved into domain folders. If your code imports files from inside the package, see [CHANGELOG.md](./CHANGELOG.md) for the new paths; the `thirdfy-agent` command is unchanged.
 - Older versions: see [CHANGELOG.md](./CHANGELOG.md).
 
 ## Quick start

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@thirdfy/agent-cli",
-  "version": "0.4.1",
+  "version": "0.4.2",
   "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",

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/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/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';

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,12 +1,12 @@
 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';
+import { BITFINEX_PERMISSION_PROFILES, DEFAULT_BITFINEX_BASE_URL } from '../../core/constants.mjs';
+import { parseBooleanFlag } from '../../core/runMode.mjs';
 
 const require = createRequire(import.meta.url);
-const { normalizeCredentialStatus } = require('../utils/cli/delegationNormalization.cjs');
+const { normalizeCredentialStatus } = require('../../utils/cli/delegationNormalization.cjs');
 export function createCredentialsCommands({ printEnvelope, getAuthToken, buildOwnerAuthHeaders, probeBitfinexPermissions }) {
 async function commandCredentialsUpsert(ctx, flags, capabilities) {
   const authToken = getAuthToken(flags, 'Missing --auth-token (or THIRDFY_AUTH_TOKEN) for credentials upsert');

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

@@ -1,11 +1,11 @@
-import { requireFlag, parseJsonFlag } from '../core/args.mjs';
-import { createCliError } from '../core/envelope.mjs';
-import { getEffectiveRunMode } from '../core/runMode.mjs';
-import { apiGet, apiPost, requestWithRouteFallback } from '../core/http.mjs';
+import { requireFlag, parseJsonFlag } from '../../core/args.mjs';
+import { createCliError } from '../../core/envelope.mjs';
+import { getEffectiveRunMode } from '../../core/runMode.mjs';
+import { apiGet, apiPost, requestWithRouteFallback } from '../../core/http.mjs';
 import { createRequire } from 'module';
 
 const require = createRequire(import.meta.url);
-const { normalizeDelegationStatus } = require('../utils/cli/delegationNormalization.cjs');
+const { normalizeDelegationStatus } = require('../../utils/cli/delegationNormalization.cjs');
 
 export function createDelegationCommands(deps) {
   const {

package/src/commands/{avantis.mjs → venues/avantis.mjs}

@@ -1,4 +1,4 @@
-import { toLegacyVenueActionKey } from '../core/venueBrand.mjs';
+import { toLegacyVenueActionKey } from '../../core/venueBrand.mjs';
 
 /**
  * Veranta (formerly Avantis) helpers. Names keep the Avantis spelling (internal identifiers); every

package/src/commands/{condor.mjs → venues/condor.mjs}

@@ -1,7 +1,7 @@
-import { apiPost } from '../core/http.mjs';
-import { exitAfterOutput } from '../core/envelope.mjs';
-import { parseJsonFlag } from '../core/args.mjs';
-import { negotiateCapabilities } from '../core/http.mjs';
+import { apiPost } from '../../core/http.mjs';
+import { exitAfterOutput } from '../../core/envelope.mjs';
+import { parseJsonFlag } from '../../core/args.mjs';
+import { negotiateCapabilities } from '../../core/http.mjs';
 import { resolveConfigAgentKey } from './polymarket.mjs';
 
 function agentApiKeyFromFlags(flags, ctx) {

package/src/commands/{hummingbot.mjs → venues/hummingbot.mjs}

@@ -1,7 +1,7 @@
-import { apiGet, apiPost } from '../core/http.mjs';
-import { exitAfterOutput } from '../core/envelope.mjs';
-import { parseJsonFlag } from '../core/args.mjs';
-import { negotiateCapabilities } from '../core/http.mjs';
+import { apiGet, apiPost } from '../../core/http.mjs';
+import { exitAfterOutput } from '../../core/envelope.mjs';
+import { parseJsonFlag } from '../../core/args.mjs';
+import { negotiateCapabilities } from '../../core/http.mjs';
 import { resolveConfigAgentKey } from './polymarket.mjs';
 
 function orgIdFromFlags(flags) {

package/src/commands/{hyperliquid.mjs → venues/hyperliquid.mjs}

@@ -1,4 +1,4 @@
-import { parseJsonFlag } from '../core/args.mjs';
+import { parseJsonFlag } from '../../core/args.mjs';
 
 export function createHyperliquidHelpers(deps) {
   const { getPreparedParams, resolveManagedExecutionPreflight } = deps;

package/src/commands/{lighter.mjs → venues/lighter.mjs}

@@ -1,4 +1,4 @@
-import { parseJsonFlag } from '../core/args.mjs';
+import { parseJsonFlag } from '../../core/args.mjs';
 
 export function createLighterHelpers(deps) {
   const { getPreparedParams, resolveManagedExecutionPreflight } = deps;

package/src/commands/{polymarket.mjs → venues/polymarket.mjs}

@@ -1,7 +1,7 @@
-import { loadProfileConfig } from '../core/context.mjs';
-import { negotiateCapabilities } from '../core/http.mjs';
-import { parseBooleanFlag } from '../core/runMode.mjs';
-import { exitAfterOutput } from '../core/envelope.mjs';
+import { loadProfileConfig } from '../../core/context.mjs';
+import { negotiateCapabilities } from '../../core/http.mjs';
+import { parseBooleanFlag } from '../../core/runMode.mjs';
+import { exitAfterOutput } from '../../core/envelope.mjs';
 
 function extractAgentKey(value) {
   if (!value || typeof value !== 'object') return '';

package/src/commands/{venue.mjs → venues/venue.mjs}

@@ -1,6 +1,6 @@
-import { apiGet, apiPost } from '../core/http.mjs';
-import { loadProfileConfig } from '../core/context.mjs';
-import { normalizeVenueProviderId } from '../core/venueBrand.mjs';
+import { apiGet, apiPost } from '../../core/http.mjs';
+import { loadProfileConfig } from '../../core/context.mjs';
+import { normalizeVenueProviderId } from '../../core/venueBrand.mjs';
 
 // `avantis` is the internal venue id the API expects; `veranta` (the venue's new name) maps onto it.
 const VENUES = new Set(['polymarket', 'hyperliquid', 'lighter', 'avantis']);

package/src/core/earnclawAttribution.mjs

@@ -4,4 +4,4 @@ export {
   resolveExecutionContextFromInput as resolveEarnClawAttributionFromInput,
   buildExecutionContextHeaders as buildEarnClawAttributionHeaders,
   mergeExecutionContext as mergeEarnClawContext,
-} from './executionContext.mjs';
+} from './execution/executionContext.mjs';

package/src/core/{actionTimeouts.mjs → execution/actionTimeouts.mjs}

@@ -1,6 +1,6 @@
-import { DEFAULT_TIMEOUT_MS } from './constants.mjs';
+import { DEFAULT_TIMEOUT_MS } from '../constants.mjs';
 import { isReadOnlyActionName, isReadOnlyResolvedAction } from './readOnlyActions.mjs';
-import { toLegacyVenueActionKey } from './venueBrand.mjs';
+import { toLegacyVenueActionKey } from '../venueBrand.mjs';
 
 /**
  * Default HTTP timeout for managed writes. A perps order or TP/SL update signs, broadcasts, and waits

package/src/core/{walletExecuteChainId.mjs → execution/walletExecuteChainId.mjs}

@@ -1,4 +1,4 @@
-import { isSvmChainId } from './chainRegistry.mjs';
+import { isSvmChainId } from '../chainRegistry.mjs';
 
 const DEFAULT_CHAIN_ID = 8453;
 

package/src/core/http.mjs

@@ -2,7 +2,7 @@ import {
   buildExecutionContextHeaders,
   mergeExecutionContext,
   resolveExecutionContextFromInput,
-} from './executionContext.mjs';
+} from './execution/executionContext.mjs';
 
 function sleep(ms) {
   return new Promise((resolve) => setTimeout(resolve, ms));

package/src/runtime/execution/hostedRuntimeWriteGate.mjs

@@ -2,7 +2,7 @@ import { createCliError } from '../../core/envelope.mjs';
 import {
   HOSTED_RUNTIME_IDEMPOTENCY_NAMESPACE,
   readHostedRuntimeUuid,
-} from '../../core/hostedRuntimeIdempotency.mjs';
+} from '../../core/execution/hostedRuntimeIdempotency.mjs';
 
 const POLYMARKET_PLACE_ACTIONS = new Set([
   'place_polymarket_order',

package/src/runtime/execution/payloads.mjs

@@ -1,14 +1,14 @@
 import { randomUUID } from 'crypto';
-import { wrapWriteIdempotencyKeyForHostedRuntime } from '../../core/hostedRuntimeIdempotency.mjs';
-import { resolveExecutionContextFromEnv } from '../../core/executionContext.mjs';
+import { wrapWriteIdempotencyKeyForHostedRuntime } from '../../core/execution/hostedRuntimeIdempotency.mjs';
+import { resolveExecutionContextFromEnv } from '../../core/execution/executionContext.mjs';
 import { requireFlag, parseJsonFlag } from '../../core/args.mjs';
 import { findAgentApiKey, loadProfileConfig } from '../../core/context.mjs';
 import { createCliError } from '../../core/envelope.mjs';
 import { toLegacyVenueActionKey } from '../../core/venueBrand.mjs';
 import { normalizeRunMode, normalizeManagedRunMode, normalizeHybridWalletMode } from '../../core/runMode.mjs';
 import { assertHostedRuntimePolymarketWriteIdempotency } from './hostedRuntimeWriteGate.mjs';
-import { resolveTokenInForFunding } from '../../core/fundingTokenIn.mjs';
-import { resolveWalletExecuteChainId } from '../../core/walletExecuteChainId.mjs';
+import { resolveTokenInForFunding } from '../../core/execution/fundingTokenIn.mjs';
+import { resolveWalletExecuteChainId } from '../../core/execution/walletExecuteChainId.mjs';
 
 function isTruthyFlag(value) {
   return value === true || String(value || '').trim().toLowerCase() === 'true';