dexbot 1.4.10 → 1.4.12

package/dist/unlock.js

@@ -1,5 +1,9 @@
 #!/usr/bin/env node
-"use strict";
+import { fileURLToPath } from 'node:url';
+import { pathToFileURL } from 'node:url';
+import { dirname as _esmDirname } from 'node:path';
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = _esmDirname(__filename);
 // node-only entry point — credential daemon launcher (Unix socket, child_process, fs)
 /**
  * unlock.ts - Credential Daemon Launcher
@@ -31,96 +35,43 @@
  *   BOT_NAME                     Fallback bot name when none is given as positional arg
  *   DEXBOT_MASTER_PASSWORD       Master password for --headless mode (less secure than file)
  */
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.waitForChildSpawn = exports.pidMatchesScriptCandidates = exports.isLikelyCredentialDaemonProcess = exports.findCredentialSocketOwnerPid = exports.ensureNoForeignCredentialDaemon = exports.candidateRuntimeScriptPaths = exports.buildDexbotStartArgs = void 0;
-exports.main = main;
-exports.waitForStableChildStartup = waitForStableChildStartup;
-const config_1 = require("./modules/config");
-const node_fs_1 = __importDefault(require("node:fs"));
-const path_api_1 = require("./modules/path_api");
-const storage_1 = require("./modules/storage");
-const node_child_process_1 = require("node:child_process");
-const credential_daemon_1 = require("./modules/launcher/credential_daemon");
-const child_env_1 = require("./modules/launcher/child_env");
-const launch_modes_1 = require("./modules/launcher/launch_modes");
-const constants_1 = require("./modules/constants");
-const runtime_1 = require("./modules/runtime");
-const paths_1 = require("./modules/paths");
-const runtime_entry_1 = require("./modules/launcher/runtime_entry");
-const supervisor_control_1 = require("./modules/launcher/supervisor_control");
-const graceful_shutdown_1 = require("./modules/graceful_shutdown");
-const bot_settings_1 = require("./modules/bot_settings");
-const chainKeys = __importStar(require("./modules/chain_keys"));
-const credentialPolicy = __importStar(require("./modules/credential_policy"));
-const market_adapter_whitelist_1 = require("./modules/market_adapter_whitelist");
-const fs_utils_1 = require("./modules/utils/fs_utils");
-const market_adapter_watchdog_1 = require("./modules/launcher/market_adapter_watchdog");
-const market_adapter_runtime_1 = require("./modules/launcher/market_adapter_runtime");
-const config_2 = require("./modules/config");
-const migrate_bot_keys_1 = require("./scripts/migrate_bot_keys");
-const errors_1 = require("./modules/utils/errors");
-const timeout_1 = require("./modules/order/utils/timeout");
-(0, config_1.setUmask)(0o077);
-const storage = (0, storage_1.getStorage)();
+import { createRequire } from 'node:module';
+const require = createRequire(import.meta.url);
+import { setUmask } from './modules/config.js';
+import fs from 'node:fs';
+import { path } from './modules/path_api.js';
+import { getStorage } from './modules/storage/index.js';
+import { spawn } from 'node:child_process';
+import { createCredentialDaemonController } from './modules/launcher/credential_daemon.js';
+import { buildScopedChildEnv } from './modules/launcher/child_env.js';
+import { parseUnlockArgs } from './modules/launcher/launch_modes.js';
+import { UPDATER, LAUNCHER } from './modules/constants.js';
+import { runtime } from './modules/runtime.js';
+import { PATHS } from './modules/paths.js';
+import { buildRuntimeScriptArgs } from './modules/launcher/runtime_entry.js';
+import { sendControlCommand } from './modules/launcher/supervisor_control.js';
+import { registerCleanup, setupGracefulShutdown } from './modules/graceful_shutdown.js';
+import { normalizeBotEntry, resolveRawBotEntries, loadSettingsFile } from './modules/bot_settings.js';
+import * as chainKeys from './modules/chain_keys.js';
+import * as credentialPolicy from './modules/credential_policy.js';
+import { getWhitelistFlags } from './modules/market_adapter_whitelist.js';
+import { createMarketAdapterWatchdog } from './modules/launcher/market_adapter_watchdog.js';
+import { isLikelyMarketAdapterProcess } from './modules/launcher/market_adapter_runtime.js';
+import { Config } from './modules/config.js';
+import { getErrorMessage } from './modules/utils/errors.js';
+import { withTimeout } from './modules/order/utils/timeout.js';
+setUmask(0o077);
+const storage = getStorage();
+const { ensureDir } = storage;
 const { createBotSupervisor, SOCKET_PATH, forwardSignal, isPidAlive, waitForPidExit, readMarketAdapterLockPid, stopMarketAdapterFromLock, usesAmaGridPrice, waitForChildSpawn, pidMatchesScriptCandidates, candidateRuntimeScriptPaths, } = require('./modules/launcher/bot_supervisor');
-exports.waitForChildSpawn = waitForChildSpawn;
-exports.pidMatchesScriptCandidates = pidMatchesScriptCandidates;
-exports.candidateRuntimeScriptPaths = candidateRuntimeScriptPaths;
 const { statusTitle, statusLabel, statusBool, statusActiveBotName, statusSuccess, statusError, colorStatus, STATUS_COLORS, readProcStat, readProcMemMB, readProcCpuTime, readProcCpuPercent, readProcUptime, formatMemoryWithUptime, printControlStatus, } = require('./modules/launcher/status_reporting');
