@sage-protocol/cli 0.3.7 → 0.3.10

package/dist/cli/commands/personal.js

@@ -7,6 +7,7 @@ const { formatJson } = require('../utils/format');
 const { getProvider, getWallet } = require('../utils/provider');
 const { loadAbi } = require('../utils/abi-loader');
 const { buildAccessControlConditions, receiptIdToHex } = require('../utils/personal-helpers');
+const { buildNodeAuthSig } = require('../utils/lit');
 const ConfigManager = require('../config');
 
 if (ConfigManager && typeof ConfigManager.loadEnv === 'function') {
@@ -100,9 +101,6 @@ function resolveSubgraphUrl(override) {
 }
 
 async function createAction(opts) {
-  if (process.env.SAGE_ENABLE_PERSONAL !== '1') {
-    throw new Error('Personal libraries are disabled. Set SAGE_ENABLE_PERSONAL=1 to enable experimental commands.');
-  }
   const provider = await getProvider();
   const wallet = await getWallet(provider);
   const diamond = getConfigAddress('SUBDAO_FACTORY_ADDRESS');
@@ -117,7 +115,7 @@ async function createAction(opts) {
     try { return contract.interface.parseLog(l); } catch (_) { return null; }
   }).find(Boolean);
   const out = {
-    txHash: receipt.transactionHash,
+    txHash: receipt.hash,
     registry: evt && evt.args ? evt.args.registry : undefined,
     policy,
   };
@@ -129,9 +127,6 @@ async function createAction(opts) {
 }
 
 async function setPriceAction(key, price, opts) {
-  if (process.env.SAGE_ENABLE_PERSONAL !== '1') {
-    throw new Error('Personal libraries are disabled. Set SAGE_ENABLE_PERSONAL=1 to enable experimental commands.');
-  }
   const provider = await getProvider();
   const wallet = await getWallet(provider);
   const mkt = getConfigAddress('PERSONAL_MARKETPLACE_ADDRESS');
@@ -146,7 +141,7 @@ async function setPriceAction(key, price, opts) {
     key,
     price,
     priceWei: priceWei.toString(),
-    txHash: receipt.transactionHash,
+    txHash: receipt.hash,
   };
   if (opts && opts.json) {
     console.log(JSON.stringify(result, null, 2));
@@ -157,9 +152,6 @@ async function setPriceAction(key, price, opts) {
 }
 
 async function sellAction(key, price, opts = {}) {
-  if (process.env.SAGE_ENABLE_PERSONAL !== '1') {
-    throw new Error('Personal libraries are disabled. Set SAGE_ENABLE_PERSONAL=1 to enable experimental commands.');
-  }
 
   if (!price || Number.isNaN(Number(price))) {
     throw new Error('Price must be a numeric value (in SXXX).');
@@ -181,7 +173,7 @@ async function sellAction(key, price, opts = {}) {
     const tx = await facet.createPersonalRegistry(policy);
     const rcpt = await tx.wait();
     if (!opts.json) {
-      console.log(`📚 Personal registry created (policy=${policy}) -> tx ${rcpt.transactionHash}`);
+      console.log(`📚 Personal registry created (policy=${policy}) -> tx ${rcpt.hash}`);
     }
   }
 
@@ -253,10 +245,12 @@ async function sellAction(key, price, opts = {}) {
       throw new Error('Lit encryption helpers not available. Ensure @lit-protocol/encryption is installed.');
     }
 
-    const litNetwork = opts.litNetwork || process.env.LIT_NETWORK || 'serrano';
-    const client = new LitNodeClient({ litNetwork });
+    const litNetwork = opts.litNetwork || process.env.LIT_NETWORK || 'datil-test';
+    const client = new LitNodeClient({ litNetwork, debug: false });
     await client.connect();
 
+    const litChain = await inferLitChain(provider, opts.chain);
+
     let sessionSigs = null;
     if (opts.session) {
       sessionSigs = loadJsonFile(opts.session, '--session');
@@ -270,13 +264,14 @@ async function sellAction(key, price, opts = {}) {
         authSig = loadJsonFile(opts.authSig, '--auth-sig');
       } else if (process.env.LIT_AUTH_SIG) {
         authSig = loadJsonFile(process.env.LIT_AUTH_SIG, 'LIT_AUTH_SIG');
-      }
-      if (!authSig) {
-        throw new Error('Provide Lit session signatures (--session) or authSig (--auth-sig) for encryption.');
+      } else {
+        // Auto-generate authSig from connected wallet
+        if (!opts.json) {
+          console.log('🔐 Generating Lit auth signature from wallet...');
+        }
+        authSig = await buildNodeAuthSig(wallet, litChain);
       }
     }
-
-    const litChain = await inferLitChain(provider, opts.chain);
     const accessConditions = buildAccessControlConditions(receiptAddress, receiptId, litChain);
 
     const encResp = await encryptUint8Array({
@@ -337,12 +332,12 @@ async function sellAction(key, price, opts = {}) {
   const marketplace = new Contract(marketplaceAddress, marketplaceAbi, wallet);
   const priceTx = await marketplace.setPrice(keyHash, priceWei);
   const priceReceipt = await priceTx.wait();
-  result.txHash = priceReceipt.transactionHash;
+  result.txHash = priceReceipt.hash;
 
   if (opts.json) {
     console.log(JSON.stringify(result, null, 2));
   } else {
-    console.log(`✅ Listed ${key} for ${price} SXXX (${priceReceipt.transactionHash})`);
+    console.log(`✅ Listed ${key} for ${price} SXXX (tx: ${priceReceipt.hash})`);
     if (result.encryptedCid) {
       console.log(`🔒 Encrypted CID: ${result.encryptedCid}`);
       console.log(`🗃️  Manifest CID: ${result.manifestCid}`);
@@ -357,9 +352,6 @@ async function unsellAction(key, opts = {}) {
 }
 
 async function priceAction(creator, key, opts = {}) {
-  if (process.env.SAGE_ENABLE_PERSONAL !== '1') {
-    throw new Error('Personal libraries are disabled. Set SAGE_ENABLE_PERSONAL=1 to enable experimental commands.');
-  }
 
   const provider = await getProvider();
   const marketplaceAddress = getConfigAddress('PERSONAL_MARKETPLACE_ADDRESS');
@@ -406,9 +398,6 @@ async function priceAction(creator, key, opts = {}) {
 }
 
 async function listAction(opts = {}) {
-  if (process.env.SAGE_ENABLE_PERSONAL !== '1') {
-    throw new Error('Personal libraries are disabled. Set SAGE_ENABLE_PERSONAL=1 to enable experimental commands.');
-  }
 
   const provider = await getProvider();
   const wallet = await getWallet(provider);
@@ -445,7 +434,48 @@ async function listAction(opts = {}) {
   let personalResourceMap = new Map();
 
   if (!explicitKeys.length && subgraphUrl) {
-    const document = `
+    // First try to get all listings (PriceSet events)
+    const listingsQuery = `
+      query($creator: Bytes!, $first: Int!) {
+        personalListings(where: { creator: $creator, listed: true }, first: $first, orderBy: updatedAt, orderDirection: desc) {
+          id
+          creator
+          key
+          price
+          listed
+          createdAt
+          updatedAt
+        }
+      }
+    `;
+    try {
+      const listingsData = await subgraphQuery(subgraphUrl, listingsQuery, {
+        creator: creatorAddress.toLowerCase(),
+        first: limit,
+      });
+
+      for (const listing of listingsData?.personalListings || []) {
+        const keyHash = String(listing.key);
+        const idKey = `hash:${keyHash}`;
+        if (!entries.has(idKey)) {
+          entries.set(idKey, {
+            type: 'hash',
+            keyHash,
+            priceFromListing: listing.price ? BigInt(String(listing.price)) : null,
+            listedAt: listing.createdAt ? Number(listing.createdAt) : null,
+            updatedAt: listing.updatedAt ? Number(listing.updatedAt) : null,
+          });
+        }
+      }
+    } catch (listingError) {
+      // PersonalListing entity may not exist yet, fall back to purchases
+      if (!listingError.message?.includes('Cannot query field')) {
+        console.warn(`⚠️  Listings query: ${listingError.message}`);
+      }
+    }
+
+    // Also fetch purchases for additional metadata
+    const purchasesQuery = `
       query($creator: Bytes!, $first: Int!) {
         licensePurchases(where: { creator: $creator }, first: $first, orderBy: blockTimestamp, orderDirection: desc) {
           key
@@ -459,7 +489,7 @@ async function listAction(opts = {}) {
       }
     `;
     try {
-      const data = await subgraphQuery(subgraphUrl, document, {
+      const data = await subgraphQuery(subgraphUrl, purchasesQuery, {
         creator: creatorAddress.toLowerCase(),
         first: limit,
       });
@@ -467,7 +497,15 @@ async function listAction(opts = {}) {
       for (const purchase of data?.licensePurchases || []) {
         const keyHash = String(purchase.key);
         const idKey = `hash:${keyHash}`;
-        if (!entries.has(idKey)) {
+        const existing = entries.get(idKey);
+        if (existing) {
+          // Enrich existing listing with purchase data
+          existing.receiptId = purchase.receiptId ? BigInt(String(purchase.receiptId)) : existing.receiptId;
+          existing.lastBuyer = purchase.buyer ? getAddress(purchase.buyer) : existing.lastBuyer;
+          existing.lastPurchaseAt = purchase.blockTimestamp ? Number(purchase.blockTimestamp) : existing.lastPurchaseAt;
+          existing.encryptedCid = purchase.encryptedCid || existing.encryptedCid;
+          existing.metadata = purchase.metadata || existing.metadata;
+        } else {
           entries.set(idKey, {
             type: 'hash',
             keyHash,
@@ -516,7 +554,10 @@ async function listAction(opts = {}) {
   }
 
   if (!entries.size) {
-    console.log('ℹ️  No listings found. Provide --keys or ensure listings have been purchased/indexed.');
+    console.log('ℹ️  No listings found.');
+    console.log('   Use --key <name> to check a specific listing by key.');
+    console.log('   Example: sage personal list --mine --key "my-prompt"');
+    console.log('   Note: Listings appear in subgraph after first purchase.');
     return [];
   }
 
@@ -592,9 +633,6 @@ async function listAction(opts = {}) {
 }
 
 async function myLicensesAction(opts = {}) {
-  if (process.env.SAGE_ENABLE_PERSONAL !== '1') {
-    throw new Error('Personal libraries are disabled. Set SAGE_ENABLE_PERSONAL=1 to enable experimental commands.');
-  }
 
   const provider = await getProvider();
   const wallet = await getWallet(provider);
@@ -712,9 +750,6 @@ async function myLicensesAction(opts = {}) {
 }
 
 async function buyAction(creator, key, expectedPriceArg, opts = {}) {
-  if (process.env.SAGE_ENABLE_PERSONAL !== '1') {
-    throw new Error('Personal libraries are disabled. Set SAGE_ENABLE_PERSONAL=1 to enable experimental commands.');
-  }
 
   const provider = await getProvider();
   const wallet = await getWallet(provider);
@@ -772,7 +807,7 @@ async function buyAction(creator, key, expectedPriceArg, opts = {}) {
     const approveTx = await sxxx.approve(marketplaceAddress, approveAmount);
     const approveReceipt = await approveTx.wait();
     if (!opts.json) {
-      console.log(`✅ SXXX approval tx ${approveReceipt.transactionHash}`);
+      console.log(`✅ SXXX approval tx ${approveReceipt.hash}`);
     }
   }
 
@@ -799,7 +834,7 @@ async function buyAction(creator, key, expectedPriceArg, opts = {}) {
     : sdk.personal.computeReceiptId(creatorAddress, key);
 
   const result = {
-    txHash: receipt.transactionHash,
+    txHash: receipt.hash,
     creator: creatorAddress,
     buyer: buyerAddress,
     key,
@@ -827,9 +862,6 @@ async function buyAction(creator, key, expectedPriceArg, opts = {}) {
 }
 
 async function accessAction(creator, key, opts) {
-  if (process.env.SAGE_ENABLE_PERSONAL !== '1') {
-    throw new Error('Personal libraries are disabled. Set SAGE_ENABLE_PERSONAL=1 to enable experimental commands.');
-  }
 
   const provider = await getProvider();
   const wallet = await getWallet(provider);
@@ -903,10 +935,12 @@ async function accessAction(creator, key, opts) {
 
   if (!opts.skipDecrypt && payloadObject) {
     const { LitNodeClient } = requireLit();
-    const litNetwork = opts.litNetwork || process.env.LIT_NETWORK || 'serrano';
-    const client = new LitNodeClient({ litNetwork });
+    const litNetwork = opts.litNetwork || process.env.LIT_NETWORK || 'datil-test';
+    const client = new LitNodeClient({ litNetwork, debug: false });
     await client.connect();
 
+    const litChain = await inferLitChain(provider, opts.chain);
+
     let sessionSigs = null;
     if (opts.session) {
       sessionSigs = loadJsonFile(opts.session, '--session');
@@ -915,13 +949,20 @@ async function accessAction(creator, key, opts) {
     }
 
     let authSig = null;
-    if (opts.authSig) {
-      authSig = loadJsonFile(opts.authSig, '--auth-sig');
-    } else if (process.env.LIT_AUTH_SIG) {
-      authSig = loadJsonFile(process.env.LIT_AUTH_SIG, 'LIT_AUTH_SIG');
+    if (!sessionSigs) {
+      if (opts.authSig) {
+        authSig = loadJsonFile(opts.authSig, '--auth-sig');
+      } else if (process.env.LIT_AUTH_SIG) {
+        authSig = loadJsonFile(process.env.LIT_AUTH_SIG, 'LIT_AUTH_SIG');
+      } else {
+        // Auto-generate authSig from connected wallet
+        if (!opts.json) {
+          console.log('🔐 Generating Lit auth signature from wallet...');
+        }
+        authSig = await buildNodeAuthSig(wallet, litChain);
+      }
     }
 
-    const litChain = await inferLitChain(provider, opts.chain);
     decrypted = await sdk.personal.decryptWithLit({
       encryptedCid: payloadObject,
       receiptId,
@@ -993,59 +1034,21 @@ async function accessAction(creator, key, opts) {
 }
 
 function register(program) {
-  const cmd = program.command('personal').description('[experimental] Manage personal registries and marketplace');
+  const { Command } = require('commander');
+  const cmd = program.command('personal').description('Manage personal prompts and premium content');
+
+  // --- Registry management ---
   cmd
     .command('create')
     .description('Create a personal registry (owned by your EOA)')
     .option('--policy <n>', 'Fork policy (0=open,1=gov_only,2=disabled)', '0')
     .action((opts) => createAction(opts).catch((err) => { console.error(err.message); process.exit(1); }));
-  cmd
-    .command('set-price <key> <price>')
-    .description('Set price in SXXX (18 decimals) for a content key')
-    .option('--json', 'Emit machine-readable JSON output', false)
-    .action((key, price, opts) => setPriceAction(key, price, opts).catch((err) => { console.error(err.message); process.exit(1); }));
-  cmd
-    .command('sell <key> <price>')
-    .description('List a personal prompt key for sale and optionally encrypt the payload')
-    .option('--encrypt', 'Encrypt content and upload manifest to IPFS', false)
-    .option('--file <path>', 'Path to plaintext prompt/content (required with --encrypt)')
-    .option('--name <name>', 'Friendly name for the encrypted payload')
-    .option('--description <text>', 'Description stored alongside the encrypted payload')
-    .option('--metadata <file>', 'Path to JSON metadata to embed in the manifest')
-    .option('--manifest <file>', 'Write manifest JSON to this path')
-    .option('--policy <n>', 'Optional: create personal registry with policy (0=open,1=gov_only,2=disabled) before selling')
-    .option('--session <file>', 'Lit session signatures JSON (preferred)')
-    .option('--auth-sig <file>', 'Lit AuthSig JSON (fallback if no session signatures)')
-    .option('--chain <litChain>', 'Override Lit chain key (default: infer)')
-    .option('--lit-network <name>', 'Lit network (serrano | datil-test | datil-dev)', process.env.LIT_NETWORK || 'serrano')
-    .option('--json', 'Emit machine-readable JSON output', false)
-    .action((key, price, opts) => sellAction(key, price, opts).catch((err) => { console.error(err.message); process.exit(1); }));
-  cmd
-    .command('unsell <key>')
-    .description('Remove a price listing (sets price to 0)')
-    .option('--json', 'Emit machine-readable JSON output', false)
-    .action((key, opts) => unsellAction(key, opts).catch((err) => { console.error(err.message); process.exit(1); }));
-  cmd
-    .command('buy <creator> <key> [expectedPrice]')
-    .description('Buy a license for a content key')
-    .option('--max-price <sxxx>', 'Maximum price you are willing to pay (SXXX)')
-    .option('--deadline <seconds>', 'Relative deadline window in seconds (default: 600)', '600')
-    .option('--auto-approve', 'Automatically approve SXXX allowance if needed', false)
-    .option('--unlimited', 'When auto-approving, approve unlimited allowance', false)
-    .option('--json', 'Emit machine-readable JSON output', false)
-    .action((creator, key, expectedPrice, opts) => buyAction(creator, key, expectedPrice, opts).catch((err) => { console.error(err.message); process.exit(1); }));
-
-  cmd
-    .command('price <creator> <key>')
-    .description('Show current listing price and fee breakdown for a key')
-    .option('--json', 'Emit machine-readable JSON output', false)
-    .action((creator, key, opts) => priceAction(creator, key, opts).catch((err) => { console.error(err.message); process.exit(1); }));
 
   cmd
     .command('list')
-    .description('List active or recent personal listings for a creator')
+    .description('List personal prompts for a creator')
     .option('--creator <address>', 'Creator address to inspect')
-    .option('--mine', 'List keys for the active wallet')
+    .option('--mine', 'List prompts for the active wallet')
     .option('--keys <keys...>', 'Explicit plaintext keys to list (skips subgraph)')
     .option('--key <key>', 'Single plaintext key to list')
     .option('--limit <n>', 'Maximum records to pull from subgraph (default 25)')
@@ -1055,28 +1058,76 @@ function register(program) {
 
   cmd
     .command('my-licenses')
-    .description('Show personal licenses owned by the active (or provided) wallet')
+    .description('Show premium licenses owned by the active wallet')
     .option('--holder <address>', 'Override holder address')
     .option('--limit <n>', 'Maximum records to pull (default 25)')
     .option('--subgraph <url>', 'Override subgraph endpoint')
     .option('--json', 'Emit machine-readable JSON output', false)
     .action((opts) => myLicensesAction(opts).catch((err) => { console.error(err.message); process.exit(1); }));
 
-  cmd
+  // --- Premium subcommand group ---
+  const premium = new Command('premium').description('Premium (paid) personal prompts');
+
+  premium
+    .command('publish <key>')
+    .description('Publish premium content for sale (encrypted, requires purchase)')
+    .requiredOption('--price <sxxx>', 'Price in SXXX (18 decimals)')
+    .requiredOption('--file <path>', 'Path to content file to encrypt')
+    .option('--name <name>', 'Friendly name for the content')
+    .option('--description <text>', 'Description of the content')
+    .option('--metadata <file>', 'Path to JSON metadata to embed in the manifest')
+    .option('--manifest <file>', 'Write manifest JSON to this path')
+    .option('--policy <n>', 'Create personal registry with policy before publishing')
+    .option('--session <file>', 'Lit session signatures JSON (preferred)')
+    .option('--auth-sig <file>', 'Lit AuthSig JSON (fallback)')
+    .option('--chain <litChain>', 'Override Lit chain key (default: infer)')
+    .option('--lit-network <name>', 'Lit network (datil-test | datil-dev)', process.env.LIT_NETWORK || 'datil-test')
+    .option('--json', 'Emit machine-readable JSON output', false)
+    .action((key, opts) => {
+      // Call sellAction with encrypt always true for premium
+      const sellOpts = { ...opts, encrypt: true };
+      sellAction(key, opts.price, sellOpts).catch((err) => { console.error(err.message); process.exit(1); });
+    });
+
+  premium
+    .command('buy <creator> <key> [expectedPrice]')
+    .description('Purchase a license for premium content')
+    .option('--max-price <sxxx>', 'Maximum price you are willing to pay (SXXX)')
+    .option('--deadline <seconds>', 'Relative deadline window in seconds (default: 600)', '600')
+    .option('--auto-approve', 'Automatically approve SXXX allowance if needed', false)
+    .option('--unlimited', 'When auto-approving, approve unlimited allowance', false)
+    .option('--json', 'Emit machine-readable JSON output', false)
+    .action((creator, key, expectedPrice, opts) => buyAction(creator, key, expectedPrice, opts).catch((err) => { console.error(err.message); process.exit(1); }));
+
+  premium
     .command('access <creator> <key>')
-    .description('Resolve encrypted personal content and decrypt via Lit (requires license)')
+    .description('Decrypt and view purchased premium content')
     .option('--holder <address>', 'Override holder address (defaults to active wallet)')
-    .option('--subgraph <url>', 'Override subgraph endpoint (defaults to SUBGRAPH_URL env)')
-    .option('--gateway <url>', 'IPFS gateway for encrypted payload fetch')
+    .option('--subgraph <url>', 'Override subgraph endpoint')
+    .option('--gateway <url>', 'IPFS gateway for payload fetch')
     .option('--session <file>', 'Path to Lit session signatures JSON')
-    .option('--auth-sig <file>', 'Path to Lit AuthSig JSON (fallback if session signatures unavailable)')
-    .option('--chain <litChain>', 'Lit chain identifier (default: auto from RPC or LIT_CHAIN env)')
-    .option('--lit-network <name>', 'Lit network (serrano | datil-test | datil-dev)', process.env.LIT_NETWORK || 'serrano')
+    .option('--auth-sig <file>', 'Path to Lit AuthSig JSON (fallback)')
+    .option('--chain <litChain>', 'Lit chain identifier')
+    .option('--lit-network <name>', 'Lit network (datil-test | datil-dev)', process.env.LIT_NETWORK || 'datil-test')
     .option('--out <file>', 'Write decrypted output to file')
-    .option('--skip-decrypt', 'Skip Lit decryption and only report license status')
-    .option('--encrypted-cid <cid>', 'Override encrypted CID when subgraph manifests are not yet indexed')
+    .option('--skip-decrypt', 'Skip decryption and only report license status')
+    .option('--encrypted-cid <cid>', 'Override encrypted CID')
     .option('--json', 'Emit machine-readable JSON report', false)
     .action((creator, key, opts) => accessAction(creator, key, opts).catch((err) => { console.error(err.message); process.exit(1); }));
+
+  premium
+    .command('price <creator> <key>')
+    .description('Show price and fee breakdown for premium content')
+    .option('--json', 'Emit machine-readable JSON output', false)
+    .action((creator, key, opts) => priceAction(creator, key, opts).catch((err) => { console.error(err.message); process.exit(1); }));
+
+  premium
+    .command('unlist <key>')
+    .description('Remove a premium listing (sets price to 0)')
+    .option('--json', 'Emit machine-readable JSON output', false)
+    .action((key, opts) => unsellAction(key, opts).catch((err) => { console.error(err.message); process.exit(1); }));
+
+  cmd.addCommand(premium);
 }
 
 module.exports = { register };