@did-btcr2/cli 0.20.0 → 0.22.0

package/dist/esm/src/commands/deactivate.js

@@ -1,98 +1,21 @@
-import { KeyManagerSigner } from '@did-btcr2/key-manager';
-import { assertKeystoreAllowedForNetwork, deriveNetwork, resolveBroadcastOptions, resolveSigningKeyRef } from '../config.js';
-import { CLIError } from '../error.js';
 import { printWatchHint } from '../hints.js';
-import { resolveKeyRef } from '../keystore/resolve-key-ref.js';
 import { formatResult } from '../output.js';
-/** The JSON Patch that marks a DID document as permanently deactivated. */
-const DEACTIVATION_PATCH = [{ op: 'add', path: '/deactivated', value: true }];
+import { prepareWrite, registerWriteOptions } from './write.js';
 export function registerDeactivateCommand(program, factory, globals) {
-    program
+    const command = program
         .command('deactivate')
         .alias('delete')
         .description('Deactivate the did:btcr2 identifier permanently. This is irreversible.')
-        .requiredOption('-s, --source-document <json>', 'Current DID document as JSON string', parseJsonArg('--source-document'))
-        .requiredOption('--source-version-id <number>', 'Current version ID of the DID document')
-        .requiredOption('-m, --verification-method-id <id>', 'DID document verification method ID used to sign the deactivation')
-        .requiredOption('-b, --beacon-id <json>', 'Beacon ID as a JSON string', parseJsonArg('--beacon-id'))
-        .option('--publish-to-cas <mode>', 'Publish update artifacts to a writable CAS before broadcast: auto|always|never. '
-        + 'CAS publication is optional; the default distributes the returned artifacts via sidecar.', parsePublishToCasMode, 'never')
-        .option('--fee-rate <satsPerVByte>', 'Fee rate in sats/vByte for the beacon transaction (default: 5). '
-        + 'Raise it under congestion so the transaction confirms.')
-        .option('--change-address <address>', 'Send transaction change to this address instead of the beacon address, '
-        + 'so a DID\'s announcements are not linked on-chain (ADR 044).')
+        .requiredOption('-i, --identifier <identifier>', 'did:btcr2 identifier to deactivate');
+    registerWriteOptions(command)
         .action(async (options) => {
-        if (!/^\d+$/.test(options.sourceVersionId)) {
-            throw new CLIError('--source-version-id must be a non-negative integer.', 'INVALID_ARGUMENT_ERROR', { value: options.sourceVersionId });
-        }
-        const parsed = {
-            sourceDocument: options.sourceDocument,
-            patches: DEACTIVATION_PATCH,
-            sourceVersionId: Number(options.sourceVersionId),
-            verificationMethodId: options.verificationMethodId,
-            beaconId: options.beaconId,
-        };
-        const did = parsed.sourceDocument?.id;
-        if (!did) {
-            throw new CLIError('Source document must contain an "id" field.', 'INVALID_ARGUMENT_ERROR', options);
-        }
-        // Deactivation is an update that applies the deactivation patch. The core
-        // method has no separate deactivate path, so this routes through update.
-        const network = deriveNetwork(did);
-        // Refuse to sign a mainnet deactivation with an unencrypted dev keystore (ADR 080).
-        assertKeystoreAllowedForNetwork(network, globals());
-        const api = factory(network, globals());
-        const keyId = resolveKeyRef(api.kms.kms, resolveSigningKeyRef(globals()));
-        const signer = new KeyManagerSigner(api.kms.kms, keyId);
-        // Resolve fee-rate/change-address through the flag -> env -> profile chain
-        // into beacon broadcast options. Undefined when neither is set, so the
-        // SDK defaults (5 sat/vB, change back to the beacon address) still apply.
-        const broadcastOptions = resolveBroadcastOptions(network, globals(), {
-            feeRate: options.feeRate,
-            changeAddress: options.changeAddress,
-        });
-        // CAS publication is optional and never required: every beacon update can
-        // be completed and shared via sidecar alone. It is opt-in and defaults to
-        // 'never'; pass --publish-to-cas auto|always to publish the signed update
-        // (and, for CAS beacons, the announcement) to a writable CAS configured
-        // via --cas-rpc-url. The returned artifacts (txid, announcement, proof)
-        // are always printed for sidecar distribution regardless.
-        const data = await api.btcr2.update({
-            sourceDocument: parsed.sourceDocument,
-            patches: parsed.patches,
-            sourceVersionId: parsed.sourceVersionId,
-            verificationMethodId: parsed.verificationMethodId,
-            beaconId: parsed.beaconId,
-            signer,
-            publishToCas: options.publishToCas,
-            ...(broadcastOptions ? { broadcastOptions } : {}),
-        });
-        console.log(formatResult({ action: 'deactivate', data }, globals()));
-        printWatchHint(globals(), network, data.txid);
+        const g = globals();
+        const { network, api, params } = await prepareWrite(options, factory, g);
+        // The api supplies the deactivation patch (ADR 094) and refuses a
+        // document that is deactivated already (ADR 100).
+        const data = await api.deactivateDid(params);
+        console.log(formatResult({ action: 'deactivate', data }, g));
+        printWatchHint(g, network, data.txid);
     });
 }
