@cogcoin/client 0.5.4 → 0.5.6

package/dist/cli/commands/service-runtime.js

@@ -1,6 +1,8 @@
 import { dirname } from "node:path";
 import { loadBundledGenesisParameters } from "@cogcoin/indexer";
+import { resolveCogcoinProcessingStartHeight } from "../../bitcoind/processing-start-height.js";
 import { UNINITIALIZED_WALLET_ROOT_ID, resolveManagedServicePaths } from "../../bitcoind/service-paths.js";
+import { resolveWalletRootIdFromLocalArtifacts, } from "../../wallet/root-resolution.js";
 import { writeLine } from "../io.js";
 import { createSuccessEnvelope, describeCanonicalCommand, writeHandledCliError, writeJsonValue, } from "../output.js";
 function formatBool(value) {
@@ -12,66 +14,39 @@ function formatMaybe(value) {
 function formatCompatibility(value) {
     return value.replaceAll("-", " ");
 }
-async function resolveEffectiveWalletRootId(dataDir, context) {
-    const paths = context.resolveWalletRuntimePaths();
-    try {
-        const loaded = await context.loadWalletState({
-            primaryPath: paths.walletStatePath,
-            backupPath: paths.walletStateBackupPath,
-        }, {
-            provider: context.walletSecretProvider,
-        });
-        return {
-            walletRootId: loaded.state.walletRootId,
-            source: "wallet-state",
-        };
-    }
-    catch {
-        // fall through
-    }
-    try {
-        const unlockSession = await context.loadUnlockSession(paths.walletUnlockSessionPath, {
-            provider: context.walletSecretProvider,
-        });
-        return {
-            walletRootId: unlockSession.walletRootId,
-            source: "unlock-session",
-        };
-    }
-    catch {
-        // fall through
-    }
-    try {
-        const explicitLock = await context.loadWalletExplicitLock(paths.walletExplicitLockPath);
-        if (explicitLock?.walletRootId) {
-            return {
-                walletRootId: explicitLock.walletRootId,
-                source: "explicit-lock",
-            };
-        }
-    }
-    catch {
-        // fall through
-    }
-    const fallbackProbe = await context.probeManagedBitcoindService({
-        dataDir,
-        chain: "main",
-        startHeight: 0,
-        walletRootId: UNINITIALIZED_WALLET_ROOT_ID,
-    });
-    if (fallbackProbe.status?.walletRootId) {
-        return {
-            walletRootId: fallbackProbe.status.walletRootId,
-            source: "bitcoind-status",
-        };
-    }
+function serviceStatusEntry(label, value, ok) {
     return {
+        text: `${label}: ${value}`,
+        ok,
+    };
+}
+function formatServiceStatusSection(header, entries) {
+    return [header, ...entries.map((entry) => `${entry.ok ? "✓" : "✗"} ${entry.text}`)].join("\n");
+}
+function formatSectionedServiceStatusReport(options) {
+    const parts = [
+        `\n⛭ ${options.title} ⛭`,
+        ...options.sections.map((section) => formatServiceStatusSection(section.header, section.entries)),
+    ];
+    if (options.nextStep !== null) {
+        parts.push(`Next step: ${options.nextStep}`);
+    }
+    return parts.join("\n\n");
+}
+async function resolveEffectiveWalletRootId(context) {
+    return resolveWalletRootIdFromLocalArtifacts({
+        paths: context.resolveWalletRuntimePaths(),
+        provider: context.walletSecretProvider,
+        loadRawWalletStateEnvelope: context.loadRawWalletStateEnvelope,
+        loadUnlockSession: context.loadUnlockSession,
+        loadWalletExplicitLock: context.loadWalletExplicitLock,
+    }).catch(() => ({
         walletRootId: UNINITIALIZED_WALLET_ROOT_ID,
         source: "default-uninitialized",
-    };
+    }));
 }
 async function inspectManagedBitcoindStatus(dataDir, context) {
-    const resolution = await resolveEffectiveWalletRootId(dataDir, context);
+    const resolution = await resolveEffectiveWalletRootId(context);
     const probe = await context.probeManagedBitcoindService({
         dataDir,
         chain: "main",
@@ -114,7 +89,7 @@ async function inspectManagedBitcoindStatus(dataDir, context) {
     };
 }
 async function inspectManagedIndexerStatus(dataDir, context) {
-    const resolution = await resolveEffectiveWalletRootId(dataDir, context);
+    const resolution = await resolveEffectiveWalletRootId(context);
     const runtimeRoot = resolveManagedServicePaths(dataDir, resolution.walletRootId).walletRuntimeRoot;
     const probe = await context.probeIndexerDaemon({
         dataDir,
@@ -144,96 +119,137 @@ async function inspectManagedIndexerStatus(dataDir, context) {
     };
 }
 function formatBitcoinStatusReport(payload) {
-    const lines = [
-        "Managed Bitcoind Status",
-        `Bitcoin datadir: ${payload.dataDir}`,
-        `Wallet root: ${payload.walletRootId}`,
-        `Wallet root source: ${payload.walletRootSource}`,
-        `Compatibility: ${formatCompatibility(payload.compatibility)}`,
+    const compatibilityOk = payload.compatibility === "compatible";
+    const serviceStateOk = payload.service?.state === "ready";
+    const nodeOk = payload.node !== null && payload.nodeError === null;
+    const managedServiceEntries = [
+        serviceStatusEntry("Compatibility", formatCompatibility(payload.compatibility), compatibilityOk),
     ];
     if (payload.service !== null) {
-        lines.push(`Service state: ${payload.service.state}`);
-        lines.push(`Process id: ${formatMaybe(payload.service.processId)}`);
-        lines.push(`Service instance: ${payload.service.serviceInstanceId}`);
-        lines.push(`Runtime root: ${payload.service.runtimeRoot}`);
-        lines.push(`Chain: ${payload.service.chain}`);
-        lines.push(`RPC: ${payload.service.rpc.url}`);
-        lines.push(`RPC cookie: ${payload.service.rpc.cookieFile}`);
-        lines.push(`ZMQ: ${payload.service.zmq.endpoint}`);
-        lines.push(`P2P port: ${payload.service.p2pPort}`);
-        lines.push(`Started at: ${payload.service.startedAtUnixMs}`);
-        lines.push(`Heartbeat at: ${payload.service.heartbeatAtUnixMs}`);
-        lines.push(`Updated at: ${payload.service.updatedAtUnixMs}`);
-        lines.push(`Managed Core wallet: ${payload.service.walletReplica?.proofStatus ?? "unavailable"}`);
+        managedServiceEntries.push(serviceStatusEntry("Service state", payload.service.state, serviceStateOk));
+        managedServiceEntries.push(serviceStatusEntry("Process id", formatMaybe(payload.service.processId), serviceStateOk));
+        managedServiceEntries.push(serviceStatusEntry("Service instance", payload.service.serviceInstanceId, serviceStateOk));
+        managedServiceEntries.push(serviceStatusEntry("Runtime root", payload.service.runtimeRoot, serviceStateOk));
+        managedServiceEntries.push(serviceStatusEntry("Chain", payload.service.chain, serviceStateOk));
+        managedServiceEntries.push(serviceStatusEntry("RPC", payload.service.rpc.url, serviceStateOk));
+        managedServiceEntries.push(serviceStatusEntry("RPC cookie", payload.service.rpc.cookieFile, serviceStateOk));
+        managedServiceEntries.push(serviceStatusEntry("ZMQ", payload.service.zmq.endpoint, serviceStateOk));
+        managedServiceEntries.push(serviceStatusEntry("P2P port", String(payload.service.p2pPort), serviceStateOk));
+        managedServiceEntries.push(serviceStatusEntry("Started at", String(payload.service.startedAtUnixMs), serviceStateOk));
+        managedServiceEntries.push(serviceStatusEntry("Heartbeat at", String(payload.service.heartbeatAtUnixMs), serviceStateOk));
+        managedServiceEntries.push(serviceStatusEntry("Updated at", String(payload.service.updatedAtUnixMs), serviceStateOk));
+        managedServiceEntries.push(serviceStatusEntry("Managed Core wallet", payload.service.walletReplica?.proofStatus ?? "unavailable", payload.service.walletReplica?.proofStatus === "ready"));
         if (payload.service.lastError !== null) {
-            lines.push(`Service error: ${payload.service.lastError}`);
+            managedServiceEntries.push(serviceStatusEntry("Service error", payload.service.lastError, false));
         }
     }
     else {
-        lines.push("Service state: unavailable");
-    }
-    if (payload.node !== null) {
-        lines.push(`Bitcoin best height: ${payload.node.bestHeight}`);
-        lines.push(`Bitcoin headers: ${payload.node.headerHeight}`);
-        lines.push(`Bitcoin best hash: ${payload.node.bestHash}`);
-        lines.push(`Verification progress: ${formatMaybe(payload.node.verificationProgress)}`);
-        lines.push(`Initial block download: ${formatBool(payload.node.initialBlockDownload)}`);
-        lines.push(`Network active: ${formatBool(payload.node.networkActive)}`);
-        lines.push(`Connections: ${payload.node.connections}`);
-        lines.push(`Inbound connections: ${formatMaybe(payload.node.inboundConnections)}`);
-        lines.push(`Outbound connections: ${formatMaybe(payload.node.outboundConnections)}`);
-    }
-    else {
-        lines.push("Bitcoin node: unavailable");
+        managedServiceEntries.push(serviceStatusEntry("Service state", "unavailable", false));
     }
+    const bitcoinNodeEntries = payload.node !== null
+        ? [
+            serviceStatusEntry("Best height", String(payload.node.bestHeight), nodeOk),
+            serviceStatusEntry("Headers", String(payload.node.headerHeight), nodeOk),
+            serviceStatusEntry("Best hash", payload.node.bestHash, nodeOk),
+            serviceStatusEntry("Verification progress", formatMaybe(payload.node.verificationProgress), nodeOk),
+            serviceStatusEntry("Initial block download", formatBool(payload.node.initialBlockDownload), nodeOk),
+            serviceStatusEntry("Network active", formatBool(payload.node.networkActive), nodeOk),
+            serviceStatusEntry("Connections", String(payload.node.connections), nodeOk),
+            serviceStatusEntry("Inbound connections", formatMaybe(payload.node.inboundConnections), nodeOk),
+            serviceStatusEntry("Outbound connections", formatMaybe(payload.node.outboundConnections), nodeOk),
+        ]
+        : [serviceStatusEntry("Node state", "unavailable", false)];
     if (payload.nodeError !== null) {
-        lines.push(`Node error: ${payload.nodeError}`);
-    }
-    if (payload.compatibility === "unreachable") {
-        lines.push("Recommended next step: Run `cogcoin bitcoin start` to start the managed Bitcoin service.");
+        bitcoinNodeEntries.push(serviceStatusEntry("Node error", payload.nodeError, false));
     }
-    return `${lines.join("\n")}\n`;
+    return formatSectionedServiceStatusReport({
+        title: "Bitcoin Status",
+        sections: [
+            {
+                header: "Paths",
+                entries: [
+                    serviceStatusEntry("Bitcoin datadir", payload.dataDir, true),
+                    serviceStatusEntry("Wallet root", payload.walletRootId, true),
+                    serviceStatusEntry("Wallet root source", payload.walletRootSource, true),
+                ],
+            },
+            {
+                header: "Managed Service",
+                entries: managedServiceEntries,
+            },
+            {
+                header: "Bitcoin Node",
+                entries: bitcoinNodeEntries,
+            },
+        ],
+        nextStep: payload.compatibility === "unreachable"
+            ? "Run `cogcoin bitcoin start` to start the managed Bitcoin service."
+            : null,
+    });
 }
 function formatIndexerStatusReport(payload) {
-    const lines = [
-        "Managed Indexer Status",
-        `Bitcoin datadir: ${payload.dataDir}`,
-        `Wallet root: ${payload.walletRootId}`,
-        `Wallet root source: ${payload.walletRootSource}`,
-        `Compatibility: ${formatCompatibility(payload.compatibility)}`,
-        `Observed source: ${payload.source}`,
+    const compatibilityOk = payload.compatibility === "compatible";
+    const observedSourceOk = payload.source === "probe";
+    const daemonStateOk = payload.daemon?.state === "synced";
+    const managedServiceEntries = [
+        serviceStatusEntry("Compatibility", formatCompatibility(payload.compatibility), compatibilityOk),
+        serviceStatusEntry("Observed source", payload.source, observedSourceOk),
     ];
     if (payload.daemon !== null) {
-        lines.push(`Daemon state: ${payload.daemon.state}`);
-        lines.push(`Process id: ${formatMaybe(payload.daemon.processId)}`);
-        lines.push(`Daemon instance: ${payload.daemon.daemonInstanceId}`);
-        lines.push(`Runtime root: ${payload.daemon.runtimeRoot}`);
-        lines.push(`Schema version: ${payload.daemon.schemaVersion}`);
-        lines.push(`Started at: ${payload.daemon.startedAtUnixMs}`);
-        lines.push(`Heartbeat at: ${payload.daemon.heartbeatAtUnixMs}`);
-        lines.push(`Updated at: ${payload.daemon.updatedAtUnixMs}`);
-        lines.push(`IPC ready: ${formatBool(payload.daemon.ipcReady)}`);
-        lines.push(`RPC reachable: ${formatBool(payload.daemon.rpcReachable)}`);
-        lines.push(`Core best height: ${formatMaybe(payload.daemon.coreBestHeight)}`);
-        lines.push(`Core best hash: ${formatMaybe(payload.daemon.coreBestHash)}`);
-        lines.push(`Applied tip height: ${formatMaybe(payload.daemon.appliedTipHeight)}`);
-        lines.push(`Applied tip hash: ${formatMaybe(payload.daemon.appliedTipHash)}`);
-        lines.push(`Snapshot sequence: ${formatMaybe(payload.daemon.snapshotSeq)}`);
-        lines.push(`Backlog blocks: ${formatMaybe(payload.daemon.backlogBlocks)}`);
-        lines.push(`Reorg depth: ${formatMaybe(payload.daemon.reorgDepth)}`);
-        lines.push(`Active snapshots: ${payload.daemon.activeSnapshotCount}`);
-        lines.push(`Last applied at: ${formatMaybe(payload.daemon.lastAppliedAtUnixMs)}`);
+        managedServiceEntries.push(serviceStatusEntry("Daemon state", payload.daemon.state, daemonStateOk));
+        managedServiceEntries.push(serviceStatusEntry("Process id", formatMaybe(payload.daemon.processId), daemonStateOk));
+        managedServiceEntries.push(serviceStatusEntry("Daemon instance", payload.daemon.daemonInstanceId, daemonStateOk));
+        managedServiceEntries.push(serviceStatusEntry("Runtime root", payload.daemon.runtimeRoot, daemonStateOk));
+        managedServiceEntries.push(serviceStatusEntry("Schema version", payload.daemon.schemaVersion, daemonStateOk));
+        managedServiceEntries.push(serviceStatusEntry("Started at", String(payload.daemon.startedAtUnixMs), daemonStateOk));
+        managedServiceEntries.push(serviceStatusEntry("Heartbeat at", String(payload.daemon.heartbeatAtUnixMs), daemonStateOk));
+        managedServiceEntries.push(serviceStatusEntry("Updated at", String(payload.daemon.updatedAtUnixMs), daemonStateOk));
+        managedServiceEntries.push(serviceStatusEntry("IPC ready", formatBool(payload.daemon.ipcReady), payload.daemon.ipcReady));
+        managedServiceEntries.push(serviceStatusEntry("RPC reachable", formatBool(payload.daemon.rpcReachable), payload.daemon.rpcReachable));
         if (payload.daemon.lastError !== null) {
-            lines.push(`Daemon error: ${payload.daemon.lastError}`);
+            managedServiceEntries.push(serviceStatusEntry("Daemon error", payload.daemon.lastError, false));
         }
     }
     else {
-        lines.push("Daemon state: unavailable");
-    }
-    if (payload.compatibility === "unreachable") {
-        lines.push("Recommended next step: Run `cogcoin indexer start` to start the managed Cogcoin indexer.");
+        managedServiceEntries.push(serviceStatusEntry("Daemon state", "unavailable", false));
     }
-    return `${lines.join("\n")}\n`;
+    const indexerStateEntries = payload.daemon !== null
+        ? [
+            serviceStatusEntry("Core best height", formatMaybe(payload.daemon.coreBestHeight), daemonStateOk),
+            serviceStatusEntry("Core best hash", formatMaybe(payload.daemon.coreBestHash), daemonStateOk),
+            serviceStatusEntry("Applied tip height", formatMaybe(payload.daemon.appliedTipHeight), daemonStateOk),
+            serviceStatusEntry("Applied tip hash", formatMaybe(payload.daemon.appliedTipHash), daemonStateOk),
+            serviceStatusEntry("Snapshot sequence", formatMaybe(payload.daemon.snapshotSeq), daemonStateOk),
+            serviceStatusEntry("Backlog blocks", formatMaybe(payload.daemon.backlogBlocks), daemonStateOk),
+            serviceStatusEntry("Reorg depth", formatMaybe(payload.daemon.reorgDepth), daemonStateOk),
+            serviceStatusEntry("Active snapshots", String(payload.daemon.activeSnapshotCount), daemonStateOk),
+            serviceStatusEntry("Last applied at", formatMaybe(payload.daemon.lastAppliedAtUnixMs), daemonStateOk),
+        ]
+        : [serviceStatusEntry("Daemon state", "unavailable", false)];
+    return formatSectionedServiceStatusReport({
+        title: "Indexer Status",
+        sections: [
+            {
+                header: "Paths",
+                entries: [
+                    serviceStatusEntry("Bitcoin datadir", payload.dataDir, true),
+                    serviceStatusEntry("Wallet root", payload.walletRootId, true),
+                    serviceStatusEntry("Wallet root source", payload.walletRootSource, true),
+                ],
+            },
+            {
+                header: "Managed Service",
+                entries: managedServiceEntries,
+            },
+            {
+                header: "Indexer State",
+                entries: indexerStateEntries,
+            },
+        ],
+        nextStep: payload.compatibility === "unreachable"
+            ? "Run `cogcoin indexer start` to start the managed Cogcoin indexer."
+            : null,
+    });
 }
 function buildStatusMessages(payload) {
     const warnings = [];
@@ -287,7 +303,7 @@ export async function runServiceRuntimeCommand(parsed, context) {
             return 0;
         }
         if (parsed.command === "bitcoin-start") {
-            const resolution = await resolveEffectiveWalletRootId(dataDir, context);
+            const resolution = await resolveEffectiveWalletRootId(context);
             const probe = await context.probeManagedBitcoindService({
                 dataDir,
                 chain: "main",
@@ -298,7 +314,7 @@ export async function runServiceRuntimeCommand(parsed, context) {
             await context.attachManagedBitcoindService({
                 dataDir,
                 chain: "main",
-                startHeight: genesis.genesisBlock,
+                startHeight: resolveCogcoinProcessingStartHeight(genesis),
                 walletRootId: resolution.walletRootId,
             });
             const bitcoindStatus = probe.compatibility === "compatible" ? "already-running" : "started";
@@ -324,7 +340,7 @@ export async function runServiceRuntimeCommand(parsed, context) {
             return 0;
         }
         if (parsed.command === "bitcoin-stop") {
-            const resolution = await resolveEffectiveWalletRootId(dataDir, context);
+            const resolution = await resolveEffectiveWalletRootId(context);
             const indexer = await context.stopIndexerDaemonService({
                 dataDir,
                 walletRootId: resolution.walletRootId,
@@ -349,7 +365,7 @@ export async function runServiceRuntimeCommand(parsed, context) {
             return 0;
         }
         if (parsed.command === "indexer-start") {
-            const resolution = await resolveEffectiveWalletRootId(dataDir, context);
+            const resolution = await resolveEffectiveWalletRootId(context);
             const dbPath = parsed.dbPath ?? context.resolveDefaultClientDatabasePath();
             await context.ensureDirectory(dirname(dbPath));
             const genesis = await loadBundledGenesisParameters();
@@ -362,7 +378,7 @@ export async function runServiceRuntimeCommand(parsed, context) {
             await context.attachManagedBitcoindService({
                 dataDir,
                 chain: "main",
-                startHeight: genesis.genesisBlock,
+                startHeight: resolveCogcoinProcessingStartHeight(genesis),
                 walletRootId: resolution.walletRootId,
             });
             const indexerProbe = await context.probeIndexerDaemon({
@@ -401,7 +417,7 @@ export async function runServiceRuntimeCommand(parsed, context) {
             return 0;
         }
         if (parsed.command === "indexer-stop") {
-            const resolution = await resolveEffectiveWalletRootId(dataDir, context);
+            const resolution = await resolveEffectiveWalletRootId(context);
             const indexer = await context.stopIndexerDaemonService({
                 dataDir,
                 walletRootId: resolution.walletRootId,

package/dist/cli/commands/sync.js

@@ -1,11 +1,19 @@
 import { dirname } from "node:path";
 import { formatManagedSyncErrorMessage } from "../../bitcoind/errors.js";
+import { resolveWalletRootIdFromLocalArtifacts } from "../../wallet/root-resolution.js";
 import { writeLine } from "../io.js";
 import { classifyCliError } from "../output.js";
 import { createStopSignalWatcher, waitForCompletionOrStop } from "../signals.js";
 export async function runSyncCommand(parsed, context) {
     const dbPath = parsed.dbPath ?? context.resolveDefaultClientDatabasePath();
     const dataDir = parsed.dataDir ?? context.resolveDefaultBitcoindDataDir();
+    const walletRoot = await resolveWalletRootIdFromLocalArtifacts({
+        paths: context.resolveWalletRuntimePaths(),
+        provider: context.walletSecretProvider,
+        loadRawWalletStateEnvelope: context.loadRawWalletStateEnvelope,
+        loadUnlockSession: context.loadUnlockSession,
+        loadWalletExplicitLock: context.loadWalletExplicitLock,
+    });
     await context.ensureDirectory(dirname(dbPath));
     const store = await context.openSqliteStore({ filename: dbPath });
     let storeOwned = true;
@@ -14,6 +22,7 @@ export async function runSyncCommand(parsed, context) {
             store,
             databasePath: dbPath,
             dataDir,
+            walletRootId: walletRoot.walletRootId,
             progressOutput: parsed.progressOutput,
         });
         storeOwned = false;

package/dist/cli/commands/wallet-admin.js

@@ -21,6 +21,66 @@ function getResetWarnings(result) {
         ? ["Some existing Cogcoin secret-provider entries could not be discovered from the remaining local wallet artifacts and may need manual cleanup."]
         : [];
 }
+function getResetNextSteps(result) {
+    return result.walletAction === "deleted" || result.walletAction === "not-present"
+        ? ["Run `cogcoin init` to create a new wallet."]
+        : ["Run `cogcoin sync` to bootstrap assumeutxo and the managed Bitcoin/indexer state."];
+}
+function formatResetBitcoinDataDirStatus(result) {
+    if (result.bitcoinDataDir.status === "outside-reset-scope") {
+        return "preserved (outside reset scope)";
+    }
+    return result.bitcoinDataDir.status;
+}
+function resetTextEntry(label, value, ok) {
+    return {
+        text: `${label}: ${value}`,
+        ok,
+    };
+}
+function formatResetSection(header, entries) {
+    return [header, ...entries.map((entry) => `${entry.ok ? "✓" : "✗"} ${entry.text}`)].join("\n");
+}
+function formatResetResultText(result) {
+    const warnings = getResetWarnings(result);
+    const nextStep = getResetNextSteps(result)[0] ?? null;
+    const secretCleanupOk = result.secretCleanupStatus !== "unknown" && result.secretCleanupStatus !== "failed";
+    const managedCleanupOk = result.stoppedProcesses.survivors === 0;
+    const outcomeEntries = [
+        resetTextEntry("Wallet action", result.walletAction, true),
+        resetTextEntry("Snapshot", result.bootstrapSnapshot.status, true),
+        resetTextEntry("Bitcoin datadir", formatResetBitcoinDataDirStatus(result), true),
+        resetTextEntry("Secret cleanup", result.secretCleanupStatus, secretCleanupOk),
+    ];
+    if (result.walletAction !== "retain-mnemonic" && result.walletOldRootId !== null) {
+        outcomeEntries.push(resetTextEntry("Previous wallet root", result.walletOldRootId, true));
+    }
+    if (result.walletAction !== "retain-mnemonic" && result.walletNewRootId !== null) {
+        outcomeEntries.push(resetTextEntry("New wallet root", result.walletNewRootId, true));
+    }
+    const sections = [
+        formatResetSection("Paths", [
+            resetTextEntry("Data root", result.dataRoot, true),
+        ]),
+        formatResetSection("Reset Outcome", outcomeEntries),
+        formatResetSection("Managed Cleanup", [
+            resetTextEntry("Managed bitcoind processes stopped", String(result.stoppedProcesses.managedBitcoind), managedCleanupOk),
+            resetTextEntry("Indexer daemons stopped", String(result.stoppedProcesses.indexerDaemon), managedCleanupOk),
+            resetTextEntry("Background miners stopped", String(result.stoppedProcesses.backgroundMining), managedCleanupOk),
+        ]),
+    ];
+    if (warnings.length > 0) {
+        sections.push(formatResetSection("Warnings", warnings.map((warning) => resetTextEntry("Warning", warning, false))));
+    }
+    const parts = [
+        "\n⛭ Cogcoin Reset ⛭",
+        ...sections,
+    ];
+    if (nextStep !== null) {
+        parts.push(`Next step: ${nextStep}`);
+    }
+    return parts.join("\n\n");
+}
 export async function runWalletAdminCommand(parsed, context) {
     const runtimePaths = context.resolveWalletRuntimePaths();
     const stopWatcher = createOwnedLockCleanupSignalWatcher(context.signalSource, context.forceExit, [
@@ -31,9 +91,9 @@ export async function runWalletAdminCommand(parsed, context) {
     ]);
     try {
         const outcome = await waitForCompletionOrStop((async () => {
-            const dataDir = parsed.dataDir ?? context.resolveDefaultBitcoindDataDir();
             const provider = context.walletSecretProvider;
             if (parsed.command === "init" || parsed.command === "wallet-init") {
+                const dataDir = parsed.dataDir ?? context.resolveDefaultBitcoindDataDir();
                 const prompter = createCommandPrompter(parsed, context);
                 const result = await context.initializeWallet({
                     dataDir,
@@ -59,6 +119,7 @@ export async function runWalletAdminCommand(parsed, context) {
                 return 0;
             }
             if (parsed.command === "restore" || parsed.command === "wallet-restore") {
+                const dataDir = parsed.dataDir ?? context.resolveDefaultBitcoindDataDir();
                 const prompter = createCommandPrompter(parsed, context);
                 const result = await context.restoreWalletFromMnemonic({
                     dataDir,
@@ -88,6 +149,14 @@ export async function runWalletAdminCommand(parsed, context) {
                 }
                 return 0;
             }
+            if (parsed.command === "wallet-show-mnemonic") {
+                const prompter = createCommandPrompter(parsed, context);
+                await context.showWalletMnemonic({
+                    provider,
+                    prompter,
+                });
+                return 0;
+            }
             const dbPath = parsed.dbPath ?? context.resolveDefaultClientDatabasePath();
             if (parsed.command === "unlock" || parsed.command === "wallet-unlock") {
                 const durationMs = parseUnlockDurationToMs(parsed.unlockFor);
@@ -105,6 +174,7 @@ export async function runWalletAdminCommand(parsed, context) {
                 return 0;
             }
             if (parsed.command === "reset") {
+                const dataDir = parsed.dataDir ?? context.resolveDefaultBitcoindDataDir();
                 if (parsed.outputMode === "preview-json") {
                     const preview = await context.previewResetWallet({
                         dataDir,
@@ -122,32 +192,15 @@ export async function runWalletAdminCommand(parsed, context) {
                 if (parsed.outputMode === "json") {
                     writeJsonValue(context.stdout, createMutationSuccessEnvelope(resolveStableMutationJsonSchema(parsed), describeCanonicalCommand(parsed), "completed", buildResetMutationData(result), {
                         warnings: getResetWarnings(result),
-                        nextSteps: result.walletAction === "deleted" || result.walletAction === "not-present"
-                            ? ["Run `cogcoin init` to create a new wallet."]
-                            : ["Run `cogcoin status` to inspect the reset local state."],
+                        nextSteps: getResetNextSteps(result),
                     }));
                     return 0;
                 }
-                writeLine(context.stdout, "Cogcoin reset completed.");
-                writeLine(context.stdout, `Data root: ${result.dataRoot}`);
-                writeLine(context.stdout, `Wallet action: ${result.walletAction}`);
-                writeLine(context.stdout, `Snapshot: ${result.bootstrapSnapshot.status}`);
-                writeLine(context.stdout, `Secret cleanup: ${result.secretCleanupStatus}`);
-                writeLine(context.stdout, `Managed bitcoind processes stopped: ${result.stoppedProcesses.managedBitcoind}`);
-                writeLine(context.stdout, `Indexer daemons stopped: ${result.stoppedProcesses.indexerDaemon}`);
-                writeLine(context.stdout, `Background miners stopped: ${result.stoppedProcesses.backgroundMining}`);
-                if (result.walletOldRootId !== null) {
-                    writeLine(context.stdout, `Previous wallet root: ${result.walletOldRootId}`);
-                }
-                if (result.walletNewRootId !== null) {
-                    writeLine(context.stdout, `New wallet root: ${result.walletNewRootId}`);
-                }
-                for (const warning of getResetWarnings(result)) {
-                    writeLine(context.stdout, `Warning: ${warning}`);
-                }
+                writeLine(context.stdout, formatResetResultText(result));
                 return 0;
             }
             if (parsed.command === "wallet-export") {
+                const dataDir = parsed.dataDir ?? context.resolveDefaultBitcoindDataDir();
                 const prompter = createCommandPrompter(parsed, context);
                 const result = await context.exportWallet({
                     archivePath: parsed.args[0],
@@ -166,6 +219,7 @@ export async function runWalletAdminCommand(parsed, context) {
                 return 0;
             }
             if (parsed.command === "wallet-import") {
+                const dataDir = parsed.dataDir ?? context.resolveDefaultBitcoindDataDir();
                 const prompter = createCommandPrompter(parsed, context);
                 const result = await context.importWallet({
                     archivePath: parsed.args[0],
@@ -185,6 +239,7 @@ export async function runWalletAdminCommand(parsed, context) {
                 return 0;
             }
             if (parsed.command === "wallet-lock") {
+                const dataDir = parsed.dataDir ?? context.resolveDefaultBitcoindDataDir();
                 const result = await context.lockWallet({
                     dataDir,
                     provider,
@@ -202,6 +257,7 @@ export async function runWalletAdminCommand(parsed, context) {
                 return 0;
             }
             if (parsed.command === "repair") {
+                const dataDir = parsed.dataDir ?? context.resolveDefaultBitcoindDataDir();
                 const result = await context.repairWallet({
                     dataDir,
                     databasePath: dbPath,

package/dist/cli/context.js

@@ -6,12 +6,12 @@ import { resolveDefaultBitcoindDataDirForTesting, resolveDefaultClientDatabasePa
 import { openManagedBitcoindClient } from "../bitcoind/index.js";
 import { inspectPassiveClientStatus } from "../passive-status.js";
 import { openSqliteStore } from "../sqlite/index.js";
-import { exportWallet, importWallet, initializeWallet, lockWallet, previewResetWallet, repairWallet, resetWallet, restoreWalletFromMnemonic, unlockWallet, } from "../wallet/lifecycle.js";
+import { exportWallet, importWallet, initializeWallet, lockWallet, previewResetWallet, repairWallet, resetWallet, restoreWalletFromMnemonic, showWalletMnemonic, unlockWallet, } from "../wallet/lifecycle.js";
 import { resolveWalletRuntimePathsForTesting } from "../wallet/runtime.js";
 import { openWalletReadContext } from "../wallet/read/index.js";
 import { loadWalletExplicitLock } from "../wallet/state/explicit-lock.js";
 import { loadUnlockSession } from "../wallet/state/session.js";
-import { loadWalletState } from "../wallet/state/storage.js";
+import { loadRawWalletStateEnvelope, loadWalletState } from "../wallet/state/storage.js";
 import { disableMiningHooks, enableMiningHooks, followMiningLog, inspectMiningControlPlane, readMiningLog, runForegroundMining, setupBuiltInMining, startBackgroundMining, stopBackgroundMining, } from "../wallet/mining/index.js";
 import { createLazyDefaultWalletSecretProvider } from "../wallet/state/provider.js";
 import { anchorDomain, buyDomain, claimCogLock, clearDomainDelegate, clearDomainEndpoint, clearDomainMiner, clearField, createField, giveReputation, lockCogToDomain, registerDomain, reclaimCogLock, revokeReputation, sendCog, setField, setDomainCanonical, setDomainDelegate, setDomainEndpoint, setDomainMiner, sellDomain, transferDomain, } from "../wallet/tx/index.js";
@@ -39,6 +39,7 @@ export function createDefaultContext(overrides = {}) {
         previewResetWallet: overrides.previewResetWallet ?? previewResetWallet,
         exportWallet: overrides.exportWallet ?? exportWallet,
         importWallet: overrides.importWallet ?? importWallet,
+        showWalletMnemonic: overrides.showWalletMnemonic ?? showWalletMnemonic,
         unlockWallet: overrides.unlockWallet ?? unlockWallet,
         lockWallet: overrides.lockWallet ?? lockWallet,
         registerDomain: overrides.registerDomain ?? registerDomain,
@@ -88,6 +89,7 @@ export function createDefaultContext(overrides = {}) {
         stopIndexerDaemonService: overrides.stopIndexerDaemonService ?? stopIndexerDaemonService,
         readPackageVersion: overrides.readPackageVersion ?? readPackageVersionFromDisk,
         loadWalletState: overrides.loadWalletState ?? loadWalletState,
+        loadRawWalletStateEnvelope: overrides.loadRawWalletStateEnvelope ?? loadRawWalletStateEnvelope,
         loadUnlockSession: overrides.loadUnlockSession ?? loadUnlockSession,
         loadWalletExplicitLock: overrides.loadWalletExplicitLock ?? loadWalletExplicitLock,
         resolveDefaultBitcoindDataDir: overrides.resolveDefaultBitcoindDataDir ?? resolveDefaultBitcoindDataDirForTesting,

package/dist/cli/mutation-json.js

@@ -150,6 +150,7 @@ export function buildResetMutationData(result) {
             walletOldRootId: result.walletOldRootId,
             walletNewRootId: result.walletNewRootId,
             bootstrapSnapshot: result.bootstrapSnapshot,
+            bitcoinDataDir: result.bitcoinDataDir,
             stoppedProcesses: result.stoppedProcesses,
             secretCleanupStatus: result.secretCleanupStatus,
         },
@@ -165,6 +166,7 @@ export function buildResetMutationData(result) {
             walletOldRootId: result.walletOldRootId,
             walletNewRootId: result.walletNewRootId,
             bootstrapSnapshot: result.bootstrapSnapshot,
+            bitcoinDataDir: result.bitcoinDataDir,
             removedPaths: result.removedPaths,
         },
     });

package/dist/cli/output.js

@@ -335,7 +335,7 @@ export function createCliErrorPresentation(errorCode, fallbackMessage) {
         return {
             what: "Mnemonic confirmation failed.",
             why: "The requested recovery-phrase confirmation word did not match, so wallet initialization was canceled before it could finish.",
-            next: "Run `cogcoin init` again and re-enter the requested confirmation words carefully.",
+            next: "Run `cogcoin init` again and re-enter the requested confirmation words carefully. The same recovery phrase will be shown until confirmation succeeds.",
         };
     }
     if (errorCode === "wallet_restore_mnemonic_invalid") {
@@ -735,6 +735,8 @@ export function describeCanonicalCommand(parsed) {
         case "restore":
         case "wallet-restore":
             return "cogcoin restore";
+        case "wallet-show-mnemonic":
+            return "cogcoin wallet show-mnemonic";
         case "unlock":
         case "wallet-unlock":
             return "cogcoin unlock";