dexbot 1.4.25 → 1.5.1

package/analysis/trade_profitability.ts

@@ -5,6 +5,7 @@ import fs from 'node:fs';
 import { pathToFileURL } from 'node:url';
 import * as KC from '../market_adapter/core/kibana_client.js';
 import * as C from '../modules/constants.js';
+import { findBotKeyByAccountRef, getStoredBotAccountId, persistBotAccountId } from './bot_key_utils.js';
 
 const { kibanaSearch, DEFAULT_CONFIG: BASE_CONFIG } = KC;
 
@@ -194,14 +195,15 @@ Analyzes filled orders for a BitShares account, computing realized PnL
 via FIFO or sequential (LIFO) inventory tracking.
 
 Arguments:
-  accountId              BitShares account ID (1.2.x) or name (with --lookup)
+  accountId              BitShares account ID (1.2.x) or name (auto-resolved in the background)
 
 Options:
   --start <iso>          Start time (ISO 8601, e.g. 2025-01-01 or 2025-01-01T00:00:00Z)
   --end <iso>            End time (ISO 8601)
   --hours <n>            Lookback hours from now (alternative to --start/--end)
   --asset <assetId>      Filter to one base asset (e.g. 1.3.113 for bitUSD)
-  --lookup               Resolve account name to ID via BitShares node
+  --lookup               Legacy (no-op): account names always resolve automatically
+  --refresh-account      Force re-resolution and update the stored accountId
   --node <url>           BitShares node URL (default: first healthy from built-in pool)
   --csv <file>           Export trade list as CSV
   --json <file>          Export full analysis as JSON