-const { MONOLITHIC_PID_FILE, MONOLITHIC_BOT_PID_FILE, MONOLITHIC_BOT_INFO_FILE, MONOLITHIC_CRED_PID_FILE, MONOLITHIC_OUT_LOG, MONOLITHIC_ERROR_LOG, CREDENTIAL_SOCKET_FILE, cleanupStateFiles, readLiveMonolithicPid, readMonolithicBotInfo, isLikelyCredentialDaemonProcess, isExpectedMonolithicBotPid, stopCredentialDaemonPid, stopCredentialDaemon, ensureNoForeignCredentialDaemon, findCredentialSocketOwnerPid, readCredentialDaemonStatus, ensureLogDir: ensureMonolithicLogDir, buildDexbotStartArgs, createUpdateScheduler, listConfiguredBots, getControlBotNames, getControlActionLabel, getControlServiceNames, printControlActionSummary, formatBotCount, } = require('./modules/launcher/monolithic_runtime');
-exports.isLikelyCredentialDaemonProcess = isLikelyCredentialDaemonProcess;
-exports.ensureNoForeignCredentialDaemon = ensureNoForeignCredentialDaemon;
-exports.findCredentialSocketOwnerPid = findCredentialSocketOwnerPid;
-exports.buildDexbotStartArgs = buildDexbotStartArgs;
-// Auto-migrate bot state files from old stable-ID key format to sanitized-name format
-try {
-    (0, migrate_bot_keys_1.runMigration)();
-}
-catch (err) {
-    console.error(`Migration error: ${(0, errors_1.getErrorMessage)(err)}`);
-}
+const { MONOLITHIC_PID_FILE, MONOLITHIC_BOT_PID_FILE, MONOLITHIC_BOT_INFO_FILE, MONOLITHIC_CRED_PID_FILE, MONOLITHIC_OUT_LOG, MONOLITHIC_ERROR_LOG, CREDENTIAL_SOCKET_FILE, cleanupStateFiles, readLiveMonolithicPid, readMonolithicBotInfo, isLikelyCredentialDaemonProcess, isExpectedMonolithicBotPid, isProcessInDstate, stopCredentialDaemonPid, stopCredentialDaemon, ensureNoForeignCredentialDaemon, findCredentialSocketOwnerPid, cleanupCredentialRuntimeFiles, readCredentialDaemonStatus, ensureLogDir: ensureMonolithicLogDir, buildDexbotStartArgs, createUpdateScheduler, listConfiguredBots, getControlBotNames, getControlActionLabel, getControlServiceNames, printControlActionSummary, formatBotCount, } = require('./modules/launcher/monolithic_runtime');
 const CODE_ROOT = __dirname;
