dexbot 1.4.25 → 1.5.0

package/dist/scripts/tv.d.ts

@@ -0,0 +1,11 @@
+#!/usr/bin/env node
+declare function parseArgs(argv: string[]): {
+    target: string | null;
+    months: number;
+    chart: string | null;
+    priceScale: string;
+    help: boolean;
+};
+declare function isPoolIdTarget(target: string): boolean;
+export { parseArgs, isPoolIdTarget };
+//# sourceMappingURL=tv.d.ts.map

package/dist/scripts/tv.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"tv.d.ts","sourceRoot":"","sources":["../../scripts/tv.ts"],"names":[],"mappings":";AAsDA,iBAAS,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG;IAAE,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IAAC,MAAM,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IAAC,UAAU,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,OAAO,CAAA;CAAE,CA2CrI;AAED,iBAAS,cAAc,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAE/C;AAgPD,OAAO,EAAE,SAAS,EAAE,cAAc,EAAE,CAAA"}

package/dist/scripts/tv.js

@@ -0,0 +1,357 @@
+#!/usr/bin/env node
+'use strict';
+/**
+ * dexbot tv — TradingView chart shortcut.
+ *
+ * Usage:
+ *   dexbot tv <bot|pool-id|AssetA/AssetB> [--month N] [--chart <path>] [--scale log|linear]
+ *
+ * - 1h candles, N months of history (default 3).
+ * - Target resolution:
+ *   - bot name/key from profiles/bots.json
+ *   - pool id (e.g. 133 or 1.19.133)
+ *   - AssetA/AssetB symbols (pool-first, orderbook fill fallback when no pool)
+ *
+ * This script ONLY pulls fresh candle data and writes it to a temp JSON file.
+ * Rendering (chart HTML, AMA overlay like the exporter, auto chart path + print)
+ * is delegated to the existing analyzer at analysis/tradingview/analyze_tradingview.js.
+ */
+import fs from 'node:fs';
+import os from 'node:os';
+import path from 'node:path';
+import { spawnSync } from 'node:child_process';
+import { fileURLToPath, pathToFileURL } from 'node:url';
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
+import { loadBotMeta, resolveAmaConfig, loadBotSettings, computeBotKey } from '../analysis/bot_key_utils.js';
+import { PATHS } from '../modules/paths.js';
+import { normalizePoolId, resolveAsset, findPoolByAssets } from '../market_adapter/utils/chain.js';
+import { fetchCandlesSequentially, outputPath, buildFetchWindowsFromRange } from '../market_adapter/inputs/fetch_lp_data.js';
+import { getMarketCandles } from '../market_adapter/core/kibana_market_candles.js';
+import { mergeCandles } from '../market_adapter/candle_utils.js';
+import { getErrorMessage } from '../modules/utils/errors.js';
+import { muteChainLogs } from '../modules/utils/chain_logs.js';
+import { isSameBotName, sanitizeKey } from '../modules/utils/sanitize_key.js';
+const INTERVAL_SECONDS = 3600;
+const DEFAULT_MONTHS = 3;
+const HOURS_PER_MONTH = 730;
+function printUsage() {
+    console.log('Usage: dexbot tv <bot|pool-id|AssetA/AssetB> [--month N] [--chart <path>] [--scale log|linear]');
+    console.log('');
+    console.log('  <bot>          Bot name or key from profiles/bots.json (AMA overlay like the exporter)');
+    console.log('  <pool-id>      Liquidity pool id, e.g. 133 or 1.19.133');
+    console.log('  AssetA/AssetB  Pair symbols, e.g. TOKENA/TOKENB (pool-first, orderbook fallback)');
+    console.log('');
+    console.log('Options:');
+    console.log(`  --month N        Months of 1h history (default ${DEFAULT_MONTHS})`);
+    console.log('  --months N       Alias for --month');
+    console.log('  --chart <path>   Override auto output path');
+    console.log('  --scale <log|linear>  Price axis scale (default log)');
+}
+function parseArgs(argv) {
+    let target = null;
+    let months = DEFAULT_MONTHS;
+    let chart = null;
+    let priceScale = 'log';
+    let help = false;
+    for (let i = 0; i < argv.length; i++) {
+        const arg = argv[i];
+        if (arg === '-h' || arg === '--help')
+            help = true;
+        else if (arg === '--month' || arg === '--months') {
+            const raw = argv[++i];
+            const n = Number(raw);
+            if (!Number.isFinite(n) || n <= 0)
+                throw new Error(`--month: invalid value "${raw}" (expected positive months, e.g. --month 6)`);
+            months = n;
+        }
+        else if (arg.startsWith('--month=')) {
+            const n = Number(arg.split('=')[1]);
+            if (!Number.isFinite(n) || n <= 0)
+                throw new Error(`--month: invalid value "${arg}" (expected positive months)`);
+            months = n;
+        }
+        else if (arg.startsWith('--months=')) {
+            const n = Number(arg.split('=')[1]);
+            if (!Number.isFinite(n) || n <= 0)
+                throw new Error(`--months: invalid value "${arg}" (expected positive months)`);
+            months = n;
+        }
+        else if (arg === '--chart') {
+            chart = String(argv[++i] || '');
+            if (!chart)
+                throw new Error('--chart: missing path');
+        }
+        else if (arg.startsWith('--chart=')) {
+            chart = arg.split('=').slice(1).join('=');
+            if (!chart)
+                throw new Error('--chart: missing path');
+        }
+        else if (arg === '--scale' || arg === '--price-scale') {
+            priceScale = String(argv[++i] || 'log').toLowerCase();
+            if (priceScale !== 'log' && priceScale !== 'linear')
+                throw new Error(`--scale: unsupported value "${priceScale}" (use log|linear)`);
+        }
+        else if (arg.startsWith('--scale=')) {
+            priceScale = arg.split('=')[1]?.toLowerCase() || 'log';
+            if (priceScale !== 'log' && priceScale !== 'linear')
+                throw new Error(`--scale: unsupported value "${priceScale}" (use log|linear)`);
+        }
+        else if (arg.startsWith('--')) {
+            throw new Error(`Unknown flag "${arg}". Usage: dexbot tv <bot|pool-id|AssetA/AssetB> [--month N]`);
+        }
+        else if (!target) {
+            target = arg;
+        }
+        else {
+            throw new Error(`Unexpected argument "${arg}". Only one target is supported. Usage: dexbot tv <bot|pool-id|AssetA/AssetB> [--month N]`);
+        }
+    }
+    return { target, months, chart, priceScale, help };
+}
+function isPoolIdTarget(target) {
+    return /^(1\.19\.\d+|\d+)$/.test(target.trim());
+}
+function findBotByTarget(target) {
+    const settings = loadBotSettings();
+    const entries = Array.isArray(settings?.bots) ? settings.bots : [];
+    for (let i = 0; i < entries.length; i++) {
+        const entry = entries[i];
+        if (!entry)
+            continue;
+        if (isSameBotName(entry.name, target))
+            return { botKey: computeBotKey(entry, i), meta: entry };
+    }
+    const meta = loadBotMeta(target);
+    if (meta) {
+        const idx = entries.indexOf(meta);
+        return { botKey: computeBotKey(meta, idx >= 0 ? idx : 0), meta };
+    }
+    return null;
+}
+function slugPart(value) {
+    return String(value || '').trim().toLowerCase().replace(/[^a-z0-9]+/g, '_').replace(/^_+|_+$/g, '') || 'unknown';
+}
+function monthsLabel(months) {
+    return Number.isInteger(months) ? `${months}m` : `${String(months).replace('.', 'p')}m`;
+}
+async function resolvePoolAssets(poolId, bitsharesClient) {
+    const fullId = normalizePoolId(poolId);
+    // Chain pool object via get_objects([poolId]) → asset_a / asset_b.
+    const db = bitsharesClient.BitShares?.db;
+    if (db && typeof db.get_objects === 'function') {
+        try {
+            const objs = await db.get_objects([fullId]);
+            const pool = Array.isArray(objs) ? objs[0] : null;
+            const idA = pool?.asset_a || pool?.asset_ids?.[0];
+            const idB = pool?.asset_b || pool?.asset_ids?.[1];
+            if (idA && idB) {
+                const assets = typeof db.get_assets === 'function' ? await db.get_assets([String(idA), String(idB)]) : null;
+                // Tolerate both [..] and [[..]] result shapes.
+                const list = Array.isArray(assets) ? assets.flat(Infinity) : [];
+                const metaA = list.find((a) => String(a?.id) === String(idA));
+                const metaB = list.find((a) => String(a?.id) === String(idB));
+                if (metaA && metaB) {
+                    return {
+                        assetA: { id: String(metaA.id), precision: Number(metaA.precision), symbol: String(metaA.symbol || idA) },
+                        assetB: { id: String(metaB.id), precision: Number(metaB.precision), symbol: String(metaB.symbol || idB) },
+                    };
+                }
+            }
+        }
+        catch (_) {
+            // Fall through to Kibana discovery below.
+        }
+    }
+    // Fallback: Kibana discovery (what went into the pool) + chain precision lookup.
+    const { discoverPoolAssets } = await import('../market_adapter/inputs/kibana_source.js');
+    const ids = await discoverPoolAssets(fullId, {});
+    if (!Array.isArray(ids) || ids.length !== 2) {
+        throw new Error(`Pool ${fullId}: expected exactly 2 assets, discovered [${(ids || []).join(', ')}]. Pass AssetA/AssetB instead.`);
+    }
+    const [idA, idB] = ids.map(String);
+    const assets = await db.get_assets([idA, idB]);
+    const metaA = (assets || []).find((a) => String(a?.id) === idA);
+    const metaB = (assets || []).find((a) => String(a?.id) === idB);
+    if (!metaA || !metaB || !Number.isFinite(Number(metaA.precision)) || !Number.isFinite(Number(metaB.precision))) {
+        throw new Error(`Pool ${fullId}: failed to resolve asset metadata for ${idA}/${idB}`);
+    }
+    return {
+        assetA: { id: idA, precision: Number(metaA.precision), symbol: String(metaA.symbol || idA) },
+        assetB: { id: idB, precision: Number(metaB.precision), symbol: String(metaB.symbol || idB) },
+    };
+}
+async function run() {
+    // Mute chain connection chatter first — shared helper, console.error untouched.
+    muteChainLogs();
+    const { target, months, chart, priceScale, help } = parseArgs(process.argv.slice(2));
+    if (help || !target) {
+        printUsage();
+        if (!target && !help)
+            process.exit(1);
+        process.exit(0);
+    }
+    const lookbackHours = Math.max(1, Math.round(months * HOURS_PER_MONTH));
+    const bucketMs = INTERVAL_SECONDS * 1000;
+    const endMs = Math.floor(Date.now() / bucketMs) * bucketMs;
+    const startMs = endMs - lookbackHours * 3600 * 1000;
+    const timeRange = { gte: new Date(startMs).toISOString(), lte: new Date(endMs).toISOString() };
+    // Classify the target locally first so a typo'd bot / malformed pair
+    // fails fast without waiting for a chain connection.
+    const botHit = findBotByTarget(target);
+    const poolTarget = !botHit && isPoolIdTarget(target);
+    const pairTarget = !botHit && !poolTarget && target.includes('/');
+    const pairParts = pairTarget ? target.split('/').map((s) => s.trim()).filter(Boolean) : [];
+    if (!botHit && !poolTarget && !pairTarget) {
+        const settings = loadBotSettings();
+        const entries = Array.isArray(settings?.bots) ? settings.bots : [];
+        const keys = entries.map((b, i) => computeBotKey(b, i)).filter(Boolean);
+        throw new Error(`Unknown target "${target}". Use a bot name/key${keys.length ? ` (${keys.slice(0, 8).join(', ')}${keys.length > 8 ? ', …' : ''})` : ''}, a pool id (e.g. 133), or AssetA/AssetB.`);
+    }
+    if (pairTarget && pairParts.length !== 2)
+        throw new Error(`Invalid pair "${target}". Use AssetA/AssetB, e.g. TOKENA/TOKENB`);
+    const bitsharesClient = await import('../modules/bitshares_client.js');
+    const { waitForConnected } = bitsharesClient;
+    await waitForConnected();
+    let tmpFile = null;
+    try {
+        let assetA;
+        let assetB;
+        let poolId = null;
+        let sourceLabel = '';
+        let botKey = null;
+        let botMeta = null;
+        if (botHit) {
+            botKey = botHit.botKey;
+            botMeta = botHit.meta;
+            const symA = botMeta.assetA;
+            const symB = botMeta.assetB;
+            if (!symA || !symB)
+                throw new Error(`Bot '${target}' has no assetA/assetB pair in profiles/bots.json`);
+            const [metaA, metaB] = await Promise.all([resolveAsset(symA, bitsharesClient), resolveAsset(symB, bitsharesClient)]);
+            assetA = { id: metaA.id, precision: metaA.precision, symbol: symA };
+            assetB = { id: metaB.id, precision: metaB.precision, symbol: symB };
+            try {
+                poolId = (await findPoolByAssets(assetA.id, assetB.id, { bitsharesClient, sortBy: 'assetABalance' })).id;
+            }
+            catch (_) {
+                poolId = null;
+            }
+            sourceLabel = poolId ? `pool ${poolId}` : 'orderbook';
+        }
+        else if (poolTarget) {
+            poolId = normalizePoolId(target.trim());
+            const resolved = await resolvePoolAssets(poolId, bitsharesClient);
+            assetA = resolved.assetA;
+            assetB = resolved.assetB;
+            sourceLabel = `pool ${poolId}`;
+        }
+        else {
+            const [metaA, metaB] = await Promise.all([resolveAsset(pairParts[0], bitsharesClient), resolveAsset(pairParts[1], bitsharesClient)]);
+            assetA = { id: metaA.id, precision: metaA.precision, symbol: pairParts[0] };
+            assetB = { id: metaB.id, precision: metaB.precision, symbol: pairParts[1] };
+            try {
+                poolId = (await findPoolByAssets(assetA.id, assetB.id, { bitsharesClient, sortBy: 'assetABalance' })).id;
+            }
+            catch (_) {
+                poolId = null;
+            }
+            sourceLabel = poolId ? `pool ${poolId}` : 'orderbook';
+        }
+        // ── Data pull (the only job of this script) ──────────────────────────
+        // Both paths reuse the existing Kibana infrastructure in 1-month
+        // windows: LP goes through the fetcher's manifest/resume + per-chunk
+        // timeout/retry machinery, book fills use the same windowing with the
+        // shared mergeCandles helper. No fetch logic is duplicated here.
+        const TV_CHUNK_MONTHS = 1;
+        console.log(`[tv] Fetching 1h candles (${months}mo, ${timeRange.gte.slice(0, 10)} → ${timeRange.lte.slice(0, 10)}) from ${sourceLabel} for ${assetA.symbol}/${assetB.symbol}...`);
+        let candles;
+        if (poolId) {
+            candles = await fetchCandlesSequentially(poolId, assetA, assetB, {
+                intervalSeconds: INTERVAL_SECONDS,
+                timeRange,
+                chunkMonths: TV_CHUNK_MONTHS,
+            }, outputPath(poolId, INTERVAL_SECONDS, assetA, assetB));
+        }
+        else {
+            const windows = buildFetchWindowsFromRange(timeRange, TV_CHUNK_MONTHS);
+            let merged = [];
+            for (let w = 0; w < windows.length; w++) {
+                console.log(`  Window ${w + 1}/${windows.length}: ${windows[w].gte.slice(0, 10)} → ${windows[w].lte.slice(0, 10)}`);
+                const part = await getMarketCandles(assetA, assetB, { intervalSeconds: INTERVAL_SECONDS, timeRange: windows[w] });
+                console.log(`    -> ${part.length} candles`);
+                merged = merged.length === 0
+                    ? part
+                    : mergeCandles(merged, part, {
+                        onCollision: (existing, incoming) => incoming[5] > existing[5] ? incoming : existing,
+                    });
+            }
+            candles = merged;
+        }
+        if (!Array.isArray(candles) || candles.length === 0)
+            throw new Error('No candles returned for the requested range');
+        console.log(`[tv] Fetched ${candles.length} candles`);
+        tmpFile = path.join(os.tmpdir(), `dexbot-tv-${sanitizeKey(botKey || assetA.symbol + '-' + assetB.symbol)}-${process.pid}.json`);
+        fs.writeFileSync(tmpFile, JSON.stringify({
+            meta: {
+                fetchedAt: new Date().toISOString(),
+                source: `dexbot tv (${sourceLabel})`,
+                pool: poolId,
+                assetA: { id: assetA.id, precision: assetA.precision, symbol: assetA.symbol },
+                assetB: { id: assetB.id, precision: assetB.precision, symbol: assetB.symbol },
+                intervalSeconds: INTERVAL_SECONDS,
+                lookbackHours,
+                format: '[timestamp_ms, open, high, low, close, volume_A]',
+            },
+            candles,
+        }), 'utf8');
+        // ── Delegate rendering to the existing TradingView exporter ──────────
+        const analyzer = path.join(__dirname, '..', 'analysis', 'tradingview', 'analyze_tradingview.js');
+        if (!fs.existsSync(analyzer))
+            throw new Error(`TradingView exporter not found at ${analyzer} (run npm run build first)`);
+        const baseName = botKey
+            ? `tv_${sanitizeKey(botKey)}`
+            : poolId
+                ? `tv_pool_${String(poolId).replace(/^1\.19\./, '')}`
+                : `tv_${slugPart(assetA.symbol)}_${slugPart(assetB.symbol)}`;
+        const chartFile = chart
+            ? path.resolve(chart)
+            : path.join(PATHS.ANALYSIS.CHARTS_DIR, `${baseName}_1h_${monthsLabel(months)}.html`);
+        const label = poolId ? `Pool ${String(poolId).replace(/^1\.19\./, '')}` : `${assetA.symbol}/${assetB.symbol}`;
+        const title = botKey && botMeta?.name ? `${botMeta.name} · ${label} · 1h · TradingView` : `${label} · 1h · TradingView`;
+        const analyzerArgs = ['--file', tmpFile, '--chart', chartFile, '--title', title, '--scale', priceScale];
+        if (botKey) {
+            // Same AMA overlay the exporter resolves for this bot.
+            const ama = resolveAmaConfig(botKey);
+            analyzerArgs.push('--bot-key', botKey, '--ama-er-period', String(ama.erPeriod), '--ama-fast-period', String(ama.fastPeriod), '--ama-slow-period', String(ama.slowPeriod));
+        }
+        const result = spawnSync(process.execPath, [analyzer, ...analyzerArgs], { stdio: 'inherit' });
+        if (result.error)
+            throw result.error;
+        if (result.status !== 0)
+            throw new Error(`TradingView exporter exited with status ${result.status}`);
+        try {
+            fs.unlinkSync(tmpFile);
+        }
+        catch (_) { /* keep on failure path only */ }
+        tmpFile = null;
+    }
+    finally {
+        try {
+            const { disconnectClient: dc } = await import('../modules/bitshares_client.js');
+            dc();
+        }
+        catch (_) { /* best-effort */ }
+        // The BitShares WS + node monitor keep the event loop alive; exit explicitly.
+        setTimeout(() => process.exit(0), 50).unref();
+    }
+}
+const invoked = process.argv[1] && import.meta.url === pathToFileURL(process.argv[1]).href;
+if (invoked) {
+    run().catch((err) => {
+        console.error(`[tv] Error: ${getErrorMessage(err)}`);
+        process.exit(1);
+    });
+}
+export { parseArgs, isPoolIdTarget };
+//# sourceMappingURL=tv.js.map

