@thirdfy/agent-cli 0.4.0 → 0.4.2

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/contracts/cli/schemas/wallet-profile.response.schema.json

@@ -0,0 +1,127 @@
+{
+  "$schema": "https://json-schema.org/draft/2020-12/schema",
+  "title": "CLI response data: wallet profile (thirdfy-mcp getWalletProfile parity)",
+  "type": "object",
+  "required": [
+    "auth",
+    "source"
+  ],
+  "properties": {
+    "auth": {
+      "enum": [
+        "owner",
+        "agent_api_key"
+      ]
+    },
+    "source": {
+      "enum": [
+        "/api/v1/agent/onboarding/cli/status",
+        "/api/v1/agent/execution-wallet"
+      ]
+    },
+    "profile": {
+      "type": "object"
+    },
+    "agentKey": {
+      "type": [
+        "string",
+        "null"
+      ]
+    },
+    "chainId": {
+      "type": "integer"
+    },
+    "chainIdAssumed": {
+      "enum": [
+        true
+      ]
+    },
+    "chainIdNote": {
+      "type": "string"
+    },
+    "ready": {
+      "type": "boolean"
+    },
+    "fundingReady": {
+      "type": "boolean"
+    },
+    "gas": {
+      "type": "object"
+    },
+    "walletControl": {
+      "type": "object"
+    },
+    "nextAction": {
+      "type": "string"
+    },
+    "userMessage": {
+      "type": "string"
+    },
+    "executionWallet": {
+      "type": "object",
+      "required": [
+        "executionWalletAddress"
+      ],
+      "properties": {
+        "executionWalletAddress": {
+          "type": [
+            "string",
+            "null"
+          ]
+        },
+        "userDid": {
+          "type": [
+            "string",
+            "null"
+          ]
+        },
+        "data": {
+          "type": "object"
+        }
+      },
+      "additionalProperties": true
+    },
+    "note": {
+      "type": "string"
+    }
+  },
+  "additionalProperties": true,
+  "oneOf": [
+    {
+      "properties": {
+        "auth": {
+          "enum": [
+            "owner"
+          ]
+        },
+        "source": {
+          "enum": [
+            "/api/v1/agent/onboarding/cli/status"
+          ]
+        }
+      },
+      "required": [
+        "profile"
+      ]
+    },
+    {
+      "properties": {
+        "auth": {
+          "enum": [
+            "agent_api_key"
+          ]
+        },
+        "source": {
+          "enum": [
+            "/api/v1/agent/execution-wallet"
+          ]
+        }
+      },
+      "required": [
+        "executionWallet",
+        "ready",
+        "chainId"
+      ]
+    }
+  ]
+}

package/src/core/context.mjs

@@ -132,6 +132,26 @@ export function findAgentApiKey(flags = {}) {
   return String(loadProfileConfig()?.agent?.apiKey || '').trim();
 }
 
