dexbot 1.4.15 → 1.4.17

package/claw/modules/position_health.ts

@@ -8,7 +8,7 @@
 
 
 import { CR_ZONES } from '../../modules/constants.js';
-import { roundToDecimals } from '../../modules/utils/math_utils.js';
+import { roundToDecimals } from '../../modules/order/utils/math.js';
 'use strict';
 
 

package/claw/modules/position_manager.ts

@@ -11,6 +11,7 @@ import { clone } from './utils.js';
 const storage = getStorage();
 import { closeShortOnBts, openShortOnBts, placeTakeProfitBuyOrderOnBts } from './short_mpa_strategy.js';
 import { getAsset, getBackingAsset, getBalances, getBitassetData, getFullAccount } from './chain_queries.js';
+import { getErrorMessage } from '../../modules/utils/errors.js';
 
 import type { ShortPositionOptions, PositionManagerOptions } from './types.js';
 
@@ -434,17 +435,37 @@ class PositionManager {
       throw new Error(`Position ${positionId} is not in planned status`);
     }
 
-    const result = await openShortOnBts({
-      accountName: position.accountName,
-      collateralAmount: position.collateral.amount,
-      debtAmount: position.debt.amount,
-      expiration: options.expiration,
-      fillOrKill: options.fillOrKill,
-      mpaAsset: position.debt.asset,
-      privateKey: options.privateKey,
-      sellPriceInBts: position.entry.sellPriceInBts,
-      targetCollateralRatio: position.collateral.targetCollateralRatio
-    });
+    let result: any;
+    try {
+      result = await openShortOnBts({
+        accountName: position.accountName,
+        collateralAmount: position.collateral.amount,
+        debtAmount: position.debt.amount,
+        expiration: options.expiration,
+        fillOrKill: options.fillOrKill,
+        mpaAsset: position.debt.asset,
+        privateKey: options.privateKey,
+        sellPriceInBts: position.entry.sellPriceInBts,
+        targetCollateralRatio: position.collateral.targetCollateralRatio
+      });
+    } catch (err: any) {
+      // The borrow may already have succeeded even though this call threw
+      // (non-atomic broadcast). Persist the failure and reconcile against the
+      // chain so a stuck 'planned' position never hides a live debt.
+      position.updatedAt = nowIso();
+      position.events.push({
+        at: position.updatedAt,
+        details: {
+          error: getErrorMessage(err)
+        },
+        type: 'entry-open-failed'
+      });
+      await this.saveState();
+      await this.syncPosition(positionId).catch((syncErr: any) => {
+        console.warn(`[POSITION] Post-entry-open sync failed for ${positionId}: ${getErrorMessage(syncErr)}`);
+      });
+      throw err;
+    }
 
     const orderIds = extractOrderIds(result?.sellOrderResult?.operation_results);
     position.entry.orderId = orderIds[0] || null;
@@ -547,7 +568,10 @@ class PositionManager {
     const state = await this.loadState();
     const position = this.#findMutablePosition(state, positionId);
     const fullAccount = await getFullAccount(position.accountName);
-    const balances = await getBalances(position.accountName).catch(() => ({}));
+    const balances = await getBalances(position.accountName).catch((err: any) => {
+      console.warn(`[POSITION] Balance fetch failed for ${position.accountName}: ${getErrorMessage(err)}`);
+      return {};
+    });
     const openOrders = Array.isArray(fullAccount?.limit_orders) ? fullAccount.limit_orders : [];
     const callOrders = Array.isArray(fullAccount?.call_orders) ? fullAccount.call_orders : [];
     const mpaAsset = await getAsset(position.debt.asset);
@@ -678,7 +702,9 @@ class PositionManager {
         await this.saveState();
 
         for (const positionId of Array.from(matchedPositionIds)) {
-          await this.syncPosition(positionId).catch(() => null);
+          await this.syncPosition(positionId).catch((err: any) => {
+            console.warn(`[POSITION] Post-fill sync failed for ${positionId}: ${getErrorMessage(err)}`);
+          });
         }
       }
     });

