@sage-protocol/cli 0.6.2 → 0.6.4

package/dist/cli/commands/governance.js

@@ -987,10 +987,10 @@ function register(program) {
           ui.info('Run: sage governance threshold-status' + (opts.gov ? ` --gov ${opts.gov}` : '') + (opts.subdao ? ` --subdao ${opts.subdao}` : ''));
         })
     )
-    // Cancel command for threshold-based cancellation
+    // Cancel command for threshold-based cancellation and guardian veto
     .addCommand(
       new Command('cancel')
-        .description('Cancel a proposal (if you are the proposer, or proposer dropped below threshold)')
+        .description('Cancel a proposal (proposer, threshold-based, or guardian veto)')
         .argument('<id>', 'Proposal ID')
         .option('--subdao <address>', 'SubDAO address to derive Governor from')
         .option('--gov <address>', 'Governor address (overrides SubDAO/context)')
@@ -1011,20 +1011,44 @@ function register(program) {
               'function proposalThreshold() view returns (uint256)',
               'function sxxxToken() view returns (address)',
               'function state(uint256) view returns (uint8)',
+              'function subDAO() view returns (address)',
               // OZ Governor cancel signature
               'function cancel(address[] memory targets, uint256[] memory values, bytes[] memory calldatas, bytes32 descriptionHash) returns (uint256)',
             ]);
 
             const govRead = new ethers.Contract(govAddr, iface, readProvider);
 
-            // Check proposal state and cancelability
+            // Check proposal state
             const state = await govRead.state(proposalId);
             const stateNames = ['Pending', 'Active', 'Canceled', 'Defeated', 'Succeeded', 'Queued', 'Expired', 'Executed'];
             const stateName = stateNames[Number(state)] || `Unknown(${state})`;
+            const stateNum = Number(state);
 
-            if (Number(state) >= 2) {
-              throw new Error(`Proposal not cancelable - current state: ${stateName}`);
-            }
+            // Get SubDAO and check guardian role
+            const GUARDIAN_ROLE = ethers.keccak256(ethers.toUtf8Bytes('GUARDIAN_ROLE'));
+            let isGuardian = false;
+            let subdaoAddr = null;
+            const myAddress = await signer.getAddress();
+
+            try {
+              subdaoAddr = await govRead.subDAO();
+              if (subdaoAddr && subdaoAddr !== ethers.ZeroAddress) {
+                const subdaoIface = new ethers.Interface([
+                  'function hasRole(bytes32 role, address account) view returns (bool)',
+                ]);
+                const subdao = new ethers.Contract(subdaoAddr, subdaoIface, readProvider);
+                isGuardian = await subdao.hasRole(GUARDIAN_ROLE, myAddress);
+              }
+            } catch (_) { /* SubDAO may not be available */ }
+
+            // State validation based on authorization path
+            // Guardians can cancel: Pending (0), Active (1), Succeeded (4), Queued (5)
+            // Others can only cancel: Pending (0), Active (1)
+            const guardianCancelableStates = [0, 1, 4, 5]; // Pending, Active, Succeeded, Queued
+            const normalCancelableStates = [0, 1]; // Pending, Active
+
+            const isGuardianCancelable = guardianCancelableStates.includes(stateNum);
+            const isNormalCancelable = normalCancelableStates.includes(stateNum);
 
             // Get proposer and check threshold
             let proposer = null, threshold = null, sxxxToken = null, proposerBalance = null;
@@ -1037,20 +1061,36 @@ function register(program) {
               proposerBalance = await erc20.balanceOf(proposer);
             }
 
-            const myAddress = await signer.getAddress();
             const iAmProposer = proposer && proposer.toLowerCase() === myAddress.toLowerCase();
             const proposerBelowThreshold = (threshold !== null && proposerBalance !== null) ? proposerBalance < threshold : false;
-            const canCancel = iAmProposer || proposerBelowThreshold;
 