+/**
+ * Whose credits a credits read is about. Same precedence as `wallet profile`: an owner credential
+ * passed as a flag (--owner-session-token or --auth-token), then an explicit --agent-api-key, then
+ * owner auth from env or config, then an agent key from env or config. Returns `{ ledger, agentApiKey,
+ * agentApiKeyExplicit }`; `ledger` is `agent` or `owner`.
+ */
+export function resolveCreditsLedger(flags = {}) {
+  const config = loadProfileConfig();
+  const explicitOwner = Boolean(String(flags.ownerSessionToken || flags.authToken || '').trim());
+  const agentApiKeyExplicit = Boolean(String(flags.agentApiKey || '').trim());
+  const storedOwner = Boolean(
+    String(
+      process.env.THIRDFY_OWNER_SESSION_TOKEN || process.env.THIRDFY_AUTH_TOKEN || config?.auth?.ownerSessionToken || config?.auth?.authToken || '',
+    ).trim(),
+  );
+  const agentApiKey = findAgentApiKey(flags);
+  const agent = !explicitOwner && (agentApiKeyExplicit || (!storedOwner && Boolean(agentApiKey)));
+  return { ledger: agent ? 'agent' : 'owner', agentApiKey, agentApiKeyExplicit };
+}
+
 /**
  * The actions list for this caller, cached per API base and key: the agent's own list
  * (`GET /api/v1/agent/actions`) whenever an agent key is set (flag, env or config, `findAgentApiKey`),

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

package/src/runtime/execution/runners/agentWalletLane.mjs

@@ -0,0 +1,109 @@
+import { apiPost } from '../../../core/http.mjs';
+import { withActionTimeout } from '../../../core/execution/actionTimeouts.mjs';
+import { actionNameForApi } from '../../actions/selection.mjs';
+import { isEmptyQueuedExecuteIntent } from '../managedReadExecuteRail.mjs';
+import {
+  isReadOnlyAction,
+  shouldFallbackAgentWalletToExecuteIntent,
+  normalizeManagedExecuteResponse,
+  READ_FAST_PATH_PREFLIGHT,
+  fastPathWalletMismatch,
+} from './managedResponse.mjs';
+import { createRequire } from 'module';
+
+const require = createRequire(import.meta.url);
+const { normalizeIntentResponse } = require('../../../utils/cli/intentNormalization.cjs');
+
+/** The agent_wallet lane: the API signs with the agent's execution wallet. */
+export function createAgentWalletLane(deps, lanes) {
+  const {
+    buildManagedExecutePayload,
+  } = deps;
+  const { shouldUseManagedReadFastPath, runReadOnlyActionViaIntentRail, resolveManagedExecutionPreflight } = lanes;
+
+async function executeManagedWalletRun(ctx, flags, resolved, options) {
+  // Market-data reads under agent_wallet must use /execute and keep the provider payload on the
+  // envelope (raw + parsed data.result). Routing them only through /execute-intent was the 0.2.34
+  // attempt to avoid a burial bug, but solo Hermes agent_wallet intents come back as an empty
+  // queued envelope with no universe. Live /execute still returns the Hyperliquid meta payload
+  // (often as a JSON string under data.result). Reads skip funding gates; routing still fails closed.
+  const isRead = isReadOnlyAction(resolved);
+  const skipPreflight = Boolean(options?.skipPreflight);
+  // A seeded preflight (Hyperliquid/Lighter/Veranta address defaults) already ran; reuse it.
+  const readFastPath =
+    !skipPreflight && !options?.managedPreflight && shouldUseManagedReadFastPath(flags, resolved, options);
+  let preflight = readFastPath ? READ_FAST_PATH_PREFLIGHT : null;
+  if (!skipPreflight && !readFastPath) {
+    preflight = await resolveManagedExecutionPreflight(ctx, flags, resolved, {
+      runMode: 'agent_wallet',
+      requireFundingCheck: !isRead,
+      preflightSeed: options?.managedPreflight,
+    });
+    if (!preflight.success) {
+      const normalized = normalizeIntentResponse({
+        success: false,
+        status: 'failed',
+        mode: 'agent_wallet',
+        blockedReason: preflight.blockedReason || 'PRECHECK_FAILED',
+        blockedStage: preflight.blockedStage || 'routing',
+        error: preflight.error || 'Managed wallet preflight failed',
+        preflightBlocked: true,
+        executionWalletAddress: preflight.executionWalletAddress || null,
+        executionWalletPreflight: preflight,
+      });
+      normalized.executionWalletAddress = preflight.executionWalletAddress || null;
+      normalized.executionWalletPreflight = preflight;
+      return normalized;
+    }
+  }
+  const payload = buildManagedExecutePayload(flags, {
+    resolvedAction: resolved.resolvedAction,
+    apiAction: actionNameForApi(resolved),
+    runMode: 'agent_wallet',
+    forceIdempotency: true,
+  });
+  const actionCtx = withActionTimeout(ctx, resolved);
+  const response = await apiPost(actionCtx, '/api/v1/agent/execute', payload);
+  if (readFastPath) {
+    const mismatch = fastPathWalletMismatch(flags, response);
+    if (mismatch) return mismatch;
+  }
+  if (shouldFallbackAgentWalletToExecuteIntent(resolved, response)) {
+    // On the fast path the wallet comes from the /execute answer, not a preflight.
+    const fallbackPreflight = readFastPath
+      ? {
+          ...READ_FAST_PATH_PREFLIGHT,
+          executionWalletAddress: response?.executionWalletAddress || response?.data?.executionWalletAddress || null,
+        }
+      : preflight;
+    const intentResult = await runReadOnlyActionViaIntentRail(ctx, flags, resolved, options, fallbackPreflight);
+    if (isEmptyQueuedExecuteIntent(intentResult.raw || intentResult)) {
+      // A read that did not answer in time (often a cold provider cache): nothing changed, and the
+      // same read usually answers on the next try. Same fields as thirdfy-mcp walletExecute.
+      intentResult.success = false;
+      intentResult.status = 'failed';
+      intentResult.error = intentResult.error || 'MANAGED_READ_EMPTY_EXECUTE_INTENT';
+      Object.assign(intentResult, {
+        errorCode: 'MANAGED_READ_EMPTY_EXECUTE_INTENT',
+        retryable: true,
+        retryAfterSeconds: 3,
+        nextAction: 'retry_later',
+        hint:
+          intentResult.hint ||
+          'The read did not answer in time; nothing was changed. Repeat the same read in a few seconds. Do not treat the empty queued result as data.',
+      });
+    }
+    intentResult.executionWalletAddress =
+      preflight?.executionWalletAddress ||
+      response?.executionWalletAddress ||
+      response?.data?.executionWalletAddress ||
+      null;
+    return intentResult;
+  }
+  return normalizeManagedExecuteResponse(response, { preflight, payload, isRead });
+}
+
+  return {
+    executeManagedWalletRun,
+  };
+}