package/claw/modules/skill_utils.ts

@@ -9,7 +9,7 @@ export function normalizeRepoRoot(repoRoot?: string) {
   return path.resolve(repoRoot || PATHS.CLAW.DIR);
 }
 
-export function normalizeProfileRoot(options: Record<string, any> = {}, repoRoot: string) {
+export function normalizeProfileRoot(options: Record<string, any> = {}, _repoRoot: string) {
   if (options.profileRoot) {
     return path.resolve(options.profileRoot);
   }
@@ -18,19 +18,15 @@ export function normalizeProfileRoot(options: Record<string, any> = {}, repoRoot
     return path.resolve(options.dexbotRoot);
   }
 
-  return path.resolve(repoRoot, '..');
+  // Profiles were relocated out of the repo (see docs/WORKFLOW.md); default to
+  // the runtime-resolved profiles dir so skills read/write user state.
+  return PATHS.PROFILES_DIR;
 }
 
 export function shellQuote(value: any) {
   return `'${String(value).replace(/'/g, `'\"'\"'`)}'`;
 }
 
-export function buildBridgeCommand(bridgeScript: string, profileRoot: string, command: string, extraArgs: any[] = []) {
-  return ['node', bridgeScript, command, '--profile-root', profileRoot, ...extraArgs]
-    .map((part, index) => (index === 0 ? String(part) : shellQuote(part)))
-    .join(' ');
-}
-
 export function createTool(name: string, description: string, command: string, args: any = null) {
   return {
     name,

package/claw/modules/types.ts

@@ -89,7 +89,7 @@ export interface ClawBridgeOptions {
     itemId?: string;
     updates?: Record<string, any>;
     messages?: any[];
-    context?: Record<string, any>;
+    context?: string | Record<string, any>;
     query?: string;
     privateKey?: string;
     patch?: Record<string, any>;
@@ -163,10 +163,29 @@ export interface PositionManagerOptions {
 
 export interface ClawProfileBundle {
     profileRoot?: string;
+    profilesDir?: string;
     botsFile?: string;
     generalSettingsFile?: string;
     marketProfilesFile?: string;
     manifestFile?: string;
+    bots?: BotSettings[];
     activeBots?: BotSettings[];
+    botsByKey?: Record<string, BotSettings>;
+    botsByName?: Record<string, BotSettings>;
+    botsConfig?: any;
+    marketProfiles?: any;
+    amaProfiles?: any;
+    generalSettings?: any;
+    manifest?: any;
+    orderFiles?: string[];
+    ordersDir?: string;
+    files?: {
+        marketProfiles?: string;
+        amaProfiles?: string;
+        bots?: string;
+        generalSettings?: string;
+        manifest?: string;
+        ordersDir?: string;
+    };
     needsMarketAdapter?: boolean;
 }

package/claw/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dexbot2-claw",
-  "version": "1.4.15",
+  "version": "1.4.17",
   "private": true,
   "description": "Claw bridge and runtime integration layer for BitShares and DEXBot2.",
   "type": "module",

package/claw/runtimes/openclaw-plugin/openclaw.plugin.json

@@ -2,7 +2,7 @@
   "id": "bitshares-claw",
   "name": "BitShares Claw",
   "description": "Native BitShares and DEXBot2 tools from the DEXBot2 claw integration",
-  "version": "1.4.15",
+  "version": "1.4.17",
   "skills": [
     "skills"
   ],

package/claw/runtimes/openclaw-plugin/package.json

@@ -1,7 +1,7 @@
 {
   "name": "bitshares-claw-openclaw-plugin",
   "private": true,
-  "version": "1.4.15",
+  "version": "1.4.17",
   "type": "module",
   "main": "index.js"
 }

package/claw/scripts/claw_bridge.ts

@@ -29,8 +29,25 @@ function parseArgs(argv: any) {
   };
 
   const args = [...argv];
-  if (args.length > 0 && !args[0].startsWith('--')) {
-    options.command = args.shift();
+  // The command may appear before or after flags (e.g. `manifest --runtime openfang`
+  // or `--runtime openfang manifest`). Pick the first non-flag token that is not a
+  // flag value as the command.
+  for (let i = 0; i < args.length; i += 1) {
+    const arg = args[i];
+    if (arg === '--payload' || arg === '--profile-root' || arg === '--account' || arg === '--bot-ref' || arg === '--pair' || arg === '--base' || arg === '--quote' || arg === '--runtime') {
+      i += 1;
+      continue;
+    }
+    if (arg === '--help' || arg === '-h') {
+      options.help = true;
+      continue;
+    }
+    if (arg.startsWith('--')) {
+      continue;
+    }
+    if (!options.command) {
+      options.command = arg;
+    }
   }
 
   for (let i = 0; i < args.length; i += 1) {
@@ -120,7 +137,9 @@ async function main(runtimeName = null, scriptPath = 'tsx scripts/claw_bridge.ts
 
   const mergedPayload = runtimeName ? { ...payload, runtimeName } : payload;
   if (command === 'manifest') {
-    process.stdout.write(`${JSON.stringify(describeScriptRuntimeManifest(runtimeName, mergedPayload), null, 2)}\n`);
+    // main already folded runtimeName into mergedPayload; pass it straight
+    // through to avoid the wrapper's redundant re-injection.
+    process.stdout.write(`${JSON.stringify(describeRuntimeManifest(mergedPayload), null, 2)}\n`);
     return;
   }
 

package/claw/scripts/claw_mcp_server.ts

@@ -1,15 +1,21 @@
 #!/usr/bin/env node
 
 // MCP stdio reserves stdout for JSON-RPC frames. Some shared DEXBot2 modules
-// log during require-time initialization, so suppress incidental console logs.
+// (notably modules/paths.ts) log relocation notices during require-time
+// initialization, so the heavy claw modules are loaded lazily below — AFTER the
+// console shim has been installed. Static imports here are limited to the
+// lightweight transport helpers (mcp_utils) which never write to stdout.
 
-import { getClawToolByName, getClawToolCatalog } from '../modules/claw_catalog.js';
-import { runClawCommand } from '../modules/claw_bridge.js';
 import { success, failure, runMcpServer, createMessageParser } from '../modules/mcp_utils.js';
 import { pathToFileURL } from 'node:url';
+
 console.log = () => {};
 console.warn = () => {};
 
+// NOTE: this is a custom newline-delimited JSON transport (not the official
+// MCP Content-Length framing); protocolVersion is echoed from the client and
+// is informational only. See claw_runtime_matrix.ts.
+
 
 function parseArgs(argv: any) {
   const options: Record<string, any> = {};
@@ -40,7 +46,8 @@ function parseArgs(argv: any) {
   return options;
 }
 
-function listMcpTools() {
+async function listMcpTools() {
+  const { getClawToolCatalog } = await import('../modules/claw_catalog.js');
   return getClawToolCatalog().map((tool: any) => ({
     name: tool.toolName,
     description: tool.description,
@@ -58,7 +65,9 @@ async function handleRequest(message: any, defaults: any) {
   switch (method) {
     case 'initialize':
       return success(id, {
-        protocolVersion: '2024-11-05',
+        // Echo the client's requested protocol version when provided, so a
+        // JSONL-speaking client can negotiate its own version.
+        protocolVersion: params?.protocolVersion || '2024-11-05',
         capabilities: {
           tools: {
             listChanged: false
@@ -77,17 +86,23 @@ async function handleRequest(message: any, defaults: any) {
       return success(id, {});
 
     case 'tools/list':
-      return success(id, {
-        tools: listMcpTools()
-      });
-
-    case 'tools/call': {
-      const tool = getClawToolByName(params?.name);
-      if (!tool) {
-        return failure(id, -32602, `Unknown tool: ${params?.name || '(missing)'}`);
+      try {
+        return success(id, {
+          tools: await listMcpTools()
+        });
+      } catch (error: any) {
+        return failure(id, -32602, `Failed to load tool catalog: ${error && error.message ? error.message : String(error)}`);
       }
 
+    case 'tools/call': {
       try {
+        const { getClawToolByName } = await import('../modules/claw_catalog.js');
+        const tool = getClawToolByName(params?.name);
+        if (!tool) {
+          return failure(id, -32602, `Unknown tool: ${params?.name || '(missing)'}`);
+        }
+
+        const { runClawCommand } = await import('../modules/claw_bridge.js');
         const result = await runClawCommand(tool.command, {
           ...defaults,
           ...(params?.arguments || {})

package/claw/scripts/honest_assets_report.ts

@@ -23,7 +23,9 @@ function parseArgs(argv: any) {
       options.json = true;
     } else if (arg === '--all-mpas') {
       options.allMpas = true;
-      options.startSymbol = 'A';
+      // list_assets lowerBound '' starts from the very beginning; starting at
+      // 'A' would silently skip every symbol that sorts before it (e.g. 1.x).
+      options.startSymbol = '';
     } else if (arg === '--batch-size' && argv[i + 1]) {
       options.batchSize = Number(argv[i + 1]);
       i += 1;

package/claw/scripts/memu_mcp_server.ts

@@ -1,11 +1,16 @@
 #!/usr/bin/env node
 
+// MCP stdio reserves stdout for JSON-RPC frames. The manifest tool now builds
+// the full claw catalog (via claw_manifest), so suppress incidental console
+// logs the same way claw_mcp_server does.
 
-
-import { createMemuBridge, describeMemuBridge } from '../modules/memu_bridge.js';
+import { describeMemuBridge } from '../modules/memu_bridge.js';
 import { success, failure, runMcpServer, createMessageParser } from '../modules/mcp_utils.js';
 import { runMemuCommand } from '../modules/memu_bridge.js';
 import { pathToFileURL } from 'node:url';
+
+console.log = () => {};
+console.warn = () => {};
 function parseArgs(argv: any) {
   const options: Record<string, any> = {};
 
@@ -36,7 +41,11 @@ function parseArgs(argv: any) {
     }
 
     if (arg === '--db-config' && next) {
-      options.databaseConfig = JSON.parse(next);
+      try {
+        options.databaseConfig = JSON.parse(next);
+      } catch (e) {
+        throw new Error(`Invalid JSON for --db-config: ${next}`);
+      }
       i += 1;
       continue;
     }
@@ -283,7 +292,9 @@ async function handleRequest(message: any, defaults: any) {
   switch (method) {
     case 'initialize':
       return success(id, {
-        protocolVersion: '2024-11-05',
+        // Echo the client's requested protocol version when provided (JSONL
+        // transport; see claw_runtime_matrix.ts).
+        protocolVersion: params?.protocolVersion || '2024-11-05',
         capabilities: {
           tools: {
             listChanged: false

package/claw/tests/test_claw_data_flow.ts

@@ -406,8 +406,10 @@ async function testKibanaPriceSource() {
   try {
     const marketCandles = await kibanaPriceSource.fetchMarketCandles('HONEST.USD', { lookbackHours: 12 });
     assert.deepStrictEqual(marketCandles, [[1, 2, 2, 2, 2, 10]]);
-    assert.strictEqual(calls.marketCandles[0].assetA.symbol, 'BTS');
-    assert.strictEqual(calls.marketCandles[0].assetB.symbol, 'HONEST.USD');
+    // fetchMarketCandles requests (mpa, bts) so the returned candles are
+    // BTS-per-MPA (the live feed convention).
+    assert.strictEqual(calls.marketCandles[0].assetA.symbol, 'HONEST.USD');
+    assert.strictEqual(calls.marketCandles[0].assetB.symbol, 'BTS');
 
     const marketClose = await kibanaPriceSource.fetchMarketClosePrices('HONEST.USD', {});
     assert.deepStrictEqual(marketClose, [2]);

package/claw/tests/test_claw_mcp_transport.ts

@@ -31,7 +31,7 @@ async function testParserAcceptsJsonlAcrossChunksAndSingleBuffer() {
       capabilities: {},
       clientInfo: {
         name: 'claw-mcp-transport-test',
-        version: '1.4.15'
+        version: '1.4.17'
       },
       protocolVersion: '2024-11-05'
     }
@@ -182,7 +182,7 @@ async function testMainEntrypointHandlesRealProcessInitialize() {
       capabilities: {},
       clientInfo: {
         name: 'claw-mcp-transport-test',
-        version: '1.4.15'
+        version: '1.4.17'
       },
       protocolVersion: '2024-11-05'
     }

package/claw/tests/test_claw_regressions.ts

@@ -50,6 +50,11 @@ async function testClawBitsharesClientWaitForConnectedTriggersNativeConnect() {
       history: {},
     }),
     createSigningClient: () => ({ client: { initPromise: Promise.resolve(), newTx() {} } }),
+    createSubscriptionManager: () => ({
+      onReconnect: async () => {},
+      subscribe: async () => () => {},
+      unsubscribe: async () => {},
+    }),
   } as any);
 
   try {

package/claw/tests/test_claw_skill_generation.ts

@@ -39,7 +39,7 @@ async function testClawSkillMarkdown() {
   assert.ok(hermesMarkdown.includes('The shared Claw MCP server registers raw tool ids such as `claw_manifest`'));
   assert.strictEqual(hermesMarkdown.includes('mcp_claw_claw_manifest'), false);
   assert.ok(openfangMarkdown.includes('## OpenFang Setup'));
-  assert.ok(openfangMarkdown.includes('claw_bridge.js'));
+  assert.ok(openfangMarkdown.includes('scripts/claw_bridge'));
   assert.ok(openfangMarkdown.includes('bitshares-claw'));
   assert.ok(nanoMarkdown.includes('## NanoBot Setup'));
   assert.ok(nanoMarkdown.includes('The stdio transport uses newline-delimited JSON-RPC messages on `stdin` and `stdout`.'));
@@ -47,7 +47,7 @@ async function testClawSkillMarkdown() {
   assert.ok(picoMarkdown.includes('The stdio transport uses newline-delimited JSON-RPC messages on `stdin` and `stdout`.'));
   assert.ok(nanoclawMarkdown.includes('## NanoClaw Setup'));
   assert.ok(nanoclawMarkdown.includes('bitshares-claw'));
-  assert.ok(nanoclawMarkdown.includes('claw_bridge.js'));
+  assert.ok(nanoclawMarkdown.includes('scripts/claw_bridge'));
 }
 
 async function testRuntimeSkillToml() {
@@ -66,7 +66,7 @@ async function testRuntimeSkillToml() {
     assert.ok(toml.includes('name = "bitshares-claw"'));
     const displayName = runtimeName.charAt(0).toUpperCase() + runtimeName.slice(1);
     assert.ok(toml.includes(`${displayName} bridge to the AI-Bot / DEXBot2 BitShares layer`));
-    assert.ok(toml.includes('claw_bridge.js'));
+    assert.ok(toml.includes('claw_bridge.ts'));
     assert.ok(toml.includes('--profile-root'));
     assert.ok(toml.includes('[[tools]]'));
 

package/claw/tests/test_nullclaw_tmp_integration.ts

@@ -27,7 +27,7 @@ async function main() {
   assert.ok(skillText.includes('name = "bitshares-claw"'));
   assert.ok(skillText.includes('NullClaw bridge to the AI-Bot / DEXBot2 BitShares layer'));
   assert.ok(skillText.includes('nullclaw'));
-  assert.ok(skillText.includes('claw_bridge.js'));
+  assert.ok(skillText.includes('claw_bridge.ts'));
 
   const bridge = createClawBridge({
     runtime: {

package/claw/tsconfig.json

@@ -29,7 +29,6 @@
   ],
   "exclude": [
     "node_modules",
-    "tests",
-    "examples"
+    "tests"
   ]
 }

package/dist/bot.js

@@ -56,7 +56,7 @@ setUmask(0o077);
 const { getStorage } = require('./modules/storage');
 const storage = getStorage();
 const { runtime } = require('./modules/runtime');
-const { createPm2AwareLogger } = require('./modules/logger');
+const { createPm2AwareLogger } = require('./modules/order/logger');
 const DEXBot = require('./modules/dexbot_class').default;
 const { normalizeBotEntry } = require('./modules/dexbot_class').default;
 const { loadSettingsFile, resolveRawBotEntries, selectBotEntry } = require('./modules/bot_settings');

package/dist/bot.js.map

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

package/dist/credential-daemon.js

@@ -103,7 +103,7 @@ const { assertPrivatePathSecurity, ensureCredentialRuntimeDirSync, getCredential
 const { buildSessionAccountCache, loadDaemonPrivateKey, } = require('./modules/credential_session_cache');
 const { fetchBootstrapPassword } = require('./modules/launcher/credential_bootstrap');
 const { normalizeBootstrapCredential } = require('./modules/launcher/credential_secret');
-const Logger = require('./modules/logger').default;
+const Logger = require('./modules/order/logger').default;
 const { ensureDir, unlink: safeUnlink } = storage;
 const { Config } = require('./modules/config');
 const daemonLogger = new Logger('credential-daemon');
@@ -113,9 +113,9 @@ const { getErrorMessage } = require('./modules/utils/errors');
 const { sleep } = require('./modules/order/utils/system');
 const { classifyBroadcastFailure } = require('./modules/broadcast_failure');
 // Unix sockets are required; only Unix-like systems are supported
-const RUNTIME_DIR = getCredentialRuntimeDir({ root: PATHS.PROJECT_ROOT });
-const SOCKET_PATH = getCredentialSocketPath({ root: PATHS.PROJECT_ROOT, runtimeDir: RUNTIME_DIR });
-const READY_FILE = getCredentialReadyFilePath({ root: PATHS.PROJECT_ROOT, runtimeDir: RUNTIME_DIR });
+const RUNTIME_DIR = getCredentialRuntimeDir();
+const SOCKET_PATH = getCredentialSocketPath({ runtimeDir: RUNTIME_DIR });
+const READY_FILE = getCredentialReadyFilePath({ runtimeDir: RUNTIME_DIR });
 let vaultSecret = null;
 let sessionSecret = null;
 let sessionAccountKeys = new Map();
@@ -806,10 +806,10 @@ function getCredentialDaemonNodeRefreshIntervalMs(settings) {
  */
 async function initialize() {
     try {
-        // Check if profiles/keys.json exists
-        const keysPath = path.join(PATHS.PROJECT_ROOT, 'profiles', 'keys.json');
+        // Check that the key vault exists at the resolved profiles dir
+        const keysPath = PATHS.PROFILES.KEYS_JSON();
         if (!storage.exists(keysPath)) {
-            throw new Error('profiles/keys.json not found. Please run: tsx dexbot.ts keys');
+            throw new Error('profiles/keys.json not found. Please run: dexbot key');
         }
         // Accept a one-shot bootstrap secret when launched by a wrapper,
         // otherwise prompt once interactively.
@@ -921,7 +921,7 @@ async function initialize() {
             // botHmacSecret until restart.  Operators need to see this.
             daemonLogger.warn?.(`[credential-daemon] Could not watch policy config file ${policyConfigPath}: ${getErrorMessage(watchErr)}. SIGHUP from bot process is now the only reload path.`);
         }
-        ensureCredentialRuntimeDirSync({ root: PATHS.PROJECT_ROOT, runtimeDir: RUNTIME_DIR, socketPath: SOCKET_PATH, readyFilePath: READY_FILE });
+        ensureCredentialRuntimeDirSync({ runtimeDir: RUNTIME_DIR });
         daemonLogger.log?.(`[credential-daemon] Runtime socket path: ${SOCKET_PATH}`);
         daemonLogger.log?.(`[credential-daemon] Ready file path: ${READY_FILE}`);
         // Clean up old socket if it exists