package/dist/scripts/tv.js.map

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

package/dist/scripts/update.js

@@ -45,11 +45,12 @@ import { Config } from '../modules/config.js';
 import { getStorage } from '../modules/storage/index.js';
 const { readJSON } = getStorage();
 import { getErrorMessage } from '../modules/utils/errors.js';
+import { CLI_COLORS } from '../modules/cli_colors.js';
 const UPDATE_COLORS = {
-    reset: '\x1b[0m',
-    ok: '\x1b[1;92m',
-    warn: '\x1b[1;33m',
-    error: '\x1b[1;31m',
+    reset: CLI_COLORS.reset,
+    ok: CLI_COLORS.brightGreen,
+    warn: CLI_COLORS.yellowBold,
+    error: CLI_COLORS.boldRed,
 };
 function colorUpdateOutput(text, color, stream = process.stdout) {
     return stream.isTTY && !Config.NO_COLOR
@@ -339,6 +340,51 @@ function resolveStashRef(message) {
     }
     return 'stash@{0}';
 }
+/**
+ * needsDepsInstall: post-pull check whether `npm install` is required.
+ *
+ * Only pre-state is the starting commit SHA (captured before
+ * checkout/pull, passed in); the decision itself happens after the pull:
+ * - `node_modules` missing or without npm's hidden lockfile (broken tree)
+ *   -> install.
+ * - `package.json`/`package-lock.json` changed since the pre-update
+ *   commit (covers branch switch + pull) -> install.
+ * - those files dirty in the worktree (e.g. stash-restored local edits)
+ *   -> install (fail-open).
+ * Fail-open (true) on any git error so a broken check never skips a
+ * needed install.
+ */
+function needsDepsInstall(preUpdateHead) {
+    if (!fs.existsSync(path.join(PATHS.PROJECT_ROOT, 'node_modules'))
+        || !fs.existsSync(path.join(PATHS.PROJECT_ROOT, 'node_modules', '.package-lock.json'))) {
+        log('node_modules missing or incomplete — dependencies need install.');
+        return true;
+    }
+    // Diff since the pre-update commit: covers branch switch + pull.
+    // Falls back to HEAD@{1} when the SHA capture failed.
+    const baseRef = preUpdateHead || 'HEAD@{1}';
+    try {
+        const pulled = execSync(`git diff --name-only ${baseRef} HEAD -- package.json package-lock.json 2>/dev/null`, { stdio: 'pipe', cwd: PATHS.PROJECT_ROOT }).toString().trim();
+        if (pulled) {
+            log(`Dependency manifests changed in pull: ${pulled.split('\n').join(', ')}`);
+            return true;
+        }
+    }
+    catch (_) {
+        return true;
+    }
+    try {
+        const dirty = execSync('git status --porcelain -- package.json package-lock.json 2>/dev/null', { stdio: 'pipe', cwd: PATHS.PROJECT_ROOT }).toString().trim();
+        if (dirty) {
+            log('Dependency manifests have local modifications — dependencies need install.');
+            return true;
+        }
+    }
+    catch (_) {
+        return true;
+    }
+    return false;
+}
 async function detectIsolatedSupervisor() {
     try {
         const resp = await sendControlCommand({ cmd: 'status' });
@@ -748,6 +794,13 @@ async function runNpmUpdateFlow() {
         const snapshot = snapshotMonolithicState();
         const monolithicWasRunning = snapshot.monolithicWasRunning;
         const hadMonolithicFiles = snapshot.hadMonolithicFiles;
+        // Starting commit for the post-pull dep check (covers both branch
+        // switch and pull — the decision itself still happens after).
+        let preUpdateHead = '';
+        try {
+            preUpdateHead = execSync('git rev-parse HEAD', { stdio: 'pipe', cwd: PATHS.PROJECT_ROOT }).toString().trim();
+        }
+        catch (_) { }
         /**
          * STEP 6b: Prepare Working Directory
          * Stashes local changes to ensure a clean pull.
@@ -791,6 +844,7 @@ async function runNpmUpdateFlow() {
          * remote content) and `--theirs` is the stashed content (the user's
          * local edits). Local changes take precedence over incoming remote.
          */
+        let lockRegenerated = false;
         if (stashed) {
             const stashRef = resolveStashRef(STASH_MESSAGE);
             log('Restoring stashed changes...');
@@ -824,28 +878,41 @@ async function runNpmUpdateFlow() {
                     if (unmerged.includes('package-lock.json')) {
                         log('package-lock.json was conflicted — regenerating...');
                         execSync('npm install --prefer-offline --ignore-scripts 2>&1', { stdio: 'pipe', cwd: PATHS.PROJECT_ROOT });
+                        lockRegenerated = true;
                     }
                 }
             }
             catch (_) { }
         }
         /**
-         * STEP 8: Reinstall Dependencies
-         * Updates npm packages to versions specified in package-lock.json.
+         * STEP 8: Reinstall Dependencies (only when needed)
+         * Runs `npm install` when the pull touched package.json/package-lock.json,
+         * when those files are dirty (stash-restored local edits), or when
+         * node_modules is missing/incomplete. Otherwise skips — the build below
+         * is what picks up pure .ts changes.
          * --ignore-scripts prevents npm from running the package `prepare` hook,
          * which would build once here before the explicit build step below.
          * --prefer-offline: Uses cached packages when possible
          */
-        log('Updating dependencies...');
-        run('npm install --prefer-offline --ignore-scripts');
+        if (lockRegenerated) {
+            log('Dependencies already regenerated after lockfile conflict — skipping npm install.');
+        }
+        else if (needsDepsInstall(preUpdateHead)) {
+            log('Updating dependencies...');
+            run('npm install --prefer-offline --ignore-scripts');
+        }
+        else {
+            log('Dependencies unchanged — skipping npm install.');
+        }
         /**
          * STEP 8b: Build TypeScript sources
          *
          * Do NOT rely on the npm `prepare` hook. The `prepare` script only re-fires
          * when package.json itself changes, not when only .ts source files are
          * updated. After a `git pull` that touches only .ts files, `npm install`
-         * is a no-op, `tsc` never runs, and the running bot process keeps loading
-         * the stale dist/ bundle — with no error surfaced to the operator.
+         * is skipped as a no-op (see STEP 8), so `tsc` would never run and the
+         * running bot process would keep loading the stale dist/ bundle — with
+         * no error surfaced to the operator.
          *
          * Always run the explicit build here so the next PM2 restart picks up
          * the new code. The staleness check at the end of this step is defense