@sage-protocol/cli 0.8.3 → 0.8.4

package/dist/cli/commands/doctor.js

@@ -48,9 +48,9 @@ async function runDoctor(opts = {}) {
     const rpcUrl = process.env.RPC_URL || 'http://127.0.0.1:8545';
     const chainId = Number(process.env.CHAIN_ID || 84532);
     const addresses = {
-      SXXX_TOKEN_ADDRESS: config.resolveAddress('SXXX_TOKEN_ADDRESS') || '0x' + 'a'.repeat(40),
-      LIBRARY_REGISTRY_ADDRESS: config.resolveAddress('LIBRARY_REGISTRY_ADDRESS') || '0x' + 'b'.repeat(40),
-      SUBDAO_FACTORY_ADDRESS: config.resolveAddress('SUBDAO_FACTORY_ADDRESS') || '0x' + 'c'.repeat(40),
+      SXXX_TOKEN_ADDRESS: config.resolveAddress('SXXX_TOKEN_ADDRESS'),
+      LIBRARY_REGISTRY_ADDRESS: config.resolveAddress('LIBRARY_REGISTRY_ADDRESS'),
+      SUBDAO_FACTORY_ADDRESS: config.resolveAddress('SUBDAO_FACTORY_ADDRESS'),
     };
     ui.info('Sage Doctor Report (test mode)');
     ui.keyValue({ 'RPC': rpcUrl, 'chainId': chainId });
@@ -257,6 +257,7 @@ async function runDoctor(opts = {}) {
   }
 
   // 4) Required addresses (config prerequisites)
+  // Uses config.resolveAddress() to check profile, env, AND chain defaults
   out.push(c.cyan('⚙️  Config prerequisites'));
   const requiredAddrs = [
     { key: 'SXXX_TOKEN_ADDRESS', label: 'SXXX token', cliFlag: '--sxxx' },
@@ -265,9 +266,11 @@ async function runDoctor(opts = {}) {
   ];
   for (const entry of requiredAddrs) {
     const k = entry.key;
-    const v = process.env[k];
+    const v = config.resolveAddress(k);
+    const isDefault = v && !process.env[k];
     if (v) {
-      out.push(`✅ ${k}: ${v}`);
+      const suffix = isDefault ? ' (default)' : '';
+      out.push(`✅ ${k}: ${v}${suffix}`);
     } else {
       out.push(`❌ ${k} (missing)`);
       const cliHint = entry.cliFlag ? ` or use "sage config addresses set ${entry.cliFlag} <0x...>"` : '';
@@ -283,15 +286,18 @@ async function runDoctor(opts = {}) {
   }
 
   // Optional feature addresses (warn-level): Bounty system, Boost managers, etc.
+  // Uses config.resolveAddress() to check profile, env, AND chain defaults
   const featureAddrs = [
     { key: 'SIMPLE_BOUNTY_SYSTEM_ADDRESS', feature: 'bounty', hint: 'Required for `sage bounty *` commands.' },
     { key: 'BOOST_MANAGER_ADDRESS', feature: 'boost (merkle)', hint: 'Required for `sage boost fund/status/claim` (Merkle manager).' },
     { key: 'BOOST_MANAGER_DIRECT_ADDRESS', feature: 'boost (direct)', hint: 'Required for `sage boost create/status/finalize` (direct manager).' }
   ];
   for (const entry of featureAddrs) {
-    const v = process.env[entry.key];
+    const v = config.resolveAddress(entry.key);
+    const isDefault = v && !process.env[entry.key];
     if (v) {
-      out.push(`✅ ${entry.key}: ${v}`);
+      const suffix = isDefault ? ' (default)' : '';
+      out.push(`✅ ${entry.key}: ${v}${suffix}`);
     } else {
       out.push(`ℹ️  ${entry.key} (missing; ${entry.feature} commands will be unavailable)`);
       diagnostics.push({
@@ -861,24 +867,25 @@ function register(program) {
 
         if (opts.json) {
           // Build JSON object with key facts
-            const rpcUrl = process.env.RPC_URL || 'https://sepolia.base.org';
-            const chainId = Number(process.env.CHAIN_ID || 0);
+          // Use config.resolve* to include chain defaults, not just env vars
+          const rpcUrl = config.resolveRpcUrl();
+          const chainId = config.resolveChainId();
           const sageHome = _resolveSageHome();
           const out = {
             rpcUrl,
             chainId,
             addresses: {
-              SXXX_TOKEN_ADDRESS: process.env.SXXX_TOKEN_ADDRESS || null,
-              LIBRARY_REGISTRY_ADDRESS: process.env.LIBRARY_REGISTRY_ADDRESS || null,
-              SUBDAO_FACTORY_ADDRESS: process.env.SUBDAO_FACTORY_ADDRESS || null,
-              SIMPLE_BOUNTY_SYSTEM_ADDRESS: process.env.SIMPLE_BOUNTY_SYSTEM_ADDRESS || null,
-              BOOST_MANAGER_ADDRESS: process.env.BOOST_MANAGER_ADDRESS || null,
-              BOOST_MANAGER_DIRECT_ADDRESS: process.env.BOOST_MANAGER_DIRECT_ADDRESS || null,
-              PERSONAL_MARKETPLACE_ADDRESS: process.env.PERSONAL_MARKETPLACE_ADDRESS || null,
-              PERSONAL_LICENSE_RECEIPT_ADDRESS: process.env.PERSONAL_LICENSE_RECEIPT_ADDRESS || null,
-              SUBDAO: process.env.WORKING_SUBDAO_ADDRESS || process.env.SUBDAO || null,
-              GOV: process.env.GOV || null,
-              TIMELOCK: process.env.TIMELOCK || process.env.TIMELOCK_ADDRESS || null,
+              SXXX_TOKEN_ADDRESS: config.resolveAddress('SXXX_TOKEN_ADDRESS'),
+              LIBRARY_REGISTRY_ADDRESS: config.resolveAddress('LIBRARY_REGISTRY_ADDRESS'),
+              SUBDAO_FACTORY_ADDRESS: config.resolveAddress('SUBDAO_FACTORY_ADDRESS'),
+              SIMPLE_BOUNTY_SYSTEM_ADDRESS: config.resolveAddress('SIMPLE_BOUNTY_SYSTEM_ADDRESS'),
+              BOOST_MANAGER_ADDRESS: config.resolveAddress('BOOST_MANAGER_ADDRESS'),
+              BOOST_MANAGER_DIRECT_ADDRESS: config.resolveAddress('BOOST_MANAGER_DIRECT_ADDRESS'),
+              PERSONAL_MARKETPLACE_ADDRESS: config.resolveAddress('PERSONAL_MARKETPLACE_ADDRESS'),
+              PERSONAL_LICENSE_RECEIPT_ADDRESS: config.resolveAddress('PERSONAL_LICENSE_RECEIPT_ADDRESS'),
+              SUBDAO: config.resolveAddress('SUBDAO'),
+              GOV: config.resolveAddress('GOV'),
+              TIMELOCK: config.resolveAddress('TIMELOCK'),
               SAFE_TX_SERVICE_URL: process.env.SAFE_TX_SERVICE_URL || null,
               SAGE_USE_SAFE_TX_SERVICE: process.env.SAGE_USE_SAFE_TX_SERVICE || null
             },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sage-protocol/cli",
-  "version": "0.8.3",
+  "version": "0.8.4",
   "description": "Sage Protocol CLI for managing AI prompt libraries",
   "bin": {
     "sage": "./bin/sage.js"