@defdone/annon 0.1.0-alpha.2 → 0.1.0-alpha.3

package/dist/node/cli.js

@@ -1,64 +1,14 @@
 import { parseArgs } from 'node:util';
-import { publicError, usage } from './errors.js';
+import { isRow } from './adapter-checks.js';
+import { buyFlow } from './buy-flow.js';
+import { camel, common, perCommand } from './cli-flags.js';
+import { AdapterError, publicError, usage } from './errors.js';
+import { humanError, humanResult } from './output/human.js';
 import { version } from './version.js';
-const common = [
-    'no-open',
-    'json',
-    'config',
-    'contract-id',
-    'near-rpc',
-    'base-rpc',
-    'network',
-    'state-dir',
-    'relayer',
-    'trust-contract',
-    'wallet',
-    'evm-key-file',
-    'solana-key-file',
-    'near-key-file',
-    'near-account',
-    'near-public-key',
-    'backup-secret-file',
-];
-const perCommand = {
-    shops: ['search', 'limit', 'offset'],
-    shop: ['id'],
-    catalog: ['shop', 'search', 'limit', 'offset'],
-    fund: [],
-    budget: [],
-    login: [],
-    init: [
-        'signer',
-        'credential-env',
-        'credential-keychain',
-        'agent',
-        'recovery',
-        'key-env',
-        'keychain-entry',
-        'new-key',
-        'daily-budget',
-    ],
-    share: ['resume', 'price', 'shop', 'title', 'description', 'storage-budget', 'listing-storage'],
-    sell: ['resume', 'price', 'split', 'base', 'moderator', 'output', 'storage-budget'],
-    buy: [
-        'force',
-        'origin',
-        'route',
-        'from-chain',
-        'from-asset',
-        'refund-to',
-        'recovery',
-        'max-price',
-        'moderator',
-        'url',
-    ],
-    open: ['purchase', 'file', 'url', 'output'],
-    recover: ['recovery', 'purchase'],
-    stop: [],
-    verify: [],
-    status: [],
-};
 const bareInit = ['json', 'config', 'stateDir', 'backupSecretFile'];
