@cogcoin/client 1.1.4 → 1.1.6

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

@@ -1,77 +1,27 @@
 import { writeLine } from "../io.js";
-import { createTerminalPrompter } from "../prompt.js";
-import { createMutationSuccessEnvelope, describeCanonicalCommand, resolveStableMutationJsonSchema, writeHandledCliError, writeJsonValue, } from "../output.js";
+import { writeHandledCliError } from "../output.js";
 import { changeClientPassword, lockClientPassword, unlockClientPassword, } from "../../wallet/state/provider.js";
-function createCommandPrompter(parsed, context) {
-    return parsed.outputMode !== "text"
-        ? createTerminalPrompter(context.stdin, context.stderr)
-        : context.createPrompter();
+function createCommandPrompter(context) {
+    return context.createPrompter();
 }
 export async function runClientAdminCommand(parsed, context) {
     try {
         if (parsed.command === "client-lock") {
-            const status = await lockClientPassword(context.walletSecretProvider);
-            if (parsed.outputMode === "json") {
-                writeJsonValue(context.stdout, createMutationSuccessEnvelope(resolveStableMutationJsonSchema(parsed), describeCanonicalCommand(parsed), "locked", {
-                    resultType: "operation",
-                    operation: {
-                        kind: "client-lock",
-                        locked: true,
-                        unlockUntilUnixMs: status.unlockUntilUnixMs,
-                    },
-                    state: {
-                        locked: true,
-                        unlockUntilUnixMs: status.unlockUntilUnixMs,
-                    },
-                }));
-                return 0;
-            }
+            await lockClientPassword(context.walletSecretProvider);
             writeLine(context.stdout, "Client locked.");
             return 0;
         }
         if (parsed.command === "client-unlock") {
-            const prompter = createCommandPrompter(parsed, context);
+            const prompter = createCommandPrompter(context);
             const status = await unlockClientPassword(context.walletSecretProvider, prompter);
-            if (parsed.outputMode === "json") {
-                writeJsonValue(context.stdout, createMutationSuccessEnvelope(resolveStableMutationJsonSchema(parsed), describeCanonicalCommand(parsed), "unlocked", {
-                    resultType: "operation",
-                    operation: {
-                        kind: "client-unlock",
-                        unlocked: status.unlocked,
-                        unlockUntilUnixMs: status.unlockUntilUnixMs,
-                    },
-                    state: {
-                        unlocked: status.unlocked,
-                        unlockUntilUnixMs: status.unlockUntilUnixMs,
-                    },
-                }));
-                return 0;
-            }
             writeLine(context.stdout, status.unlockUntilUnixMs === null
                 ? "Client unlocked."
                 : `Client unlocked until ${new Date(status.unlockUntilUnixMs).toISOString()}.`);
             return 0;
         }
         if (parsed.command === "client-change-password") {
-            const prompter = createCommandPrompter(parsed, context);
+            const prompter = createCommandPrompter(context);
             const status = await changeClientPassword(context.walletSecretProvider, prompter);
-            if (parsed.outputMode === "json") {
-                writeJsonValue(context.stdout, createMutationSuccessEnvelope(resolveStableMutationJsonSchema(parsed), describeCanonicalCommand(parsed), "changed", {
-                    resultType: "operation",
-                    operation: {
-                        kind: "client-change-password",
-                        changed: true,
-                        unlocked: status.unlocked,
-                        unlockUntilUnixMs: status.unlockUntilUnixMs,
-                    },
-                    state: {
-                        changed: true,
-                        unlocked: status.unlocked,
-                        unlockUntilUnixMs: status.unlockUntilUnixMs,
-                    },
-                }));
-                return 0;
-            }
             writeLine(context.stdout, status.unlockUntilUnixMs === null
                 ? "Client password changed."
                 : `Client password changed. Client unlocked until ${new Date(status.unlockUntilUnixMs).toISOString()}.`);

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

@@ -1,25 +1,20 @@
 import { dirname } from "node:path";
-import { buildMinePromptData, buildMineSetupData, } from "../mining-json.js";
-import { buildMineSetupPreviewData } from "../preview-json.js";
 import { formatMiningPromptMutationReport } from "../mining-format.js";
 import { writeLine } from "../io.js";
-import { createTerminalPrompter } from "../prompt.js";
-import { createPreviewSuccessEnvelope, createMutationSuccessEnvelope, describeCanonicalCommand, resolvePreviewJsonSchema, resolveStableMiningControlJsonSchema, writeHandledCliError, writeJsonValue, } from "../output.js";
+import { writeHandledCliError } from "../output.js";
 import { formatNextStepLines, getMineSetupNextSteps } from "../workflow-hints.js";
 import { withInteractiveWalletSecretProvider } from "../../wallet/state/provider.js";
-function createCommandPrompter(parsed, context) {
-    return parsed.outputMode !== "text"
-        ? createTerminalPrompter(context.stdin, context.stderr)
-        : context.createPrompter();
+function createCommandPrompter(context) {
+    return context.createPrompter();
 }
 export async function runMiningAdminCommand(parsed, context) {
     try {
-        const runtimePaths = context.resolveWalletRuntimePaths(parsed.seedName);
+        const runtimePaths = context.resolveWalletRuntimePaths();
         const dbPath = parsed.dbPath ?? context.resolveDefaultClientDatabasePath();
         const dataDir = parsed.dataDir ?? context.resolveDefaultBitcoindDataDir();
         const packageVersion = await context.readPackageVersion();
         if (parsed.command === "mine-setup") {
-            const prompter = createCommandPrompter(parsed, context);
+            const prompter = createCommandPrompter(context);
             const provider = withInteractiveWalletSecretProvider(context.walletSecretProvider, prompter);
             const view = await context.setupBuiltInMining({
                 provider,
@@ -27,18 +22,6 @@ export async function runMiningAdminCommand(parsed, context) {
                 paths: runtimePaths,
             });
             const nextSteps = getMineSetupNextSteps();
-            if (parsed.outputMode === "preview-json") {
-                writeJsonValue(context.stdout, createPreviewSuccessEnvelope(resolvePreviewJsonSchema(parsed), describeCanonicalCommand(parsed), "configured", buildMineSetupPreviewData(view), {
-                    nextSteps,
-                }));
-                return 0;
-            }
-            if (parsed.outputMode === "json") {
-                writeJsonValue(context.stdout, createMutationSuccessEnvelope(resolveStableMiningControlJsonSchema(parsed), "cogcoin mine setup", "configured", buildMineSetupData(view), {
-                    nextSteps,
-                }));
-                return 0;
-            }
             writeLine(context.stdout, "Built-in mining provider configured.");
             writeLine(context.stdout, `Provider: ${view.provider.provider ?? "unknown"}`);
             if (view.provider.modelId !== null) {
@@ -56,7 +39,7 @@ export async function runMiningAdminCommand(parsed, context) {
             return 0;
         }
         if (parsed.command === "mine-prompt") {
-            const prompter = createCommandPrompter(parsed, context);
+            const prompter = createCommandPrompter(context);
             if (!prompter.isInteractive) {
                 throw new Error("mine_prompt_requires_tty");
             }
@@ -80,11 +63,9 @@ export async function runMiningAdminCommand(parsed, context) {
                 if (currentEntry === undefined) {
                     throw new Error("mine_prompt_domain_not_mineable");
                 }
-                if (parsed.outputMode === "text") {
-                    writeLine(context.stdout, `Domain: ${currentEntry.domain.name}`);
-                    writeLine(context.stdout, `Current domain prompt: ${currentEntry.prompt ?? "none"}`);
-                    writeLine(context.stdout, `Global fallback prompt: ${promptState.fallbackPromptConfigured ? "configured" : "not configured"}`);
-                }
+                writeLine(context.stdout, `Domain: ${currentEntry.domain.name}`);
+                writeLine(context.stdout, `Current domain prompt: ${currentEntry.prompt ?? "none"}`);
+                writeLine(context.stdout, `Global fallback prompt: ${promptState.fallbackPromptConfigured ? "configured" : "not configured"}`);
                 const nextPrompt = await prompter.prompt("Domain prompt (blank to clear and use the global fallback): ");
                 const result = await context.updateMiningDomainPrompt({
                     paths: runtimePaths,
@@ -93,10 +74,6 @@ export async function runMiningAdminCommand(parsed, context) {
                     domainName: targetDomain,
                     prompt: nextPrompt,
                 });
-                if (parsed.outputMode === "json") {
-                    writeJsonValue(context.stdout, createMutationSuccessEnvelope(resolveStableMiningControlJsonSchema(parsed), describeCanonicalCommand(parsed), result.status, buildMinePromptData(result)));
-                    return 0;
-                }
                 writeLine(context.stdout, formatMiningPromptMutationReport(result));
                 return 0;
             }

package/dist/cli/commands/mining-read.js

@@ -2,8 +2,7 @@ import { dirname } from "node:path";
 import { stat } from "node:fs/promises";
 import { formatMineStatusReport, formatMiningEventRecord, formatMiningPromptListReport, } from "../mining-format.js";
 import { writeLine } from "../io.js";
-import { createErrorEnvelope, createSuccessEnvelope, describeCanonicalCommand, normalizeListPage, writeJsonValue, } from "../output.js";
-import { buildMineLogJson, buildMinePromptListJson, buildMineStatusJson } from "../read-json.js";
+import { normalizeListPage, } from "../output.js";
 import { formatNextStepLines } from "../workflow-hints.js";
 import { withInteractiveWalletSecretProvider } from "../../wallet/state/provider.js";
 async function readRotationIndices(paths) {
@@ -21,12 +20,19 @@ async function readRotationIndices(paths) {
     }
     return rotation;
 }
+function getMinePromptListNextSteps(result) {
+    if (result.prompts.length === 0) {
+        return ["cogcoin domains --mineable"];
+    }
+    const nextDomainPrompt = result.prompts.find((entry) => entry.mineable && entry.prompt === null);
+    return nextDomainPrompt === undefined ? [] : [`cogcoin mine prompt ${nextDomainPrompt.domain.name}`];
+}
 export async function runMiningReadCommand(parsed, context) {
     try {
         const dbPath = parsed.dbPath ?? context.resolveDefaultClientDatabasePath();
         const dataDir = parsed.dataDir ?? context.resolveDefaultBitcoindDataDir();
         const packageVersion = await context.readPackageVersion();
-        const runtimePaths = context.resolveWalletRuntimePaths(parsed.seedName);
+        const runtimePaths = context.resolveWalletRuntimePaths();
         await context.ensureDirectory(dirname(dbPath));
         if (parsed.command === "mine-log") {
             if (!parsed.follow) {
@@ -41,27 +47,9 @@ export async function runMiningReadCommand(parsed, context) {
                 });
                 const events = normalized.items.slice().reverse();
                 if (events.length === 0) {
-                    if (parsed.outputMode === "json") {
-                        const result = buildMineLogJson(events, normalized.page, await readRotationIndices(runtimePaths));
-                        writeJsonValue(context.stdout, createSuccessEnvelope("cogcoin/mine-log/v1", describeCanonicalCommand(parsed), result.data, {
-                            warnings: result.warnings,
-                            explanations: result.explanations,
-                            nextSteps: result.nextSteps,
-                        }));
-                        return 0;
-                    }
                     writeLine(context.stdout, "No mining events recorded yet.");
                     return 0;
                 }
-                if (parsed.outputMode === "json") {
-                    const result = buildMineLogJson(events, normalized.page, await readRotationIndices(runtimePaths));
-                    writeJsonValue(context.stdout, createSuccessEnvelope("cogcoin/mine-log/v1", describeCanonicalCommand(parsed), result.data, {
-                        warnings: result.warnings,
-                        explanations: result.explanations,
-                        nextSteps: result.nextSteps,
-                    }));
-                    return 0;
-                }
                 for (const event of events) {
                     writeLine(context.stdout, formatMiningEventRecord(event));
                 }
@@ -91,9 +79,7 @@ export async function runMiningReadCommand(parsed, context) {
             return 0;
         }
         if (parsed.command === "mine-prompt-list") {
-            const provider = parsed.outputMode === "text"
-                ? withInteractiveWalletSecretProvider(context.walletSecretProvider, context.createPrompter())
-                : context.walletSecretProvider;
+            const provider = withInteractiveWalletSecretProvider(context.walletSecretProvider, context.createPrompter());
             const readContext = await context.openWalletReadContext({
                 dataDir,
                 databasePath: dbPath,
@@ -102,21 +88,13 @@ export async function runMiningReadCommand(parsed, context) {
                 paths: runtimePaths,
             });
             try {
-                const result = buildMinePromptListJson(await context.inspectMiningDomainPromptState({
+                const result = await context.inspectMiningDomainPromptState({
                     paths: runtimePaths,
                     provider,
                     readContext,
-                }));
-                if (parsed.outputMode === "json") {
-                    writeJsonValue(context.stdout, createSuccessEnvelope("cogcoin/mine-prompt-list/v1", describeCanonicalCommand(parsed), result.data, {
-                        warnings: result.warnings,
-                        explanations: result.explanations,
-                        nextSteps: result.nextSteps,
-                    }));
-                    return 0;
-                }
-                writeLine(context.stdout, formatMiningPromptListReport(result.data));
-                for (const line of formatNextStepLines(result.nextSteps)) {
+                });
+                writeLine(context.stdout, formatMiningPromptListReport(result));
+                for (const line of formatNextStepLines(getMinePromptListNextSteps(result))) {
                     writeLine(context.stdout, line);
                 }
                 return 0;
@@ -125,9 +103,7 @@ export async function runMiningReadCommand(parsed, context) {
                 await readContext.close();
             }
         }
-        const provider = parsed.outputMode === "text"
-            ? withInteractiveWalletSecretProvider(context.walletSecretProvider, context.createPrompter())
-            : context.walletSecretProvider;
+        const provider = withInteractiveWalletSecretProvider(context.walletSecretProvider, context.createPrompter());
         const readContext = await context.openWalletReadContext({
             dataDir,
             databasePath: dbPath,
@@ -145,15 +121,6 @@ export async function runMiningReadCommand(parsed, context) {
                 indexer: readContext.indexer,
                 paths: runtimePaths,
             });
-            if (parsed.outputMode === "json") {
-                const result = buildMineStatusJson(mining);
-                writeJsonValue(context.stdout, createSuccessEnvelope("cogcoin/mine-status/v1", describeCanonicalCommand(parsed), result.data, {
-                    warnings: result.warnings,
-                    explanations: result.explanations,
-                    nextSteps: result.nextSteps,
-                }));
-                return 0;
-            }
             writeLine(context.stdout, formatMineStatusReport(mining));
             return 0;
         }
@@ -163,14 +130,6 @@ export async function runMiningReadCommand(parsed, context) {
     }
     catch (error) {
         const message = error instanceof Error ? error.message : String(error);
-        if (parsed.outputMode === "json") {
-            writeJsonValue(context.stdout, createErrorEnvelope(parsed.command === "mine-log"
-                ? "cogcoin/mine-log/v1"
-                : parsed.command === "mine-prompt-list"
-                    ? "cogcoin/mine-prompt-list/v1"
-                    : "cogcoin/mine-status/v1", describeCanonicalCommand(parsed), message, message));
-            return 5;
-        }
         writeLine(context.stderr, message);
         return 5;
     }