@sage-protocol/cli 0.3.6 → 0.3.9

package/dist/cli/commands/bounty.js

@@ -6,6 +6,7 @@ const { ethers } = require('ethers');
 const { resolveArtifact } = require('../utils/artifacts');
 const { getSignerSession } = require('../utils/cli-session');
 const { handleCLIError } = require('../utils/error-handler');
+const { resolveGovContext } = require('../utils/gov-context');
 
 function hex32(id) {
   if (!id) throw new Error('Missing id');
@@ -43,22 +44,6 @@ function deriveBountyId({ idHex, slug, title }) {
   return { idHex: ethers.keccak256(ethers.toUtf8Bytes(auto)), source: 'auto', slug: auto };
 }
 
-async function getGovernorAddress(subdao) {
-  if (subdao) {
-    const rpcUrl = process.env.RPC_URL || 'https://base-sepolia.publicnode.com';
-    try {
-      const provider = new ethers.JsonRpcProvider(rpcUrl);
-      const abi = ['function governor() view returns (address)'];
-      const sub = new ethers.Contract(subdao, abi, provider);
-      return await sub.governor();
-    } catch (e) {
-      console.log(`⚠️  Could not get governor from SubDAO: ${e.message}`);
-      return process.env.GOV;
-    }
-  }
-  return process.env.GOV;
-}
-
 async function maybeEnsureSxxxAllowance(governorAddr, defaultAmountEther = '100') {
   try {
     const autoYes = String(process.env.SAGE_YES || '').toLowerCase();
@@ -91,40 +76,6 @@ async function maybeEnsureSxxxAllowance(governorAddr, defaultAmountEther = '100'
   }
 }
 
-async function resolveGovContext(options) {
-  let subdao = options.subdao || process.env.WORKING_SUBDAO_ADDRESS || process.env.SUBDAO;
-  let governorAddr = process.env.GOV;
-
-  if (subdao) {
-    governorAddr = await getGovernorAddress(subdao);
-  } else {
-    // Fallback to wizard to select a SubDAO or main gov
-    const inquirer = (require('inquirer').default || require('inquirer'));
-    const { scope } = await inquirer.prompt([
-      {
-        type: 'list', name: 'scope', message: 'Select governance context', choices: [
-          { name: 'A SubDAO (recommended)', value: 'subdao' },
-          { name: 'Main protocol (use GOV from env)', value: 'main' }
-        ]
-      }
-    ]);
-
-    if (scope === 'subdao') {
-      // For now, use a simple prompt for SubDAO address
-      const { subdaoAddr } = await inquirer.prompt([
-        { type: 'input', name: 'subdaoAddr', message: 'Enter SubDAO address:' }
-      ]);
-      subdao = subdaoAddr;
-      governorAddr = await getGovernorAddress(subdao);
-      process.env.SUBDAO = subdao;
-      process.env.WORKING_SUBDAO_ADDRESS = subdao;
-      cliConfig.writeAddresses({ SUBDAO: subdao, WORKING_SUBDAO_ADDRESS: subdao, GOV: governorAddr });
-    }
-  }
-
-  return { governorAddr, subdao };
-}
-
 function register(program) {
   const bounty = new Command('bounty')
     .description('Enhanced bounty management (create, claim, complete, approve)')
@@ -142,17 +93,17 @@ function register(program) {
     .option('--salt <hex32>', 'Salt (0x... 32 bytes). Default random')
     .option('--delay <sec>', 'Override delay seconds (default Timelock value)')
     .option('--execute', 'Execute immediately if delay=0', false)
-    .option('--subdao <address>', 'Resolve Timelock from SubDAO')
+    .option('--subdao <address>', 'Resolve Timelock from DAO/SubDAO')
+    .option('--dao <address>', 'Alias for --subdao (DAO/SubDAO)')
     .option('--gov <address>', 'Resolve Timelock via Governor')
     .action(async (opts) => {
       try {
         const { ethers } = require('ethers');
-        const { resolveGovContext } = require('../utils/gov-context');
         const wm = new (require('@sage-protocol/wallet-manager'))();
         await wm.connect();
         const signer = wm.getSigner();
         const provider = wm.getProvider();
-        const ctx = await resolveGovContext({ govOpt: opts.gov, subdaoOpt: opts.subdao, provider });
+        const ctx = await resolveGovContext({ govOpt: opts.gov, subdaoOpt: opts.subdao || opts.dao, provider });
         const tlAddr = ctx.timelock || process.env.TIMELOCK || process.env.TIMELOCK_ADDRESS;
         if (!tlAddr) throw new Error('Timelock not resolved. Pass --subdao or set TIMELOCK');
         const tlAbi = resolveArtifact('contracts/cloneable/TimelockControllerCloneable.sol/TimelockControllerCloneable.json').abi;
@@ -193,7 +144,8 @@ function register(program) {
   bounty
     .command('set-mode')
     .description('Set bounty winner mode: auto | board | token')
-    .requiredOption('--subdao <address>', 'SubDAO to derive timelock/governor')
+    .requiredOption('--subdao <address>', 'DAO/SubDAO to derive timelock/governor')
+    .option('--dao <address>', 'Alias for --subdao')
     .requiredOption('--mode <mode>', 'auto | board | token')
     .option('--fast-track <wei>', 'Auto mode: fast-track limit in wei', (value) => BigInt(value))
     .option('--operator <address>', 'Board mode: operator Safe/EOA address')
@@ -207,7 +159,7 @@ function register(program) {
         await sdk.bounty.configureWinnerMode({
           provider,
           signer,
-          subdao: opts.subdao,
+          subdao: opts.subdao || opts.dao,
           mode: String(opts.mode || '').toLowerCase(),
           fastTrackLimit: opts.fastTrack ?? defaultFastTrack,
           governanceConfig: opts.governanceConfig,
@@ -225,7 +177,8 @@ function register(program) {
   bounty
     .command('fund')
     .description('Fund a bounty via Governor proposal (approve + increaseReward)')
-    .requiredOption('--subdao <address>', 'SubDAO (derives Governor)')
+    .requiredOption('--subdao <address>', 'DAO/SubDAO (derives Governor)')
+    .option('--dao <address>', 'Alias for --subdao')
     .requiredOption('--bounty-system <address>', 'SimpleBountySystem address')
     .requiredOption('--bounty-id <id>', 'Bounty id', (value) => BigInt(value))
     .requiredOption('--token <address>', 'ERC20 token address (e.g. SXXX)')
@@ -237,7 +190,7 @@ function register(program) {
         const { proposalCall } = await sdk.bounty.fundFromTreasury({
           provider,
           signer,
-          subdao: opts.subdao,
+          subdao: opts.subdao || opts.dao,
           bountySystem: opts.bountySystem,
           bountyId: opts.bountyId,
           token: opts.token,
@@ -286,7 +239,8 @@ function register(program) {
   bounty
     .command('propose-approve')
     .description('Propose approval of bounty completion (token mode)')
-    .requiredOption('--subdao <address>', 'SubDAO (derives Governor)')
+    .requiredOption('--subdao <address>', 'DAO/SubDAO (derives Governor)')
+    .option('--dao <address>', 'Alias for --subdao')
     .requiredOption('--bounty-system <address>', 'SimpleBountySystem address')
     .requiredOption('--bounty-id <id>', 'Bounty id', (value) => BigInt(value))
     .requiredOption('--deliverable <cid>', 'Deliverable IPFS CID')
@@ -297,7 +251,7 @@ function register(program) {
         const { proposalCall } = await sdk.bounty.proposeApproveWinner({
           provider,
           signer,
-          subdao: opts.subdao,
+          subdao: opts.subdao || opts.dao,
           bountySystem: opts.bountySystem,
           bountyId: opts.bountyId,
           deliverable: opts.deliverable,
@@ -479,15 +433,21 @@ function register(program) {
     .option('--ipfs <cid>', 'IPFS CID with detailed specifications')
     .option('--deadline <days>', 'Deadline in days from now', '30')
     .option('--fast-track', 'Enable fast-track approval for small bounties', false)
-    .option('--subdao <address>', 'SubDAO context for governance')
+    .option('--subdao <address>', 'DAO/SubDAO context for governance')
+    .option('--dao <address>', 'Alias for --subdao')
+    .option('--yes', 'Skip interactive confirmation prompts', false)
     .action(async (opts) => {
       try {
-        const { governorAddr, subdao } = await resolveGovContext(opts);
+        const rpcUrl = process.env.RPC_URL || 'https://base-sepolia.publicnode.com';
+        const provider = new ethers.JsonRpcProvider(rpcUrl);
+        const ctx = await resolveGovContext({ govOpt: null, subdaoOpt: opts.subdao || opts.dao, provider });
+        const governorAddr = ctx.governor || process.env.GOV;
+        const subdao = ctx.subdao || opts.subdao || opts.dao || process.env.WORKING_SUBDAO_ADDRESS || process.env.SUBDAO || null;
+        if (!governorAddr) throw new Error('Governor address not resolved. Pass --subdao/--dao or configure GOV/SUBDAO in .sage config.');
         const bountySystem = cliConfig.resolveAddress('SIMPLE_BOUNTY_SYSTEM_ADDRESS');
         if (!bountySystem) throw new Error('SIMPLE_BOUNTY_SYSTEM_ADDRESS not set in environment');
 
         // Convert reward to wei
-        const rpcUrl = process.env.RPC_URL || 'https://base-sepolia.publicnode.com';
         const rewardWei = ethers.parseEther(String(opts.reward)).toString();
 
         // Calculate deadline timestamp
@@ -536,8 +496,17 @@ function register(program) {
         console.log('IPFS CID:', ipfsCID);
         console.log('Fast-track eligible:', fastTrackEligible);
 
-        const inquirer = (require('inquirer').default || require('inquirer'));
-        const { confirm } = await inquirer.prompt([{ type: 'confirm', name: 'confirm', message: 'Create bounty proposal?', default: true }]);
+        let confirm = false;
+        const autoYes = String(process.env.SAGE_YES || '').toLowerCase();
+        if (opts.yes || autoYes === '1' || autoYes === 'true') {
+          confirm = true;
+        } else {
+          const inquirer = (require('inquirer').default || require('inquirer'));
+          const ans = await inquirer.prompt([
+            { type: 'confirm', name: 'confirm', message: 'Create bounty proposal?', default: true }
+          ]);
+          confirm = !!ans.confirm;
+        }
         if (!confirm) return;
 
         // Ensure SXXX allowance for bounty system (creator stake)
@@ -573,7 +542,8 @@ function register(program) {
     .command('claim')
     .description('Claim an active bounty')
     .requiredOption('--id <bountyId>', 'Bounty ID to claim')
-    .option('--subdao <address>', 'SubDAO context')
+    .option('--subdao <address>', 'DAO/SubDAO context')
+    .option('--dao <address>', 'Alias for --subdao')
     .action(async (opts) => {
       try {
         const bountySystem = cliConfig.resolveAddress('SIMPLE_BOUNTY_SYSTEM_ADDRESS');
@@ -606,7 +576,8 @@ function register(program) {
     .description('Mark bounty as complete with deliverable')
     .requiredOption('--id <bountyId>', 'Bounty ID to complete')
     .requiredOption('--deliverable <ipfs>', 'IPFS CID of deliverable')
-    .option('--subdao <address>', 'SubDAO context')
+    .option('--subdao <address>', 'DAO/SubDAO context')
+    .option('--dao <address>', 'Alias for --subdao')
     .action(async (opts) => {
       try {
         const bountySystem = cliConfig.resolveAddress('SIMPLE_BOUNTY_SYSTEM_ADDRESS');
@@ -636,7 +607,9 @@ function register(program) {
     .description('Manually craft a governance proposal to approve bounty completion')
     .requiredOption('--id <bountyId>', 'Bounty ID to approve')
     .option('--proposal <proposalId>', 'Reference proposal ID for context')
-    .option('--subdao <address>', 'SubDAO context')
+    .option('--subdao <address>', 'DAO/SubDAO context')
+    .option('--dao <address>', 'Alias for --subdao')
+    .option('--yes', 'Skip interactive confirmation prompts', false)
     .action(async (opts) => {
       try {
         const { governorAddr } = await resolveGovContext(opts);
@@ -656,8 +629,17 @@ function register(program) {
         console.log('Bounty ID:', opts.id);
         console.log('Reference Proposal:', opts.proposal || 'None');
 
-        const inquirer = (require('inquirer').default || require('inquirer'));
-        const { confirm } = await inquirer.prompt([{ type: 'confirm', name: 'confirm', message: 'Create approval proposal?', default: true }]);
+        let confirm = false;
+        const autoYes = String(process.env.SAGE_YES || '').toLowerCase();
+        if (opts.yes || autoYes === '1' || autoYes === 'true') {
+          confirm = true;
+        } else {
+          const inquirer = (require('inquirer').default || require('inquirer'));
+          const ans = await inquirer.prompt([
+            { type: 'confirm', name: 'confirm', message: 'Create approval proposal?', default: true }
+          ]);
+          confirm = !!ans.confirm;
+        }
         if (!confirm) return;
 
         const rpcUrl = process.env.RPC_URL || 'https://base-sepolia.publicnode.com';
@@ -753,10 +735,15 @@ function register(program) {
     .option('--slug <text>', 'Bounty id slug; hashed to bytes32 if provided')
     .option('--id <bytes32>', 'Bounty id bytes32 (takes precedence)')
     .requiredOption('--cid <cid>', 'IPFS CID/URI with bounty details')
-    .option('--subdao <address>', 'SubDAO to derive Governor from')
+    .option('--subdao <address>', 'DAO/SubDAO to derive Governor from')
+    .option('--dao <address>', 'Alias for --subdao')
+    .option('--yes', 'Skip interactive confirmation prompts', false)
     .action(async (opts) => {
       try {
-        const { governorAddr } = await resolveGovContext(opts);
+        const rpcUrl = process.env.RPC_URL || 'https://base-sepolia.publicnode.com';
+        const provider = new ethers.JsonRpcProvider(rpcUrl);
+        const ctx = await resolveGovContext({ govOpt: null, subdaoOpt: opts.subdao || opts.dao, provider });
+        const governorAddr = ctx.governor || process.env.GOV;
         const announcer = opts.announcer || cliConfig.resolveAddress('BOUNTY_ANNOUNCEMENTS_ADDRESS');
         if (!announcer) throw new Error('Missing BountyAnnouncements address. Set BOUNTY_ANNOUNCEMENTS_ADDRESS or pass --announcer');
 
@@ -773,8 +760,17 @@ function register(program) {
         console.log('--- Proposal Preview (announce) ---');
         console.log({ targets, values: values.map(v => v.toString()), calldatas, description, derivedId: { idHex, source, slug } });
 
-        const inquirer = (require('inquirer').default || require('inquirer'));
-        const { confirm } = await inquirer.prompt([{ type: 'confirm', name: 'confirm', message: 'Submit proposal?', default: true }]);
+        let confirm = false;
+        const autoYes = String(process.env.SAGE_YES || '').toLowerCase();
+        if (opts.yes || autoYes === '1' || autoYes === 'true') {
+          confirm = true;
+        } else {
+          const inquirer = (require('inquirer').default || require('inquirer'));
+          const ans = await inquirer.prompt([
+            { type: 'confirm', name: 'confirm', message: 'Submit proposal?', default: true }
+          ]);
+          confirm = !!ans.confirm;
+        }
         if (!confirm) return;
 
         const WM = require('@sage-protocol/wallet-manager');
@@ -814,10 +810,15 @@ function register(program) {
     .option('--amount <amount>', 'Intended payout amount (units of asset, or wei for ETH)', '0')
     .option('--asset <address>', 'ERC20 token address (omit or 0x0 for ETH)', '0x0000000000000000000000000000000000000000')
     .option('--erc20', 'Treat payout as ERC20 (default ETH if not set)', false)
-    .option('--subdao <address>', 'SubDAO to derive Governor from')
+    .option('--subdao <address>', 'DAO/SubDAO to derive Governor from')
+    .option('--dao <address>', 'Alias for --subdao')
+    .option('--yes', 'Skip interactive confirmation prompts', false)
     .action(async (opts) => {
       try {
-        const { governorAddr } = await resolveGovContext(opts);
+        const rpcUrl = process.env.RPC_URL || 'https://base-sepolia.publicnode.com';
+        const provider = new ethers.JsonRpcProvider(rpcUrl);
+        const ctx = await resolveGovContext({ govOpt: null, subdaoOpt: opts.subdao || opts.dao, provider });
+        const governorAddr = ctx.governor || process.env.GOV;
         const announcer = opts.announcer || process.env.BOUNTY_ANNOUNCEMENTS_ADDRESS;
         if (!announcer) throw new Error('Missing BountyAnnouncements address. Set BOUNTY_ANNOUNCEMENTS_ADDRESS or pass --announcer');
         const winnerAddr = opts.winner || process.env.DEV_WALLET_ADDRESS;
@@ -839,8 +840,17 @@ function register(program) {
         console.log('--- Proposal Preview (winner) ---');
         console.log({ targets, values: values.map(v => v.toString()), calldatas, description, derivedId: { idHex, source, slug } });
 
-        const inquirer = (require('inquirer').default || require('inquirer'));
-        const { confirm } = await inquirer.prompt([{ type: 'confirm', name: 'confirm', message: 'Submit proposal?', default: true }]);
+        let confirm = false;
+        const autoYes = String(process.env.SAGE_YES || '').toLowerCase();
+        if (opts.yes || autoYes === '1' || autoYes === 'true') {
+          confirm = true;
+        } else {
+          const inquirer = (require('inquirer').default || require('inquirer'));
+          const ans = await inquirer.prompt([
+            { type: 'confirm', name: 'confirm', message: 'Submit proposal?', default: true }
+          ]);
+          confirm = !!ans.confirm;
+        }
         if (!confirm) return;
 
         const WM = require('@sage-protocol/wallet-manager');
@@ -866,11 +876,16 @@ function register(program) {
     .description('Create a proposal to pay a bounty winner in ETH from Timelock')
     .option('--to <address>', 'Winner address (defaults to DEV_WALLET_ADDRESS)')
     .requiredOption('--amount <eth>', 'Amount in ETH (decimal)')
-    .option('--subdao <address>', 'SubDAO to derive Governor from')
+    .option('--subdao <address>', 'DAO/SubDAO to derive Governor from')
+    .option('--dao <address>', 'Alias for --subdao')
     .option('--note <text>', 'Description note')
+    .option('--yes', 'Skip interactive confirmation prompts', false)
     .action(async (opts) => {
       try {
-        const { governorAddr } = await resolveGovContext(opts);
+        const rpcUrl = process.env.RPC_URL || 'https://base-sepolia.publicnode.com';
+        const provider = new ethers.JsonRpcProvider(rpcUrl);
+        const ctx = await resolveGovContext({ govOpt: null, subdaoOpt: opts.subdao || opts.dao, provider });
+        const governorAddr = ctx.governor || process.env.GOV;
         const to = opts.to || process.env.DEV_WALLET_ADDRESS;
         if (!to) throw new Error('Missing winner address. Set DEV_WALLET_ADDRESS or pass --to');
 
@@ -884,8 +899,17 @@ function register(program) {
         console.log('--- Proposal Preview (payout-eth) ---');
         console.log({ targets, values: values.map(v => v.toString()), calldatas, description });
 
-        const inquirer = (require('inquirer').default || require('inquirer'));
-        const { confirm } = await inquirer.prompt([{ type: 'confirm', name: 'confirm', message: 'Submit proposal?', default: true }]);
+        let confirm = false;
+        const autoYes = String(process.env.SAGE_YES || '').toLowerCase();
+        if (opts.yes || autoYes === '1' || autoYes === 'true') {
+          confirm = true;
+        } else {
+          const inquirer = (require('inquirer').default || require('inquirer'));
+          const ans = await inquirer.prompt([
+            { type: 'confirm', name: 'confirm', message: 'Submit proposal?', default: true }
+          ]);
+          confirm = !!ans.confirm;
+        }
         if (!confirm) return;
 
         const WM = require('@sage-protocol/wallet-manager');
@@ -920,11 +944,16 @@ function register(program) {
     .option('--token <address>', 'ERC20 token address held by Timelock (defaults to SXXX_TOKEN_ADDRESS)')
     .option('--to <address>', 'Winner address (defaults to DEV_WALLET_ADDRESS)')
     .requiredOption('--amount <units>', 'Token amount in smallest units')
-    .option('--subdao <address>', 'SubDAO to derive Governor from')
+    .option('--subdao <address>', 'DAO/SubDAO to derive Governor from')
+    .option('--dao <address>', 'Alias for --subdao')
     .option('--note <text>', 'Description note')
+    .option('--yes', 'Skip interactive confirmation prompts', false)
     .action(async (opts) => {
       try {
-        const { governorAddr } = await resolveGovContext(opts);
+        const rpcUrl = process.env.RPC_URL || 'https://base-sepolia.publicnode.com';
+        const provider = new ethers.JsonRpcProvider(rpcUrl);
+        const ctx = await resolveGovContext({ govOpt: null, subdaoOpt: opts.subdao || opts.dao, provider });
+        const governorAddr = ctx.governor || process.env.GOV;
         const token = opts.token || process.env.SXXX_TOKEN_ADDRESS;
         if (!token) throw new Error('Missing token. Set SXXX_TOKEN_ADDRESS or pass --token');
         const to = opts.to || process.env.DEV_WALLET_ADDRESS;
@@ -941,8 +970,17 @@ function register(program) {
         console.log('--- Proposal Preview (payout-erc20) ---');
         console.log({ targets, values: values.map(v => v.toString()), calldatas, description });
 
-        const inquirer = (require('inquirer').default || require('inquirer'));
-        const { confirm } = await inquirer.prompt([{ type: 'confirm', name: 'confirm', message: 'Submit proposal?', default: true }]);
+        let confirm = false;
+        const autoYes = String(process.env.SAGE_YES || '').toLowerCase();
+        if (opts.yes || autoYes === '1' || autoYes === 'true') {
+          confirm = true;
+        } else {
+          const inquirer = (require('inquirer').default || require('inquirer'));
+          const ans = await inquirer.prompt([
+            { type: 'confirm', name: 'confirm', message: 'Submit proposal?', default: true }
+          ]);
+          confirm = !!ans.confirm;
+        }
         if (!confirm) return;
 
         const WM = require('@sage-protocol/wallet-manager');

package/dist/cli/commands/config.js

@@ -568,6 +568,8 @@ function register(program) {
                 setIf('BOUNTY_ANNOUNCEMENTS_ADDRESS', data.BountyAnnouncements || data.Bounty);
                 setIf('SIMPLE_BOUNTY_SYSTEM_ADDRESS', data.SimpleBountySystem || data.BountySystem);
                 setIf('SIMPLE_CONTRIBUTOR_SYSTEM_ADDRESS', data.SimpleContributorSystem || data.ContributorSystem);
+                setIf('MOCK_USDC_ADDRESS', data.MockUSDC || data.MockUsdc || data.USDC);
+                setIf('BOOST_MANAGER_DIRECT_ADDRESS', data.GovernanceBoostManagerDirect || data.BoostManagerDirect);
                 // Optionally include test/deployer addresses under separate keys
                 // but avoid setting SUBDAO/GOV/TIMELOCK unless user decides explicitly
 

package/dist/cli/commands/doctor.js

@@ -238,9 +238,14 @@ async function runDoctor(opts = {}) {
     }
   }
 
-  // Optional feature addresses (warn-level): Bounty system, etc.
+  // Optional feature addresses (warn-level): Bounty system, Boost managers, Premium prompts, etc.
   const featureAddrs = [
-    { key: 'SIMPLE_BOUNTY_SYSTEM_ADDRESS', feature: 'bounty', hint: 'Required for `sage bounty *` commands.' }
+    { 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).' },
+    { key: 'PREMIUM_PROMPTS_ADDRESS', feature: 'premium prompts', hint: 'Required for `sage premium *` commands.' },
+    { key: 'PREMIUM_RECEIPT_ADDRESS', feature: 'premium receipts', hint: 'Required for ERC1155 receipt checks (premium.check).' },
+    { key: 'SIMPLE_KEY_STORE_ADDRESS', feature: 'premium keystore', hint: 'Recommended for premium roles wiring and Lit access control.' }
   ];
   for (const entry of featureAddrs) {
     const v = process.env[entry.key];
@@ -319,7 +324,7 @@ async function runDoctor(opts = {}) {
 
   // 6) Governor diagnostics (mode, roles, quorum, cooldown, stakeRequired)
   try {
-    const subdao = opts.subdao || process.env.WORKING_SUBDAO_ADDRESS || process.env.SUBDAO;
+    const subdao = opts.subdao || opts.dao || process.env.WORKING_SUBDAO_ADDRESS || process.env.SUBDAO;
     let governorAddr = process.env.GOV;
     if (subdao && provider) {
       const abi = ['function governor() view returns (address)'];
@@ -764,7 +769,8 @@ function register(program) {
     .option('--json', 'Output JSON for CI/scripts', false)
     .option('--registry', 'Also check LibraryRegistry roles (FACTORY_ROLE, LIBRARY_ADMIN_ROLE)', false)
     .option('--cid <cid>', 'Optional CID to warm-test IPFS gateways')
-    .option('--subdao <address>', 'Target DAO for mode/roles diagnostics')
+    .option('--subdao <address>', 'Target DAO/SubDAO for mode/roles diagnostics')
+    .option('--dao <address>', 'Alias for --subdao')
     .option('--fix', 'Attempt to fix detected issues interactively', false)
     .option('--auto-fix', 'Attempt to fix non-interactively with safe defaults', false)
     .action(async (opts) => {
@@ -823,8 +829,8 @@ 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);
+            const rpcUrl = process.env.RPC_URL || 'https://sepolia.base.org';
+            const chainId = Number(process.env.CHAIN_ID || 0);
           const sageHome = _resolveSageHome();
           const out = {
             rpcUrl,
@@ -834,9 +840,14 @@ function register(program) {
               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,
+              PREMIUM_PROMPTS_ADDRESS: process.env.PREMIUM_PROMPTS_ADDRESS || null,
+              PREMIUM_RECEIPT_ADDRESS: process.env.PREMIUM_RECEIPT_ADDRESS || null,
+              SIMPLE_KEY_STORE_ADDRESS: process.env.SIMPLE_KEY_STORE_ADDRESS || null,
               SUBDAO: process.env.WORKING_SUBDAO_ADDRESS || process.env.SUBDAO || null,
               GOV: process.env.GOV || null,
-              TIMELOCK: process.env.TIMELOCK || null,
+              TIMELOCK: process.env.TIMELOCK || process.env.TIMELOCK_ADDRESS || null,
               SAFE_TX_SERVICE_URL: process.env.SAFE_TX_SERVICE_URL || null,
               SAGE_USE_SAFE_TX_SERVICE: process.env.SAGE_USE_SAFE_TX_SERVICE || null
             },