@beclab/olaresid 0.1.12 → 0.2.0

package/dist/cli.js

@@ -65,7 +65,8 @@ function parseArgs() {
         'is-owner',
         'transfer',
         'fetch',
-        'fetch-domain'
+        'fetch-domain',
+        'fetch-all'
     ];
     for (let i = 0; i < args.length; i++) {
         const arg = args[i];
@@ -79,6 +80,9 @@ function parseArgs() {
         else if (arg === '--network' || arg === '-n') {
             options.network = args[++i] || 'mainnet';
         }
+        else if (arg === '--from') {
+            options.from = args[++i];
+        }
         else if (arg === '--rpc') {
             options.rpc = args[++i];
         }
@@ -138,6 +142,18 @@ function parseArgs() {
     }
     return { command, subCommand, domain, value, options };
 }
+function normalizeTagFromDomain(from, toDomain) {
+    if (!from) {
+        return toDomain;
+    }
+    const normalized = from.trim().toLowerCase();
+    if (normalized === 'root' ||
+        normalized === ':root' ||
+        normalized === '""') {
+        return '';
+    }
+    return (0, olares_id_1.normalizeToDomain)(from);
+}
 function showHelp() {
     console.log(`
 DID CLI Tool v${CLI_VERSION}
@@ -191,15 +207,18 @@ COMMANDS:
                                Define a new tag type (requires PRIVATE_KEY_OR_MNEMONIC)
                                Supported types: string, uint8, uint256, int8, int256, bool, address, bytes, bytes32
                                Array types: string[], uint8[], etc.
-    tag set <domain> <tag-name> <value>
+	tag set <domain> <tag-name> <value> [--from <domain|root>]
                                Set tag value (requires PRIVATE_KEY_OR_MNEMONIC)
-                               Value can be a string or JSON for arrays/objects
-    tag get <domain> <tag-name>
+							   Value can be a string or JSON for arrays/objects
+							   --from specifies where tag type is defined (default: same as <domain>)
+	tag get <domain> <tag-name> [--from <domain|root>]
                                Get tag value (read-only)
-    tag remove <domain> <tag-name>
+	tag remove <domain> <tag-name> [--from <domain|root>]
                                Remove tag value (requires PRIVATE_KEY_OR_MNEMONIC)
-    tag list <domain>          List all tags with values for domain (read-only)
-    tag list-defined <domain>  List all defined tag types for domain (read-only)
+	tag list <domain> [--from <domain|root>]
+                               List all tags with values for domain (read-only)
+    tag list-defined [domain]  List all tag types defined by the domain (read-only)
+                               Omit domain to query tag types defined by root
     tag set-tagger <domain> <tag-name> <address>
                                Set tagger address for a tag (requires PRIVATE_KEY_OR_MNEMONIC)
     tag get-tagger <domain> <tag-name>
@@ -222,16 +241,17 @@ COMMANDS:
     config set <key> <value> [--network <network>]
                                Set configuration value (default network: mainnet)
                                Keys: rpc, contractDid, contractRootResolver,
-                                     contractAbiType, contractRootResolver2, supportSvcUrl
+                                     contractAbiType, contractRootResolver2,
+                                     supportSvcUrl, queryContract
     
   Crypto Utility Commands:
     crypto generate            Generate a new mnemonic phrase (--words option)
                                Saves to file, use --output to specify file path
-    crypto address             Get Ethereum address from mnemonic (requires MNEMONIC env var)
-    crypto did                 Get DID from mnemonic (requires MNEMONIC env var)
-    crypto privatekey          Get EVM private key from mnemonic (requires MNEMONIC env var)
+    crypto address             Get Ethereum address from private key or mnemonic (requires PRIVATE_KEY_OR_MNEMONIC)
+    crypto did                 Get DID from mnemonic (requires PRIVATE_KEY_OR_MNEMONIC with mnemonic)
+    crypto privatekey          Get/save EVM private key (requires PRIVATE_KEY_OR_MNEMONIC)
                                Saves to file, use --output to specify file path
-    crypto derive              Derive all keys from mnemonic (requires MNEMONIC env var)
+    crypto derive              Derive all keys from mnemonic (requires PRIVATE_KEY_OR_MNEMONIC with mnemonic)
                                Saves to file, use --output to specify file path
     
   Utility Commands:
@@ -242,12 +262,13 @@ COMMANDS:
     
   Legacy Commands:
     fetch <domain>             Fetch domain information (alias: fetch-domain)
-    fetch-all                  Fetch all domains from contract
-    config                     Show network configurations
+    fetch-all                  Fetch all domains from contract and save to JSON file
+                               Use --output to specify file path (default: domains-<network>-<date>.json)
     help                       Show this help message
 
 OPTIONS:
   -n, --network <network>         Network to use (sepolia|mainnet) [default: mainnet]
+	--from <domain|root>            Tag source domain for tag set/get/remove/list (default: target domain)
   --rpc <url>                     Custom RPC endpoint URL
   --contract-did <address>        Custom DID contract address
   --contract-resolver <address>   Custom RootResolver contract address
@@ -293,7 +314,6 @@ EXAMPLES:
   # Subdomain management (auto-generate mnemonic for subdomain owner)
   export PRIVATE_KEY_OR_MNEMONIC=0xYOUR_PRIVATE_KEY
   did-cli subdomain register parent.com child
-  did-cli subdomain register parent.com child --words 24
   
   # Subdomain management (use existing mnemonic for subdomain owner)
   export SUBDOMAIN_OWNER_MNEMONIC="your twelve word mnemonic here"
@@ -305,7 +325,6 @@ EXAMPLES:
   # Transfer domain ownership (auto-generate mnemonic for new owner)
   export PRIVATE_KEY_OR_MNEMONIC=0xYOUR_PRIVATE_KEY
   did-cli transfer example.com
-  did-cli transfer example.com --words 24
   
   # Transfer domain ownership (use existing mnemonic for new owner)
   export TO_MNEMONIC="your twelve word mnemonic here"
@@ -313,8 +332,8 @@ EXAMPLES:
   
   # Crypto utilities
   did-cli crypto generate --words 12
-  did-cli crypto generate --words 24 --output ./custom-path.txt
-  export MNEMONIC="your twelve word mnemonic here"
+  did-cli crypto generate --output ./custom-path.txt
+  export PRIVATE_KEY_OR_MNEMONIC="your twelve word mnemonic here"
   did-cli crypto address
   did-cli crypto did
   did-cli crypto privatekey --output ./my-private-key.txt
@@ -384,8 +403,15 @@ EXAMPLES:
   did-cli config list                              # List all networks
   did-cli config set rpc https://optimism.llamarpc.com  # Set mainnet RPC
   did-cli config set contractDid 0x1234... --network sepolia  # Set sepolia contract
+  did-cli config set queryContract 0x637197... --network sepolia  # Set query contract
   did-cli config set rpc https://my-rpc.com --network custom_net  # Create new network
   
+  # Fetch all domains
+  did-cli fetch-all                                # Fetch all mainnet domains (auto-named file)
+  did-cli fetch-all --network sepolia              # Fetch all sepolia domains
+  did-cli fetch-all --output ./my-domains.json     # Custom output file path
+  did-cli fetch-all --network sepolia --verbose    # With progress details
+  
   # Utilities
   did-cli convert pem-to-der ./public-key.pem
   did-cli convert ip-to-bytes 192.168.1.1
@@ -393,13 +419,12 @@ EXAMPLES:
 
 ENVIRONMENT VARIABLES:
   PRIVATE_KEY_OR_MNEMONIC         Private key (0x...) or mnemonic phrase for signing transactions
-                                  (required for write operations)
+                                  and crypto utility commands (required for write operations
+                                  and crypto address/did/privatekey/derive)
   SUBDOMAIN_OWNER_MNEMONIC        Mnemonic phrase for generating subdomain owner identity
                                   (used in subdomain registration)
   TO_MNEMONIC                     Mnemonic phrase for generating new owner identity
                                   (used in domain transfer)
-  MNEMONIC                        Mnemonic phrase for crypto utility commands
-                                  (used in crypto address, did, privatekey, derive)
   EVM_PRIVATE_KEY                 EVM wallet private key for wallet management operations
                                   (required for wallet evm add/remove commands)
   SOLANA_PRIVATE_KEY              Solana wallet private key for wallet management operations
@@ -414,27 +439,12 @@ async function fetchDomain(domain, options) {
             debug_1.debug.enable();
             debug_1.debug.setLevel(options.debugLevel);
         }
-        // Get network configuration
-        const config = (0, config_1.getNetworkConfig)(options.network);
-        if (!config) {
-            console.error(`❌ Unknown network: ${options.network}`);
-            console.error('Available networks:', (0, config_1.getAvailableNetworks)().join(', '));
-            process.exit(1);
-        }
-        // Command line parameters take priority
-        const finalConfig = {
-            rpc: options.rpc || config.rpc,
-            contractDid: options.contractDid || config.contractDid,
-            contractRootResolver: options.contractResolver || config.contractRootResolver,
-            contractAbiType: options.contractAbi || config.contractAbiType
-        };
         if (debug_1.debug.isEnabled()) {
             debug_1.debug.info(`🔍 Fetching domain: ${domain}`);
             debug_1.debug.info(`🌐 Network: ${options.network}`);
-            debug_1.debug.info('Using configuration:', finalConfig);
         }
-        // Create DID console instance
-        const olaresId = index_1.default.createConsole(finalConfig.rpc, finalConfig.contractDid, finalConfig.contractRootResolver, finalConfig.contractAbiType);
+        // Use getConsole helper to create console instance
+        const olaresId = getConsole(options);
         // Fetch domain data
         const domainData = await olaresId.fetchDomain(domain);
         if (!domainData) {
@@ -451,6 +461,70 @@ async function fetchDomain(domain, options) {
         process.exit(1);
     }
 }
+async function fetchAll(options) {
+    try {
+        // Set debug options
+        if (options.verbose || options.debug) {
+            debug_1.debug.enable();
+            debug_1.debug.setLevel(options.debugLevel);
+        }
+        if (debug_1.debug.isEnabled()) {
+            debug_1.debug.info('🔍 Fetching all domains');
+            debug_1.debug.info(`🌐 Network: ${options.network}`);
+        }
+        // Use getConsole helper to create console instance
+        const olaresId = getConsole(options);
+        // Check if query contract is configured
+        if (!olaresId.queryContractAddress) {
+            console.error('❌ Query contract address not configured for this network');
+            console.error(`   Use: did-cli config set queryContract <address> --network ${options.network}`);
+            process.exit(1);
+        }
+        console.log('📡 Fetching all domains from contract...');
+        console.log(`   Network: ${options.network}`);
+        console.log(`   Query Contract: ${olaresId.queryContractAddress}`);
+        console.log();
+        let totalDomains = 0;
+        const startTime = Date.now();
+        // Fetch all domains with progress
+        const domains = await olaresId.fetchAllFlat({
+            batchSize: 100,
+            onProgress: (current, total) => {
+                totalDomains = total;
+                const percent = ((current / total) * 100).toFixed(1);
+                process.stdout.write(`\r⏳ Progress: ${current}/${total} (${percent}%)`);
+            }
+        });
+        const elapsed = ((Date.now() - startTime) / 1000).toFixed(2);
+        process.stdout.write('\r' + ' '.repeat(50) + '\r'); // Clear progress line
+        console.log(`✅ Fetched ${totalDomains} domains in ${elapsed}s`);
+        console.log();
+        // Determine output file path
+        const timestamp = new Date()
+            .toISOString()
+            .replace(/[:.]/g, '-')
+            .split('T')[0];
+        const defaultFilename = `domains-${options.network}-${timestamp}.json`;
+        const outputPath = options.output || path.join(process.cwd(), defaultFilename);
+        // Save to file
+        const jsonContent = JSON.stringify(domains, null, 2);
+        fs.writeFileSync(outputPath, jsonContent, 'utf-8');
+        console.log(`💾 Saved to: ${outputPath}`);
+        console.log(`   File size: ${(jsonContent.length / 1024).toFixed(2)} KB`);
+        console.log(`   Total domains: ${domains.length}`);
+        if (debug_1.debug.isEnabled()) {
+            debug_1.debug.info('Fetch all completed successfully');
+            debug_1.debug.info(`Output file: ${outputPath}`);
+        }
+    }
+    catch (error) {
+        console.error('❌ Error fetching all domains:', error instanceof Error ? error.message : String(error));
+        if (debug_1.debug.isEnabled()) {
+            debug_1.debug.error('Full error details:', error);
+        }
+        process.exit(1);
+    }
+}
 // ============================================================================
 // Helper Functions
 // ============================================================================
@@ -468,9 +542,10 @@ function getConsole(options) {
         contractAbiType: options.contractAbi || networkConfig.contractAbiType,
         contractRootResolver2: options.contractRootResolver2 ||
             networkConfig.contractRootResolver2,
-        supportSvcUrl: options.supportSvcUrl || networkConfig.supportSvcUrl
+        supportSvcUrl: options.supportSvcUrl || networkConfig.supportSvcUrl,
+        queryContract: networkConfig.queryContract
     };
-    return index_1.default.createConsole(config.rpc, config.contractDid, config.contractRootResolver, config.contractAbiType, config.contractRootResolver2, config.supportSvcUrl);
+    return index_1.default.createConsole(config.rpc, config.contractDid, config.contractRootResolver, config.contractAbiType, config.contractRootResolver2, config.supportSvcUrl, config.queryContract);
 }
 function getPrivateKeyOrMnemonic() {
     const key = process.env.PRIVATE_KEY_OR_MNEMONIC;
@@ -1125,7 +1200,7 @@ async function cryptoGenerate(options) {
             console.log('  • Delete the file after copying to a secure location');
             console.log(`  • Command: rm ${outputFile}`);
             console.log('\n💡 To use the mnemonic:');
-            console.log(`  export MNEMONIC="$(cat ${outputFile})"`);
+            console.log(`  export PRIVATE_KEY_OR_MNEMONIC="$(cat ${outputFile})"`);
         }
     }
     catch (error) {
@@ -1137,26 +1212,37 @@ async function cryptoGenerate(options) {
     }
 }
 /**
- * Get mnemonic from environment variable
+ * Get private key or mnemonic from environment variable
+ * Returns: { value: string, isMnemonic: boolean }
  */
-function getMnemonic() {
-    const mnemonic = process.env.MNEMONIC;
-    if (!mnemonic) {
-        console.error('❌ Error: MNEMONIC environment variable is required');
-        console.error('Please set MNEMONIC environment variable');
-        console.error('Example: export MNEMONIC="your twelve word mnemonic phrase here"');
+function getPrivateKeyOrMnemonicWithType() {
+    const key = process.env.PRIVATE_KEY_OR_MNEMONIC;
+    if (!key) {
+        console.error('❌ Error: Private key or mnemonic is required for this operation');
+        console.error('Please set PRIVATE_KEY_OR_MNEMONIC environment variable');
+        console.error('Example: export PRIVATE_KEY_OR_MNEMONIC=0xYOUR_PRIVATE_KEY');
+        console.error('Or:      export PRIVATE_KEY_OR_MNEMONIC="your twelve word mnemonic phrase here"');
         console.error('\n⚠️  Important: Always use quotes for mnemonic phrases!');
         process.exit(1);
     }
-    return mnemonic;
+    const trimmed = key.trim();
+    const wordCount = trimmed.split(/\s+/).length;
+    const isMnemonic = wordCount >= 12 && wordCount <= 24;
+    return { value: trimmed, isMnemonic };
 }
 /**
- * Crypto utility: Get Ethereum address from mnemonic
+ * Crypto utility: Get Ethereum address from private key or mnemonic
  */
 async function cryptoGetAddress(options) {
     try {
-        const mnemonic = getMnemonic();
-        const address = await (0, index_1.getEthereumAddressFromMnemonic)(mnemonic);
+        const { value, isMnemonic } = getPrivateKeyOrMnemonicWithType();
+        let address;
+        if (isMnemonic) {
+            address = await (0, index_1.getEthereumAddressFromMnemonic)(value);
+        }
+        else {
+            address = (0, index_1.getEthereumAddressFromPrivateKey)(value);
+        }
         if (options.json) {
             console.log(JSON.stringify({
                 address: address
@@ -1176,12 +1262,18 @@ async function cryptoGetAddress(options) {
     }
 }
 /**
- * Crypto utility: Get DID from mnemonic
+ * Crypto utility: Get DID from mnemonic (only works with mnemonic)
  */
 async function cryptoGetDID(options) {
     try {
-        const mnemonic = getMnemonic();
-        const did = await (0, index_1.getDIDFromMnemonic)(mnemonic);
+        const { value, isMnemonic } = getPrivateKeyOrMnemonicWithType();
+        if (!isMnemonic) {
+            console.error('❌ Error: DID derivation requires a mnemonic phrase');
+            console.error('   Private keys cannot be used to derive DID');
+            console.error('   Please provide a mnemonic phrase in PRIVATE_KEY_OR_MNEMONIC');
+            process.exit(1);
+        }
+        const did = await (0, index_1.getDIDFromMnemonic)(value);
         if (options.json) {
             console.log(JSON.stringify({
                 did: did
@@ -1201,12 +1293,19 @@ async function cryptoGetDID(options) {
     }
 }
 /**
- * Crypto utility: Get EVM private key from mnemonic
+ * Crypto utility: Get/display EVM private key (from mnemonic or show existing private key)
  */
 async function cryptoGetPrivateKey(options) {
     try {
-        const mnemonic = getMnemonic();
-        const privateKey = await (0, index_1.getEVMPrivateKeyFromMnemonic)(mnemonic);
+        const { value, isMnemonic } = getPrivateKeyOrMnemonicWithType();
+        let privateKey;
+        if (isMnemonic) {
+            privateKey = await (0, index_1.getEVMPrivateKeyFromMnemonic)(value);
+        }
+        else {
+            // Already a private key, just use it
+            privateKey = value;
+        }
         // Save private key to file
         const outputFile = options.output || './private-key.txt';
         fs.writeFileSync(outputFile, privateKey, 'utf-8');
@@ -1216,7 +1315,7 @@ async function cryptoGetPrivateKey(options) {
             }, null, 2));
         }
         else {
-            console.log('🔑 EVM Private Key generated');
+            console.log('🔑 EVM Private Key');
             console.log(`📄 Private key saved to: ${outputFile}`);
             console.log('\n⚠️  SECURITY WARNING:');
             console.log('  • Keep this private key secure! Never share it!');
@@ -1233,13 +1332,20 @@ async function cryptoGetPrivateKey(options) {
     }
 }
 /**
- * Crypto utility: Derive all keys from mnemonic
+ * Crypto utility: Derive all keys from mnemonic (only works with mnemonic)
  */
 async function cryptoDerive(options) {
     try {
-        const mnemonic = getMnemonic();
-        const { owner, did } = await (0, index_1.deriveDIDFromMnemonic)(mnemonic);
-        const privateKey = await (0, index_1.getEVMPrivateKeyFromMnemonic)(mnemonic);
+        const { value, isMnemonic } = getPrivateKeyOrMnemonicWithType();
+        if (!isMnemonic) {
+            console.error('❌ Error: Key derivation requires a mnemonic phrase');
+            console.error('   Private keys cannot be used to derive additional keys');
+            console.error('   Please provide a mnemonic phrase in PRIVATE_KEY_OR_MNEMONIC');
+            console.error('   Note: You can derive address from a private key using "crypto address"');
+            process.exit(1);
+        }
+        const { owner, did } = await (0, index_1.deriveDIDFromMnemonic)(value);
+        const privateKey = await (0, index_1.getEVMPrivateKeyFromMnemonic)(value);
         // Save all keys to file
         const outputFile = options.output || './derived-keys.txt';
         const fileContent = `Ethereum Address: ${owner}\nDID: ${did}\nPrivate Key: ${privateKey}`;
@@ -1520,6 +1626,7 @@ async function configShow(options) {
             console.log(`  Contract ABIType:       ${networkConfig.contractAbiType}`);
             console.log(`  Contract RootResolver2: ${networkConfig.contractRootResolver2}`);
             console.log(`  Support Service URL:    ${networkConfig.supportSvcUrl}`);
+            console.log(`  Query Contract:         ${networkConfig.queryContract || '(not set)'}`);
             console.log(`\n📄 Configuration file: ${(0, config_1.getConfigFilePath)()}`);
         }
     }
@@ -1576,7 +1683,8 @@ async function configSet(key, value, options) {
             'contractRootResolver',
             'contractAbiType',
             'contractRootResolver2',
-            'supportSvcUrl'
+            'supportSvcUrl',
+            'queryContract'
         ];
         if (!validKeys.includes(key)) {
             console.error(`❌ Invalid config key: ${key}`);
@@ -1697,14 +1805,17 @@ async function tagDefine(domain, tagName, typeString, options) {
 /**
  * Set tag value
  */
-async function tagSet(domain, tagName, valueStr, options) {
+async function tagSet(toDomain, fromDomain, tagName, valueStr, options) {
     try {
         const didConsole = getConsole(options);
         const privateKeyOrMnemonic = getPrivateKeyOrMnemonic();
         await didConsole.setSigner(privateKeyOrMnemonic);
-        const domainContext = didConsole.domain(domain);
+        const domainContext = didConsole.domain(fromDomain);
         const tagCtx = domainContext.tag();
-        console.log(`\n📝 Setting tag "${tagName}" for domain: ${domain}`);
+        const fromLabel = fromDomain === '' ? '(root)' : fromDomain;
+        console.log(`\n📝 Setting tag "${tagName}"`);
+        console.log(`   From: ${fromLabel}`);
+        console.log(`   To:   ${toDomain}`);
         console.log(`   Value: ${valueStr}`);
         // Try to parse value as JSON, otherwise use as string
         let value;
@@ -1714,12 +1825,13 @@ async function tagSet(domain, tagName, valueStr, options) {
         catch {
             value = valueStr;
         }
-        const result = await tagCtx.setTag(domain, tagName, value);
+        const result = await tagCtx.setTag(toDomain, tagName, value);
         if (result.success) {
             if (options.json) {
                 console.log(JSON.stringify({
                     success: true,
-                    domain,
+                    from: fromDomain,
+                    to: toDomain,
                     tagName,
                     value,
                     transactionHash: result.transactionHash,
@@ -1749,18 +1861,22 @@ async function tagSet(domain, tagName, valueStr, options) {
 /**
  * Get tag value
  */
-async function tagGet(domain, tagName, options) {
+async function tagGet(toDomain, fromDomain, tagName, options) {
     try {
         const didConsole = getConsole(options);
-        const domainContext = didConsole.domain(domain);
+        const domainContext = didConsole.domain(fromDomain);
         const tagCtx = domainContext.tag();
-        console.log(`\n📖 Getting tag "${tagName}" for domain: ${domain}`);
-        const value = await tagCtx.getTag(domain, tagName);
+        const fromLabel = fromDomain === '' ? '(root)' : fromDomain;
+        console.log(`\n📖 Getting tag "${tagName}"`);
+        console.log(`   From: ${fromLabel}`);
+        console.log(`   To:   ${toDomain}`);
+        const value = await tagCtx.getTag(toDomain, tagName);
         if (value !== null && value !== undefined) {
             if (options.json) {
                 console.log(JSON.stringify({
                     success: true,
-                    domain,
+                    from: fromDomain,
+                    to: toDomain,
                     tagName,
                     value
                 }, (_, v) => (typeof v === 'bigint' ? v.toString() : v), 2));
@@ -1779,7 +1895,8 @@ async function tagGet(domain, tagName, options) {
             if (options.json) {
                 console.log(JSON.stringify({
                     success: true,
-                    domain,
+                    from: fromDomain,
+                    to: toDomain,
                     tagName,
                     value: null
                 }));
@@ -1797,20 +1914,24 @@ async function tagGet(domain, tagName, options) {
 /**
  * Remove tag value
  */
-async function tagRemove(domain, tagName, options) {
+async function tagRemove(toDomain, fromDomain, tagName, options) {
     try {
         const didConsole = getConsole(options);
         const privateKeyOrMnemonic = getPrivateKeyOrMnemonic();
         await didConsole.setSigner(privateKeyOrMnemonic);
-        const domainContext = didConsole.domain(domain);
+        const domainContext = didConsole.domain(fromDomain);
         const tagCtx = domainContext.tag();
-        console.log(`\n🗑️  Removing tag "${tagName}" for domain: ${domain}`);
-        const result = await tagCtx.removeTag(domain, tagName);
+        const fromLabel = fromDomain === '' ? '(root)' : fromDomain;
+        console.log(`\n🗑️  Removing tag "${tagName}"`);
+        console.log(`   From: ${fromLabel}`);
+        console.log(`   To:   ${toDomain}`);
+        const result = await tagCtx.removeTag(toDomain, tagName);
         if (result.success) {
             if (options.json) {
                 console.log(JSON.stringify({
                     success: true,
-                    domain,
+                    from: fromDomain,
+                    to: toDomain,
                     tagName,
                     transactionHash: result.transactionHash,
                     gasUsed: result.gasUsed?.toString(),
@@ -1839,16 +1960,21 @@ async function tagRemove(domain, tagName, options) {
 /**
  * List all tags for a domain
  */
-async function tagList(domain, options) {
+async function tagList(toDomain, fromDomain, options) {
     try {
         const didConsole = getConsole(options);
-        const domainContext = didConsole.domain(domain);
-        console.log(`\n📋 Listing all tags for domain: ${domain}`);
-        const tags = await domainContext.getAllTags();
+        const domainContext = didConsole.domain(fromDomain);
+        const tagCtx = domainContext.tag();
+        const fromLabel = fromDomain === '' ? '(root)' : fromDomain;
+        console.log(`\n📋 Listing all tags`);
+        console.log(`   From: ${fromLabel}`);
+        console.log(`   To:   ${toDomain}`);
+        const tags = await tagCtx.getAllTags(toDomain);
         if (options.json) {
             console.log(JSON.stringify({
                 success: true,
-                domain,
+                from: fromDomain,
+                to: toDomain,
                 count: tags.length,
                 tags
             }, (_, v) => (typeof v === 'bigint' ? v.toString() : v), 2));
@@ -1878,7 +2004,8 @@ async function tagListDefined(domain, options) {
     try {
         const didConsole = getConsole(options);
         const domainContext = didConsole.domain(domain);
-        console.log(`\n📋 Listing defined tag types for domain: ${domain}`);
+        const domainLabel = domain === '' ? '(root)' : domain;
+        console.log(`\n📋 Listing tag types defined by: ${domainLabel}`);
         const tags = await domainContext.getDefinedTags();
         if (options.json) {
             console.log(JSON.stringify({
@@ -2191,8 +2318,9 @@ async function main() {
                         }
                         else {
                             console.error('❌ Error: Usage: did-cli config set <key> <value> [--network <network>]');
-                            console.error('   Valid keys: rpc, contractDid, contractRootResolver, contractAbiType, contractRootResolver2, supportSvcUrl');
+                            console.error('   Valid keys: rpc, contractDid, contractRootResolver, contractAbiType, contractRootResolver2, supportSvcUrl, queryContract');
                             console.error('\n   Example: did-cli config set rpc https://optimism.llamarpc.com --network mainnet');
+                            console.error('   Example: did-cli config set queryContract 0xAf0430AB9f2450c52E7401846C7CA702D53eCFC2 --network sepolia');
                             process.exit(1);
                         }
                         break;
@@ -2341,7 +2469,7 @@ async function main() {
                     case 'set':
                         if (!domain || !value) {
                             console.error('❌ Error: tag set requires <domain>, <tag-name> and <value>');
-                            console.error('Usage: did-cli tag set <domain> <tag-name> <value>');
+                            console.error('Usage: did-cli tag set <domain> <tag-name> <value> [--from <domain|root>]');
                             console.error('   Value can be a string or JSON (e.g., \'["item1","item2"]\' for arrays)');
                             console.error('\nNote: Set PRIVATE_KEY_OR_MNEMONIC environment variable first');
                             process.exit(1);
@@ -2350,14 +2478,15 @@ async function main() {
                             const args = process.argv.slice(2);
                             const setIdx = args.indexOf('set');
                             if (setIdx >= 0 && args.length > setIdx + 3) {
-                                const actualDomain = args[setIdx + 1];
+                                const actualDomain = (0, olares_id_1.normalizeToDomain)(args[setIdx + 1]);
+                                const fromDomain = normalizeTagFromDomain(options.from, actualDomain);
                                 const tagName = args[setIdx + 2];
                                 const valueStr = args[setIdx + 3];
-                                await tagSet(actualDomain, tagName, valueStr, options);
+                                await tagSet(actualDomain, fromDomain, tagName, valueStr, options);
                             }
                             else {
                                 console.error('❌ Error: Missing arguments for tag set');
-                                console.error('Usage: did-cli tag set <domain> <tag-name> <value>');
+                                console.error('Usage: did-cli tag set <domain> <tag-name> <value> [--from <domain|root>]');
                                 process.exit(1);
                             }
                         }
@@ -2365,20 +2494,21 @@ async function main() {
                     case 'get':
                         if (!domain) {
                             console.error('❌ Error: tag get requires <domain> and <tag-name>');
-                            console.error('Usage: did-cli tag get <domain> <tag-name>');
+                            console.error('Usage: did-cli tag get <domain> <tag-name> [--from <domain|root>]');
                             process.exit(1);
                         }
                         {
                             const args = process.argv.slice(2);
                             const getIdx = args.indexOf('get');
                             if (getIdx >= 0 && args.length > getIdx + 2) {
-                                const actualDomain = args[getIdx + 1];
+                                const actualDomain = (0, olares_id_1.normalizeToDomain)(args[getIdx + 1]);
+                                const fromDomain = normalizeTagFromDomain(options.from, actualDomain);
                                 const tagName = args[getIdx + 2];
-                                await tagGet(actualDomain, tagName, options);
+                                await tagGet(actualDomain, fromDomain, tagName, options);
                             }
                             else {
                                 console.error('❌ Error: Missing arguments for tag get');
-                                console.error('Usage: did-cli tag get <domain> <tag-name>');
+                                console.error('Usage: did-cli tag get <domain> <tag-name> [--from <domain|root>]');
                                 process.exit(1);
                             }
                         }
@@ -2386,7 +2516,7 @@ async function main() {
                     case 'remove':
                         if (!domain) {
                             console.error('❌ Error: tag remove requires <domain> and <tag-name>');
-                            console.error('Usage: did-cli tag remove <domain> <tag-name>');
+                            console.error('Usage: did-cli tag remove <domain> <tag-name> [--from <domain|root>]');
                             console.error('\nNote: Set PRIVATE_KEY_OR_MNEMONIC environment variable first');
                             process.exit(1);
                         }
@@ -2394,13 +2524,14 @@ async function main() {
                             const args = process.argv.slice(2);
                             const removeIdx = args.indexOf('remove');
                             if (removeIdx >= 0 && args.length > removeIdx + 2) {
-                                const actualDomain = args[removeIdx + 1];
+                                const actualDomain = (0, olares_id_1.normalizeToDomain)(args[removeIdx + 1]);
+                                const fromDomain = normalizeTagFromDomain(options.from, actualDomain);
                                 const tagName = args[removeIdx + 2];
-                                await tagRemove(actualDomain, tagName, options);
+                                await tagRemove(actualDomain, fromDomain, tagName, options);
                             }
                             else {
                                 console.error('❌ Error: Missing arguments for tag remove');
-                                console.error('Usage: did-cli tag remove <domain> <tag-name>');
+                                console.error('Usage: did-cli tag remove <domain> <tag-name> [--from <domain|root>]');
                                 process.exit(1);
                             }
                         }
@@ -2408,18 +2539,15 @@ async function main() {
                     case 'list':
                         if (!domain) {
                             console.error('❌ Error: Domain argument is required');
-                            console.error('Usage: did-cli tag list <domain>');
+                            console.error('Usage: did-cli tag list <domain> [--from <domain|root>]');
                             process.exit(1);
                         }
-                        await tagList(domain, options);
+                        const fromDomain = normalizeTagFromDomain(options.from, domain);
+                        await tagList(domain, fromDomain, options);
                         break;
                     case 'list-defined':
-                        if (!domain) {
-                            console.error('❌ Error: Domain argument is required');
-                            console.error('Usage: did-cli tag list-defined <domain>');
-                            process.exit(1);
-                        }
-                        await tagListDefined(domain, options);
+                        // domain defaults to "" (root) when not provided
+                        await tagListDefined(domain ?? '', options);
                         break;
                     case 'set-tagger':
                         if (!domain || !value) {
@@ -2483,6 +2611,9 @@ async function main() {
                 }
                 await fetchDomain(domain, options);
                 break;
+            case 'fetch-all':
+                await fetchAll(options);
+                break;
             default:
                 console.error(`❌ Unknown command: ${command}`);
                 console.error('Run "did-cli help" for usage information');