@sage-protocol/cli 0.4.1 → 0.4.3

package/dist/cli/commands/prompts.js

@@ -136,98 +136,223 @@ async function importOnchainPrompt(nameOrKey, opts) {
   }
 }
 
-async function importSkillPrompt(name, opts) {
-  const { enterJsonMode, withJsonVersion } = require('../utils/json-output');
-  enterJsonMode(opts);
-  const ws = readWorkspace();
-  if (!ws) throw new Error('Workspace not found. Run `sage prompts init` first.');
-  const candidates = [];
-  if (opts.fromDir) {
-    candidates.push(opts.fromDir);
-  } else {
-    const cwd = process.cwd();
-    const home = (os.homedir && os.homedir()) || null;
-    const roots = [];
-    roots.push(path.join(cwd, '.agent', 'skills'));
-    roots.push(path.join(cwd, '.claude', 'skills'));
-    if (home) {
-      roots.push(path.join(home, '.agent', 'skills'));
-      roots.push(path.join(home, '.claude', 'skills'));
-    }
-    for (const root of roots) {
-      candidates.push(path.join(root, name));
-    }
+
+// --- Unified Artifact Commands ---
+
+async function createArtifact(opts) {
+  const ArtifactManager = require('../services/artifact-manager');
+  const manager = new ArtifactManager();
+  await manager.initialize();
+
+  const kind = opts.kind || 'prompt';
+  const name = opts.name;
+  if (!name) {
+    console.error('❌ Name is required');
+    process.exit(1);
   }
-  let skillDir = null;
-  for (const dir of candidates) {
-    if (!dir) continue;
-    const skillPath = path.join(dir, 'SKILL.md');
-    if (fs.existsSync(skillPath)) {
-      skillDir = dir;
-      break;
-    }
+
+  const targets = opts.targets ? opts.targets.split(',') : [];
+
+  const artifact = await manager.saveArtifact({
+    key: name,
+    kind,
+    body: opts.content || `You are a ${kind}...`,
+    meta: {
+      description: opts.description || '',
+      tags: opts.tags ? opts.tags.split(',') : []
+    },
+    targets
+  });
+
+  console.log(`✅ Created ${kind}: ${artifact.key}`);
+  console.log(`   Path: ${artifact.filePath}`);
+}
+
+async function listArtifacts(opts) {
+  const ArtifactManager = require('../services/artifact-manager');
+  const manager = new ArtifactManager();
+  await manager.initialize();
+
+  const filter = {};
+  if (opts.kind) filter.kind = opts.kind;
+  if (opts.scope) filter.scope = opts.scope;
+
+  const artifacts = await manager.listArtifacts(filter);
+
+  if (opts.json) {
+    console.log(JSON.stringify(artifacts, null, 2));
+    return;
   }
-  if (!skillDir) {
-    const msg = `Skill '${name}' not found. Install it with OpenSkills (e.g. openskills install anthropics/skills) and try again, or pass --from-dir.`;
-    if (opts.json) {
-      console.log(JSON.stringify(withJsonVersion({ ok: false, reason: msg }), null, 2));
-    } else {
-      console.error('❌', msg);
-    }
+
+  console.log(`Found ${artifacts.length} artifacts:`);
+  const grouped = {};
+  artifacts.forEach(a => {
+    if (!grouped[a.kind]) grouped[a.kind] = [];
+    grouped[a.kind].push(a);
+  });
+
+  Object.keys(grouped).forEach(kind => {
+    console.log(`\n${kind.toUpperCase()}:`);
+    grouped[kind].forEach(a => {
+      console.log(`  - ${a.key} [${a.scope}] ${a.targets.length ? `(targets: ${a.targets.join(',')})` : ''}`);
+    });
+  });
+}
+
+async function exportArtifacts(opts) {
+  const ArtifactManager = require('../services/artifact-manager');
+  const manager = new ArtifactManager();
+  await manager.initialize();
+
+  const target = opts.target;
+  if (!target) {
+    console.error('❌ Target is required (cursor, claude)');
     process.exit(1);
   }
-  const skillPath = path.join(skillDir, 'SKILL.md');
-  const raw = fs.readFileSync(skillPath, 'utf8');
-  let frontmatter = {};
-  let body = raw;
-  if (raw.startsWith('---')) {
-    const end = raw.indexOf('\n---', 3);
-    if (end !== -1) {
-      const header = raw.slice(3, end).split(/\r?\n/);
-      header.forEach((line) => {
-        const m = line.match(/^(\w+)\s*:\s*(.+)$/);
-        if (m) {
-          const key = m[1].trim();
-          const value = m[2].trim();
-          frontmatter[key] = value;
-        }
-      });
-      body = raw.slice(end + 4);
-    }
+
+  const artifacts = await manager.listArtifacts();
+  const relevant = artifacts.filter(a => a.targets.includes(target) || (a.meta && a.meta.targets && a.meta.targets.includes(target)));
+
+  if (relevant.length === 0) {
+    console.log(`No artifacts found for target: ${target}`);
+    return;
   }
-  const skillName = String(frontmatter.name || name).trim();
-  const description = frontmatter.description ? String(frontmatter.description).trim() : '';
-  const relKey = path.posix.join('skills', skillName);
-  const destDir = path.join(ws.promptsDir, 'skills');
-  fs.mkdirSync(destDir, { recursive: true });
-  const destFile = path.join(destDir, `${skillName}.md`);
-  const headerLines = [
-    `<!-- Imported from SKILL '${name}' at ${skillPath} -->`,
-    description ? `<!-- ${description} -->` : null,
-    '',
-  ].filter(Boolean);
-  const outBody = `${headerLines.join('\n')}\n${body.trim()}\n`;
-  fs.writeFileSync(destFile, outBody, 'utf8');
-  const result = {
-    ok: true,
-    mode: 'skill',
-    key: relKey,
-    name: skillName,
-    description: description || null,
-    file: destFile,
-  };
-  if (opts.json) {
-    console.log(JSON.stringify(withJsonVersion(result), null, 2));
-  } else {
-    console.log(`✅ Imported skill '${skillName}' into workspace`);
-    console.log(`  - key : ${relKey}`);
-    console.log(`  - file: ${destFile}`);
+
+  console.log(`Exporting ${relevant.length} artifacts to ${target}...`);
+
+  if (target === 'cursor') {
+    const cursorDir = path.join(process.cwd(), '.cursor', 'rules');
+    if (!fs.existsSync(cursorDir)) fs.mkdirSync(cursorDir, { recursive: true });
+
+    for (const a of relevant) {
+      const filename = `${a.key.replace(/\//g, '-')}.mdc`;
+      const content = `---\ndescription: ${a.meta.description || a.key}\nglobs: ${a.meta.globs || '*'}\n---\n\n${a.body}`;
+      fs.writeFileSync(path.join(cursorDir, filename), content);
+      console.log(`  - Wrote ${filename}`);
+    }
+  } else if (target === 'claude') {
+    const claudeFile = path.join(process.cwd(), 'CLAUDE.md');
+    let content = fs.existsSync(claudeFile) ? fs.readFileSync(claudeFile, 'utf8') : '';
+
+    // Simple append for now, ideally we use markers
+    const markerStart = '<!-- SAGE_START -->';
+    const markerEnd = '<!-- SAGE_END -->';
+
+    let newSection = `${markerStart}\n\n`;
+    for (const a of relevant) {
+      newSection += `## ${a.key}\n${a.body}\n\n`;
+    }
+    newSection += `${markerEnd}`;
+
+    if (content.includes(markerStart)) {
+      const regex = new RegExp(`${markerStart}[\\s\\S]*?${markerEnd}`);
+      content = content.replace(regex, newSection);
+    } else {
+      content += `\n\n${newSection}`;
+    }
+
+    fs.writeFileSync(claudeFile, content);
+    console.log(`  - Updated CLAUDE.md`);
   }
 }
 
 function register(program) {
   const cmd = new Command('prompts').description('Prompt-first workspace commands');
 
+  cmd
+    .command('new')
+    .description('Create a new artifact (prompt, snippet, skill)')
+    .option('--kind <kind>', 'Artifact kind (prompt, snippet, skill)', 'prompt')
+    .option('--name <name>', 'Artifact name/key (required)')
+    .option('--content <content>', 'Initial content')
+    .option('--description <desc>', 'Description')
+    .option('--tags <tags>', 'Comma-separated tags')
+    .option('--targets <targets>', 'Export targets (cursor, claude)')
+    .option('--publishable', 'Mark as publishable (default: true for prompts, false for others)')
+    .option('--no-publishable', 'Mark as not publishable')
+    .action(async (opts) => {
+      // Handle publishable flag: if --publishable is set, true. If --no-publishable, false.
+      // If neither, undefined (let ArtifactManager decide based on kind).
+      let publishable = undefined;
+      if (opts.publishable === true) publishable = true;
+      if (opts.publishable === false) publishable = false; // commander handles --no-X as false
+
+      const ArtifactManager = require('../services/artifact-manager');
+      const manager = new ArtifactManager();
+      await manager.initialize();
+
+      const kind = opts.kind || 'prompt';
+      const name = opts.name;
+      if (!name) {
+        console.error('❌ Name is required');
+        process.exit(1);
+      }
+
+      const targets = opts.targets ? opts.targets.split(',') : [];
+
+      const artifact = await manager.saveArtifact({
+        key: name,
+        kind,
+        body: opts.content || `You are a ${kind}...`,
+        meta: {
+          description: opts.description || '',
+          tags: opts.tags ? opts.tags.split(',') : []
+        },
+        targets,
+        publishable
+      });
+
+      console.log(`✅ Created ${kind}: ${artifact.key}`);
+      console.log(`   Path: ${artifact.filePath}`);
+      console.log(`   Publishable: ${artifact.publishable}`);
+    });
+
+  cmd
+    .command('list')
+    .description('List all artifacts in the project')
+    .option('--kind <kind>', 'Filter by kind')
+    .option('--publishable', 'Filter by publishable status')
+    .option('--no-publishable', 'Filter by non-publishable status')
+    .option('--json', 'Output JSON')
+    .action(async (opts) => {
+      const ArtifactManager = require('../services/artifact-manager');
+      const manager = new ArtifactManager();
+      await manager.initialize();
+
+      const filter = {};
+      if (opts.kind) filter.kind = opts.kind;
+      if (opts.publishable === true) filter.publishable = true;
+      if (opts.publishable === false) filter.publishable = false;
+
+      const artifacts = await manager.listArtifacts(filter);
+
+      if (opts.json) {
+        console.log(JSON.stringify(artifacts, null, 2));
+        return;
+      }
+
+      console.log(`Found ${artifacts.length} artifacts:`);
+      const grouped = {};
+      artifacts.forEach(a => {
+        if (!grouped[a.kind]) grouped[a.kind] = [];
+        grouped[a.kind].push(a);
+      });
+
+      Object.keys(grouped).forEach(kind => {
+        console.log(`\n${kind.toUpperCase()}:`);
+        grouped[kind].forEach(a => {
+          const statusIcon = a.publishable ? '📡' : '🔒';
+          const syncStatus = a.publishing?.status === 'published' ? '✅' :
+            a.publishing?.status === 'modified' ? '📝' :
+              a.publishing?.status === 'new' ? '✨' : '❓';
+
+          const toolsInfo = a.meta?.tools?.length ? ` (tools: ${a.meta.tools.join(',')})` : '';
+          console.log(`  ${statusIcon} ${syncStatus} ${a.key} ${a.targets.length ? `(targets: ${a.targets.join(',')})` : ''}${toolsInfo}`);
+        });
+      });
+      console.log('\nLegend: 📡 Publishable, 🔒 Local-only | ✅ Synced, 📝 Modified, ✨ New');
+    });
+
   cmd
     .command('init')
     .description('Initialize a prompt workspace (prompts/ + .sage/workspace.json)')
@@ -639,7 +764,7 @@ function register(program) {
           prompts.length,
           opts.title,
           opts.desc || `Manifest CID: ${manifestCID}`,
-          { 
+          {
             libraryId: opts.libraryId || 'main',
             ctx: { subdaoOpt: opts.dao || opts.subdao }
           }
@@ -881,11 +1006,14 @@ function register(program) {
     .option('--yes', 'Skip interactive confirmations', false)
     .option('--json', 'Emit JSON output', false)
     .action(async (opts) => {
+      // Declare ws and dest outside try block so they're accessible in catch
+      let ws = null;
+      let dest = null;
       try {
         const { enterJsonMode, withJsonVersion } = require('../utils/json-output');
         const { isTTY, isJSONMode } = require('../utils/output-mode');
         enterJsonMode(opts);
-        const ws = readWorkspace();
+        ws = readWorkspace();
         if (!ws) throw new Error('Workspace not found. Run `sage prompts init`.');
         const scan = computeChangeSet(ws);
         const changed = [...scan.added, ...scan.modified];
@@ -895,7 +1023,30 @@ function register(program) {
           console.log(msg);
           return;
         }
-        const prompts = changed.map((key) => ({ key, name: key.split('/').pop(), files: [path.join(ws.promptsDir, `${key}.md`)] }));
+        const prompts = [];
+        const ArtifactManager = require('../services/artifact-manager');
+        const am = new ArtifactManager();
+        await am.initialize();
+
+        for (const key of changed) {
+          const artifact = await am.getArtifact(key);
+          if (artifact && artifact.publishable) {
+            prompts.push({ key, name: key.split('/').pop(), files: [path.join(ws.promptsDir, `${key}.md`)] });
+          } else if (artifact) {
+            if (!opts.json) console.log(`ℹ️  Skipping non-publishable artifact: ${key}`);
+          } else {
+            // Fallback for non-artifact files if any (shouldn't happen with strict mode but safe to keep)
+            prompts.push({ key, name: key.split('/').pop(), files: [path.join(ws.promptsDir, `${key}.md`)] });
+          }
+        }
+
+        if (!prompts.length) {
+          const msg = 'No publishable changes detected.';
+          if (opts.json) return console.log(JSON.stringify(withJsonVersion({ ok: false, reason: msg })));
+          console.log(msg);
+          return;
+        }
+
         // Workspace size warning & plan details
         const fs = require('fs');
         let totalBytes = 0;
@@ -952,7 +1103,7 @@ function register(program) {
           throw new Error(msg);
         }
         const provider = process.env.RPC_URL ? new ethers.JsonRpcProvider(process.env.RPC_URL) : null;
-        let dest = await deriveDestination({ provider, subdaoOpt: subdaoInput, workspaceSubdao: ws.subdao, aliasResolver: resolveAliasOrAddress });
+        dest = await deriveDestination({ provider, subdaoOpt: subdaoInput, workspaceSubdao: ws.subdao, aliasResolver: resolveAliasOrAddress });
         // Apply --dest override (CI-oriented)
         if (opts.dest) {
           const v = String(opts.dest).toLowerCase();
@@ -1167,8 +1318,14 @@ function register(program) {
       }
     });
 
+  // --- Unified Commands ---
+
+
+
+  // --- Legacy / Specific Commands ---
+
   cmd
-    .command('export')
+    .command('export-legacy')
     .description('Render a skill for a target environment')
     .argument('<key>', 'Skill key')
     .option('--as <target>', 'Target (cursor|claude|browser|json)', 'cursor')
@@ -1255,7 +1412,6 @@ function register(program) {
         process.exit(1);
       }
     });
-
   program.addCommand(cmd);
 }
 

package/dist/cli/commands/wallet.js

@@ -14,7 +14,9 @@ const colors = {
     green: (text) => `\x1b[32m${text}\x1b[0m`,
     yellow: (text) => `\x1b[33m${text}\x1b[0m`,
     blue: (text) => `\x1b[34m${text}\x1b[0m`,
-    cyan: (text) => `\x1b[36m${text}\x1b[0m`
+    cyan: (text) => `\x1b[36m${text}\x1b[0m`,
+    dim: (text) => `\x1b[2m${text}\x1b[0m`,
+    white: (text) => `\x1b[37m${text}\x1b[0m`
 };
 
 function register(program) {
@@ -376,22 +378,39 @@ const Web3AuthWalletManager = require('../web3auth-wallet-manager');
       new Command('fund')
         .description('Get wallet funding instructions')
         .action(async () => {
+          console.log(colors.blue('💰 Wallet Funding Instructions (Base Sepolia Testnet):'));
+          console.log('');
+          console.log(colors.yellow('🔗 Get testnet ETH from:'));
+          console.log(colors.cyan('   https://www.coinbase.com/faucets/base-ethereum-sepolia-faucet'));
+          console.log('');
+
+          // Try to show wallet address if already configured (non-interactive)
+          let address = null;
           try {
-            const walletManager = new WalletManager();
-            await walletManager.connect();
-            if (walletManager.wallet && walletManager.wallet.fundWallet) {
-              await walletManager.wallet.fundWallet();
-            } else {
-              console.log(colors.blue('💰 Wallet Funding Instructions:'));
-              console.log(colors.cyan('📧 Your wallet address:', walletManager.getAccount()));
-              console.log(colors.yellow('🔗 Get testnet ETH from: https://www.coinbase.com/faucets/base-ethereum-sepolia-faucet'));
-              console.log(colors.yellow('📝 Send ETH to your address above'));
-              console.log(colors.green('✅ Check balance with: sage wallet balance'));
-            }
-          } catch (error) {
-            console.error('❌ Failed to get funding instructions:', error.message);
-            process.exit(1);
+            const cast = new CastWalletManager();
+            const saved = cast.loadCastWallet();
+            address = saved?.address || null;
+          } catch (_) {}
+
+          // Fallback to profile wallet address
+          if (!address) {
+            try {
+              const prof = config.readProfiles();
+              const ap = prof.activeProfile || 'default';
+              address = prof.profiles?.[ap]?.wallet || null;
+            } catch (_) {}
+          }
+
+          if (address) {
+            console.log(colors.cyan('📧 Your wallet address:'));
+            console.log(colors.white(`   ${address}`));
+            console.log('');
+            console.log(colors.yellow('📝 Send ETH to your address above'));
+          } else {
+            console.log(colors.dim('📧 Connect a wallet to see your address: sage wallet connect'));
           }
+          console.log('');
+          console.log(colors.green('✅ Check balance with: sage wallet balance'));
         })
     )
     .addCommand(

package/dist/cli/config.js

@@ -3,6 +3,7 @@ const path = require('path');
 
 const DEFAULT_RPC_URL = 'https://base-sepolia.publicnode.com';
 const DEFAULT_CHAIN_ID = 84532;
+const DEFAULT_SUBGRAPH_URL = 'https://api.goldsky.com/api/public/project_cmhxp0fppsbdd01q56xp2gqw9/subgraphs/sxxx-protocol/1.0.2/gn';
 
 const ADDRESS_ALIAS_GROUPS = [
   ['GOV', 'GOVERNOR_ADDRESS'],
@@ -482,6 +483,18 @@ function createLocalConfig() {
       return DEFAULT_CHAIN_ID;
     },
 
+    resolveSubgraphUrl(options = {}) {
+      const profileVal = this.resolveProfileValue(['subgraphUrl'], null, options);
+      if (profileVal) return profileVal;
+      return (
+        process.env.SUBGRAPH_URL ||
+        process.env.SAGE_SUBGRAPH_URL ||
+        process.env.NEXT_PUBLIC_GRAPH_ENDPOINT ||
+        process.env.NEXT_PUBLIC_SUBGRAPH_URL ||
+        DEFAULT_SUBGRAPH_URL
+      );
+    },
+
     resolveAddress(key, defaultValue = null, options = {}) {
       const keys = collectAliasKeys(key);
       for (const candidate of keys) {

package/dist/cli/index.js

@@ -101,7 +101,7 @@ program
 
 // Reordered to highlight consolidated namespaces ('prompts' and 'gov')
 const commandGroups = [
-  { title: 'Content (new)', modules: ['prompts', 'project', 'prompt', 'personal', 'interview', 'creator', 'contributor', 'bounty'] },
+  { title: 'Content (new)', modules: ['prompts', 'project', 'personal', 'interview', 'creator', 'contributor', 'bounty'] },
   { title: 'Governance (new)', modules: ['proposals', 'governance', 'dao', 'timelock', 'roles', 'members', 'gov-config', 'stake-status'] },
   { title: 'Treasury', modules: ['treasury', 'safe', 'boost'] },
   { title: 'Ops & Utilities', modules: ['config', 'wallet', 'sxxx', 'ipfs', 'ipns', 'context', 'doctor', 'factory', 'upgrade', 'resolve', 'dry-run-queue', 'mcp', 'start', 'wizard', 'init', 'dao-config', 'pin', 'council', 'sbt', 'completion', 'help', 'hook'] },
@@ -196,7 +196,7 @@ process.stderr.write = (chunk, encoding, callback) => {
     if (typeof callback === 'function') callback();
     return true;
   }
-  
+
   const handled = aliasSupport.handleOutputError(chunk);
   if (!handled) {
     return currentStderrWrite(chunk, encoding, callback);