-            if (!canCancel) {
-              throw new Error(`Cannot cancel: You are not the proposer and proposer's balance (${proposerBalance ? ethers.formatEther(proposerBalance) : '?'} SXXX) is still above threshold (${threshold ? ethers.formatEther(threshold) : '?'} SXXX)`);
+            // Determine cancel authorization
+            let cancelReason = null;
+            if (isGuardian && isGuardianCancelable) {
+              cancelReason = 'guardian_veto';
+            } else if (isNormalCancelable && iAmProposer) {
+              cancelReason = 'proposer';
+            } else if (isNormalCancelable && proposerBelowThreshold) {
+              cancelReason = 'below_threshold';
+            }
+
+            if (!cancelReason) {
+              if (isGuardian && !isGuardianCancelable) {
+                throw new Error(`Proposal not cancelable - current state: ${stateName} (guardians cannot cancel ${stateName} proposals)`);
+              } else if (!isNormalCancelable) {
+                throw new Error(`Proposal not cancelable - current state: ${stateName}`);
+              } else {
+                throw new Error(`Cannot cancel: You are not the proposer, not a guardian, and proposer's balance (${proposerBalance ? ethers.formatEther(proposerBalance) : '?'} SXXX) is still above threshold (${threshold ? ethers.formatEther(threshold) : '?'} SXXX)`);
+              }
             }
 
             if (!opts.json) {
               ui.info(`Proposal ${id} - State: ${stateName}`);
-              if (iAmProposer) {
+              if (cancelReason === 'guardian_veto') {
+                ui.warn('🛡️  Guardian veto: Using emergency cancel authority');
+              } else if (cancelReason === 'proposer') {
                 ui.info('You are the proposer - can cancel your own proposal');
-              } else if (proposerBelowThreshold) {
+              } else if (cancelReason === 'below_threshold') {
                 ui.info(`Proposer dropped below threshold (${ethers.formatEther(proposerBalance)} < ${ethers.formatEther(threshold)} SXXX)`);
               }
             }
@@ -1107,7 +1147,7 @@ function register(program) {
     // Check cancelability of a proposal
     .addCommand(
       new Command('cancelability')
-        .description('Check if a proposal can be canceled (threshold-based or by proposer)')
+        .description('Check if a proposal can be canceled (proposer, threshold-based, or guardian veto)')
         .argument('<id>', 'Proposal ID')
         .option('--subdao <address>', 'SubDAO address to derive Governor from')
         .option('--gov <address>', 'Governor address (overrides SubDAO/context)')
@@ -1128,6 +1168,7 @@ function register(program) {
               'function proposalThresholdSnapshot(uint256) view returns (uint256)',
               'function sxxxToken() view returns (address)',
               'function state(uint256) view returns (uint8)',
+              'function subDAO() view returns (address)',
             ]);
 
             const gov = new ethers.Contract(govAddr, iface, provider);
@@ -1136,9 +1177,15 @@ function register(program) {
             const state = await gov.state(proposalId);
             const stateNames = ['Pending', 'Active', 'Canceled', 'Defeated', 'Succeeded', 'Queued', 'Expired', 'Executed'];
             const stateName = stateNames[Number(state)] || `Unknown(${state})`;
+            const stateNum = Number(state);
 
-            // Cancelable states: Pending (0) or Active (1)
-            const inCancelableState = Number(state) < 2;
+            // Cancelable states differ by authorization path
+            // Guardians: Pending (0), Active (1), Succeeded (4), Queued (5)
+            // Others: Pending (0), Active (1)
+            const guardianCancelableStates = [0, 1, 4, 5];
+            const normalCancelableStates = [0, 1];
+            const inGuardianCancelableState = guardianCancelableStates.includes(stateNum);
+            const inNormalCancelableState = normalCancelableStates.includes(stateNum);
 
             // Get proposer and threshold info
             let proposer = null, threshold = null, snapshotThreshold = null, sxxxToken = null, proposerBalance = null;
@@ -1163,19 +1210,21 @@ function register(program) {
             const result = {
               proposalId: proposalId.toString(),
               state: stateName,
-              stateNum: Number(state),
-              inCancelableState,
+              stateNum,
+              cancelableByGuardian: inGuardianCancelableState,
+              cancelableByProposer: inNormalCancelableState,
+              cancelableByAnyone: inNormalCancelableState && proposerBelowThreshold,
               proposer,
               threshold: effectiveThreshold ? ethers.formatEther(effectiveThreshold) : null,
               proposerBalance: proposerBalance !== null ? ethers.formatEther(proposerBalance) : null,
               proposerBelowThreshold,
-              cancelableByAnyone: inCancelableState && proposerBelowThreshold,
-              cancelableByProposer: inCancelableState,
-              reason: !inCancelableState
+              reason: !inNormalCancelableState && !inGuardianCancelableState
                 ? `Proposal in ${stateName} state (not cancelable)`
-                : proposerBelowThreshold
-                  ? 'Proposer below threshold - anyone can cancel'
-                  : 'Only proposer can cancel',
+                : inGuardianCancelableState && !inNormalCancelableState
+                  ? `Guardian veto available (${stateName} state)`
+                  : proposerBelowThreshold
+                    ? 'Proposer below threshold - anyone can cancel'
+                    : 'Proposer or guardian can cancel',
             };
 
             if (opts.json) {
@@ -1188,17 +1237,21 @@ function register(program) {
               ui.labelValue('Proposer Balance', result.proposerBalance ? `${result.proposerBalance} SXXX` : '-');
               ui.newline();
 
-              if (!inCancelableState) {
+              if (!inNormalCancelableState && !inGuardianCancelableState) {
                 ui.info(`Not cancelable: ${stateName} state`);
+              } else if (inGuardianCancelableState && !inNormalCancelableState) {
+                ui.warn(`🛡️  Guardian veto available: ${stateName} proposals can be canceled by guardians`);
+                ui.info('Run: sage governance cancel ' + id + ' (requires GUARDIAN_ROLE)');
               } else if (proposerBelowThreshold) {
                 ui.warn('Cancelable by anyone: proposer dropped below threshold');
                 ui.info('Run: sage governance cancel ' + id);
               } else {
-                ui.info('Only cancelable by proposer');
+                ui.info('Cancelable by proposer or guardian');
               }
             }
 
-            process.exit(result.cancelableByAnyone ? 0 : 1);
+            // Exit 0 if cancelable by anyone (threshold) or guardian
+            process.exit(result.cancelableByAnyone || result.cancelableByGuardian ? 0 : 1);
 
           } catch (e) {
             if (opts.json) {

package/dist/cli/commands/reputation.js

@@ -24,7 +24,7 @@ function getDefaultSubgraphUrl() {
   return (
     process.env.SUBGRAPH_URL ||
     process.env.SAGE_SUBGRAPH_URL ||
-    'https://api.studio.thegraph.com/query/67446/sage-protocol-base-sepolia/version/latest'
+    'https://api.goldsky.com/api/public/project_cmhxp0fppsbdd01q56xp2gqw9/subgraphs/sxxx-protocol/1.0.5/gn'
   );
 }
 

package/dist/cli/privy-auth-wallet-manager.js

@@ -518,7 +518,7 @@ class PrivyAuthWalletManager {
         "react/jsx-runtime": "https://esm.sh/react@18.2.0/jsx-runtime",
         "react-dom": "https://esm.sh/react-dom@18.2.0",
         "react-dom/client": "https://esm.sh/react-dom@18.2.0/client",
-        "@privy-io/react-auth": "https://esm.sh/@privy-io/react-auth@2.25.0?external=react,react-dom"
+        "@privy-io/react-auth": "https://esm.sh/@privy-io/react-auth@1.73.1?external=react,react-dom"
       }
     }
   </script>
@@ -529,20 +529,17 @@ class PrivyAuthWalletManager {
   <script type="text/babel" data-type="module" data-presets="react">
     import React, { useState, useEffect } from 'react';
     import { createRoot } from 'react-dom/client';
-    import { PrivyProvider, usePrivy, useSessionSigners, useWallets } from '@privy-io/react-auth';
+    import { PrivyProvider, usePrivy } from '@privy-io/react-auth';
 
     const PRIVY_APP_ID = '${this.appId}';
-    const SESSION_SIGNER_ID = '${sessionSignerAddress || process.env.PRIVY_SESSION_SIGNER_ID || ''}';
+    const SESSION_SIGNER_ID = '${sessionSignerAddress || ''}';
     const CALLBACK_URL = 'http://localhost:${port}/callback';
     const STATE = '${state}';
 
     function LoginApp() {
-      const { login, authenticated, user, ready, getAccessToken, logout } = usePrivy();
-      const { addSessionSigners } = useSessionSigners();
-      const { wallets, createWallet } = useWallets();
+      const { login, authenticated, user, ready, getAccessToken, logout, createWallet } = usePrivy();
       const [status, setStatus] = useState('');
-      const [isDelegating, setIsDelegating] = useState(false);
-      const [showManualCreate, setShowManualCreate] = useState(false);
+      const [isProcessing, setIsProcessing] = useState(false);
 
       useEffect(() => {
         if (ready && !authenticated) {
@@ -550,65 +547,38 @@ class PrivyAuthWalletManager {
         }
       }, [ready, authenticated]);
 
-      // Show manual create button after 5 seconds if still delegating
-      useEffect(() => {
-        if (isDelegating) {
-            const timer = setTimeout(() => setShowManualCreate(true), 5000);
-            return () => clearTimeout(timer);
-        }
-      }, [isDelegating]);
-
-      const handleDelegationAndCallback = async (walletAddress) => {
+      const handleCallback = async (walletAddress) => {
          try {
-            setIsDelegating(true);
-            setStatus('Adding session signer for CLI...');
-            console.log('Attempting to add session signer:', walletAddress);
-
-            if (!SESSION_SIGNER_ID) {
-              setStatus('Server session signer not configured. Set PRIVY_SESSION_SIGNER_ID in your environment.');
-              setIsDelegating(false);
-              setShowManualCreate(true);
-              return;
-            }
-
-            // SESSION_SIGNER_ID is "wallet-auth:<base64-spki>"
-            const res = await addSessionSigners({
-              address: walletAddress,
-              signers: [{ signerId: SESSION_SIGNER_ID }],
+            setIsProcessing(true);
+            setStatus('Finalizing login...');
+
+            const token = await getAccessToken();
+            await fetch(CALLBACK_URL, {
+              method: 'POST',
+              headers: { 'Content-Type': 'application/json' },
+              body: JSON.stringify({
+                state: STATE,
+                userId: user.id,
+                walletId: walletAddress,
+                walletAddress: walletAddress,
+                accessToken: token,
+                email: user.email?.address
+              })
             });
-            console.log('Session signer added result:', JSON.stringify(res));
-
-            setStatus('Session signer added! Finalizing...');
-            
-             const token = await getAccessToken();
-             await fetch(CALLBACK_URL, {
-                method: 'POST',
-                headers: { 'Content-Type': 'application/json' },
-                body: JSON.stringify({
-                  state: STATE,
-                  userId: user.id,
-                  walletId: walletAddress,
-                  walletAddress: walletAddress,
-                  accessToken: token,
-                  email: user.email?.address
-                })
-             });
             setStatus('Done! You can close this window.');
          } catch (err) {
-            console.error('Delegation error:', err);
-            setStatus('Delegation failed: ' + err.message);
-            setIsDelegating(false);
-            setShowManualCreate(true);
+            console.error('Callback error:', err);
+            setStatus('Error: ' + err.message);
+            setIsProcessing(false);
          }
       };
 
-      const createNewWallet = async () => {
+      const handleCreateWallet = async () => {
         try {
             setStatus('Creating new wallet...');
             const newWallet = await createWallet();
-            setStatus('New wallet created: ' + newWallet.address);
-            // Wait a moment for state to settle
-            setTimeout(() => handleDelegationAndCallback(newWallet.address), 1000);
+            setStatus('Wallet created: ' + newWallet.address);
+            setTimeout(() => handleCallback(newWallet.address), 500);
         } catch (err) {
             console.error('Creation error:', err);
             setStatus('Failed to create wallet: ' + err.message);
@@ -623,44 +593,24 @@ class PrivyAuthWalletManager {
 
       useEffect(() => {
         async function handleAuth() {
-          if (authenticated && user && !isDelegating && !status.includes('Error') && !status.includes('Done')) {
+          if (authenticated && user && !isProcessing && !status.includes('Error') && !status.includes('Done')) {
             try {
               // Find the *embedded* wallet
-              const embeddedWallet = user.linkedAccounts.find(
+              const embeddedWallet = user.linkedAccounts?.find(
                 (account) => account.type === 'wallet' && account.walletClientType === 'privy'
               );
 
               if (!embeddedWallet) {
                 setStatus('No embedded wallet found. Creating one...');
-                createNewWallet();
+                handleCreateWallet();
                 return;
               }
 
-              if (!embeddedWallet.delegated) {
-                await handleDelegationAndCallback(embeddedWallet.address);
-              } else {
-                 // Already delegated, just callback
-                 setStatus('Finalizing login...');
-                 const token = await getAccessToken();
-                 await fetch(CALLBACK_URL, {
-                    method: 'POST',
-                    headers: { 'Content-Type': 'application/json' },
-                    body: JSON.stringify({
-                      state: STATE,
-                      userId: user.id,
-                      walletId: embeddedWallet.address,
-                      walletAddress: embeddedWallet.address,
-                      accessToken: token,
-                      email: user.email?.address
-                    })
-                 });
-                 setStatus('Done! You can close this window.');
-              }
+              await handleCallback(embeddedWallet.address);
             } catch (err) {
               console.error(err);
               setStatus('Error: ' + err.message);
-              setIsDelegating(false);
-              setShowManualCreate(true);
+              setIsProcessing(false);
             }
           }
         }
@@ -670,25 +620,27 @@ class PrivyAuthWalletManager {
 
       if (!ready) return <div className="card"><div className="loader"></div><p>Loading Privy...</p></div>;
 
+      // Don't show our card when not authenticated - let Privy modal be the only UI
+      if (!authenticated) {
+        return null;
+      }
+
       return (
         <div className="card">
           <h1>Sage CLI Login</h1>
-          {!authenticated ? (
-            <p>Please log in to continue.</p>
-          ) : (
-            <div>
-              <p>Logged in as {user?.email?.address}</p>
+          <div>
+              <p>Logged in as {user?.email?.address || 'User'}</p>
               {status && (
                 <div className={"status " + (status.includes('Error') || status.includes('Failed') ? 'error' : 'success')}>
                   {status}
                 </div>
               )}
-              {isDelegating && <div className="loader" style={{marginTop: '1rem'}}></div>}
-              
-              {(showManualCreate || status.includes('Error') || status.includes('Failed')) && (
+              {isProcessing && !status.includes('Done') && <div className="loader" style={{marginTop: '1rem'}}></div>}
+
+              {(status.includes('Error') || status.includes('Failed')) && (
                   <div style={{marginTop: '1.5rem', borderTop: '1px solid #eee', paddingTop: '1rem'}}>
-                    <p style={{marginBottom: '0.5rem', fontSize: '0.9rem'}}>Stuck? Try creating a new wallet:</p>
-                    <button onClick={createNewWallet}>
+                    <p style={{marginBottom: '0.5rem', fontSize: '0.9rem'}}>Stuck? Try these options:</p>
+                    <button onClick={handleCreateWallet}>
                       Create New Wallet & Retry
                     </button>
                     <button onClick={handleLogout} style={{marginTop: '0.5rem', background: '#eee', color: '#333'}}>
@@ -696,8 +648,7 @@ class PrivyAuthWalletManager {
                     </button>
                   </div>
               )}
-            </div>
-          )}
+          </div>
         </div>
       );
     }

package/dist/ops/config/env/load-env.sepolia.sh

@@ -11,7 +11,9 @@ fi
 if [ -f ./.env ]; then
   while IFS= read -r line; do
     [[ -z "$line" || ${line:0:1} == "#" ]] && continue
-    export "$line"
+    # Skip lines that already have 'export' prefix or contain special characters
+    [[ "$line" == export* ]] && continue
+    export "$line" 2>/dev/null || true
   done < ./.env
 fi
 
@@ -51,6 +53,10 @@ const pairs = [
   ['SIMPLE_CONTRIBUTOR_SYSTEM_ADDRESS', 'SimpleContributorSystem'],
   ['VOTING_MULTIPLIER_NFT_ADDRESS', 'VotingMultiplierNFT'],
   ['SAGE_AUCTION_HOUSE_ADDRESS', 'SageAuctionHouse'],
+  ['SBT_ADDRESS', 'SoulboundBadge'],
+  ['PREMIUM_PROMPTS_ADDRESS', 'PremiumPrompts'],
+  ['PREMIUM_RECEIPT_ADDRESS', 'PremiumReceipt'],
+  ['GOVERNANCE_CONFIG_ADDRESS', 'GovernanceConfig'],
 ];
 const lines = [];
 for (const [envKey, contractKey] of pairs) {
@@ -79,11 +85,4 @@ echo "GRAPH_STUDIO_PROJECT_ID: ${GRAPH_STUDIO_PROJECT_ID:-unset}"
 echo "BOOST_MANAGER_ADDRESS: ${BOOST_MANAGER_ADDRESS:-unset}"
 echo "SIMPLE_BOUNTY_SYSTEM_ADDRESS: ${SIMPLE_BOUNTY_SYSTEM_ADDRESS:-unset}"
 echo "SXXX_FAUCET_ADDRESS: ${SXXX_FAUCET_ADDRESS:-unset}"
-
-export BOOST_MANAGER_DIRECT_ADDRESS=0xBAf5E782f9Ff645992b623415938eC33b6eEEcc6
-
-export BOOST_VIEW_GLUE_ADDRESS=0x266F3386907de1713393c0ed51aD08775d3Df016
-
-export BOOST_LOGGER_GLUE_ADDRESS=0x6B72761193D32aa225CC1BB020F3A4215B5d92c2
-
-export BOOST_CREATION_GLUE_ADDRESS=0xC05cd2068fda3f0C9DF177a316A64cB9AA93071B
+echo "SBT_ADDRESS: ${SBT_ADDRESS:-unset}"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sage-protocol/cli",
-  "version": "0.6.2",
+  "version": "0.6.4",
   "description": "Sage Protocol CLI for managing AI prompt libraries",
   "bin": {
     "sage": "./bin/sage.js"
@@ -39,7 +39,7 @@
     "@lit-protocol/lit-node-client-nodejs": "^7.3.1",
     "@privy-io/node": "^0.6.2",
     "@sage-protocol/contracts": "^0.1.0",
-    "@sage-protocol/sdk": "^0.1.24",
+    "@sage-protocol/sdk": "workspace:*",
     "@sage-protocol/shared": "^0.1.0",
     "@sage-protocol/wallet-manager": "^0.1.0",
     "@walletconnect/sign-client": "^2.21.6",