-const BOTS_FILE = paths_1.PATHS.PROFILES.BOTS_JSON;
-const LOGS_DIR = paths_1.PATHS.LOGS_DIR;
-const SUPERVISOR_OUT_LOG = path_api_1.path.join(LOGS_DIR, 'supervisor.log');
-const SUPERVISOR_ERROR_LOG = path_api_1.path.join(LOGS_DIR, 'supervisor-error.log');
-const controller = (0, credential_daemon_1.createCredentialDaemonController)({ root: paths_1.PATHS.PROJECT_ROOT, codeRoot: CODE_ROOT });
+const BOTS_FILE = PATHS.PROFILES.BOTS_JSON;
+const LOGS_DIR = PATHS.LOGS_DIR;
+const SUPERVISOR_OUT_LOG = path.join(LOGS_DIR, 'supervisor.log');
+const SUPERVISOR_ERROR_LOG = path.join(LOGS_DIR, 'supervisor-error.log');
+const controller = createCredentialDaemonController({ root: PATHS.PROJECT_ROOT, codeRoot: CODE_ROOT });
 const DEFAULT_STARTUP_GRACE_MS = 750;
 const botProcessRef = { current: null };
 function printLauncherHeader({ botName = null, clawOnly = false, creditOnly = false, isolated = false, dryrun = false, headless = false } = {}) {
@@ -220,14 +171,14 @@ function waitForStableChildStartup(child, { label = 'child process', timeoutMs =
     });
 }
 function resolveBotEntryForName(botName) {
-    const { config } = (0, bot_settings_1.loadSettingsFile)(BOTS_FILE);
-    const raw = (0, bot_settings_1.resolveRawBotEntries)(config);
+    const { config } = loadSettingsFile(BOTS_FILE);
+    const raw = resolveRawBotEntries(config);
     const match = raw.find((b) => b && b.name === botName);
     if (!match)
         return null;
     const entryCopy = JSON.parse(JSON.stringify(match));
     entryCopy.active = true;
-    return (0, bot_settings_1.normalizeBotEntry)(entryCopy);
+    return normalizeBotEntry(entryCopy);
 }
 function getLaunchedBotNames(botName) {
     return botName
@@ -236,7 +187,7 @@ function getLaunchedBotNames(botName) {
 }
 // ── Isolated supervisor mode ───────────────────────────────────────
 function isSupervisorTransientError(err) {
-    const msg = String(err && (0, errors_1.getErrorMessage)(err) || '');
+    const msg = String(err && getErrorMessage(err) || '');
     return msg.includes('No supervisor socket found') || msg.includes('Connection timed out');
 }
 function waitForSupervisorReady({ child = null, timeoutMs = 15000, intervalMs = 250 } = {}) {
@@ -255,7 +206,7 @@ function waitForSupervisorReady({ child = null, timeoutMs = 15000, intervalMs =
         const startedAt = Date.now();
         const poll = async () => {
             try {
-                await (0, supervisor_control_1.sendControlCommand)({ cmd: 'status' });
+                await sendControlCommand({ cmd: 'status' });
                 finish(resolve, true);
             }
             catch (err) {
@@ -283,12 +234,12 @@ function waitForSupervisorReady({ child = null, timeoutMs = 15000, intervalMs =
 }
 function ensureSupervisorLogDir() {
     if (!storage.exists(LOGS_DIR)) {
-        (0, fs_utils_1.ensureDir)(LOGS_DIR);
+        ensureDir(LOGS_DIR);
     }
 }
 async function sendIsolatedDeleteIfAvailable() {
     try {
-        const resp = await (0, supervisor_control_1.sendControlCommand)({ cmd: 'delete' });
+        const resp = await sendControlCommand({ cmd: 'delete' });
         if (resp.ok && resp.status) {
             printControlStatus(resp.status);
         }
@@ -306,28 +257,28 @@ async function sendIsolatedDeleteIfAvailable() {
 }
 async function launchDetachedSupervisor({ botName = null, credentialDaemonPid = null } = {}) {
     try {
-        await (0, supervisor_control_1.sendControlCommand)({ cmd: 'status' });
-        throw new Error(`another isolated supervisor is already running at ${config_2.Config.DEXBOT_SUPERVISOR_SOCKET || SOCKET_PATH}`);
+        await sendControlCommand({ cmd: 'status' });
+        throw new Error(`another isolated supervisor is already running at ${Config.DEXBOT_SUPERVISOR_SOCKET || SOCKET_PATH}`);
     }
     catch (err) {
-        if (!String(err && (0, errors_1.getErrorMessage)(err) || '').includes('No supervisor socket found')) {
+        if (!String(err && getErrorMessage(err) || '').includes('No supervisor socket found')) {
             throw err;
         }
     }
     ensureSupervisorLogDir();
     const stdoutFd = storage.open(SUPERVISOR_OUT_LOG, 'a', 0o600);
     const stderrFd = storage.open(SUPERVISOR_ERROR_LOG, 'a', 0o600);
-    const args = (0, runtime_entry_1.buildRuntimeScriptArgs)({
+    const args = buildRuntimeScriptArgs({
         codeRoot: CODE_ROOT,
         scriptSegments: ['unlock'],
         scriptArgs: ['--isolated', ...(botName ? [botName] : [])],
     });
     let child = null;
     try {
-        child = (0, node_child_process_1.spawn)(config_2.Config.EXEC_PATH, args, {
-            cwd: paths_1.PATHS.PROJECT_ROOT,
+        child = spawn(Config.EXEC_PATH, args, {
+            cwd: PATHS.PROJECT_ROOT,
             detached: true,
-            env: (0, child_env_1.buildScopedChildEnv)({
+            env: buildScopedChildEnv({
                 extra: {
                     DEXBOT_ISOLATED_CHILD: '1',
                     ...(credentialDaemonPid ? { DEXBOT_MANAGED_CRED_PID: String(credentialDaemonPid) } : {}),
@@ -345,7 +296,7 @@ async function launchDetachedSupervisor({ botName = null, credentialDaemonPid =
     catch (err) {
         if (child && child.pid) {
             try {
-                runtime_1.runtime.kill(child.pid, 'SIGTERM');
+                runtime.kill(child.pid, 'SIGTERM');
             }
             catch (_) { }
         }
@@ -374,7 +325,7 @@ async function runIsolated({ botName, botEntry = null, stayResident = false, sta
     else {
         supervisor = createBotSupervisor();
     }
-    (0, graceful_shutdown_1.registerCleanup)('Bot supervisor', () => supervisor.shutdown());
+    registerCleanup('Bot supervisor', () => supervisor.shutdown());
     await supervisor.start();
     await supervisor.waitForStableStartup({ timeoutMs: startupGraceMs });
     printLauncherStartupSummary({ botNames: getLaunchedBotNames(botName || null), mode: 'isolated' });
@@ -409,7 +360,7 @@ async function runIsolated({ botName, botEntry = null, stayResident = false, sta
                     return;
                 }
                 const elapsedMs = Date.now() - pollStartedAt;
-                if (elapsedMs >= constants_1.LAUNCHER.MONOLITHIC.SUPERVISOR_POLL_TIMEOUT_MS) {
+                if (elapsedMs >= LAUNCHER.MONOLITHIC.SUPERVISOR_POLL_TIMEOUT_MS) {
                     clearInterval(interval);
                     cleanupSignalHandlers();
                     reject(new Error(`Supervisor poll timeout after ${Math.ceil(elapsedMs / 1000)}s: ` +
@@ -429,11 +380,11 @@ async function main({ argv = process.argv, startupGraceMs = DEFAULT_STARTUP_GRAC
     if (typeof chainKeys.checkKeysFileSecurity === 'function')
         chainKeys.checkKeysFileSecurity();
     if (typeof credentialPolicy.checkPolicyFileSecurity === 'function')
-        credentialPolicy.checkPolicyFileSecurity(paths_1.PATHS.PROFILES.DAEMON_POLICIES_JSON);
-    const parsed = (0, launch_modes_1.parseUnlockArgs)(argv);
-    const isDetachedSupervisorChild = config_2.Config.DEXBOT_ISOLATED_CHILD;
-    const forceForegroundIsolated = config_2.Config.DEXBOT_ISOLATED_FOREGROUND;
-    const isMonolithicBgChild = config_2.Config.DEXBOT_MONOLITHIC_BG;
+        credentialPolicy.checkPolicyFileSecurity(PATHS.PROFILES.DAEMON_POLICIES_JSON);
+    const parsed = parseUnlockArgs(argv);
+    const isDetachedSupervisorChild = Config.DEXBOT_ISOLATED_CHILD;
+    const forceForegroundIsolated = Config.DEXBOT_ISOLATED_FOREGROUND;
+    const isMonolithicBgChild = Config.DEXBOT_MONOLITHIC_BG;
     const forceForeground = argv.includes('--foreground');
     if (parsed.control) {
         await handleControl({ cmd: parsed.control.cmd, target: parsed.control.target ?? undefined });
@@ -548,8 +499,8 @@ async function main({ argv = process.argv, startupGraceMs = DEFAULT_STARTUP_GRAC
                 catch (_) { }
                 throw _e;
             }
-            const child = (0, node_child_process_1.spawn)(config_2.Config.EXEC_PATH, [__filename, ...argv.slice(2)], {
-                cwd: paths_1.PATHS.PROJECT_ROOT,
+            const child = spawn(Config.EXEC_PATH, [__filename, ...argv.slice(2)], {
+                cwd: PATHS.PROJECT_ROOT,
                 detached: true,
                 env: {
                     ...process.env,
@@ -587,17 +538,17 @@ async function main({ argv = process.argv, startupGraceMs = DEFAULT_STARTUP_GRAC
             daemonReleased = true;
             printLauncherStartupSummary({ botNames: launchedBotNames, mode: 'isolated' });
             console.log(`Supervisor PID: ${supervisorPid}`);
-            console.log(`Control socket: ${config_2.Config.DEXBOT_SUPERVISOR_SOCKET || SOCKET_PATH}`);
+            console.log(`Control socket: ${Config.DEXBOT_SUPERVISOR_SOCKET || SOCKET_PATH}`);
             console.log(`Supervisor logs: ${SUPERVISOR_OUT_LOG}`);
             process.exitCode = 0;
             return;
         }
         // Monolithic foreground mode — spawn and supervise the bot process directly
-        const updater = constants_1.UPDATER.ACTIVE ? createUpdateScheduler({ botProcessRef }) : null;
+        const updater = UPDATER.ACTIVE ? createUpdateScheduler({ botProcessRef }) : null;
         const cancelUpdater = updater ? updater.cancel : () => { };
-        const watchdog = (0, market_adapter_watchdog_1.createMarketAdapterWatchdog)({
+        const watchdog = createMarketAdapterWatchdog({
             codeRoot: CODE_ROOT,
-            root: paths_1.PATHS.PROJECT_ROOT,
+            root: PATHS.PROJECT_ROOT,
             logsDir: LOGS_DIR,
         });
         const cancelWatchdog = watchdog.schedule(MONOLITHIC_ERROR_LOG);
@@ -618,8 +569,8 @@ async function main({ argv = process.argv, startupGraceMs = DEFAULT_STARTUP_GRAC
             do {
                 launchedBotNames = getLaunchedBotNames(effectiveBotName || botName);
                 const dexbotArgs = buildDexbotStartArgs(effectiveBotName || botName, dryrun);
-                const botProcess = (0, node_child_process_1.spawn)(config_2.Config.EXEC_PATH, dexbotArgs, {
-                    cwd: paths_1.PATHS.PROJECT_ROOT,
+                const botProcess = spawn(Config.EXEC_PATH, dexbotArgs, {
+                    cwd: PATHS.PROJECT_ROOT,
                     env: process.env,
                     stdio: isMonolithicBgChild ? 'pipe' : 'inherit',
                 });
@@ -636,8 +587,8 @@ async function main({ argv = process.argv, startupGraceMs = DEFAULT_STARTUP_GRAC
                     catch (_) { }
                 }
                 if (isMonolithicBgChild && botProcess.stdout) {
-                    const outStream = node_fs_1.default.createWriteStream(MONOLITHIC_OUT_LOG, { flags: 'a' });
-                    const errStream = node_fs_1.default.createWriteStream(MONOLITHIC_ERROR_LOG, { flags: 'a' });
+                    const outStream = fs.createWriteStream(MONOLITHIC_OUT_LOG, { flags: 'a' });
+                    const errStream = fs.createWriteStream(MONOLITHIC_ERROR_LOG, { flags: 'a' });
                     botProcess.stdout.pipe(outStream);
                     botProcess.stderr.pipe(errStream);
                     botProcess.stdout.on('error', () => { });
@@ -684,18 +635,18 @@ async function main({ argv = process.argv, startupGraceMs = DEFAULT_STARTUP_GRAC
                 }
                 else if (exitCode !== 0) {
                     const uptime = Date.now() - lastStartTime;
-                    if (uptime >= constants_1.LAUNCHER.MONOLITHIC.minUptimeMs) {
+                    if (uptime >= LAUNCHER.MONOLITHIC.minUptimeMs) {
                         restartCount = 0;
                     }
                     restartCount++;
-                    if (restartCount > constants_1.LAUNCHER.MONOLITHIC.maxRestarts) {
-                        console.error(statusError(`Bot crashed ${constants_1.LAUNCHER.MONOLITHIC.maxRestarts} times without stable uptime. Exiting.`));
+                    if (restartCount > LAUNCHER.MONOLITHIC.maxRestarts) {
+                        console.error(statusError(`Bot crashed ${LAUNCHER.MONOLITHIC.maxRestarts} times without stable uptime. Exiting.`));
                         process.exitCode = exitCode || 1;
                         keepRunning = false;
                     }
                     else {
-                        console.log(`Bot crashed (exit ${exitCode}), restarting in ${constants_1.LAUNCHER.MONOLITHIC.restartDelayMs / 1000}s (attempt ${restartCount}/${constants_1.LAUNCHER.MONOLITHIC.maxRestarts})...`);
-                        await new Promise((r) => setTimeout(r, constants_1.LAUNCHER.MONOLITHIC.restartDelayMs));
+                        console.log(`Bot crashed (exit ${exitCode}), restarting in ${LAUNCHER.MONOLITHIC.restartDelayMs / 1000}s (attempt ${restartCount}/${LAUNCHER.MONOLITHIC.maxRestarts})...`);
+                        await new Promise((r) => setTimeout(r, LAUNCHER.MONOLITHIC.restartDelayMs));
                     }
                 }
                 else {
@@ -723,6 +674,94 @@ async function main({ argv = process.argv, startupGraceMs = DEFAULT_STARTUP_GRAC
     }
 }
 // ── Control command handling ───────────────────────────────────────
+/**
+ * Resolve the live credential daemon PID (owned or foreign) for status
+ * reporting. Falls back to the socket owner when the tracked PID file is
+ * missing or stale.
+ */
+function resolveCredentialDaemonForStatus() {
+    let credPid = null;
+    let credForeign = false;
+    try {
+        const raw = storage.readFile(MONOLITHIC_CRED_PID_FILE).trim();
+        const n = Number(raw);
+        if (Number.isInteger(n) && n > 0)
+            credPid = n;
+    }
+    catch (_) { }
+    if (!credPid && storage.exists(CREDENTIAL_SOCKET_FILE)) {
+        const ownerPid = findCredentialSocketOwnerPid();
+        if (ownerPid > 0 && isLikelyCredentialDaemonProcess(ownerPid)) {
+            credPid = ownerPid;
+            credForeign = true;
+        }
+    }
+    return { pid: credPid, foreign: credForeign };
+}
+/**
+ * Print the "Credential daemon:" status block for a resolved daemon PID.
+ */
+async function printCredentialDaemonStatusBlock(credPid, credForeign) {
+    const credStatus = await readCredentialDaemonStatus(credPid);
+    console.log(`  ${statusTitle('Credential daemon:')}`);
+    if (credPid && credForeign) {
+        console.log(`    ${statusLabel('PID:')}   ${credPid} ${colorStatus('(foreign/unowned)', STATUS_COLORS.warn)}`);
+    }
+    else {
+        console.log(`    ${statusLabel('PID:')}   ${credPid || '-'}`);
+    }
+    if (credPid && isPidAlive(credPid) && isLikelyCredentialDaemonProcess(credPid)) {
+        const credUptime = readProcUptime(credPid);
+        const credMem = readProcMemMB(credPid);
+        console.log(`    ${statusLabel('Memory:')}  ${formatMemoryWithUptime(credMem, credUptime)}`);
+        console.log(`    ${statusLabel('Alive:')} ${statusBool(true)}`);
+    }
+    else {
+        console.log(`    ${statusLabel('Alive:')} ${statusBool(false)}`);
+    }
+    console.log(`    ${statusLabel('Ready:')} ${statusBool(credStatus.ready)}`);
+    console.log(`    ${statusLabel('Socket:')} ${statusBool(credStatus.socket)}`);
+    if (credForeign) {
+        console.log(`    ${colorStatus('Rerun `dexbot unlock` to detach the foreign daemon and unlock with a fresh master password.', STATUS_COLORS.warn)}`);
+    }
+    return credStatus;
+}
+/**
+ * Print the "Market adapter:" status block for the running adapter (or note
+ * that it is not running).
+ */
+function printMarketAdapterStatusBlock() {
+    const adapterPid = readMarketAdapterLockPid();
+    const adapterAlive = adapterPid > 0 && isLikelyMarketAdapterProcess(adapterPid);
+    console.log(`  ${statusTitle('Market adapter:')}`);
+    if (adapterAlive) {
+        console.log(`    ${statusLabel('PID:')}     ${adapterPid}`);
+        console.log(`    ${statusLabel('Memory:')}  ${formatMemoryWithUptime(readProcMemMB(adapterPid), readProcUptime(adapterPid))}`);
+    }
+    else if (adapterPid > 0) {
+        console.log(`    ${colorStatus('(offline)', STATUS_COLORS.warn)}`);
+        return;
+    }
+    else {
+        console.log(`    ${colorStatus('(not running)', STATUS_COLORS.muted)}`);
+        return;
+    }
+    const amaBots = listConfiguredBots().filter((b) => b.active && usesAmaGridPrice(b));
+    function botKeyFromName(name) {
+        return String(name).trim().toLowerCase().replace(/[^a-z0-9]+/g, '-').replace(/^-+|-+$/g, '') || 'bot';
+    }
+    console.log(`    ${statusLabel('Active:')}  ${formatBotCount(amaBots.length)}`);
+    for (const b of amaBots) {
+        const flags = getWhitelistFlags(botKeyFromName(b.name));
+        const indicators = [];
+        if (flags.asymmetricBounds)
+            indicators.push('range');
+        if (flags.dynamicWeight)
+            indicators.push('weight');
+        const suffix = indicators.length > 0 ? `, ${indicators.join(', ')}` : '';
+        console.log(`      - ${colorStatus(b.name, STATUS_COLORS.ok)} (${b.gridPrice}${suffix})`);
+    }
+}
 async function handleControl({ cmd, target }) {
     const effectiveCmd = cmd === 'shutdown' ? 'delete' : cmd === 'stat' ? 'status' : cmd;
     const actionLabel = getControlActionLabel(cmd);
@@ -732,18 +771,35 @@ async function handleControl({ cmd, target }) {
             const summaryBotNames = getControlBotNames(undefined, true);
             const summaryServiceNames = getControlServiceNames(effectiveCmd, summaryBotNames);
             if (effectiveCmd === 'restart-all') {
-                const adapterResult = await stopMarketAdapterFromLock();
-                if (adapterResult.stopped) {
-                    console.log(`Stop signal sent to market adapter PID ${adapterResult.pid}`);
+                if (process.stdin.isTTY) {
+                    const credResult = await stopCredentialDaemon();
+                    if (credResult.signaled) {
+                        console.log('Stop signal sent to credential daemon');
+                    }
+                    const daemonOpts = { detached: true };
+                    const unlockedNow = await controller.ensureCredentialDaemon(daemonOpts);
+                    if (unlockedNow) {
+                        console.log(statusSuccess('✓ Authentication successful'));
+                    }
+                    const newCredPid = controller.getManagedDaemonPid();
+                    if (newCredPid) {
+                        try {
+                            storage.writeFile(MONOLITHIC_CRED_PID_FILE, String(newCredPid), { mode: 0o600 });
+                        }
+                        catch (_) { }
+                    }
+                    controller.releaseManagedDaemon();
                 }
+                await stopMarketAdapterFromLock();
                 try {
-                    runtime_1.runtime.kill(pid, 'SIGUSR2');
+                    runtime.kill(pid, 'SIGUSR2');
                 }
                 catch (err) {
                     if (err.code !== 'ESRCH')
                         throw err;
                 }
                 printControlActionSummary(actionLabel, summaryBotNames, summaryServiceNames);
+                process.exit(0);
                 return;
             }
             if (effectiveCmd === 'status') {
@@ -775,23 +831,6 @@ async function handleControl({ cmd, target }) {
                         displayedBots = [{ name: String(botInfo.botName) }];
                     }
                 }
-                let credPid = null;
-                let credForeign = false;
-                try {
-                    const raw = storage.readFile(MONOLITHIC_CRED_PID_FILE).trim();
-                    const n = Number(raw);
-                    if (Number.isInteger(n) && n > 0)
-                        credPid = n;
-                }
-                catch (_) { }
-                if (!credPid && storage.exists(CREDENTIAL_SOCKET_FILE)) {
-                    const ownerPid = findCredentialSocketOwnerPid();
-                    if (ownerPid > 0 && isLikelyCredentialDaemonProcess(ownerPid)) {
-                        credPid = ownerPid;
-                        credForeign = true;
-                    }
-                }
-                const credStatus = await readCredentialDaemonStatus(credPid);
                 console.log(statusTitle('Monolithic bot'));
                 console.log(`  ${statusLabel('PID:')}     ${targetPid}`);
                 console.log(`  ${statusLabel('Memory:')}  ${formatMemoryWithUptime(mem, uptime)}`);
@@ -800,73 +839,32 @@ async function handleControl({ cmd, target }) {
                 for (const b of displayedBots) {
                     console.log(`    - ${statusActiveBotName(b.name)}`);
                 }
-                console.log(`  ${statusTitle('Credential daemon:')}`);
-                if (credPid && credForeign) {
-                    console.log(`    ${statusLabel('PID:')}   ${credPid} ${colorStatus('(foreign/unowned)', STATUS_COLORS.warn)}`);
-                }
-                else {
-                    console.log(`    ${statusLabel('PID:')}   ${credPid || '-'}`);
-                }
-                if (credPid && isPidAlive(credPid) && isLikelyCredentialDaemonProcess(credPid)) {
-                    const credUptime = readProcUptime(credPid);
-                    const credMem = readProcMemMB(credPid);
-                    console.log(`    ${statusLabel('Memory:')}  ${formatMemoryWithUptime(credMem, credUptime)}`);
-                    console.log(`    ${statusLabel('Alive:')} ${statusBool(true)}`);
-                }
-                else {
-                    console.log(`    ${statusLabel('Alive:')} ${statusBool(false)}`);
-                }
-                console.log(`    ${statusLabel('Ready:')} ${statusBool(credStatus.ready)}`);
-                console.log(`    ${statusLabel('Socket:')} ${statusBool(credStatus.socket)}`);
-                if (credForeign) {
-                    console.log(`    ${colorStatus('Rerun `dexbot unlock` to detach the foreign daemon and unlock with a fresh master password.', STATUS_COLORS.warn)}`);
-                }
-                const adapterPid = readMarketAdapterLockPid();
-                const adapterAlive = adapterPid > 0 && (0, market_adapter_runtime_1.isLikelyMarketAdapterProcess)(adapterPid);
-                const amaBots = listConfiguredBots().filter((b) => b.active && usesAmaGridPrice(b));
-                console.log(`  ${statusTitle('Market adapter:')}`);
-                if (adapterAlive) {
-                    console.log(`    ${statusLabel('PID:')}     ${adapterPid}`);
-                    console.log(`    ${statusLabel('Memory:')}  ${formatMemoryWithUptime(readProcMemMB(adapterPid), readProcUptime(adapterPid))}`);
-                }
-                else if (adapterPid > 0) {
-                    console.log(`    ${statusLabel('PID:')}     ${adapterPid} ${colorStatus('(not alive)', STATUS_COLORS.warn)}`);
-                }
-                else {
-                    console.log(`    ${colorStatus('(not running)', STATUS_COLORS.muted)}`);
-                }
-                function botKeyFromName(name) {
-                    return String(name).trim().toLowerCase().replace(/[^a-z0-9]+/g, '-').replace(/^-+|-+$/g, '') || 'bot';
-                }
-                console.log(`    ${statusLabel('Active:')}  ${formatBotCount(amaBots.length)}`);
-                for (const b of amaBots) {
-                    const flags = (0, market_adapter_whitelist_1.getWhitelistFlags)(botKeyFromName(b.name));
-                    const indicators = [];
-                    if (flags.asymmetricBounds)
-                        indicators.push('range');
-                    if (flags.dynamicWeight)
-                        indicators.push('weight');
-                    const suffix = indicators.length > 0 ? `, ${indicators.join(', ')}` : '';
-                    console.log(`      - ${colorStatus(b.name, STATUS_COLORS.ok)} (${b.gridPrice}${suffix})`);
-                }
+                const { pid: credPid, foreign: credForeign } = resolveCredentialDaemonForStatus();
+                await printCredentialDaemonStatusBlock(credPid, credForeign);
+                printMarketAdapterStatusBlock();
                 return;
             }
             let monolithicExited = false;
             try {
-                runtime_1.runtime.kill(pid, 'SIGTERM');
-                const timeoutMs = effectiveCmd === 'delete' ? constants_1.LAUNCHER.MONOLITHIC.controlStopTimeoutMs : 5000;
-                monolithicExited = await waitForPidExit(pid, timeoutMs);
-                if (!monolithicExited && effectiveCmd === 'delete') {
-                    runtime_1.runtime.kill(pid, 'SIGKILL');
-                    monolithicExited = await waitForPidExit(pid, 2000);
-                    if (!monolithicExited) {
-                        throw new Error(`monolithic wrapper PID ${pid} did not exit after SIGKILL`);
-                    }
+                if (isProcessInDstate(pid)) {
+                    console.warn(`monolithic wrapper PID ${pid} is in uninterruptible sleep (D-state), cannot kill. Cleaning up state.`);
+                    monolithicExited = true;
                 }
-                if (effectiveCmd === 'delete') {
-                    const credResult = await stopCredentialDaemon();
-                    if (credResult.signaled) {
-                        console.log('Stop signal sent to credential daemon');
+                else {
+                    runtime.kill(pid, 'SIGTERM');
+                    const timeoutMs = effectiveCmd === 'delete' ? LAUNCHER.MONOLITHIC.controlStopTimeoutMs : 5000;
+                    monolithicExited = await waitForPidExit(pid, timeoutMs);
+                    if (!monolithicExited && effectiveCmd === 'delete') {
+                        if (isProcessInDstate(pid)) {
+                            console.warn(`monolithic wrapper PID ${pid} is in D-state, skipping SIGKILL.`);
+                        }
+                        else {
+                            runtime.kill(pid, 'SIGKILL');
+                            monolithicExited = await waitForPidExit(pid, 2000);
+                            if (!monolithicExited) {
+                                console.warn(`monolithic wrapper PID ${pid} did not exit after SIGKILL (may be in uninterruptible sleep). Cleaning up state.`);
+                            }
+                        }
                     }
                 }
             }
@@ -876,10 +874,16 @@ async function handleControl({ cmd, target }) {
                 monolithicExited = true;
             }
             finally {
-                if (effectiveCmd !== 'delete' || monolithicExited) {
+                if (effectiveCmd === 'delete' || monolithicExited) {
                     cleanupStateFiles();
                 }
             }
+            if (effectiveCmd === 'delete') {
+                const credResult = await stopCredentialDaemon();
+                if (credResult.signaled) {
+                    console.log('Stop signal sent to credential daemon');
+                }
+            }
             printControlActionSummary(actionLabel, summaryBotNames, summaryServiceNames);
             return;
         }
@@ -898,6 +902,22 @@ async function handleControl({ cmd, target }) {
             console.log(effectiveCmd === 'delete' ? 'Removed stale monolithic PID file' : 'Monolithic bot not running (stale PID file)');
             return;
         }
+        else if (effectiveCmd === 'status') {
+            // The monolithic runtime is stopped (bots + market adapter down),
+            // but the credential daemon may still be running — a `dexbot stop`
+            // leaves it alive for faster re-unlock. Report that state instead of
+            // falling through to an isolated supervisor socket that is absent.
+            const daemon = resolveCredentialDaemonForStatus();
+            if (daemon.pid && isPidAlive(daemon.pid) && isLikelyCredentialDaemonProcess(daemon.pid)) {
+                console.log(statusTitle('Monolithic bot'));
+                console.log(`  ${colorStatus('(offline)', STATUS_COLORS.warn)}`);
+                console.log();
+                await printCredentialDaemonStatusBlock(daemon.pid, daemon.foreign);
+                console.log();
+                printMarketAdapterStatusBlock();
+                return;
+            }
+        }
     }
     if (effectiveCmd === 'delete' && !target && storage.exists(MONOLITHIC_CRED_PID_FILE)) {
         await sendIsolatedDeleteIfAvailable();
@@ -915,8 +935,22 @@ async function handleControl({ cmd, target }) {
     const controlCmd = { cmd: effectiveCmd };
     if (target)
         controlCmd.bot = target;
+    // Restart credential daemon for restart-all (no target) in isolated mode
+    if (!target && effectiveCmd === 'restart-all' && process.stdin.isTTY) {
+        const ownerPid = findCredentialSocketOwnerPid();
+        if (ownerPid > 0 && isLikelyCredentialDaemonProcess(ownerPid)) {
+            await stopCredentialDaemonPid(ownerPid);
+        }
+        cleanupCredentialRuntimeFiles();
+        const daemonOpts = { detached: true };
+        const unlockedNow = await controller.ensureCredentialDaemon(daemonOpts);
+        if (unlockedNow) {
+            console.log(statusSuccess('✓ Authentication successful'));
+        }
+        controller.releaseManagedDaemon();
+    }
     try {
-        const resp = await (0, supervisor_control_1.sendControlCommand)(controlCmd);
+        const resp = await sendControlCommand(controlCmd);
         if (resp.ok && resp.status) {
             printControlStatus(resp.status);
         }
@@ -934,39 +968,41 @@ async function handleControl({ cmd, target }) {
             console.log('No runtime processes found.');
             return;
         }
-        console.error(statusError(`control ${cmd}: ${(0, errors_1.getErrorMessage)(err)}`));
+        console.error(statusError(`control ${cmd}: ${getErrorMessage(err)}`));
         process.exitCode = 1;
     }
+    process.exit(0);
 }
 // ── Bootstrap ──────────────────────────────────────────────────────
-const isUnlockStartDirectRun = require.main === module || (process.argv[1] &&
-    path_api_1.path.parse(process.argv[1]).name === 'unlock');
+const isUnlockStartDirectRun = !!process.argv[1] && (import.meta.url === pathToFileURL(process.argv[1]).href ||
+    path.parse(process.argv[1]).name === 'unlock');
 if (isUnlockStartDirectRun) {
-    (0, graceful_shutdown_1.setupGracefulShutdown)();
-    if (config_2.Config.DEXBOT_ISOLATED_CHILD) {
-        (0, graceful_shutdown_1.registerCleanup)('Credential daemon', () => stopCredentialDaemonPid(config_2.Config.DEXBOT_MANAGED_CRED_PID));
+    setupGracefulShutdown();
+    if (Config.DEXBOT_ISOLATED_CHILD) {
+        registerCleanup('Credential daemon', () => stopCredentialDaemonPid(Config.DEXBOT_MANAGED_CRED_PID));
     }
-    else if (config_2.Config.DEXBOT_MONOLITHIC_BG) {
-        (0, graceful_shutdown_1.registerCleanup)('PID files', cleanupStateFiles);
-        (0, graceful_shutdown_1.registerCleanup)('Bot process', async () => {
+    else if (Config.DEXBOT_MONOLITHIC_BG) {
+        registerCleanup('PID files', cleanupStateFiles);
+        registerCleanup('Bot process', async () => {
             const bot = botProcessRef.current;
             if (bot && !bot.killed) {
                 forwardSignal(bot, 'SIGTERM');
-                await (0, timeout_1.withTimeout)(new Promise((resolve) => bot.once('close', resolve)), constants_1.LAUNCHER.MONOLITHIC.SHUTDOWN_GRACE_MS, { onTimeout: 'resolve', defaultValue: undefined });
+                await withTimeout(new Promise((resolve) => bot.once('close', resolve)), LAUNCHER.MONOLITHIC.SHUTDOWN_GRACE_MS, { onTimeout: 'resolve', defaultValue: undefined });
             }
         });
     }
     else {
-        (0, graceful_shutdown_1.registerCleanup)('Credential daemon', () => controller.stopManagedDaemon());
+        registerCleanup('Credential daemon', () => controller.stopManagedDaemon());
     }
     (async () => {
         try {
             await main();
         }
         catch (err) {
-            console.error(statusError(`unlock failed: ${(0, errors_1.getErrorMessage)(err) || err}`));
+            console.error(statusError(`unlock failed: ${getErrorMessage(err) || err}`));
             process.exit(1);
         }
     })();
 }
+export { buildDexbotStartArgs, candidateRuntimeScriptPaths, ensureNoForeignCredentialDaemon, findCredentialSocketOwnerPid, isLikelyCredentialDaemonProcess, main, pidMatchesScriptCandidates, waitForChildSpawn, waitForStableChildStartup };
 //# sourceMappingURL=unlock.js.map