mppx 0.6.3 → 0.6.5

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # mppx
 
+## 0.6.5
+
+### Patch Changes
+
+- 3c5cd4b: Fixed zero-amount Tempo proof credentials to bind signatures to the challenge realm.
+- 24604ff: Fixed MCP stdio startup and returned structured CLI command results without writing raw tool output to stdout.
+
+## 0.6.4
+
+### Patch Changes
+
+- 0d1e548: Fixed credential `opaque` serialization to use the spec-compliant base64url string shape, while keeping deserialization backward-compatible with legacy object-shaped credentials.
+- 9536014: Added canonical discovery output using `x-payment-info.offers[]` while continuing to accept the legacy flat shorthand during validation and parsing.
+
 ## 0.6.3
 
 ### Patch Changes

package/dist/Credential.d.ts

@@ -24,6 +24,8 @@ export declare class InvalidCredentialEncodingError extends Error {
 }
 /**
  * Deserializes an Authorization header value to a credential.
+ * Accepts the spec-compliant base64url `opaque` string shape and the legacy
+ * object-shaped `opaque` form emitted by older mppx versions.
  *
  * @param header - The Authorization header value.
  * @returns The deserialized credential.
@@ -79,6 +81,8 @@ export declare namespace from {
 export declare function fromRequest<payload = unknown>(request: Request): Credential<payload>;
 /**
  * Serializes a credential to the Authorization header format.
+ * When present, `challenge.opaque` is encoded as the base64url string required
+ * by the Payment auth credential format.
  *
  * @param credential - The credential to serialize.
  * @returns A string suitable for the Authorization header value.

package/dist/Credential.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Credential.d.ts","sourceRoot":"","sources":["../src/Credential.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,SAAS,MAAM,gBAAgB,CAAA;AAG3C;;GAEG;AACH,MAAM,MAAM,UAAU,CACpB,OAAO,GAAG,OAAO,EACjB,SAAS,SAAS,SAAS,CAAC,SAAS,GAAG,SAAS,CAAC,SAAS,IACzD;IACF,2CAA2C;IAC3C,SAAS,EAAE,SAAS,CAAA;IACpB,qCAAqC;IACrC,OAAO,EAAE,OAAO,CAAA;IAChB,2EAA2E;IAC3E,MAAM,CAAC,EAAE,MAAM,CAAA;CAChB,CAAA;AAED,qBAAa,+BAAgC,SAAQ,KAAK;IACxD,SAAkB,IAAI,qCAAoC;;CAK3D;AAED,qBAAa,yBAA0B,SAAQ,KAAK;IAClD,SAAkB,IAAI,+BAA8B;;CAKrD;AAED,qBAAa,8BAA+B,SAAQ,KAAK;IACvD,SAAkB,IAAI,oCAAmC;;CAK1D;AAED;;;;;;;;;;;;GAYG;AACH,wBAAgB,WAAW,CAAC,OAAO,GAAG,OAAO,EAAE,KAAK,EAAE,MAAM,GAAG,UAAU,CAAC,OAAO,CAAC,CAsBjF;AAED;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,IAAI,CAAC,KAAK,CAAC,UAAU,SAAS,IAAI,CAAC,UAAU,EAC3D,UAAU,EAAE,UAAU,GACrB,UAAU,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE,UAAU,CAAC,WAAW,CAAC,CAAC,CAO5D;AAED,MAAM,CAAC,OAAO,WAAW,IAAI,CAAC;IAC5B,KAAK,UAAU,GAAG;QAChB,2CAA2C;QAC3C,SAAS,EAAE,SAAS,CAAC,SAAS,CAAA;QAC9B,qCAAqC;QACrC,OAAO,EAAE,OAAO,CAAA;QAChB,2EAA2E;QAC3E,MAAM,CAAC,EAAE,MAAM,CAAA;KAChB,CAAA;CACF;AAED;;;;;;;;;;;;GAYG;AACH,wBAAgB,WAAW,CAAC,OAAO,GAAG,OAAO,EAAE,OAAO,EAAE,OAAO,GAAG,UAAU,CAAC,OAAO,CAAC,CAMpF;AAED;;;;;;;;;;;;;GAaG;AACH,wBAAgB,SAAS,CAAC,UAAU,EAAE,UAAU,GAAG,MAAM,CAYxD;AAED;;;;;;GAMG;AACH,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAGlE"}
+{"version":3,"file":"Credential.d.ts","sourceRoot":"","sources":["../src/Credential.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,SAAS,MAAM,gBAAgB,CAAA;AAG3C;;GAEG;AACH,MAAM,MAAM,UAAU,CACpB,OAAO,GAAG,OAAO,EACjB,SAAS,SAAS,SAAS,CAAC,SAAS,GAAG,SAAS,CAAC,SAAS,IACzD;IACF,2CAA2C;IAC3C,SAAS,EAAE,SAAS,CAAA;IACpB,qCAAqC;IACrC,OAAO,EAAE,OAAO,CAAA;IAChB,2EAA2E;IAC3E,MAAM,CAAC,EAAE,MAAM,CAAA;CAChB,CAAA;AAED,qBAAa,+BAAgC,SAAQ,KAAK;IACxD,SAAkB,IAAI,qCAAoC;;CAK3D;AAED,qBAAa,yBAA0B,SAAQ,KAAK;IAClD,SAAkB,IAAI,+BAA8B;;CAKrD;AAED,qBAAa,8BAA+B,SAAQ,KAAK;IACvD,SAAkB,IAAI,oCAAmC;;CAK1D;AAED;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,WAAW,CAAC,OAAO,GAAG,OAAO,EAAE,KAAK,EAAE,MAAM,GAAG,UAAU,CAAC,OAAO,CAAC,CAoCjF;AAED;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,IAAI,CAAC,KAAK,CAAC,UAAU,SAAS,IAAI,CAAC,UAAU,EAC3D,UAAU,EAAE,UAAU,GACrB,UAAU,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE,UAAU,CAAC,WAAW,CAAC,CAAC,CAO5D;AAED,MAAM,CAAC,OAAO,WAAW,IAAI,CAAC;IAC5B,KAAK,UAAU,GAAG;QAChB,2CAA2C;QAC3C,SAAS,EAAE,SAAS,CAAC,SAAS,CAAA;QAC9B,qCAAqC;QACrC,OAAO,EAAE,OAAO,CAAA;QAChB,2EAA2E;QAC3E,MAAM,CAAC,EAAE,MAAM,CAAA;KAChB,CAAA;CACF;AAED;;;;;;;;;;;;GAYG;AACH,wBAAgB,WAAW,CAAC,OAAO,GAAG,OAAO,EAAE,OAAO,EAAE,OAAO,GAAG,UAAU,CAAC,OAAO,CAAC,CAMpF;AAED;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,SAAS,CAAC,UAAU,EAAE,UAAU,GAAG,MAAM,CAcxD;AAED;;;;;;GAMG;AACH,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAGlE"}

package/dist/Credential.js

@@ -21,6 +21,8 @@ export class InvalidCredentialEncodingError extends Error {
 }
 /**
  * Deserializes an Authorization header value to a credential.
+ * Accepts the spec-compliant base64url `opaque` string shape and the legacy
+ * object-shaped `opaque` form emitted by older mppx versions.
  *
  * @param header - The Authorization header value.
  * @returns The deserialized credential.
@@ -41,6 +43,16 @@ export function deserialize(value) {
         const parsed = JSON.parse(json);
         const challenge = Challenge.Schema.parse({
             ...parsed.challenge,
+            ...(parsed.challenge.opaque !== undefined && {
+                // TODO: Drop the legacy object-shaped `opaque` fallback after old mppx
+                // clients are no longer in circulation. Older mppx versions echoed
+                // `opaque` as an expanded JSON object in credentials, but the Payment
+                // auth spec requires clients to return the original base64url string
+                // unchanged in the credential challenge object.
+                opaque: typeof parsed.challenge.opaque === 'string'
+                    ? PaymentRequest.deserialize(parsed.challenge.opaque)
+                    : parsed.challenge.opaque,
+            }),
             request: PaymentRequest.deserialize(parsed.challenge.request),
         });
         return {
@@ -101,6 +113,8 @@ export function fromRequest(request) {
 }
 /**
  * Serializes a credential to the Authorization header format.
+ * When present, `challenge.opaque` is encoded as the base64url string required
+ * by the Payment auth credential format.
  *
  * @param credential - The credential to serialize.
  * @returns A string suitable for the Authorization header value.
@@ -114,10 +128,12 @@ export function fromRequest(request) {
  * ```
  */
 export function serialize(credential) {
+    const { opaque, request, ...challenge } = credential.challenge;
     const wire = {
         challenge: {
-            ...credential.challenge,
-            request: PaymentRequest.serialize(credential.challenge.request),
+            ...challenge,
+            ...(opaque !== undefined && { opaque: PaymentRequest.serialize(opaque) }),
+            request: PaymentRequest.serialize(request),
         },
         payload: credential.payload,
         ...(credential.source && { source: credential.source }),

package/dist/Credential.js.map

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

package/dist/bin.js

@@ -1,4 +1,4 @@
 #!/usr/bin/env node
 import cli from './cli/cli.js';
-cli.serve().then(() => process.exit(0));
+await cli.serve();
 //# sourceMappingURL=bin.js.map

package/dist/bin.js.map

@@ -1 +1 @@
-{"version":3,"file":"bin.js","sourceRoot":"","sources":["../src/bin.ts"],"names":[],"mappings":";AACA,OAAO,GAAG,MAAM,cAAc,CAAA;AAE9B,GAAG,CAAC,KAAK,EAAE,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAA"}
+{"version":3,"file":"bin.js","sourceRoot":"","sources":["../src/bin.ts"],"names":[],"mappings":";AACA,OAAO,GAAG,MAAM,cAAc,CAAA;AAE9B,MAAM,GAAG,CAAC,KAAK,EAAE,CAAA"}

package/dist/cli/cli.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cli.d.ts","sourceRoot":"","sources":["../../src/cli/cli.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,GAAG,EAAa,MAAM,OAAO,CAAA;AAsCtC,QAAA,MAAM,GAAG;;;;;;;;;;;;;;;;;;;;;;;;wBAscP,CAAA;AA6oBF,eAAe,GAAG,CAAA"}
+{"version":3,"file":"cli.d.ts","sourceRoot":"","sources":["../../src/cli/cli.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,GAAG,EAAa,MAAM,OAAO,CAAA;AA6EtC,QAAA,MAAM,GAAG;;;;;;;;;;;;;;;;;;;;;;;;wBAscP,CAAA;AA8uBF,eAAe,GAAG,CAAA"}

package/dist/cli/cli.js

@@ -15,6 +15,37 @@ import { loadConfig, resolveAcceptPayment, selectChallenge } from './internal.js
 import { readTempoKeystore, resolveTempoAccount } from './plugins/tempo.js';
 import { chainName, confirm, decodeMemo, fetchBalanceLines, fmtBalance, fmtChallengeValue, fmtRequestValue, isTempoAccount, link, parseMethodOpts, pc, printRequestHeaders, printResponseHeaders, prompt, resolveChain, resolveRpcUrl, } from './utils.js';
 const packageJson = createRequire(import.meta.url)('../../package.json');
+const accountSummarySchema = z.object({
+    address: z.string(),
+    isDefault: z.boolean().optional(),
+    name: z.string(),
+    source: z.string().optional(),
+});
+const accountViewSchema = z.object({
+    address: z.string(),
+    balances: z.array(z.string()).optional(),
+    name: z.string(),
+    type: z.string().optional(),
+});
+const discoveryIssueSchema = z.object({
+    message: z.string(),
+    path: z.string(),
+    severity: z.string(),
+});
+function shouldReturnStructured(c) {
+    return c.format === 'json' && c.formatExplicit;
+}
+function outputResult(c, data, print) {
+    if (shouldReturnStructured(c))
+        return c.ok(data);
+    print();
+    return undefined;
+}
+function canReadCommandStdin() {
+    if (process.stdin.isTTY !== false)
+        return false;
+    return process.stdin.listenerCount('data') === 0 && process.stdin.listenerCount('readable') === 0;
+}
 const cli = Cli.create('mppx', {
     version: packageJson.version,
     description: 'Make HTTP requests with automatic payment handling',
@@ -468,26 +499,40 @@ const account = Cli.create('account', {
         account: z.string().optional().describe('Account name (env: MPPX_ACCOUNT)'),
         rpcUrl: z.string().optional().describe('RPC endpoint (env: MPPX_RPC_URL)'),
     }),
+    output: z.object({ address: z.string(), name: z.string() }),
     alias: { account: 'a', rpcUrl: 'r' },
     async run(c) {
+        const structured = shouldReturnStructured(c);
         let resolvedName = c.options.account;
         if (!resolvedName) {
             const existing = await createKeychain().list();
             if (existing.length === 0)
                 resolvedName = 'main';
             else {
+                if (structured)
+                    return c.error({
+                        code: 'ACCOUNT_REQUIRED',
+                        message: 'Account name is required in structured mode.',
+                        exitCode: 2,
+                    });
                 const input = await prompt('Account name');
                 if (!input)
-                    return;
+                    return undefined;
                 resolvedName = input;
             }
         }
         let keychain = createKeychain(resolvedName);
         while (await keychain.get()) {
+            if (structured)
+                return c.error({
+                    code: 'ACCOUNT_EXISTS',
+                    message: `Account "${resolvedName}" already exists.`,
+                    exitCode: 1,
+                });
             process.stderr.write(`${pc.dim(`Account "${resolvedName}" already exists.`)}\n\n`);
             const input = await prompt('Enter different name');
             if (!input)
-                return;
+                return undefined;
             resolvedName = input;
             keychain = createKeychain(resolvedName);
         }
@@ -497,16 +542,18 @@ const account = Cli.create('account', {
         const accounts = await createKeychain().list();
         if (accounts.length === 1)
             createDefaultStore().set(resolvedName);
-        console.log(`Account "${resolvedName}" saved to keychain.`);
         const explorerUrl = tempoMainnet.blockExplorers?.default?.url;
         const addrDisplay = explorerUrl
             ? link(`${explorerUrl}/address/${acct.address}`, acct.address)
             : acct.address;
-        console.log(pc.dim(`Address ${addrDisplay}`));
         const rpcUrl = resolveRpcUrl(c.options.rpcUrl);
         resolveChain({ rpcUrl })
             .then((chain) => createClient({ chain, transport: http(rpcUrl) }))
             .then((client) => import('viem/tempo').then(({ Actions }) => Actions.faucet.fund(client, { account: acct }).catch(() => { })));
+        return outputResult(c, { address: acct.address, name: resolvedName }, () => {
+            console.log(`Account "${resolvedName}" saved to keychain.`);
+            console.log(pc.dim(`Address ${addrDisplay}`));
+        });
     },
 })
     .command('default', {
@@ -514,6 +561,7 @@ const account = Cli.create('account', {
     options: z.object({
         account: z.string().describe('Account name'),
     }),
+    output: z.object({ name: z.string() }),
     alias: { account: 'a' },
     async run(c) {
         const accountName = c.options.account;
@@ -527,8 +575,9 @@ const account = Cli.create('account', {
                 });
             }
             createDefaultStore().set(accountName);
-            console.log(`Default account set to "${accountName}"`);
-            return;
+            return outputResult(c, { name: accountName }, () => {
+                console.log(`Default account set to "${accountName}"`);
+            });
         }
         const key = await createKeychain(accountName).get();
         if (!key) {
@@ -539,7 +588,9 @@ const account = Cli.create('account', {
             });
         }
         createDefaultStore().set(accountName);
-        console.log(`Default account set to "${accountName}"`);
+        return outputResult(c, { name: accountName }, () => {
+            console.log(`Default account set to "${accountName}"`);
+        });
     },
 })
     .command('delete', {
@@ -548,6 +599,7 @@ const account = Cli.create('account', {
         account: z.string().describe('Account name'),
         yes: z.boolean().optional().describe('DANGER!! Skip confirmation prompts'),
     }),
+    output: z.object({ defaultAccount: z.string().optional(), name: z.string() }),
     alias: { account: 'a' },
     async run(c) {
         const keychain = createKeychain(c.options.account);
@@ -562,6 +614,12 @@ const account = Cli.create('account', {
         const acct = privateKeyToAccount(key);
         const balanceLines = await fetchBalanceLines(acct.address, { includeTestnet: false });
         if (!c.options.yes) {
+            if (shouldReturnStructured(c))
+                return c.error({
+                    code: 'CONFIRMATION_REQUIRED',
+                    message: 'Pass --yes to delete an account in structured mode.',
+                    exitCode: 2,
+                });
             const explorerUrl = tempoMainnet.blockExplorers?.default?.url;
             const addrDisplay = explorerUrl
                 ? link(`${explorerUrl}/address/${acct.address}`, acct.address)
@@ -574,22 +632,27 @@ const account = Cli.create('account', {
             const confirmed = await confirm('Confirm delete?');
             if (!confirmed) {
                 console.log('Canceled');
-                return;
+                return undefined;
             }
         }
         await keychain.delete();
         const currentDefault = createDefaultStore().get();
+        let defaultAccount;
         if (currentDefault === c.options.account) {
             const remaining = await createKeychain().list();
             if (remaining.length > 0) {
-                createDefaultStore().set(remaining[0]);
-                console.log(`Default account set to "${remaining[0]}"`);
+                defaultAccount = remaining[0];
+                createDefaultStore().set(defaultAccount);
             }
             else {
                 createDefaultStore().clear();
             }
         }
-        console.log(`Account "${c.options.account}" deleted`);
+        return outputResult(c, { defaultAccount, name: c.options.account }, () => {
+            if (defaultAccount)
+                console.log(`Default account set to "${defaultAccount}"`);
+            console.log(`Account "${c.options.account}" deleted`);
+        });
     },
 })
     .command('fund', {
@@ -598,8 +661,10 @@ const account = Cli.create('account', {
         account: z.string().optional().describe('Account name (env: MPPX_ACCOUNT)'),
         rpcUrl: z.string().optional().describe('RPC endpoint (env: MPPX_RPC_URL)'),
     }),
+    output: z.object({ account: z.string(), chain: z.string(), transactions: z.array(z.string()) }),
     alias: { account: 'a', rpcUrl: 'r' },
     async run(c) {
+        const structured = shouldReturnStructured(c);
         const accountName = resolveAccountName(c.options.account);
         const keychain = createKeychain(accountName);
         const key = await keychain.get();
@@ -617,27 +682,40 @@ const account = Cli.create('account', {
         const rpcUrl = resolveRpcUrl(c.options.rpcUrl);
         const chain = await resolveChain({ rpcUrl });
         const client = createClient({ chain, transport: http(rpcUrl) });
-        console.log(`Funding "${accountName}" on ${chainName(chain)}`);
+        if (!structured)
+            console.log(`Funding "${accountName}" on ${chainName(chain)}`);
         try {
             const { Actions } = await import('viem/tempo');
             const hashes = await Actions.faucet.fund(client, { account: acct });
             const explorerUrl = chain.blockExplorers?.default?.url;
-            for (const hash of hashes) {
-                const label = explorerUrl ? link(`${explorerUrl}/tx/${hash}`, pc.gray(hash)) : hash;
-                console.log(`  ${label}`);
+            if (!structured) {
+                for (const hash of hashes) {
+                    const label = explorerUrl ? link(`${explorerUrl}/tx/${hash}`, pc.gray(hash)) : hash;
+                    console.log(`  ${label}`);
+                }
             }
             const { waitForTransactionReceipt } = await import('viem/actions');
             await Promise.all(hashes.map((hash) => waitForTransactionReceipt(client, { hash })));
-            console.log('Funded successfully');
+            return outputResult(c, { account: accountName, chain: chainName(chain), transactions: [...hashes] }, () => {
+                console.log('Funded successfully');
+            });
         }
         catch (err) {
+            if (structured)
+                return c.error({
+                    code: 'FUNDING_FAILED',
+                    message: err instanceof Error ? err.message : String(err),
+                    exitCode: 1,
+                });
             console.error('Funding failed:', err instanceof Error ? err.message : err);
+            return undefined;
         }
     },
 })
     .command('list', {
     description: 'List all accounts',
-    async run() {
+    output: z.object({ accounts: z.array(accountSummarySchema) }),
+    async run(c) {
         const currentDefault = createDefaultStore().get();
         const accounts = (await createKeychain().list()).sort();
         const resolved = [];
@@ -658,21 +736,29 @@ const account = Cli.create('account', {
                 resolved.push({ name: tempoName, address: entry.wallet_address, source: 'tempo wallet' });
         }
         if (resolved.length === 0) {
-            console.log(`No accounts found.`);
-            return;
+            return outputResult(c, { accounts: [] }, () => {
+                console.log(`No accounts found.`);
+            });
         }
         const explorerUrl = tempoMainnet.blockExplorers?.default?.url;
         const maxWidth = Math.max(...resolved.map((e) => e.name.length + (e.name === currentDefault ? 1 : 0)));
-        for (const entry of resolved) {
-            const isDefault = entry.name === currentDefault;
-            const label = isDefault ? `${entry.name}${pc.dim('*')}` : entry.name;
-            const width = entry.name.length + (isDefault ? 1 : 0);
-            const addrDisplay = explorerUrl
-                ? link(`${explorerUrl}/address/${entry.address}`, entry.address)
-                : entry.address;
-            const sourceLabel = entry.source ? `  ${pc.dim(`(${entry.source})`)}` : '';
-            console.log(`${label}${' '.repeat(maxWidth - width + 2)}${pc.dim(addrDisplay)}${sourceLabel}`);
-        }
+        return outputResult(c, {
+            accounts: resolved.map((entry) => ({
+                ...entry,
+                ...(entry.name === currentDefault ? { isDefault: true } : undefined),
+            })),
+        }, () => {
+            for (const entry of resolved) {
+                const isDefault = entry.name === currentDefault;
+                const label = isDefault ? `${entry.name}${pc.dim('*')}` : entry.name;
+                const width = entry.name.length + (isDefault ? 1 : 0);
+                const addrDisplay = explorerUrl
+                    ? link(`${explorerUrl}/address/${entry.address}`, entry.address)
+                    : entry.address;
+                const sourceLabel = entry.source ? `  ${pc.dim(`(${entry.source})`)}` : '';
+                console.log(`${label}${' '.repeat(maxWidth - width + 2)}${pc.dim(addrDisplay)}${sourceLabel}`);
+            }
+        });
     },
 })
     .command('export', {
@@ -680,6 +766,7 @@ const account = Cli.create('account', {
     options: z.object({
         account: z.string().optional().describe('Account name (env: MPPX_ACCOUNT)'),
     }),
+    output: z.object({ privateKey: z.string() }),
     alias: { account: 'a' },
     async run(c) {
         const accountName = resolveAccountName(c.options.account);
@@ -701,7 +788,9 @@ const account = Cli.create('account', {
             else
                 return c.error({ code: 'ACCOUNT_NOT_FOUND', message: 'No account found.', exitCode: 69 });
         }
-        console.log(key);
+        return outputResult(c, { privateKey: key }, () => {
+            console.log(key);
+        });
     },
 })
     .command('view', {
@@ -710,6 +799,7 @@ const account = Cli.create('account', {
         account: z.string().optional().describe('Account name (env: MPPX_ACCOUNT)'),
         rpcUrl: z.string().optional().describe('RPC endpoint (env: MPPX_RPC_URL)'),
     }),
+    output: accountViewSchema,
     alias: { account: 'a', rpcUrl: 'r' },
     async run(c) {
         const accountName = resolveAccountName(c.options.account);
@@ -729,13 +819,19 @@ const account = Cli.create('account', {
             const addrDisplay = explorerUrl
                 ? link(`${explorerUrl}/address/${address}`, address)
                 : address;
-            console.log(`${pc.dim('Address')}  ${addrDisplay}`);
             const balanceLines = await fetchBalanceLines(address, chain && rpcUrl ? { chain, rpcUrl } : undefined);
-            for (let i = 0; i < balanceLines.length; i++)
-                console.log(`${pc.dim(i === 0 ? 'Balance' : '       ')}  ${balanceLines[i]}`);
-            console.log(`${pc.dim('Name')}     ${accountName}`);
-            console.log(`${pc.dim('Type')}     ${tempoEntry.wallet_type} ${pc.dim('(tempo wallet)')}`);
-            return;
+            return outputResult(c, {
+                address,
+                balances: balanceLines,
+                name: accountName,
+                type: `${tempoEntry.wallet_type} (tempo wallet)`,
+            }, () => {
+                console.log(`${pc.dim('Address')}  ${addrDisplay}`);
+                for (let i = 0; i < balanceLines.length; i++)
+                    console.log(`${pc.dim(i === 0 ? 'Balance' : '       ')}  ${balanceLines[i]}`);
+                console.log(`${pc.dim('Name')}     ${accountName}`);
+                console.log(`${pc.dim('Type')}     ${tempoEntry.wallet_type} ${pc.dim('(tempo wallet)')}`);
+            });
         }
         const keychain = createKeychain(accountName);
         const key = await keychain.get();
@@ -756,11 +852,13 @@ const account = Cli.create('account', {
         const addrDisplay = explorerUrl
             ? link(`${explorerUrl}/address/${acct.address}`, acct.address)
             : acct.address;
-        console.log(`${pc.dim('Address')}  ${addrDisplay}`);
         const balanceLines = await fetchBalanceLines(acct.address, chain && rpcUrl ? { chain, rpcUrl } : undefined);
-        for (let i = 0; i < balanceLines.length; i++)
-            console.log(`${pc.dim(i === 0 ? 'Balance' : '       ')}  ${balanceLines[i]}`);
-        console.log(`${pc.dim('Name')}     ${accountName}`);
+        return outputResult(c, { address: acct.address, balances: balanceLines, name: accountName }, () => {
+            console.log(`${pc.dim('Address')}  ${addrDisplay}`);
+            for (let i = 0; i < balanceLines.length; i++)
+                console.log(`${pc.dim(i === 0 ? 'Balance' : '       ')}  ${balanceLines[i]}`);
+            console.log(`${pc.dim('Name')}     ${accountName}`);
+        });
     },
 });
 const sign = Cli.create('sign', {
@@ -783,6 +881,7 @@ const sign = Cli.create('sign', {
             .optional()
             .describe('RPC endpoint, defaults to public RPC for chain (env: MPPX_RPC_URL)'),
     }),
+    output: z.object({ authorization: z.string() }),
     alias: {
         account: 'a',
         challenge: 'C',
@@ -792,7 +891,7 @@ const sign = Cli.create('sign', {
     },
     async run(c) {
         const raw = c.options.challenge ||
-            (process.stdin.isTTY === false
+            (canReadCommandStdin()
                 ? await new Promise((resolve, reject) => {
                     let data = '';
                     process.stdin.setEncoding('utf-8');
@@ -823,7 +922,7 @@ const sign = Cli.create('sign', {
         }
         if (c.options.dryRun) {
             process.stderr.write('Challenge is valid.\n');
-            return;
+            return undefined;
         }
         const loaded = await loadConfig(c.options.config);
         const selected = selectChallenge(challenges, loaded?.config);
@@ -870,12 +969,9 @@ const sign = Cli.create('sign', {
                 exitCode: 2,
             });
         }
-        if (c.format === 'json') {
-            console.log(JSON.stringify({ authorization: credential }));
-        }
-        else {
+        return outputResult(c, { authorization: credential }, () => {
             console.log(credential);
-        }
+        });
     },
 });
 const init = Cli.create('init', {
@@ -883,6 +979,7 @@ const init = Cli.create('init', {
     options: z.object({
         force: z.boolean().optional().describe('Overwrite existing config file'),
     }),
+    output: z.object({ file: z.string() }),
     alias: { force: 'f' },
     async run(c) {
         const cwd = process.cwd();
@@ -915,7 +1012,9 @@ export default defineConfig({
 })
 `;
         fs.writeFileSync(dest, template);
-        console.log(`Created ${filename}`);
+        return outputResult(c, { file: dest }, () => {
+            console.log(`Created ${filename}`);
+        });
     },
 });
 const discover = Cli.create('discover', {
@@ -929,6 +1028,7 @@ const discover = Cli.create('discover', {
     options: z.object({
         output: z.string().optional().describe('Write output to a file instead of stdout'),
     }),
+    output: z.record(z.string(), z.unknown()),
     alias: { output: 'o' },
     async run(c) {
         const modulePath = path.resolve(c.args.module);
@@ -974,9 +1074,12 @@ const discover = Cli.create('discover', {
             const outPath = path.resolve(c.options.output);
             fs.writeFileSync(outPath, `${json}\n`);
             process.stderr.write(`Wrote ${outPath}\n`);
+            return outputResult(c, doc, () => { });
         }
         else {
-            console.log(json);
+            return outputResult(c, doc, () => {
+                console.log(json);
+            });
         }
     },
 })
@@ -985,6 +1088,12 @@ const discover = Cli.create('discover', {
     args: z.object({
         input: z.string().describe('Path or URL to a discovery document'),
     }),
+    output: z.object({
+        errorCount: z.number(),
+        issues: z.array(discoveryIssueSchema),
+        valid: z.boolean(),
+        warningCount: z.number(),
+    }),
     async run(c) {
         const input = c.args.input;
         let raw;
@@ -1055,8 +1164,9 @@ const discover = Cli.create('discover', {
             });
         }
         const issues = validateDiscovery(doc);
-        for (const issue of issues)
-            console.log(`[${issue.severity}] ${issue.path}: ${issue.message}`);
+        if (!shouldReturnStructured(c))
+            for (const issue of issues)
+                console.log(`[${issue.severity}] ${issue.path}: ${issue.message}`);
         const errorCount = issues.filter((issue) => issue.severity === 'error').length;
         const warningCount = issues.filter((issue) => issue.severity === 'warning').length;
         if (errorCount > 0) {
@@ -1066,9 +1176,11 @@ const discover = Cli.create('discover', {
                 exitCode: 1,
             });
         }
-        console.log(warningCount > 0
-            ? `Discovery document is valid with ${warningCount} warning(s).`
-            : 'Discovery document is valid.');
+        return outputResult(c, { errorCount, issues, valid: true, warningCount }, () => {
+            console.log(warningCount > 0
+                ? `Discovery document is valid with ${warningCount} warning(s).`
+                : 'Discovery document is valid.');
+        });
     },
 });
 cli.command(account);