-/**
- * Commander argParser for `--publish-to-cas`. Validates the value is one of the
- * three {@link PublishToCasMode} policies, erroring at parse time otherwise.
- */
-function parsePublishToCasMode(value) {
-    if (value !== 'auto' && value !== 'always' && value !== 'never') {
-        throw new CLIError('--publish-to-cas must be one of "auto", "always", or "never".', 'INVALID_ARGUMENT_ERROR', { value });
-    }
-    return value;
-}
-/**
- * Returns a commander argParser that validates JSON.
- * Errors at parse time with a clear flag reference.
- */
-function parseJsonArg(flagName) {
-    return (value) => {
-        try {
-            return JSON.parse(value);
-        }
-        catch {
-            throw new CLIError(`Invalid JSON for ${flagName}. Must be a valid JSON string.`, 'INVALID_ARGUMENT_ERROR', { flagName, value });
-        }
-    };
-}
 //# sourceMappingURL=deactivate.js.map

package/dist/esm/src/commands/deactivate.js.map

@@ -1 +1 @@
-{"version":3,"file":"deactivate.js","sourceRoot":"","sources":["../../../../src/commands/deactivate.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"deactivate.js","sourceRoot":"","sources":["../../../../src/commands/deactivate.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAC7C,OAAO,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAE5C,OAAO,EAAE,YAAY,EAAE,oBAAoB,EAAmB,MAAM,YAAY,CAAC;AAEjF,MAAM,UAAU,yBAAyB,CACvC,OAAiB,EACjB,OAAoB,EACpB,OAA6B;IAE7B,MAAM,OAAO,GAAG,OAAO;SACpB,OAAO,CAAC,YAAY,CAAC;SACrB,KAAK,CAAC,QAAQ,CAAC;SACf,WAAW,CAAC,wEAAwE,CAAC;SACrF,cAAc,CAAC,+BAA+B,EAAE,oCAAoC,CAAC,CAAC;IACzF,oBAAoB,CAAC,OAAO,CAAC;SAC1B,MAAM,CAAC,KAAK,EAAE,OAAmB,EAAE,EAAE;QACpC,MAAM,CAAC,GAAG,OAAO,EAAE,CAAC;QACpB,MAAM,EAAE,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,MAAM,YAAY,CAAC,OAAO,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC;QACzE,kEAAkE;QAClE,kDAAkD;QAClD,MAAM,IAAI,GAAG,MAAM,GAAG,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC;QAC7C,OAAO,CAAC,GAAG,CAAC,YAAY,CAAC,EAAE,MAAM,EAAE,YAAY,EAAE,IAAI,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC;QAC7D,cAAc,CAAC,CAAC,EAAE,OAAO,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;IACxC,CAAC,CAAC,CAAC;AACP,CAAC"}

package/dist/esm/src/commands/identifier.js

@@ -0,0 +1,110 @@
+import { Identifier } from '@did-btcr2/api';
+import { bytesToHex, hexToBytes } from '@noble/hashes/utils.js';
+import { readFile } from 'node:fs/promises';
+import { CLIError } from '../error.js';
+import { formatResult } from '../output.js';
+/**
+ * Registers the `identifier` command group. `decode` prints the components of
+ * a did:btcr2 identifier. `validate` checks that an identifier conforms to the
+ * specification and prints a report. Both commands are offline and
+ * keystore-free: they use the api with no Bitcoin connection, no CAS, and no
+ * key material.
+ */
+export function registerIdentifierCommand(program, factory, globals) {
+    const identifier = program
+        .command('identifier')
+        .description('Decode and validate did:btcr2 identifiers (offline).');
+    const print = (result) => console.log(formatResult(result, globals()));
+    identifier
+        .command('decode <did>')
+        .description('Print the components of a did:btcr2 identifier.')
+        .option('--initial-document', 'Add the initial DID document. An external identifier (x) needs --genesis-document.', false)
+        .option('--genesis-document <path>', 'Path to the JSON genesis document of an external identifier (x). Requires --initial-document.')
+        .action(async (did, options) => {
+        if (options.genesisDocument !== undefined && !options.initialDocument) {
+            throw new CLIError('--genesis-document requires --initial-document.', 'INVALID_ARGUMENT_ERROR');
+        }
+        assertValidIdentifier(did);
+        const api = factory();
+        const components = api.did.decode(did);
+        if (options.genesisDocument !== undefined && components.hrp === 'k') {
+            throw new CLIError('--genesis-document applies only to external identifiers (x).', 'INVALID_ARGUMENT_ERROR', { did });
+        }
+        const data = {
+            did,
+            idType: components.idType,
+            hrp: components.hrp,
+            version: components.version,
+            network: components.network,
+            genesisBytes: bytesToHex(components.genesisBytes),
+        };
+        if (options.initialDocument) {
+            if (components.hrp === 'x' && options.genesisDocument === undefined) {
+                throw new CLIError('An external identifier (x) needs --genesis-document <path> for --initial-document.', 'INVALID_ARGUMENT_ERROR', { did });
+            }
+            const genesisDocument = options.genesisDocument === undefined
+                ? undefined
+                : await readGenesisDocument(options.genesisDocument);
+            data.initialDocument = api.btcr2.getInitialDocument(did, genesisDocument);
+        }
+        print({ action: 'identifier-decode', data });
+    });
+    identifier
+        .command('validate <did>')
+        .description('Check that a did:btcr2 identifier conforms to the specification. Exit code 1 if it does not.')
+        .option('-b, --bytes <hex>', 'Genesis bytes as a hex string that the identifier must encode: the 33-byte public key (k) '
+        + 'or the 32-byte genesis document hash (x). Adds the genesisBytesMatch check.')
+        .option('--genesis-document <path>', 'Path to the JSON genesis document of an external identifier (x). Adds the genesisDocument check.')
+        .action(async (did, options) => {
+        const genesisBytes = options.bytes === undefined ? undefined : parseHexBytes(options.bytes);
+        let genesisDocument;
+        if (options.genesisDocument !== undefined) {
+            // Refuse the flag for a KEY identifier before the file read. An invalid
+            // identifier passes through: the report names its failed check.
+            if (Identifier.isValid(did) && Identifier.decode(did).hrp === 'k') {
+                throw new CLIError('--genesis-document applies only to external identifiers (x).', 'INVALID_ARGUMENT_ERROR', { did });
+            }
+            genesisDocument = await readGenesisDocument(options.genesisDocument);
+        }
+        const report = factory().did.validate(did, { genesisBytes, genesisDocument });
+        print({ action: 'identifier-validate', data: report });
+        if (!report.valid)
+            process.exitCode = 1;
+    });
+}
+/**
+ * Throws a `CLIError` that names the failed check if the identifier is not
+ * valid. The Bech32m decoder alone throws a raw error with a stack; this
+ * guard gives `decode` one message shape for every failure.
+ */
+function assertValidIdentifier(did) {
+    const report = Identifier.validate(did);
+    if (report.valid)
+        return;
+    const failed = report.checks[report.checks.length - 1];
+    throw new CLIError(`Invalid identifier (${failed.name} check): ${failed.detail ?? 'failed'}`, 'INVALID_ARGUMENT_ERROR', { did, check: failed.name });
+}
+/** Parses the `--bytes` hex string. The length is a validation result, not an argument error. */
+function parseHexBytes(value) {
+    try {
+        return hexToBytes(value.trim());
+    }
+    catch {
+        throw new CLIError('Invalid bytes: not valid hex.', 'INVALID_ARGUMENT_ERROR', { bytes: value });
+    }
+}
+/** Reads and parses the genesis document file. The content must be a JSON object. */
+async function readGenesisDocument(path) {
+    let parsed;
+    try {
+        parsed = JSON.parse(await readFile(path, 'utf-8'));
+    }
+    catch {
+        throw new CLIError('Invalid genesis document path. Must be a valid path to a JSON file.', 'INVALID_ARGUMENT_ERROR', { genesisDocument: path });
+    }
+    if (parsed === null || typeof parsed !== 'object' || Array.isArray(parsed)) {
+        throw new CLIError('Invalid genesis document. The file must contain a JSON object.', 'INVALID_ARGUMENT_ERROR', { genesisDocument: path });
+    }
+    return parsed;
+}
+//# sourceMappingURL=identifier.js.map

package/dist/esm/src/commands/identifier.js.map

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

package/dist/esm/src/commands/index.js

@@ -4,6 +4,7 @@ export { registerCreateCommand } from './create.js';
 export { registerResolveCommand } from './resolve.js';
 export { registerUpdateCommand } from './update.js';
 export { registerDeactivateCommand } from './deactivate.js';
+export { registerIdentifierCommand } from './identifier.js';
 export { registerKeyCommand } from './key.js';
 export { registerKeystoreCommand } from './keystore.js';
 export { registerConfigCommand } from './config.js';

package/dist/esm/src/commands/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/commands/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,WAAW,CAAC;AAChD,OAAO,EAAE,yBAAyB,EAAE,MAAM,iBAAiB,CAAC;AAC5D,OAAO,EAAE,qBAAqB,EAAE,MAAM,aAAa,CAAC;AACpD,OAAO,EAAE,sBAAsB,EAAE,MAAM,cAAc,CAAC;AACtD,OAAO,EAAE,qBAAqB,EAAE,MAAM,aAAa,CAAC;AACpD,OAAO,EAAE,yBAAyB,EAAE,MAAM,iBAAiB,CAAC;AAC5D,OAAO,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAC;AAC9C,OAAO,EAAE,uBAAuB,EAAE,MAAM,eAAe,CAAC;AACxD,OAAO,EAAE,qBAAqB,EAAE,MAAM,aAAa,CAAC;AACpD,OAAO,EAAE,sBAAsB,EAAE,MAAM,cAAc,CAAC;AACtD,OAAO,EAAE,yBAAyB,EAAE,MAAM,iBAAiB,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/commands/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,WAAW,CAAC;AAChD,OAAO,EAAE,yBAAyB,EAAE,MAAM,iBAAiB,CAAC;AAC5D,OAAO,EAAE,qBAAqB,EAAE,MAAM,aAAa,CAAC;AACpD,OAAO,EAAE,sBAAsB,EAAE,MAAM,cAAc,CAAC;AACtD,OAAO,EAAE,qBAAqB,EAAE,MAAM,aAAa,CAAC;AACpD,OAAO,EAAE,yBAAyB,EAAE,MAAM,iBAAiB,CAAC;AAC5D,OAAO,EAAE,yBAAyB,EAAE,MAAM,iBAAiB,CAAC;AAC5D,OAAO,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAC;AAC9C,OAAO,EAAE,uBAAuB,EAAE,MAAM,eAAe,CAAC;AACxD,OAAO,EAAE,qBAAqB,EAAE,MAAM,aAAa,CAAC;AACpD,OAAO,EAAE,sBAAsB,EAAE,MAAM,cAAc,CAAC;AACtD,OAAO,EAAE,yBAAyB,EAAE,MAAM,iBAAiB,CAAC"}

package/dist/esm/src/commands/resolve.js

@@ -1,8 +1,7 @@
-import { DEFAULT_MIN_CONF, Identifier } from '@did-btcr2/api';
-import { readFile } from 'node:fs/promises';
+import { Identifier } from '@did-btcr2/api';
 import { deriveNetwork } from '../config.js';
-import { CLIError } from '../error.js';
 import { formatResult } from '../output.js';
+import { MIN_CONF_HELP, parseMinConf, readResolutionOptions } from '../resolution-options.js';
 export function registerResolveCommand(program, factory, globals) {
     program
         .command('resolve')
@@ -11,8 +10,7 @@ export function registerResolveCommand(program, factory, globals) {
         .requiredOption('-i, --identifier <identifier>', 'did:btcr2 identifier')
         .option('-r, --resolution-options <json>', 'JSON string containing resolution options')
         .option('-p, --resolution-options-path <path>', 'Path to a JSON file containing resolution options')
-        .option('--min-conf <n>', 'Minimum block confirmations a beacon signal needs before resolution applies it '
-        + `(positive integer, default: ${DEFAULT_MIN_CONF}). Overrides minConf inside -r/-p`, parseMinConf)
+        .option('--min-conf <n>', MIN_CONF_HELP, parseMinConf)
         .action(async (options) => {
         const parsed = await validateResolveOptions(options);
         const network = deriveNetwork(parsed.identifier);
@@ -25,38 +23,7 @@ export function registerResolveCommand(program, factory, globals) {
 async function validateResolveOptions(options) {
     // Validate identifier format early
     Identifier.decode(options.identifier);
-    let resolutionOptions = undefined;
-    if (options.resolutionOptions) {
-        try {
-            resolutionOptions = JSON.parse(options.resolutionOptions);
-        }
-        catch {
-            throw new CLIError('Invalid resolution options. Must be a valid JSON string.', 'INVALID_ARGUMENT_ERROR', options);
-        }
-    }
-    else if (options.resolutionOptionsPath) {
-        try {
-            const content = await readFile(options.resolutionOptionsPath, 'utf-8');
-            resolutionOptions = JSON.parse(content);
-        }
-        catch {
-            throw new CLIError('Invalid resolution options path. Must be a valid path to a JSON file.', 'INVALID_ARGUMENT_ERROR', options);
-        }
-    }
-    // The flag wins over a minConf inside the JSON options.
-    if (options.minConf !== undefined) {
-        resolutionOptions = { ...(resolutionOptions ?? {}), minConf: options.minConf };
-    }
+    const resolutionOptions = await readResolutionOptions(options);
     return { identifier: options.identifier, options: resolutionOptions };
 }
-/**
- * Commander argParser for `--min-conf`. Accepts a positive integer (minimum 1),
- * the domain the specification gives `minConf`. Errors at parse time otherwise.
- */
-function parseMinConf(value) {
-    if (!/^[1-9]\d*$/.test(value)) {
-        throw new CLIError('--min-conf must be a positive integer (minimum 1).', 'INVALID_ARGUMENT_ERROR', { value });
-    }
-    return Number(value);
-}
 //# sourceMappingURL=resolve.js.map

package/dist/esm/src/commands/resolve.js.map

@@ -1 +1 @@
-{"version":3,"file":"resolve.js","sourceRoot":"","sources":["../../../../src/commands/resolve.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"resolve.js","sourceRoot":"","sources":["../../../../src/commands/resolve.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAE5C,OAAO,EAAE,aAAa,EAAmB,MAAM,cAAc,CAAC;AAC9D,OAAO,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAC5C,OAAO,EAAE,aAAa,EAAE,YAAY,EAAE,qBAAqB,EAA8B,MAAM,0BAA0B,CAAC;AAG1H,MAAM,UAAU,sBAAsB,CACpC,OAAiB,EACjB,OAAoB,EACpB,OAA6B;IAE7B,OAAO;SACJ,OAAO,CAAC,SAAS,CAAC;SAClB,KAAK,CAAC,MAAM,CAAC;SACb,WAAW,CAAC,6CAA6C,CAAC;SAC1D,cAAc,CAAC,+BAA+B,EAAE,sBAAsB,CAAC;SACvE,MAAM,CAAC,iCAAiC,EAAE,2CAA2C,CAAC;SACtF,MAAM,CAAC,sCAAsC,EAAE,mDAAmD,CAAC;SACnG,MAAM,CAAC,gBAAgB,EAAE,aAAa,EAAE,YAAY,CAAC;SACrD,MAAM,CAAC,KAAK,EAAE,OAAuD,EAAE,EAAE;QACxE,MAAM,MAAM,GAAG,MAAM,sBAAsB,CAAC,OAAO,CAAC,CAAC;QACrD,MAAM,OAAO,GAAG,aAAa,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;QACjD,MAAM,GAAG,GAAG,OAAO,CAAC,OAAO,EAAE,OAAO,EAAE,CAAC,CAAC;QACxC,MAAM,IAAI,GAAG,MAAM,GAAG,CAAC,UAAU,CAAC,MAAM,CAAC,UAAU,EAAE,MAAM,CAAC,OAAO,CAAC,CAAC;QACrE,MAAM,MAAM,GAAG,EAAE,MAAM,EAAE,SAAkB,EAAE,IAAI,EAAE,CAAC;QACpD,OAAO,CAAC,GAAG,CAAC,YAAY,CAAC,MAAM,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC;IAC/C,CAAC,CAAC,CAAC;AACP,CAAC;AAED,KAAK,UAAU,sBAAsB,CACnC,OAAuD;IAEvD,mCAAmC;IACnC,UAAU,CAAC,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;IACtC,MAAM,iBAAiB,GAAG,MAAM,qBAAqB,CAAC,OAAO,CAAC,CAAC;IAC/D,OAAO,EAAE,UAAU,EAAE,OAAO,CAAC,UAAU,EAAE,OAAO,EAAE,iBAAiB,EAAE,CAAC;AACxE,CAAC"}

package/dist/esm/src/commands/update.js

@@ -1,94 +1,24 @@
-import { KeyManagerSigner } from '@did-btcr2/key-manager';
-import { assertKeystoreAllowedForNetwork, deriveNetwork, resolveBroadcastOptions, resolveSigningKeyRef } from '../config.js';
-import { CLIError } from '../error.js';
 import { printWatchHint } from '../hints.js';
-import { resolveKeyRef } from '../keystore/resolve-key-ref.js';
 import { formatResult } from '../output.js';
+import { parseJsonArg, prepareWrite, registerWriteOptions } from './write.js';
 export function registerUpdateCommand(program, factory, globals) {
-    program
+    const command = program
         .command('update')
         .description('Update a did:btcr2 document.')
-        .requiredOption('-s, --source-document <json>', 'Source DID document as JSON string', parseJsonArg('--source-document'))
-        .requiredOption('--source-version-id <number>', 'Source version ID as a number')
-        .requiredOption('-p, --patches <json>', 'JSON Patch operations as a JSON string array', parseJsonArg('--patches'))
-        .requiredOption('-m, --verification-method-id <id>', 'DID document verification method ID')
-        .requiredOption('-b, --beacon-id <json>', 'Beacon ID as a JSON string', parseJsonArg('--beacon-id'))
-        .option('--publish-to-cas <mode>', 'Publish update artifacts to a writable CAS before broadcast: auto|always|never. '
-        + 'CAS publication is optional; the default distributes the returned artifacts via sidecar.', parsePublishToCasMode, 'never')
-        .option('--fee-rate <satsPerVByte>', 'Fee rate in sats/vByte for the beacon transaction (default: 5). '
-        + 'Raise it under congestion so the transaction confirms.')
-        .option('--change-address <address>', 'Send transaction change to this address instead of the beacon address, '
-        + 'so a DID\'s announcements are not linked on-chain (ADR 044).')
+        .requiredOption('-i, --identifier <identifier>', 'did:btcr2 identifier to update')
+        .requiredOption('-p, --patches <json>', 'JSON Patch operations as a JSON string array', parseJsonArg('--patches'));
+    registerWriteOptions(command)
         .action(async (options) => {
-        if (!/^\d+$/.test(options.sourceVersionId)) {
-            throw new CLIError('--source-version-id must be a non-negative integer.', 'INVALID_ARGUMENT_ERROR', { value: options.sourceVersionId });
-        }
-        const parsed = {
-            sourceDocument: options.sourceDocument,
-            patches: options.patches,
-            sourceVersionId: Number(options.sourceVersionId),
-            verificationMethodId: options.verificationMethodId,
-            beaconId: options.beaconId,
-        };
-        const did = parsed.sourceDocument?.id;
-        if (!did) {
-            throw new CLIError('Source document must contain an "id" field.', 'INVALID_ARGUMENT_ERROR', options);
-        }
-        const network = deriveNetwork(did);
-        // Refuse to sign a mainnet update with an unencrypted dev keystore (ADR 080).
-        assertKeystoreAllowedForNetwork(network, globals());
-        const api = factory(network, globals());
-        const keyId = resolveKeyRef(api.kms.kms, resolveSigningKeyRef(globals()));
-        const signer = new KeyManagerSigner(api.kms.kms, keyId);
-        // Resolve fee-rate/change-address through the flag -> env -> profile chain
-        // into beacon broadcast options. Undefined when neither is set, so the
-        // SDK defaults (5 sat/vB, change back to the beacon address) still apply.
-        const broadcastOptions = resolveBroadcastOptions(network, globals(), {
-            feeRate: options.feeRate,
-            changeAddress: options.changeAddress,
-        });
-        // CAS publication is optional and never required: every beacon update can
-        // be completed and shared via sidecar alone. It is opt-in and defaults to
-        // 'never'; pass --publish-to-cas auto|always to publish the signed update
-        // (and, for CAS beacons, the announcement) to a writable CAS configured
-        // via --cas-rpc-url. The returned artifacts (txid, announcement, proof)
-        // are always printed for sidecar distribution regardless.
-        const data = await api.btcr2.update({
-            sourceDocument: parsed.sourceDocument,
-            patches: parsed.patches,
-            sourceVersionId: parsed.sourceVersionId,
-            verificationMethodId: parsed.verificationMethodId,
-            beaconId: parsed.beaconId,
-            signer,
-            publishToCas: options.publishToCas,
-            ...(broadcastOptions ? { broadcastOptions } : {}),
-        });
-        console.log(formatResult({ action: 'update', data }, globals()));
-        printWatchHint(globals(), network, data.txid);
+        const g = globals();
+        const { network, api, params } = await prepareWrite(options, factory, g);
+        // The api resolves the source document if the source pair is absent,
+        // derives an omitted verification method and beacon, and publishes to
+        // the CAS only under --publish-to-cas auto|always. The returned
+        // artifacts (txid, signed update, announcement, proof) are printed for
+        // sidecar distribution in every case.
+        const data = await api.updateDid({ ...params, patches: options.patches });
+        console.log(formatResult({ action: 'update', data }, g));
+        printWatchHint(g, network, data.txid);
     });
 }
-/**
- * Commander argParser for `--publish-to-cas`. Validates the value is one of the
- * three {@link PublishToCasMode} policies, erroring at parse time otherwise.
- */
-function parsePublishToCasMode(value) {
-    if (value !== 'auto' && value !== 'always' && value !== 'never') {
-        throw new CLIError('--publish-to-cas must be one of "auto", "always", or "never".', 'INVALID_ARGUMENT_ERROR', { value });
-    }
-    return value;
-}
-/**
- * Returns a commander argParser that validates JSON.
- * Errors at parse time with a clear flag reference.
- */
-function parseJsonArg(flagName) {
-    return (value) => {
-        try {
-            return JSON.parse(value);
-        }
-        catch {
-            throw new CLIError(`Invalid JSON for ${flagName}. Must be a valid JSON string.`, 'INVALID_ARGUMENT_ERROR', { flagName, value });
-        }
-    };
-}
 //# sourceMappingURL=update.js.map

package/dist/esm/src/commands/update.js.map

@@ -1 +1 @@
-{"version":3,"file":"update.js","sourceRoot":"","sources":["../../../../src/commands/update.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"update.js","sourceRoot":"","sources":["../../../../src/commands/update.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAC7C,OAAO,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAE5C,OAAO,EAAE,YAAY,EAAE,YAAY,EAAE,oBAAoB,EAAmB,MAAM,YAAY,CAAC;AAE/F,MAAM,UAAU,qBAAqB,CACnC,OAAiB,EACjB,OAAoB,EACpB,OAA6B;IAE7B,MAAM,OAAO,GAAG,OAAO;SACpB,OAAO,CAAC,QAAQ,CAAC;SACjB,WAAW,CAAC,8BAA8B,CAAC;SAC3C,cAAc,CAAC,+BAA+B,EAAE,gCAAgC,CAAC;SACjF,cAAc,CACb,sBAAsB,EACtB,8CAA8C,EAC9C,YAAY,CAAC,WAAW,CAAC,CAC1B,CAAC;IACJ,oBAAoB,CAAC,OAAO,CAAC;SAC1B,MAAM,CAAC,KAAK,EAAE,OAA0C,EAAE,EAAE;QAC3D,MAAM,CAAC,GAAG,OAAO,EAAE,CAAC;QACpB,MAAM,EAAE,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,MAAM,YAAY,CAAC,OAAO,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC;QACzE,qEAAqE;QACrE,sEAAsE;QACtE,gEAAgE;QAChE,uEAAuE;QACvE,sCAAsC;QACtC,MAAM,IAAI,GAAG,MAAM,GAAG,CAAC,SAAS,CAAC,EAAE,GAAG,MAAM,EAAE,OAAO,EAAE,OAAO,CAAC,OAA2B,EAAE,CAAC,CAAC;QAC9F,OAAO,CAAC,GAAG,CAAC,YAAY,CAAC,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC;QACzD,cAAc,CAAC,CAAC,EAAE,OAAO,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;IACxC,CAAC,CAAC,CAAC;AACP,CAAC"}

package/dist/esm/src/commands/write.js

@@ -0,0 +1,119 @@
+import { KeyManagerSigner } from '@did-btcr2/key-manager';
+import { assertKeystoreAllowedForNetwork, deriveNetwork, resolveBroadcastOptions, resolveSigningKeyRef, } from '../config.js';
+import { CLIError } from '../error.js';
+import { resolveKeyRef } from '../keystore/resolve-key-ref.js';
+import { MIN_CONF_HELP, parseMinConf, readResolutionOptions } from '../resolution-options.js';
+/**
+ * Registers the flags that `update` and `deactivate` share. Each command
+ * registers `-i/--identifier` (and `update` its `-p/--patches`) before it
+ * calls this function, so those flags lead the help output.
+ */
+export function registerWriteOptions(command) {
+    return command
+        .option('-s, --source-document <json>', 'Source DID document as a JSON string. Requires --source-version-id. '
+        + 'Omit both to resolve the current document first', parseJsonArg('--source-document'))
+        .option('--source-version-id <number>', 'Version ID of the source document, a non-negative integer. Requires --source-document', parseSourceVersionId)
+        .option('-m, --verification-method-id <id>', 'Verification method that signs the update '
+        + '(default: the one method of the document that publishes the signing key)')
+        .option('-b, --beacon-id <id>', 'Beacon service that announces the update, as a DID URL '
+        + '(default: the only beacon of the document, else the one beacon with a spendable UTXO)')
+        .option('-r, --resolution-options <json>', 'Resolution options as a JSON string, for the resolution of the source document')
+        .option('--resolution-options-path <path>', 'Path to a JSON file with resolution options, for the resolution of the source document')
+        .option('--min-conf <n>', MIN_CONF_HELP, parseMinConf)
+        .option('--publish-to-cas <mode>', 'Publish update artifacts to a writable CAS before broadcast: auto|always|never. '
+        + 'CAS publication is optional; the default distributes the returned artifacts via sidecar.', parsePublishToCasMode, 'never')
+        .option('--fee-rate <satsPerVByte>', 'Fee rate in sats/vByte for the beacon transaction (default: 5). '
+        + 'Raise it under congestion so the transaction confirms.')
+        .option('--change-address <address>', 'Send transaction change to this address instead of the beacon address, '
+        + 'so a DID\'s announcements are not linked on-chain (ADR 044).');
+}
+/**
+ * Validates the shared write flags, derives the network from the identifier,
+ * applies the mainnet keystore guard, builds the signer, and returns the
+ * parameters for `updateDid` and `deactivateDid`.
+ *
+ * The checks run in this order, before any key material is read:
+ * 1. The identifier decodes and names a supported network.
+ * 2. `--source-document` and `--source-version-id` come together or not at
+ *    all (ADR 101). The api refuses a half pair too; the cli names the flags.
+ * 3. The resolution flags come only without the source pair. The api ignores
+ *    `resolutionOptions` when the pair is supplied (ADR 098). A silent ignore
+ *    of `--min-conf` would mislead.
+ * 4. A mainnet write is refused with an unencrypted dev keystore (ADR 080).
+ */
+export async function prepareWrite(options, factory, g) {
+    const did = options.identifier;
+    const network = deriveNetwork(did);
+    const hasDocument = options.sourceDocument !== undefined;
+    const hasVersion = options.sourceVersionId !== undefined;
+    if (hasDocument !== hasVersion) {
+        throw new CLIError('Provide both --source-document and --source-version-id, or neither. '
+            + 'Omit both to resolve the current document first.', 'INVALID_ARGUMENT_ERROR', { did });
+    }
+    const hasResolutionFlags = options.resolutionOptions !== undefined
+        || options.resolutionOptionsPath !== undefined
+        || options.minConf !== undefined;
+    if (hasDocument && hasResolutionFlags) {
+        throw new CLIError('--resolution-options, --resolution-options-path, and --min-conf apply only when '
+            + '--source-document and --source-version-id are omitted. A supplied source pair skips resolution.', 'INVALID_ARGUMENT_ERROR', { did });
+    }
+    assertKeystoreAllowedForNetwork(network, g);
+    const resolutionOptions = await readResolutionOptions(options);
+    const api = factory(network, g);
+    const keyId = resolveKeyRef(api.kms.kms, resolveSigningKeyRef(g));
+    const signer = new KeyManagerSigner(api.kms.kms, keyId);
+    // Resolve fee-rate/change-address through the flag, env, and profile layers
+    // into beacon broadcast options. Undefined when no layer sets one, so the
+    // SDK defaults (5 sat/vB, change back to the beacon address) still apply.
+    const broadcastOptions = resolveBroadcastOptions(network, g, {
+        feeRate: options.feeRate,
+        changeAddress: options.changeAddress,
+    });
+    return {
+        network,
+        api,
+        params: {
+            did,
+            signer,
+            sourceDocument: options.sourceDocument,
+            sourceVersionId: options.sourceVersionId,
+            verificationMethodId: options.verificationMethodId,
+            beaconId: options.beaconId,
+            resolutionOptions,
+            publishToCas: options.publishToCas,
+            broadcastOptions,
+        },
+    };
+}
+/** Commander argParser for `--source-version-id`: digits only, a non-negative integer. */
+function parseSourceVersionId(value) {
+    if (!/^\d+$/.test(value)) {
+        throw new CLIError('--source-version-id must be a non-negative integer.', 'INVALID_ARGUMENT_ERROR', { value });
+    }
+    return Number(value);
+}
+/**
+ * Commander argParser for `--publish-to-cas`. Validates the value is one of the
+ * three {@link PublishToCasMode} policies, erroring at parse time otherwise.
+ */
+function parsePublishToCasMode(value) {
+    if (value !== 'auto' && value !== 'always' && value !== 'never') {
+        throw new CLIError('--publish-to-cas must be one of "auto", "always", or "never".', 'INVALID_ARGUMENT_ERROR', { value });
+    }
+    return value;
+}
+/**
+ * Returns a commander argParser that validates JSON.
+ * Errors at parse time with a clear flag reference.
+ */
+export function parseJsonArg(flagName) {
+    return (value) => {
+        try {
+            return JSON.parse(value);
+        }
+        catch {
+            throw new CLIError(`Invalid JSON for ${flagName}. Must be a valid JSON string.`, 'INVALID_ARGUMENT_ERROR', { flagName, value });
+        }
+    };
+}
+//# sourceMappingURL=write.js.map

package/dist/esm/src/commands/write.js.map

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