@@ -233,6 +235,7 @@ function parseArgs() {
         end: null,
         asset: null,
         lookup: false,
+        refreshAccount: false,
         node: C.NODE_MANAGEMENT.DEFAULT_NODES[0],
         csv: null,
         json: null,
@@ -249,6 +252,7 @@ function parseArgs() {
             case '--end':          opts.end      = args[++i]; break;
             case '--asset':        opts.asset    = args[++i]; break;
             case '--lookup':       opts.lookup   = true; break;
+            case '--refresh-account': opts.refreshAccount = true; break;
             case '--node':         opts.node     = args[++i]; break;
             case '--csv':          opts.csv      = args[++i]; break;
             case '--json':         opts.json     = args[++i]; break;
@@ -1329,13 +1333,37 @@ async function run() {
     const opts = parseArgs();
     let accountId = opts.accountId;
 
-    if (opts.lookup) {
-        const resolved = await resolveAccountId(accountId, opts.node);
-        if (!resolved) {
-            console.error(`  Could not resolve "${accountId}" to an account ID`);
-            process.exit(1);
+    if (!/^1\.2\.\d+$/.test(String(accountId))) {
+        // Background resolution: the Kibana query below filters on the 1.2.x
+        // account_id field, so a name must always resolve first (a raw name
+        // would silently return zero fills).
+        // Stored ID first: when the name belongs to a bot in profiles/bots.json
+        // and its stamped accountId still matches, no chain lookup is needed.
+        let matchedKey: string | null = null;
+        let stored: string | null = null;
+        try {
+            const match = findBotKeyByAccountRef(accountId);
+            if (match) {
+                matchedKey = match.botKey;
+                stored = getStoredBotAccountId(match.botKey, accountId);
+            }
+        } catch (_) {
+            // bots.json issues must never break resolution; fall through to chain.
+        }
+        if (stored && !opts.refreshAccount) {
+            console.log(`  Using stored accountId ${stored} from profiles/bots.json (no lookup needed; pass --refresh-account to re-verify)`);
+            accountId = stored;
+        } else {
+            const resolved = await resolveAccountId(accountId, opts.node);
+            if (!resolved) {
+                console.error(`  Could not resolve "${accountId}" to an account ID`);
+                process.exit(1);
+            }
+            accountId = resolved;
+            if (matchedKey && persistBotAccountId(matchedKey, resolved)) {
+                console.log(`  Stored accountId ${resolved} in profiles/bots.json`);
+            }
         }
-        accountId = resolved;
     }
 
     // Build time range

package/analysis/tradingview/README.md

@@ -2,6 +2,31 @@
 
 This exporter generates a standalone HTML chart in the `analysis/charts/` folder using the local `uPlot`-based TradingView-style renderer.
 
+## Recommended: `dexbot tv` (One Step)
+
+`dexbot tv` fetches the candles itself (chunked Kibana scans for pools, order-book fallback for pairs) and then renders through this exporter — no manual fetch/export steps needed:
+
+```bash
+# Bot chart with AMA overlay (bot key from profiles/bots.json, default: 3 months)
+dexbot tv <bot>
+
+# Any pool by bare or full ID
+dexbot tv 133
+dexbot tv 1.19.133
+
+# Any pair (pool-first, order-book fallback)
+dexbot tv TOKENA/TOKENB
+
+# Options
+dexbot tv <bot> --month 6              # months of 1h candles (default: 3)
+dexbot tv <bot> --chart analysis/charts/custom.html
+dexbot tv <bot> --scale linear         # log (default) or linear
+```
+
+Output: `analysis/charts/tv_<bot|pool_<id>|<a>_<b>>_1h_<N>m.html`, with a clickable `file://` link printed on completion. Unknown targets fail fast with the list of known bot keys.
+
+The sections below cover manual usage (explicit candle files, direct runner flags).
+
 ## What It Produces
 
 - Log-scale price chart

package/analysis/tradingview/analyze_tradingview.ts

@@ -11,7 +11,7 @@ import { getErrorMessage } from '../../modules/utils/errors.js';
 import { toIntervalLabel } from '../../market_adapter/interval_utils.js';
 import { loadBotMeta } from '../bot_key_utils.js';
 import { resolveSource, listAvailableBots } from '../resolve_source.js';
-import { writeChartFile } from '../chart_utils.js';
+import { writeChartFile, toFileUrl } from '../chart_utils.js';
 import { PATHS } from '../../modules/paths.js';
 
 
@@ -148,7 +148,7 @@ async function main() {
 
         writeChartFile(config.chartFile, html);
 
-        if (!config.quiet) console.log(`[TradingView] ✓ Chart saved to ${config.chartFile}`);
+        if (!config.quiet) console.log(`\n[TradingView] ✓ Chart saved. Open chart: (${toFileUrl(config.chartFile)})`);
     } catch (err: any) {
         console.error(`[TradingView] Error: ${getErrorMessage(err)}`);
         process.exit(1);

package/analysis/trend_detection/package.json

@@ -1,6 +1,6 @@
 {
   "name": "trend-detection",
-  "version": "1.4.25",
+  "version": "1.5.1",
   "description": "Kalman filter trend detection with tactical/modal state tracking",
   "main": "../../dist/analysis/trend_detection/kalman_trend_analyzer.js",
   "scripts": {

package/claw/modules/claw_launcher.ts

@@ -9,6 +9,7 @@ import { loadSettingsFile, resolveRawBotEntries, saveSettingsFile, normalizeBotE
 import { normalizeMode, detectMode, setPreferredMode, describeModeChoice } from './launcher_mode_detector.js';
 import { normalizeRoot, resolveRuntimeScript, normalizeProfileDir } from './launcher_paths.js';
 import { getErrorMessage } from '../../modules/utils/errors.js';
+import { isSameBotName } from '../../modules/utils/sanitize_key.js';
 
 const storage = getStorage();
 
@@ -174,7 +175,7 @@ async function launcherReset(botName: string | null, options: Record<string, any
   const { config } = loadSettingsFile(PROFILES_BOTS_FILE);
   const entries = normalizeBotEntries(resolveRawBotEntries(config));
 
-  const targets = botName ? entries.filter((b: any) => b.name === botName) : entries.filter((b: any) => b.active !== false);
+  const targets = botName ? entries.filter((b: any) => isSameBotName(b.name, botName)) : entries.filter((b: any) => b.active !== false);
 
   if (botName && targets.length === 0) {
     throw new Error(`Bot '${botName}' not found in ${PROFILES_BOTS_FILE}`);
@@ -235,7 +236,7 @@ async function launcherDisable(botName: string | null, options: Record<string, a
     };
   }
 
-  const match = entries.find((b: any) => b.name === botName);
+  const match = entries.find((b: any) => isSameBotName(b.name, botName));
   if (!match) {
     throw new Error(`Bot '${botName}' not found in ${PROFILES_BOTS_FILE}`);
   }
@@ -268,7 +269,7 @@ async function launcherPm2Start(botName: string | null, options: Record<string,
   const { config } = loadSettingsFile(PROFILES_BOTS_FILE);
   const entries = normalizeBotEntries(resolveRawBotEntries(config));
 
-  const targets = botName ? entries.filter((b: any) => b.name === botName) : entries.filter((b: any) => b.active !== false);
+  const targets = botName ? entries.filter((b: any) => isSameBotName(b.name, botName)) : entries.filter((b: any) => b.active !== false);
 
   if (botName && targets.length === 0) {
     throw new Error(`Bot '${botName}' not found or not active in ${PROFILES_BOTS_FILE}`);
@@ -287,7 +288,7 @@ async function launcherPm2Start(botName: string | null, options: Record<string,
   // Filter apps if specific bot requested
   let appsToStart = apps;
   if (botName) {
-    appsToStart = apps.filter((app: any) => app.name === botName);
+    appsToStart = apps.filter((app: any) => isSameBotName(app.name, botName));
     if (appsToStart.length === 0) {
       throw new Error(`No PM2 app found for bot '${botName}'`);
     }

package/claw/modules/credit_runtime_adapter.ts

@@ -3,6 +3,7 @@
 import { PATHS } from '../../modules/paths.js';
 import CreditRuntime from '../../modules/credit_runtime.js';
 import { getErrorMessage } from '../../modules/utils/errors.js';
+import { isSameBotName } from '../../modules/utils/sanitize_key.js';
 
 
 function createCreditRuntimeAdapter(infra: any, options: Record<string, any> = {}) {
@@ -55,7 +56,7 @@ function createCreditRuntimeAdapter(infra: any, options: Record<string, any> = {
     try {
       const bundle = await infra.profiles.loadBundle();
       const match = bundle.bots.find(
-        (b: Record<string, any>) => b.botKey === botRef || b.name === botRef,
+        (b: Record<string, any>) => isSameBotName(b.botKey, botRef) || isSameBotName(b.name, botRef),
       );
       return match || null;
     } catch {

package/claw/modules/dexbot_profiles.ts

@@ -10,6 +10,7 @@ import { acquireFileLock } from '../../market_adapter/utils/file_lock.js';
 import { assertNoDuplicateBotKeys } from '../../modules/bot_settings.js';
 import { clone } from './utils.js';
 import { createBotKey, sanitizeKey } from '../../modules/account_orders.js';
+import { isSameBotName } from '../../modules/utils/sanitize_key.js';
 const storage = getStorage();
 
 import type { BotSettings, ProfileOptions, ClawProfileBundle } from './types.js';
@@ -815,10 +816,10 @@ function matchBotIdentifier(bot: any, identifier: any) {
   }
 
   if (typeof identifier === 'object') {
-    if (identifier.botKey && bot.botKey === identifier.botKey) {
+    if (identifier.botKey && (bot.botKey === identifier.botKey || isSameBotName(bot.botKey, identifier.botKey))) {
       return true;
     }
-    if (identifier.name && bot.name === identifier.name) {
+    if (identifier.name && isSameBotName(bot.name, identifier.name)) {
       return true;
     }
     if (identifier.assetA && identifier.assetB && bot.assetA === identifier.assetA && bot.assetB === identifier.assetB) {
@@ -839,7 +840,7 @@ function matchBotIdentifier(bot: any, identifier: any) {
     return false;
   }
 
-  if (bot.botKey === value || bot.name === value) {
+  if (bot.botKey === value || isSameBotName(bot.botKey, value) || isSameBotName(bot.name, value)) {
     return true;
   }
 

package/claw/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dexbot2-claw",
-  "version": "1.4.25",
+  "version": "1.5.1",
   "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.25",
+  "version": "1.5.1",
   "skills": [
     "skills"
   ],

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

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

package/claw/tests/test_claw_mcp_transport.ts

@@ -30,7 +30,7 @@ async function testParserAcceptsJsonlAcrossChunksAndSingleBuffer() {
       capabilities: {},
       clientInfo: {
         name: 'claw-mcp-transport-test',
-        version: '1.4.25'
+        version: '1.5.1'
       },
       protocolVersion: '2024-11-05'
     }
@@ -187,7 +187,7 @@ async function testMainEntrypointHandlesRealProcessInitialize() {
       capabilities: {},
       clientInfo: {
         name: 'claw-mcp-transport-test',
-        version: '1.4.25'
+        version: '1.5.1'
       },
       protocolVersion: '2024-11-05'
     }

package/dist/analysis/analyze_derivatives.js

@@ -13,7 +13,7 @@
  *
  *   node dist/analysis/analyze_derivatives.js \\
  *     --source market_adapter \
- *     --bot-key XRP-BTS
+ *     --bot-key AAA-BBB
  *
  * Output:
  *   analysis/charts/derivative_chart.html

package/dist/analysis/bot_key_utils.d.ts

@@ -5,7 +5,34 @@ declare function resolveBotKey(botName: any, filePath?: string): string | null;
 declare function candleFileForBot(botKey: string, intervalLabel: string, dataDir?: string): string;
 declare function resolveCandleFile(botKey: string, intervalLabel: string, dataDir?: string, botsFile?: string): string | null;
 declare function loadBotMeta(botKey: any, filePath?: string): any;
+/**
+ * Persist a resolved account name → ID mapping onto the bot entry in
+ * profiles/bots.json (`accountId` next to `preferredAccount`), so analysis
+ * tools can skip the chain lookup on subsequent runs. No-op when the stored
+ * value already matches. Prefers a byte-preserving textual patch (comments,
+ * key order and formatting survive); falls back to a full rewrite using the
+ * same atomic writeJSON serialization the bot editor uses. Returns true when
+ * the file was updated.
+ */
+declare function persistBotAccountId(botKey: any, accountId: string, filePath?: string): boolean;
+/**
+ * Return the stored chain account ID for a bot key, or null when none is
+ * stamped yet. When expectedRef is given, the stored ID is only returned if
+ * the entry's current preferredAccount still matches it — a rename must
+ * never silently reuse a stale ID.
+ */
+declare function getStoredBotAccountId(botKey: any, expectedRef?: string | null, filePath?: string): string | null;
+/**
+ * Find the bot entry whose preferredAccount matches a raw account reference
+ * (case-insensitive). Used by tools that accept a bare account name to locate
+ * the stored accountId and the persist target. Returns null for 1.2.x input
+ * or when no bot claims the name.
+ */
+declare function findBotKeyByAccountRef(ref: any, filePath?: string): {
+    botKey: string;
+    meta: any;
+} | null;
 declare function resolveAmaConfig(botKey: any): any;
 declare function resolveAmaKey(botKey: any): string;
-export { loadBotSettings, sanitizeKey, computeBotKey, resolveBotKey, candleFileForBot, resolveCandleFile, loadBotMeta, resolveAmaConfig, resolveAmaKey };
+export { loadBotSettings, sanitizeKey, computeBotKey, resolveBotKey, candleFileForBot, resolveCandleFile, loadBotMeta, getStoredBotAccountId, findBotKeyByAccountRef, persistBotAccountId, resolveAmaConfig, resolveAmaKey };
 //# sourceMappingURL=bot_key_utils.d.ts.map

package/dist/analysis/bot_key_utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"bot_key_utils.d.ts","sourceRoot":"","sources":["../../analysis/bot_key_utils.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,WAAW,EAAE,MAAM,kCAAkC,CAAC;AAU/D,iBAAS,eAAe,CAAC,QAAQ,SAA2B,OAO3D;AAED,iBAAS,aAAa,CAAC,GAAG,EAAE,GAAG,EAAE,KAAK,EAAE,MAAM,UAM7C;AAED,iBAAS,aAAa,CAAC,OAAO,EAAE,GAAG,EAAE,QAAQ,SAA2B,iBAQvE;AAED,iBAAS,gBAAgB,CAAC,MAAM,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,EAAE,OAAO,SAAgC,UAEvG;AAED,iBAAS,iBAAiB,CAAC,MAAM,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,EAAE,OAAO,SAAgC,EAAE,QAAQ,SAA2B,iBAS7I;AAED,iBAAS,WAAW,CAAC,MAAM,EAAE,GAAG,EAAE,QAAQ,SAA2B,OASpE;AAED,iBAAS,gBAAgB,CAAC,MAAM,EAAE,GAAG,OAuEpC;AAED,iBAAS,aAAa,CAAC,MAAM,EAAE,GAAG,UAQjC;AAED,OAAO,EAAE,eAAe,EAAE,WAAW,EAAE,aAAa,EAAE,aAAa,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,WAAW,EAAE,gBAAgB,EAAE,aAAa,EAAE,CAAA"}
+{"version":3,"file":"bot_key_utils.d.ts","sourceRoot":"","sources":["../../analysis/bot_key_utils.ts"],"names":[],"mappings":"AAUA,OAAO,EAAE,WAAW,EAAE,MAAM,kCAAkC,CAAC;AAU/D,iBAAS,eAAe,CAAC,QAAQ,SAA2B,OAa3D;AAED,iBAAS,aAAa,CAAC,GAAG,EAAE,GAAG,EAAE,KAAK,EAAE,MAAM,UAM7C;AAED,iBAAS,aAAa,CAAC,OAAO,EAAE,GAAG,EAAE,QAAQ,SAA2B,iBAQvE;AAED,iBAAS,gBAAgB,CAAC,MAAM,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,EAAE,OAAO,SAAgC,UAEvG;AAED,iBAAS,iBAAiB,CAAC,MAAM,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,EAAE,OAAO,SAAgC,EAAE,QAAQ,SAA2B,iBAS7I;AAED,iBAAS,WAAW,CAAC,MAAM,EAAE,GAAG,EAAE,QAAQ,SAA2B,OASpE;AAwLD;;;;;;;;GAQG;AACH,iBAAS,mBAAmB,CAAC,MAAM,EAAE,GAAG,EAAE,SAAS,EAAE,MAAM,EAAE,QAAQ,SAA2B,GAAG,OAAO,CAwBzG;AAED;;;;;GAKG;AACH,iBAAS,qBAAqB,CAAC,MAAM,EAAE,GAAG,EAAE,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI,EAAE,QAAQ,SAA2B,GAAG,MAAM,GAAG,IAAI,CAY3H;AAED;;;;;GAKG;AACH,iBAAS,sBAAsB,CAAC,GAAG,EAAE,GAAG,EAAE,QAAQ,SAA2B,GAAG;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,GAAG,CAAA;CAAE,GAAG,IAAI,CAiBnH;AAED,iBAAS,gBAAgB,CAAC,MAAM,EAAE,GAAG,OAuEpC;AAED,iBAAS,aAAa,CAAC,MAAM,EAAE,GAAG,UAQjC;AAED,OAAO,EAAE,eAAe,EAAE,WAAW,EAAE,aAAa,EAAE,aAAa,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,WAAW,EAAE,qBAAqB,EAAE,sBAAsB,EAAE,mBAAmB,EAAE,gBAAgB,EAAE,aAAa,EAAE,CAAA"}