+/** Without a target `status` and `open` use the latest purchase; these take none at all. */
+const optionalTarget = ['status', 'open'];
+const noTarget = ['recover', 'login', 'init', 'shops', 'catalog'];
 export function parseCli(argv) {
     try {
         const keys = [...new Set([...common, ...Object.values(perCommand).flat()])];
@@ -75,18 +25,15 @@ export function parseCli(argv) {
             (command === 'fund' || command === 'shop' ? extra.length !== 1 : extra.length !== 0))
             throw usage();
         const cmd = command;
-        if ((['recover', 'login', 'init', 'shops', 'catalog'].includes(cmd) && target !== undefined) ||
-            (!['recover', 'login', 'init', 'shops', 'catalog'].includes(cmd) && !target))
+        if ((noTarget.includes(cmd) && target !== undefined) ||
+            (![...noTarget, ...optionalTarget].includes(cmd) && !target))
             throw usage();
         if (cmd === 'shop' && target !== 'add')
             throw usage();
         const allowed = [...common, ...perCommand[cmd]];
         if (Object.keys(parsed.values).some((k) => !allowed.includes(k)))
             throw usage();
-        const values = Object.fromEntries(Object.entries(parsed.values).map(([k, v]) => [
-            k.replace(/-([a-z])/g, (_, c) => c.toUpperCase()),
-            v,
-        ]));
+        const values = Object.fromEntries(Object.entries(parsed.values).map(([k, v]) => [camel(k), v]));
         for (const key of ['limit', 'offset']) {
             if (values[key] !== undefined) {
                 if (typeof values[key] !== 'string' || !/^(0|[1-9][0-9]*)$/.test(values[key]))
@@ -126,6 +73,11 @@ export function parseCli(argv) {
             throw usage();
         if (cmd === 'recover' && !values.recovery)
             throw usage();
+        // --shop and --search only select the catalog listing a row number refers to.
+        if (cmd === 'buy' &&
+            (values.shop !== undefined || values.search !== undefined) &&
+            !isRow(target))
+            throw usage();
         if (values.route && !['near', 'base', '1click'].includes(String(values.route)))
             throw usage();
         if (values.wallet && !['evm', 'solana', 'near'].includes(String(values.wallet)))
@@ -143,6 +95,7 @@ export function parseCli(argv) {
 }
 const versionFlags = ['--version', '-v'];
 const HELP = `annon <command> [options]
+annon (no arguments, in a terminal) or annon shell: interactive session; type help inside
 shops [--search <q>] [--limit <n>] [--offset <n>]
 shop add <url> [--id <alias>]
 catalog [--shop <id>] [--search <q>] [--limit <n>] [--offset <n>]
@@ -155,12 +108,14 @@ sell <file> --resume <file-id> [--output <PAY2>]
 fund <file-id> <NEAR>
 budget <file-id>
 sell <file> [--storage-budget <NEAR>] --price <USDC> --split <kind:id:bps,...> [--base] [--moderator <account>] [--output <PAY2>]
-buy <url|offer.json> [--route near|base|1click] [--origin <configured name>] [--from-chain <chain>] [--from-asset <1Click asset>] [--refund-to <address>] [--recovery <kind:id>] [--max-price <USDC> or configured cap] [--url <expected resource for offer.json>] [--moderator <trusted account>]
-open <purchase-id|backup|PAY2> [--purchase <id|backup>] [--file <PAY2> | --url <url>] --output <file>
+buy <url|offer.json|catalog row number --shop <id> [--search <q>]> [--open <file>] [--route near|base|1click] [--origin <configured name>] [--from-chain <chain>] [--from-asset <1Click asset>] [--refund-to <address>] [--recovery <kind:id>] [--max-price <USDC> or configured cap] [--url <expected resource for offer.json>] [--moderator <trusted account>]
+open [purchase-id|id prefix|backup|PAY2] [--purchase <id|id prefix|backup>] [--file <PAY2> | --url <url>] --output <file>
 recover --recovery <kind:id> [--purchase <id>]
 stop <file-id>
 verify <PAY2|url>
-status <purchase-id>
+status [purchase-id|id prefix]
+status and open without an id use this contract's latest purchase; an id prefix needs 8 or more
+hex digits and a purchase saved for this contract and network.
 Common: --json --config <file> --contract-id <account> --near-rpc <url> --base-rpc <url>
 --network <near:mainnet> --state-dir <dir> --relayer <url> --trust-contract
 --wallet evm|solana|near --evm-key-file <file> --solana-key-file <file> --near-key-file <file>
@@ -171,8 +126,42 @@ Secrets: env ANNON_EVM_PRIVATE_KEY, ANNON_SOLANA_KEYPAIR, ANNON_NEAR_CREDENTIALS
 named files. See packages/annon/CLI.md. --version prints the installed version.
 Exit: 0 success (buy may need deposit), 1 operation failed, 2 arguments/config, 3 trust required, 4 purchase pending or uncertain.
 `;
-export async function runCli(argv, execute, write) {
+/** 4: not settled. A pending status, or a buy whose payment may be on chain or is not accepted yet. */
+function exitCode(input, result) {
+    if (!result)
+        return 0;
+    if (input.command === 'status' && result.state === 'pending')
+        return 4;
+    if (input.command !== 'buy')
+        return 0;
+    // A payment that may be on chain outranks a failed status check or open after it.
+    if (result.state === 'uncertain')
+        return 4;
+    const failed = (result.openError ?? result.statusError);
+    if (failed)
+        return failed.exitCode;
+    return result.state === 'uncertain' || result.settlement === 'pending' ? 4 : 0;
+}
+/** The script contract: shop rules as text in pretty mode, then one JSON envelope. */
+function writeJson(input, result, compact, write) {
+    if (!compact && ['shops', 'catalog', 'share'].includes(input.command)) {
+        const show = (value) => {
+            const r = value;
+            const rules = r.info?.rules ?? r.rules;
+            if (rules)
+                write(`Shop rules (${r.shop?.manifest ?? r.manifest}):\n${rules.text}`);
+        };
+        show(result);
+        const items = result.items;
+        if (Array.isArray(items))
+            for (const item of items)
+                show(item);
+    }
+    write(JSON.stringify({ ok: true, result }, null, compact ? undefined : 2));
+}
+export async function runCli(argv, execute, write, options = {}) {
     const json = argv.includes('--json') || argv.includes('--json=true');
+    const human = options.human === true && !json;
     if (argv.length === 0 || argv.includes('--help')) {
         write(HELP);
         return 0;
@@ -184,34 +173,21 @@ export async function runCli(argv, execute, write) {
         return 0;
     }
     try {
+        if (argv[0] === 'shell')
+            throw new AdapterError('invalid_arguments', 'The interactive session needs a terminal, takes no options and is not available in agent mode.', 2);
         const input = parseCli(argv);
-        const result = await execute(input);
-        if (!json && ['shops', 'catalog', 'share'].includes(input.command)) {
-            const show = (value) => {
-                const r = value;
-                const rules = r.info?.rules ?? r.rules;
-                if (rules)
-                    write(`Shop rules (${r.shop?.manifest ?? r.manifest}):\n${rules.text}`);
-            };
-            show(result);
-            const items = result.items;
-            if (Array.isArray(items))
-                for (const item of items)
-                    show(item);
-        }
-        write(JSON.stringify({ ok: true, result }, null, json ? undefined : 2));
-        // 4: not settled. A pending status, or a buy whose payment may be on chain (uncertain).
-        return result &&
-            typeof result === 'object' &&
-            'state' in result &&
-            ((input.command === 'status' && result.state === 'pending') ||
-                (input.command === 'buy' && result.state === 'uncertain'))
-            ? 4
-            : 0;
+        const result = await buyFlow(input, execute, human, options);
+        if (human)
+            write(humanResult(input, result));
+        else
+            writeJson(input, result, json, write);
+        return exitCode(input, result);
     }
     catch (error) {
         const safe = publicError(error);
-        write(JSON.stringify({ ok: false, error: safe }, null, json ? undefined : 2));
+        write(human
+            ? humanError(safe)
+            : JSON.stringify({ ok: false, error: safe }, null, json ? undefined : 2));
         return safe.exitCode;
     }
 }

package/dist/node/config.d.ts

@@ -36,4 +36,6 @@ export interface Config extends DiscoveryConfig {
 export declare const defaultStateDir: () => string;
 export declare function loadConfig(o: Input, env: Environment, login?: boolean, forcedAgent?: boolean): Promise<Config>;
 export type TrustPrompt = (description: string) => Promise<boolean>;
+/** Trust is recorded per network, NEAR RPC and contract. */
+export declare const trustId: (c: Config) => string;
 export declare function trustContract(c: Config, explicit: boolean, prompt?: TrustPrompt): Promise<void>;

package/dist/node/config.js

@@ -177,11 +177,13 @@ export async function loadConfig(o, env, login = false, forcedAgent = false) {
         throw new AdapterError('invalid_config', 'Set contractId, network and nearRpc (plus baseRpc for Base operations) in the config file, environment or flags. Endpoints must use HTTPS (HTTP only on localhost).', 2);
     }
 }
+/** Trust is recorded per network, NEAR RPC and contract. */
+export const trustId = (c) => JSON.stringify([c.network, c.nearRpc, c.contractId]);
 export async function trustContract(c, explicit, prompt) {
     const dir = join(c.stateDir, 'trust');
     await mkdir(dir, { recursive: true, mode: 0o700 });
     const store = fileStore(dir);
-    const id = JSON.stringify([c.network, c.nearRpc, c.contractId]);
+    const id = trustId(c);
     if (await store.load(id))
         return;
     if (!explicit &&

package/dist/node/core-adapter.js

@@ -46,6 +46,7 @@ import './origin.js';
 import { buy, prepareBuy, verifyFile } from './buy-commands.js';
 import { requestContext, } from './command-context.js';
 import { open, recover, status, statusOnChain } from './purchase-commands.js';
+import { withPurchaseRef } from './purchase-ref.js';
 import { createSdk } from './relay-transport.js';
 import { sell, share, stop } from './seller-commands.js';
 import { fileBudget, fund, fundWithNearWallet } from './storage-commands.js';
@@ -59,6 +60,9 @@ function createCoreAdapter(env = process.env, d = {}) {
     return async (o) => {
         const c = await loadConfig(o, env, false, d.agent);
         await trustContract(c, o.trustContract === true || c.trustContract === true, o.json || d.agent ? undefined : d.prompt);
+        // Agents always name the full purchase ID.
+        if ((o.command === 'status' || o.command === 'open') && !d.agent)
+            o = await withPurchaseRef(o, c);
         const ctx = requestContext(env, d, fetcher, wait, o, c);
         if (o.command === 'budget')
             return fileBudget(ctx);

package/dist/node/login-page.d.ts

@@ -3,5 +3,5 @@
  * request value as text. The stylesheet is served from the page's own origin (`style-src 'self'`),
  * with no inline styles, web fonts or other resources.
  */
-export declare const LOGIN_PAGE_HTML = "<!doctype html><html lang=\"en\"><head><meta charset=\"utf-8\"><meta name=\"viewport\" content=\"width=device-width, initial-scale=1\"><meta name=\"color-scheme\" content=\"light\"><title>Annon wallet approval</title><link rel=\"stylesheet\" href=\"/app.css\"><script src=\"/app.js\" defer></script></head><body><main class=\"card\">\n<header class=\"brand\"><svg class=\"mark\" viewBox=\"0 0 24 28\" width=\"22\" height=\"26\" aria-hidden=\"true\"><path d=\"M2 27V12a10 10 0 0 1 20 0v15h-5V12a5 5 0 0 0-10 0v15z\"/></svg><p class=\"eyebrow\">ANNON CLI</p></header>\n<h1 id=\"title\">Waiting for the CLI</h1>\n<section class=\"pair\" aria-labelledby=\"pair-label\"><p class=\"label\" id=\"pair-label\">Pairing code</p><p id=\"pair\" class=\"code\">------</p><p class=\"hint\">Check that your terminal shows the same code.</p></section>\n<section id=\"summary\" class=\"summary\" hidden><p id=\"amount\" class=\"amount\" hidden></p><dl id=\"rows\" class=\"rows\"></dl><div id=\"message-box\" class=\"message\" hidden><p id=\"message-label\" class=\"label\"></p><pre id=\"message\"></pre></div><ul id=\"warnings\" class=\"warnings\" hidden></ul><div id=\"terms-box\" class=\"terms\" hidden><p class=\"label\">Terms from the CLI</p><p class=\"hint\">For review. Your wallet signs only the request above.</p><dl id=\"terms\" class=\"rows\"></dl></div><p id=\"note\" class=\"note\"></p></section>\n<section class=\"act\"><div id=\"wallet-field\" class=\"field\" hidden><span class=\"label\" id=\"near-wallet-label\">NEAR wallet</span><div class=\"picker\"><div id=\"near-wallet\" class=\"picker-button\" role=\"combobox\" tabindex=\"0\" aria-haspopup=\"listbox\" aria-expanded=\"false\" aria-controls=\"near-wallet-list\" aria-labelledby=\"near-wallet-label near-wallet-value\"><span id=\"near-wallet-value\">Meteor Wallet</span></div><ul id=\"near-wallet-list\" class=\"picker-list\" role=\"listbox\" aria-labelledby=\"near-wallet-label\" hidden><li id=\"near-wallet-meteor\" class=\"option\" role=\"option\" aria-selected=\"true\">Meteor Wallet<span class=\"option-note\">Extension or web popup</span></li><li id=\"near-wallet-hot\" class=\"option\" role=\"option\" aria-selected=\"false\">HOT Wallet<span class=\"option-note\">Mainnet only</span></li></ul></div></div><div class=\"buttons\"><button id=\"approve\" class=\"primary\" disabled>Review in wallet</button><button id=\"cancel\" class=\"secondary\" hidden>Cancel</button></div><p id=\"status\" class=\"status\" role=\"status\" aria-live=\"polite\"></p></section>\n<details class=\"details\"><summary>Technical details</summary><pre id=\"action\"></pre></details>\n</main></body></html>";
-export declare const LOGIN_PAGE_CSS = ":root{--paper:#FAF8F2;--alt:#F1EDE3;--ink:#111111;--soft:#2E2C28;--muted:#4A4741;--line:#D9D3C7;--red:#B3261E;--serif:Newsreader,\"Iowan Old Style\",Georgia,serif;--mono:\"IBM Plex Mono\",ui-monospace,\"SF Mono\",Menlo,monospace}\n*{box-sizing:border-box;border-radius:0}\nhtml{background:var(--paper)}\nbody{margin:0;background:var(--paper);color:var(--ink);font:16px/1.5 var(--serif);-webkit-text-size-adjust:100%}\n.card{max-width:640px;margin:0 auto;padding:40px 16px 56px}\n.brand{display:flex;align-items:center;gap:10px;margin-bottom:20px}\n.mark{fill:var(--ink);flex:none}\n.eyebrow,.label,dt,.details summary,button{font-family:var(--mono);letter-spacing:.08em;text-transform:uppercase;font-size:12px}\n.eyebrow{margin:0;color:var(--soft)}\nh1{font-weight:500;font-size:clamp(28px,6vw,36px);line-height:1.15;margin:0 0 24px;letter-spacing:-.01em}\n.label{margin:0 0 6px;color:var(--muted)}\n.hint{margin:6px 0 0;color:var(--muted);font-size:15px}\n.pair{border:1px solid var(--ink);background:var(--alt);padding:16px 20px;margin-bottom:28px}\n.code{margin:0;font:600 clamp(30px,9vw,40px)/1.1 var(--mono);letter-spacing:.18em;word-break:break-all}\n.summary{border-top:1px solid var(--line);padding-top:20px}\n.amount{margin:0 0 12px;font-size:clamp(30px,8vw,42px);line-height:1.1}\n.rows{margin:0}\n.row{display:grid;grid-template-columns:minmax(0,11em) minmax(0,1fr);gap:4px 16px;padding:9px 0;border-bottom:1px solid var(--line)}\ndt{color:var(--muted);padding-top:3px}\ndd{margin:0;color:var(--soft);overflow-wrap:anywhere}\ndd.mono{font:14px/1.5 var(--mono)}\n.message,.terms{margin-top:20px}\npre{margin:0;padding:14px 16px;background:var(--alt);border:1px solid var(--line);font:13px/1.55 var(--mono);color:var(--soft);white-space:pre-wrap;overflow-wrap:anywhere;max-height:22em;overflow:auto}\n.warnings{margin:20px 0 0;padding:12px 16px 12px 32px;border:1px solid var(--red);color:var(--red)}\n.note{margin:20px 0 0;color:var(--soft)}\n.act{margin-top:28px;border-top:1px solid var(--line);padding-top:20px}\n.field{margin:0 0 16px;display:flex;flex-wrap:wrap;align-items:center;gap:8px 16px}\n.picker{position:relative;flex:0 1 20em;min-width:0}\n.picker-button{display:flex;align-items:center;justify-content:space-between;gap:12px;background:var(--paper);color:var(--ink);border:1px solid var(--ink);padding:10px 12px;cursor:pointer;font:14px/1.4 var(--mono);user-select:none}\n.picker-button::after{content:\"\";width:0;height:0;border:5px solid transparent;border-top-color:var(--ink);border-bottom:0;flex:none}\n.picker-button[aria-expanded=\"true\"]::after{border-top:0;border-bottom:5px solid var(--ink)}\n.picker-button[aria-disabled=\"true\"]{opacity:.4;cursor:not-allowed}\n.picker-list{position:absolute;z-index:2;left:0;right:0;top:100%;margin:0;padding:0;list-style:none;background:var(--paper);border:1px solid var(--ink);border-top:0}\n.option{display:flex;justify-content:space-between;align-items:baseline;gap:12px;padding:10px 12px;cursor:pointer;font:14px/1.4 var(--mono);color:var(--soft)}\n.option+.option{border-top:1px solid var(--line)}\n.option.active{background:var(--alt);color:var(--ink)}\n.option[aria-selected=\"true\"]{color:var(--ink);font-weight:600}\n.option[aria-selected=\"true\"]::before{content:\"\";width:6px;height:6px;background:var(--ink);flex:none;align-self:center}\n.option[aria-disabled=\"true\"]{color:var(--muted);cursor:not-allowed;opacity:.6}\n.option-note{margin-left:auto;font-size:11px;font-weight:400;letter-spacing:.06em;text-transform:uppercase;color:var(--muted)}\n.buttons{display:flex;flex-wrap:wrap;gap:12px}\nbutton{padding:14px 22px;border:1px solid var(--ink);cursor:pointer}\n.primary{background:var(--ink);color:var(--paper)}\n.secondary{background:transparent;color:var(--ink)}\nbutton:disabled{cursor:not-allowed;opacity:.4}\nbutton:focus-visible,.picker-button:focus-visible,summary:focus-visible{outline:2px solid var(--red);outline-offset:2px}\n.status{min-height:1.5em;margin:16px 0 0;color:var(--soft)}\n.status.wait{color:var(--muted)}\n.status.ok{color:var(--ink);border-left:3px solid var(--ink);padding-left:12px}\n.status.error{color:var(--red);border-left:3px solid var(--red);padding-left:12px}\n.details{margin-top:32px;border-top:1px solid var(--line);padding-top:12px}\n.details summary{cursor:pointer;color:var(--muted);padding:6px 0}\n.details pre{margin-top:10px}\n[hidden]{display:none!important}\n@media (max-width:480px){.row{grid-template-columns:1fr}.card{padding-top:28px}button{flex:1 1 100%}.picker{flex-basis:100%}}\n";
+export declare const LOGIN_PAGE_HTML = "<!doctype html><html lang=\"en\"><head><meta charset=\"utf-8\"><meta name=\"viewport\" content=\"width=device-width, initial-scale=1\"><meta name=\"color-scheme\" content=\"light\"><title>Annon wallet approval</title><link rel=\"stylesheet\" href=\"/app.css\"><script src=\"/app.js\" defer></script></head><body><main class=\"card\">\n<header class=\"brand\"><svg class=\"mark\" viewBox=\"0 0 24 28\" width=\"22\" height=\"26\" aria-hidden=\"true\"><path d=\"M2 27V12a10 10 0 0 1 20 0v15h-5V12a5 5 0 0 0-10 0v15z\"/></svg><p class=\"eyebrow\">ANNON CLI</p></header>\n<h1 id=\"title\">Waiting for the CLI</h1>\n<section class=\"pair\" aria-labelledby=\"pair-label\"><p class=\"label\" id=\"pair-label\">Pairing code</p><p id=\"pair\" class=\"code\">------</p><p class=\"hint\">Check that your terminal shows the same code.</p></section>\n<div id=\"steps\" aria-label=\"Finished approvals\"></div>\n<p class=\"label\" id=\"step-state\">In progress</p>\n<section id=\"summary\" class=\"summary\" hidden><p id=\"amount\" class=\"amount\" hidden></p><dl id=\"rows\" class=\"rows\"></dl><div id=\"message-box\" class=\"message\" hidden><p id=\"message-label\" class=\"label\"></p><pre id=\"message\"></pre></div><ul id=\"warnings\" class=\"warnings\" hidden></ul><div id=\"terms-box\" class=\"terms\" hidden><p class=\"label\">Terms from the CLI</p><p class=\"hint\">For review. Your wallet signs only the request above.</p><dl id=\"terms\" class=\"rows\"></dl></div><p id=\"note\" class=\"note\"></p></section>\n<section class=\"act\"><div id=\"wallet-field\" class=\"field\" hidden><span class=\"label\" id=\"near-wallet-label\">NEAR wallet</span><div class=\"picker\"><div id=\"near-wallet\" class=\"picker-button\" role=\"combobox\" tabindex=\"0\" aria-haspopup=\"listbox\" aria-expanded=\"false\" aria-controls=\"near-wallet-list\" aria-labelledby=\"near-wallet-label near-wallet-value\"><span id=\"near-wallet-value\">Meteor Wallet</span></div><ul id=\"near-wallet-list\" class=\"picker-list\" role=\"listbox\" aria-labelledby=\"near-wallet-label\" hidden><li id=\"near-wallet-meteor\" class=\"option\" role=\"option\" aria-selected=\"true\">Meteor Wallet<span class=\"option-note\">Extension or web popup</span></li><li id=\"near-wallet-hot\" class=\"option\" role=\"option\" aria-selected=\"false\">HOT Wallet<span class=\"option-note\">Mainnet only</span></li></ul></div></div><div class=\"buttons\"><button id=\"approve\" class=\"primary\" disabled>Review in wallet</button><button id=\"cancel\" class=\"secondary\" hidden>Cancel</button></div><p id=\"status\" class=\"status\" role=\"status\" aria-live=\"polite\"></p></section>\n<details id=\"current-technical\" class=\"details\"><summary>Technical details</summary><pre id=\"action\"></pre></details>\n</main></body></html>";
+export declare const LOGIN_PAGE_CSS = ":root{--paper:#FAF8F2;--alt:#F1EDE3;--ink:#111111;--soft:#2E2C28;--muted:#4A4741;--line:#D9D3C7;--red:#B3261E;--serif:Newsreader,\"Iowan Old Style\",Georgia,serif;--mono:\"IBM Plex Mono\",ui-monospace,\"SF Mono\",Menlo,monospace}\n*{box-sizing:border-box;border-radius:0}\nhtml{background:var(--paper)}\nbody{margin:0;background:var(--paper);color:var(--ink);font:16px/1.5 var(--serif);-webkit-text-size-adjust:100%}\n.card{max-width:640px;margin:0 auto;padding:40px 16px 56px}\n.brand{display:flex;align-items:center;gap:10px;margin-bottom:20px}\n.mark{fill:var(--ink);flex:none}\n.eyebrow,.label,dt,.details summary,button{font-family:var(--mono);letter-spacing:.08em;text-transform:uppercase;font-size:12px}\n.eyebrow{margin:0;color:var(--soft)}\nh1{font-weight:500;font-size:clamp(28px,6vw,36px);line-height:1.15;margin:0 0 24px;letter-spacing:-.01em}\n.label{margin:0 0 6px;color:var(--muted)}\n.hint{margin:6px 0 0;color:var(--muted);font-size:15px}\n.pair{border:1px solid var(--ink);background:var(--alt);padding:16px 20px;margin-bottom:28px}\n.code{margin:0;font:600 clamp(30px,9vw,40px)/1.1 var(--mono);letter-spacing:.18em;word-break:break-all}\n.step{border-top:1px solid var(--line);padding:12px 0;margin-bottom:16px}\n.step>summary{cursor:pointer;display:flex;gap:16px;align-items:baseline}\n.done-mark{color:#23643B;font:12px var(--mono);white-space:nowrap}\n.step[open]>summary{margin-bottom:16px}\n.summary{border-top:1px solid var(--line);padding-top:20px}\n.amount{margin:0 0 12px;font-size:clamp(30px,8vw,42px);line-height:1.1}\n.rows{margin:0}\n.row{display:grid;grid-template-columns:minmax(0,11em) minmax(0,1fr);gap:4px 16px;padding:9px 0;border-bottom:1px solid var(--line)}\ndt{color:var(--muted);padding-top:3px}\ndd{margin:0;color:var(--soft);overflow-wrap:anywhere}\ndd.mono{font:14px/1.5 var(--mono)}\n.message,.terms{margin-top:20px}\npre{margin:0;padding:14px 16px;background:var(--alt);border:1px solid var(--line);font:13px/1.55 var(--mono);color:var(--soft);white-space:pre-wrap;overflow-wrap:anywhere;max-height:22em;overflow:auto}\n.warnings{margin:20px 0 0;padding:12px 16px 12px 32px;border:1px solid var(--red);color:var(--red)}\n.note{margin:20px 0 0;color:var(--soft)}\n.act{margin-top:28px;border-top:1px solid var(--line);padding-top:20px}\n.field{margin:0 0 16px;display:flex;flex-wrap:wrap;align-items:center;gap:8px 16px}\n.picker{position:relative;flex:0 1 20em;min-width:0}\n.picker-button{display:flex;align-items:center;justify-content:space-between;gap:12px;background:var(--paper);color:var(--ink);border:1px solid var(--ink);padding:10px 12px;cursor:pointer;font:14px/1.4 var(--mono);user-select:none}\n.picker-button::after{content:\"\";width:0;height:0;border:5px solid transparent;border-top-color:var(--ink);border-bottom:0;flex:none}\n.picker-button[aria-expanded=\"true\"]::after{border-top:0;border-bottom:5px solid var(--ink)}\n.picker-button[aria-disabled=\"true\"]{opacity:.4;cursor:not-allowed}\n.picker-list{position:absolute;z-index:2;left:0;right:0;top:100%;margin:0;padding:0;list-style:none;background:var(--paper);border:1px solid var(--ink);border-top:0}\n.option{display:flex;justify-content:space-between;align-items:baseline;gap:12px;padding:10px 12px;cursor:pointer;font:14px/1.4 var(--mono);color:var(--soft)}\n.option+.option{border-top:1px solid var(--line)}\n.option.active{background:var(--alt);color:var(--ink)}\n.option[aria-selected=\"true\"]{color:var(--ink);font-weight:600}\n.option[aria-selected=\"true\"]::before{content:\"\";width:6px;height:6px;background:var(--ink);flex:none;align-self:center}\n.option[aria-disabled=\"true\"]{color:var(--muted);cursor:not-allowed;opacity:.6}\n.option-note{margin-left:auto;font-size:11px;font-weight:400;letter-spacing:.06em;text-transform:uppercase;color:var(--muted)}\n.buttons{display:flex;flex-wrap:wrap;gap:12px}\nbutton{padding:14px 22px;border:1px solid var(--ink);cursor:pointer}\n.primary{background:var(--ink);color:var(--paper)}\n.secondary{background:transparent;color:var(--ink)}\nbutton:disabled{cursor:not-allowed;opacity:.4}\nbutton:focus-visible,.picker-button:focus-visible,summary:focus-visible{outline:2px solid var(--red);outline-offset:2px}\n.status{min-height:1.5em;margin:16px 0 0;color:var(--soft)}\n.status.wait{color:var(--muted)}\n.status.ok{color:var(--ink);border-left:3px solid var(--ink);padding-left:12px}\n.status.error{color:var(--red);border-left:3px solid var(--red);padding-left:12px}\n.details{margin-top:32px;border-top:1px solid var(--line);padding-top:12px}\n.details summary{cursor:pointer;color:var(--muted);padding:6px 0}\n.details pre{margin-top:10px}\n[hidden]{display:none!important}\n@media (max-width:480px){.row{grid-template-columns:1fr}.card{padding-top:28px}button{flex:1 1 100%}.picker{flex-basis:100%}}\n";

package/dist/node/login-page.js

@@ -9,9 +9,11 @@ export const LOGIN_PAGE_HTML = `<!doctype html><html lang="en"><head><meta chars
 <header class="brand">${MARK}<p class="eyebrow">ANNON CLI</p></header>
 <h1 id="title">Waiting for the CLI</h1>
 <section class="pair" aria-labelledby="pair-label"><p class="label" id="pair-label">Pairing code</p><p id="pair" class="code">------</p><p class="hint">Check that your terminal shows the same code.</p></section>
+<div id="steps" aria-label="Finished approvals"></div>
+<p class="label" id="step-state">In progress</p>
 <section id="summary" class="summary" hidden><p id="amount" class="amount" hidden></p><dl id="rows" class="rows"></dl><div id="message-box" class="message" hidden><p id="message-label" class="label"></p><pre id="message"></pre></div><ul id="warnings" class="warnings" hidden></ul><div id="terms-box" class="terms" hidden><p class="label">Terms from the CLI</p><p class="hint">For review. Your wallet signs only the request above.</p><dl id="terms" class="rows"></dl></div><p id="note" class="note"></p></section>
 <section class="act"><div id="wallet-field" class="field" hidden><span class="label" id="near-wallet-label">NEAR wallet</span><div class="picker"><div id="near-wallet" class="picker-button" role="combobox" tabindex="0" aria-haspopup="listbox" aria-expanded="false" aria-controls="near-wallet-list" aria-labelledby="near-wallet-label near-wallet-value"><span id="near-wallet-value">Meteor Wallet</span></div><ul id="near-wallet-list" class="picker-list" role="listbox" aria-labelledby="near-wallet-label" hidden><li id="near-wallet-meteor" class="option" role="option" aria-selected="true">Meteor Wallet<span class="option-note">Extension or web popup</span></li><li id="near-wallet-hot" class="option" role="option" aria-selected="false">HOT Wallet<span class="option-note">Mainnet only</span></li></ul></div></div><div class="buttons"><button id="approve" class="primary" disabled>Review in wallet</button><button id="cancel" class="secondary" hidden>Cancel</button></div><p id="status" class="status" role="status" aria-live="polite"></p></section>
-<details class="details"><summary>Technical details</summary><pre id="action"></pre></details>
+<details id="current-technical" class="details"><summary>Technical details</summary><pre id="action"></pre></details>
 </main></body></html>`;
 export const LOGIN_PAGE_CSS = `:root{--paper:#FAF8F2;--alt:#F1EDE3;--ink:#111111;--soft:#2E2C28;--muted:#4A4741;--line:#D9D3C7;--red:#B3261E;--serif:Newsreader,"Iowan Old Style",Georgia,serif;--mono:"IBM Plex Mono",ui-monospace,"SF Mono",Menlo,monospace}
 *{box-sizing:border-box;border-radius:0}
@@ -27,6 +29,10 @@ h1{font-weight:500;font-size:clamp(28px,6vw,36px);line-height:1.15;margin:0 0 24
 .hint{margin:6px 0 0;color:var(--muted);font-size:15px}
 .pair{border:1px solid var(--ink);background:var(--alt);padding:16px 20px;margin-bottom:28px}
 .code{margin:0;font:600 clamp(30px,9vw,40px)/1.1 var(--mono);letter-spacing:.18em;word-break:break-all}
+.step{border-top:1px solid var(--line);padding:12px 0;margin-bottom:16px}
+.step>summary{cursor:pointer;display:flex;gap:16px;align-items:baseline}
+.done-mark{color:#23643B;font:12px var(--mono);white-space:nowrap}
+.step[open]>summary{margin-bottom:16px}
 .summary{border-top:1px solid var(--line);padding-top:20px}
 .amount{margin:0 0 12px;font-size:clamp(30px,8vw,42px);line-height:1.1}
 .rows{margin:0}

package/dist/node/main.js

@@ -2,6 +2,21 @@
 import { createInterface } from 'node:readline/promises';
 import { createAdapter } from './adapter.js';
 import { runCli } from './cli.js';
+import { createSession } from './shell/session.js';
+import { humanOutput, sessionAllowed, welcome } from './shell/welcome.js';
+const argv = process.argv.slice(2);
+const notify = (message) => process.stderr.write(`${message}\n`);
+if (await sessionAllowed(argv, process.stdin.isTTY === true && process.stdout.isTTY === true, process.env)) {
+    const session = createSession({
+        input: process.stdin,
+        output: process.stdout,
+        terminal: true,
+        welcome: await welcome(process.env),
+        adapter: (hooks) => createAdapter(process.env, hooks),
+    });
+    // A confirmed Ctrl-C leaves a command running; exiting ends it as it would end a one-shot run.
+    process.exit(await session.run());
+}
 const adapter = createAdapter(process.env, {
     ...(process.stdin.isTTY && process.stderr.isTTY
         ? {
@@ -16,6 +31,9 @@ const adapter = createAdapter(process.env, {
             },
         }
         : {}),
-    notify: (message) => process.stderr.write(`${message}\n`),
+    notify,
+});
+process.exitCode = await runCli(argv, adapter, (text) => process.stdout.write(`${text}\n`), {
+    human: await humanOutput(process.stdout.isTTY === true, process.env),
+    notify,
 });
-process.exitCode = await runCli(process.argv.slice(2), adapter, (text) => process.stdout.write(`${text}\n`));

package/dist/node/output/discovery.d.ts

@@ -0,0 +1,23 @@
+import type { CatalogEntry, Shop, ShopFailure, ShopRules } from '../../shops/discovery.js';
+import type { Input } from '../cli.js';
+type Page<T> = {
+    items: T[];
+    total: number;
+    nextOffset: number | null;
+};
+export declare function shopsText(page: Page<Shop | ShopFailure>): string;
+export declare const shopAddedText: (r: {
+    manifest: string;
+    id?: string;
+    trusted: boolean;
+}) => string;
+/** Row numbers count from the start of the listing, so `buy <n>` means the same row on any page. */
+export declare const rowNumber: (input: Input, index: number) => number;
+export declare function catalogText(input: Input, page: Page<CatalogEntry> & {
+    shop?: {
+        manifest: string;
+        name: string;
+    };
+    rules?: ShopRules;
+}): string;
+export {};

package/dist/node/output/discovery.js

@@ -0,0 +1,52 @@
+/** Human output for `shops`, `shop add` and `catalog`. */
+import { usdc } from '../../settle-near/codec.js';
+import { cleanText, short, table, truncate } from './text.js';
+const more = (page) => page.nextOffset === null ? [] : [`More: add --offset ${page.nextOffset}`];
+export function shopsText(page) {
+    if (page.items.length === 0)
+        return 'No shops configured. Add one with: annon shop add <shop url> --id <name>';
+    return [
+        `Shops (${page.total}):`,
+        table(page.items.map((shop) => [
+            ` ${cleanText(shop.id ?? '-')}`,
+            'info' in shop ? cleanText(shop.info.name) : `unavailable (${shop.error})`,
+            'info' in shop ? shop.info.shopUrl : shop.manifest,
+            shop.trusted ? 'trusted profile' : '',
+        ])),
+        ...more(page),
+    ].join('\n');
+}
+export const shopAddedText = (r) => `Shop added${r.id ? ` as ${cleanText(r.id)}` : ''}: ${r.manifest}\nList its files with: annon catalog --shop ${cleanText(r.id ?? r.manifest)}`;
+/** Row numbers count from the start of the listing, so `buy <n>` means the same row on any page. */
+export const rowNumber = (input, index) => (input.offset ?? 0) + index + 1;
+const routes = (e) => e.takenDown
+    ? 'taken down'
+    : e.salesStopped
+        ? 'sales stopped'
+        : ['near', ...(e.terms.base ? ['base'] : []), '1click'].join(', ');
+const day = (seconds) => seconds === null ? '-' : new Date(seconds * 1000).toISOString().slice(0, 10);
+/** The shop's rules in one line; the full text stays in `--json` and is shown by `share`. */
+const rulesLine = (shop, rules) => `Shop rules${shop ? ` (${cleanText(shop.name)})` : ''}: ${truncate(cleanText(rules.text).replace(/\s+/g, ' ').trim(), 160)}`;
+export function catalogText(input, page) {
+    if (page.items.length === 0)
+        return page.total === 0 ? 'No files.' : 'No files on this page.';
+    const first = rowNumber(input, 0);
+    const shop = input.shop === undefined ? '' : ` --shop ${input.shop}`;
+    return [
+        `Files ${first} to ${first + page.items.length - 1} of ${page.total}:`,
+        table([
+            [' #', 'Title', 'Price', 'Routes', 'Seller', 'Expires'],
+            ...page.items.map((e, i) => [
+                String(rowNumber(input, i)).padStart(2),
+                truncate(cleanText(e.title || e.name), 40),
+                `${usdc(e.terms.near.price)} USDC`,
+                routes(e),
+                short(cleanText(`${e.terms.seller.kind}:${e.terms.seller.id}`)),
+                day(e.expiresAt),
+            ]),
+        ]),
+        ...(page.rules ? [rulesLine(page.shop, page.rules)] : []),
+        ...more(page),
+        `Buy a row with: annon buy <#>${shop}${input.search === undefined ? '' : ` --search ${JSON.stringify(input.search)}`}`,
+    ].join('\n');
+}

package/dist/node/output/human.d.ts

@@ -0,0 +1,10 @@
+/**
+ * What a person reads in a terminal in place of the JSON envelope. `--json`, pipes and agent mode
+ * never come here, so scripts keep the envelope.
+ */
+import type { PublicError } from '../../errors.js';
+import type { Input } from '../cli.js';
+type Result = Record<string, unknown>;
+export declare function humanResult(input: Input, result: Result | undefined): string;
+export declare function humanError(error: PublicError): string;
+export {};

package/dist/node/output/human.js

@@ -0,0 +1,46 @@
+import { catalogText, shopAddedText, shopsText } from './discovery.js';
+import { buyText, failure, loginText, openText, recoverText, statusText } from './purchase.js';
+import { cleanText, fields } from './text.js';
+/** A seller accepts the shop's rules by sharing, so `share` shows them whole, with their source. */
+function shareText(r) {
+    const { rules, shop, ...rest } = r;
+    return [
+        ...(rules ? [`Shop rules (${shop?.manifest}):\n${cleanText(rules.text, true)}`] : []),
+        fields(rest),
+    ].join('\n');
+}
+export function humanResult(input, result) {
+    const r = result ?? {};
+    switch (input.command) {
+        case 'login':
+            return loginText(r);
+        case 'shops':
+            return shopsText(r);
+        case 'shop':
+            return shopAddedText(r);
+        case 'catalog':
+            return catalogText(input, r);
+        case 'buy':
+            return buyText(r);
+        case 'status':
+            return statusText(r);
+        case 'open':
+            return openText(r);
+        case 'recover':
+            return recoverText(r);
+        case 'share':
+            return shareText(r);
+        case 'verify':
+            return `Verified file ${r.fileId} (${r.checked}) against ${r.contractId}.`;
+        default:
+            return fields(r);
+    }
+}
+export function humanError(error) {
+    const { code: _code, message: _message, exitCode: _exitCode, retryAfterSeconds, ...facts } = error;
+    return [
+        `Error: ${failure(error)}`,
+        ...(Object.keys(facts).length > 0 ? [fields(facts)] : []),
+        ...(retryAfterSeconds === undefined ? [] : [`Try again in ${retryAfterSeconds} seconds.`]),
+    ].join('\n');
+}

package/dist/node/output/purchase.d.ts

@@ -0,0 +1,10 @@
+/** Human output for `login`, `buy`, `status`, `open` and `recover`. */
+import type { PublicError } from '../../errors.js';
+type Result = Record<string, unknown>;
+export declare const loginText: (r: Result) => string;
+export declare const failure: (e: PublicError) => string;
+export declare function buyText(r: Result): string;
+export declare function statusText(r: Result): string;
+export declare const openText: (r: Result) => string;
+export declare function recoverText(r: Result): string;
+export {};

package/dist/node/output/purchase.js

@@ -0,0 +1,78 @@
+import { cleanText, networkName, table } from './text.js';
+export const loginText = (r) => {
+    const identity = r.identity;
+    return `Signed in as ${cleanText(identity.id)} on ${networkName(String(r.network))}.`;
+};
+const paid = (r) => {
+    const payment = r.payment;
+    return payment ? `${payment.amountUsdc} USDC, ${payment.route} route` : `${r.route} route`;
+};
+export const failure = (e) => `${cleanText(e.message)} (${e.code})`;
+/** The 1Click deposit a person makes from their own wallet, with the cutoff and any memo. */
+function depositText(deposit, source) {
+    const amount = source?.amountFormatted === undefined
+        ? `${deposit.amount} base units`
+        : `${source.amountFormatted} ${source.symbol ?? 'tokens'} (${deposit.amount} base units)`;
+    return [
+        'Send this deposit from your own wallet:',
+        table([
+            ['  Amount', amount],
+            ['  Asset', deposit.asset],
+            ['  Chain', deposit.blockchain ?? deposit.chain],
+            ['  To', deposit.address],
+            ...(deposit.memo === undefined ? [] : [['  Memo', `${deposit.memo} (required)`]]),
+            ['  Before', deposit.depositBefore],
+        ].map((row) => row.map((cell) => cleanText(cell)))),
+    ].join('\n');
+}
+export function buyText(r) {
+    const id = String(r.purchaseId);
+    const lines = [`Purchase ${id} (${paid(r)})`];
+    if (r.state === 'opened') {
+        const opened = r.opened;
+        lines.push(`Accepted by NEAR. Saved ${opened.output} (${opened.bytes} bytes).`);
+    }
+    else if (r.openError)
+        lines.push(`Accepted by NEAR, but the file was not saved: ${failure(r.openError)}`, 'The purchase is kept. Retry with: annon open --output <file>');
+    else if (r.state === 'accepted')
+        lines.push('Accepted by NEAR.', 'Save the file with: annon open --output <file>');
+    else {
+        if (r.state === 'uncertain' && r.txHash)
+            lines.push(`Transaction: ${cleanText(r.txHash)}`);
+        if (r.statusError)
+            lines.push(`Status check failed: ${failure(r.statusError)}`);
+        if (r.instructions)
+            lines.push(depositText(r.instructions, r.source));
+        lines.push(String(r.next));
+        if (r.instructions)
+            lines.push('Then: annon status, and annon open --output <file> (both use this purchase).');
+    }
+    lines.push(`Backup: ${r.backup}`);
+    return lines.join('\n');
+}
+export function statusText(r) {
+    const id = String(r.purchaseId);
+    if (r.state === 'accepted')
+        return `Purchase ${id} is accepted.\nSave the file with: annon open ${id} --output <file>`;
+    return [
+        `Purchase ${id} is ${r.state}${r.submission === 'uncertain' ? ' (the payment may have been sent)' : ''}.`,
+        ...(r.txHash ? [`Transaction: ${cleanText(r.txHash)}`] : []),
+        String(r.next),
+        ...(r.retryAfterSeconds === undefined
+            ? []
+            : [`Check again in ${r.retryAfterSeconds} seconds.`]),
+    ].join('\n');
+}
+export const openText = (r) => `Saved ${r.output} (${r.bytes} bytes) from purchase ${r.purchaseId}.`;
+export function recoverText(r) {
+    const recovered = r.recovered;
+    const errors = r.errors;
+    return [
+        recovered.length === 0
+            ? 'No purchases recovered.'
+            : `Recovered purchases (${recovered.length}):`,
+        ...recovered.map((p) => `  ${p.purchaseId}  file ${p.fileId}\n    backup: ${p.backup}`),
+        ...errors.map((e) => `  ${e.purchaseId}  failed: ${cleanText(e.message)} (${e.code})`),
+        ...(recovered.length > 0 ? ['Open one with: annon open <purchase id> --output <file>'] : []),
+    ].join('\n');
+}

package/dist/node/output/text.d.ts

@@ -0,0 +1,10 @@
+/** Shared pieces of the human output: safe text, short IDs, aligned tables and field lists. */
+export declare function cleanText(value: unknown, lines?: boolean): string;
+/** `0x1234abcd...ef01` for a long ID or address; short values are returned whole. */
+export declare const short: (id: string) => string;
+export declare const truncate: (text: string, max: number) => string;
+/** Left-aligned columns, two spaces apart; the last column is not padded. */
+export declare function table(rows: string[][]): string;
+/** Every field of a result as `name: value`, so a command without its own layout hides nothing. */
+export declare function fields(result: Record<string, unknown>): string;
+export declare const networkName: (network: string) => string;