@sage-protocol/cli 0.4.0 → 0.4.2

package/dist/cli/mcp-server.js

@@ -11,6 +11,7 @@ const { ethers } = require('ethers');
 const { execSync } = require('child_process');
 const axios = require('axios');
 const fss = require('fs');
+const { hydrateEnvFromSageConfig } = require('./services/mcp/env-loader');
 const { createLibraryManifestLister } = require('./services/mcp/library-manifests');
 const { createManifestFetcher } = require('./services/mcp/manifest-fetcher');
 const { createManifestWorkflows } = require('./services/mcp/manifest-workflows');
@@ -57,37 +58,10 @@ class MCPServer extends EventEmitter {
   }
 
   async initialize() {
-    // Hydrate env from .sage/config.json if missing
+    // Hydrate env from .sage/config.json if missing (factory, registry, token, subgraph)
     try {
-      let dir = process.cwd();
-      let cfgPath = null;
-      for (let i = 0; i < 6; i++) {
-        const cand = path.join(dir, '.sage', 'config.json');
-        if (fss.existsSync(cand)) { cfgPath = cand; break; }
-        const next = path.dirname(dir);
-        if (next === dir) break;
-        dir = next;
-      }
-      if (!cfgPath) {
-        const alt = path.join(__dirname, '..', '.sage', 'config.json');
-        if (fss.existsSync(alt)) cfgPath = alt;
-      }
-      if (cfgPath) {
-        const raw = fss.readFileSync(cfgPath, 'utf8');
-        const j = JSON.parse(raw);
-        const active = j.activeProfile || Object.keys(j.profiles || {})[0];
-        const a = (j.profiles && j.profiles[active] && j.profiles[active].addresses) || {};
-        if (!process.env.SUBDAO_FACTORY_ADDRESS && (a.SUBDAO_FACTORY_ADDRESS || a.SUBDAO_FACTORY)) {
-          process.env.SUBDAO_FACTORY_ADDRESS = a.SUBDAO_FACTORY_ADDRESS || a.SUBDAO_FACTORY;
-        }
-        if (!process.env.LIBRARY_REGISTRY_ADDRESS && (a.LIBRARY_REGISTRY_ADDRESS || a.LIBRARY_REGISTRY)) {
-          process.env.LIBRARY_REGISTRY_ADDRESS = a.LIBRARY_REGISTRY_ADDRESS || a.LIBRARY_REGISTRY;
-        }
-        if (!process.env.SXXX_TOKEN_ADDRESS && (a.SXXX_TOKEN_ADDRESS || a.SXXX)) {
-          process.env.SXXX_TOKEN_ADDRESS = a.SXXX_TOKEN_ADDRESS || a.SXXX;
-        }
-      }
-    } catch (_) { /* ignore */ }
+      hydrateEnvFromSageConfig({ cwd: process.cwd(), fallbackDir: path.join(__dirname, '..') });
+    } catch (_) { /* non-fatal */ }
     // Ensure directories exist
     await this.ensureDirectories();
 

package/dist/cli/metamask-integration.js

@@ -1,5 +1,4 @@
 const { ethers } = require('ethers');
-try { require('dotenv').config({ quiet: true }); } catch (_) {}
 
 class MetaMaskIntegration {
     constructor() {

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

@@ -142,7 +142,7 @@ class PrivyWalletManager {
 
     async initialize() {
         try {
-            console.log('✅ Deterministic wallet manager initialized');
+            if (process.env.SAGE_VERBOSE === '1') console.log('✅ Deterministic wallet manager initialized');
             return true;
         } catch (error) {
             console.error('❌ Wallet initialization failed:', error.message);
@@ -208,7 +208,7 @@ class PrivyWalletManager {
     async promptEmail() {
         let cached = getCachedPrivyEmail();
         if (cached && cached.includes('@')) {
-            if (!process.env.SAGE_QUIET_JSON) console.log(`📧 Using cached Privy email: ${cached}`);
+            if (!process.env.SAGE_QUIET_JSON && process.env.SAGE_VERBOSE === '1') console.log(`📧 Using cached Privy email: ${cached}`);
             return cached;
         }
         let email = '';

package/dist/cli/prompt-manager.js

@@ -1,7 +1,6 @@
 const { ethers } = require('ethers');
 const FactoryABI = require('./utils/factory-abi');
 const { resolveArtifact } = require('./utils/artifacts');
-try { require('dotenv').config({ quiet: true }); } catch (_) {}
 
 // Simple color functions
 const colors = {

package/dist/cli/services/artifact-manager.js

@@ -0,0 +1,198 @@
+
+const fs = require('fs');
+const path = require('path');
+const config = require('../config');
+const { readWorkspace, computeChangeSet } = require('./prompts/workspace');
+
+class ArtifactManager {
+    constructor(cwd = process.cwd()) {
+        this.cwd = cwd;
+        this.config = config;
+        this.promptsDir = path.join(this.cwd, 'prompts');
+        this.sageDir = path.join(this.cwd, '.sage');
+    }
+
+    async initialize() {
+        if (!fs.existsSync(this.promptsDir)) fs.mkdirSync(this.promptsDir, { recursive: true });
+    }
+
+    /**
+     * List all artifacts, optionally filtered
+     * @param {Object} filter { kind, publishable }
+     */
+    async listArtifacts(filter = {}) {
+        const artifacts = [];
+        const ws = readWorkspace();
+        const changes = ws ? computeChangeSet(ws) : { added: [], modified: [], removed: [] };
+
+        if (fs.existsSync(this.promptsDir)) {
+            const workspaceFiles = await this._scanDir(this.promptsDir);
+            for (const file of workspaceFiles) {
+                const artifact = await this._parseArtifact(file, ws, changes);
+                if (artifact) artifacts.push(artifact);
+            }
+        }
+
+        return artifacts.filter(a => {
+            if (filter.kind && a.kind !== filter.kind) return false;
+            if (filter.publishable !== undefined && a.publishable !== filter.publishable) return false;
+            return true;
+        });
+    }
+
+    async getArtifact(key) {
+        // Try to find the file. Key could be "skills/coding-helper" -> prompts/skills/coding-helper.md
+        const potentialPath = path.join(this.promptsDir, key + '.md');
+
+        if (fs.existsSync(potentialPath)) {
+            const ws = readWorkspace();
+            const changes = ws ? computeChangeSet(ws) : { added: [], modified: [], removed: [] };
+            return await this._parseArtifact(potentialPath, ws, changes);
+        }
+
+        return null;
+    }
+
+    async saveArtifact(artifact) {
+        const { key, kind, body, meta, targets, publishable } = artifact;
+
+        let relPath = key;
+        if (!relPath.endsWith('.md')) relPath += '.md';
+
+        // Enforce directory conventions
+        if (kind === 'skill' && !relPath.startsWith('skills/')) {
+            relPath = `skills/${relPath}`;
+        } else if (kind === 'snippet' && !relPath.startsWith('snippets/')) {
+            relPath = `snippets/${relPath}`;
+        }
+
+        const filePath = path.join(this.promptsDir, relPath);
+        const dir = path.dirname(filePath);
+        if (!fs.existsSync(dir)) fs.mkdirSync(dir, { recursive: true });
+
+        // Update meta
+        const frontmatter = {
+            ...meta,
+            kind,
+            publishable: publishable !== undefined ? publishable : (kind === 'prompt'),
+            targets: targets || meta?.targets || []
+        };
+
+        // Construct file content
+        const yaml = Object.entries(frontmatter)
+            .filter(([_, v]) => v !== undefined && v !== null)
+            .map(([k, v]) => `${k}: ${JSON.stringify(v)}`)
+            .join('\n');
+
+        const content = `---\n${yaml}\n---\n\n${body}`;
+
+        fs.writeFileSync(filePath, content);
+
+        return this._parseArtifact(filePath);
+    }
+
+    // --- Helpers ---
+
+    async _scanDir(dir, base = '') {
+        let results = [];
+        try {
+            const list = fs.readdirSync(dir);
+            for (const file of list) {
+                const fullPath = path.join(dir, file);
+                const stat = fs.statSync(fullPath);
+                if (stat && stat.isDirectory()) {
+                    results = results.concat(await this._scanDir(fullPath));
+                } else {
+                    if (file.endsWith('.md')) {
+                        results.push(fullPath);
+                    }
+                }
+            }
+        } catch (e) {
+            // ignore if dir doesn't exist
+        }
+        return results;
+    }
+
+    async _parseArtifact(filePath, ws = null, changes = null) {
+        try {
+            const content = fs.readFileSync(filePath, 'utf8');
+            const { attributes, body } = this._parseFrontMatter(content);
+
+            // Infer key from path relative to prompts dir
+            const relative = path.relative(this.promptsDir, filePath);
+            const key = relative.replace(/\.md$/, '');
+
+            // Infer kind
+            let kind = attributes.kind;
+            if (!kind) {
+                if (key.startsWith('skills/') || key.includes('/skills/')) kind = 'skill';
+                else if (key.startsWith('snippets/') || key.includes('/snippets/')) kind = 'snippet';
+                else kind = 'prompt';
+            }
+
+            // Infer publishable
+            // Default: true for prompts, false for skills/snippets
+            let publishable = attributes.publishable;
+            if (publishable === undefined) {
+                publishable = (kind === 'prompt');
+            }
+
+            // Derive publishing state
+            let status = 'unpublished';
+            if (ws && ws.files && ws.files[key]) {
+                if (changes && changes.modified.includes(key)) {
+                    status = 'modified';
+                } else {
+                    status = 'published'; // Assumed synced if in workspace and not modified
+                }
+            } else if (changes && changes.added.includes(key)) {
+                status = 'new';
+            }
+
+            return {
+                key,
+                kind,
+                publishable,
+                body,
+                meta: attributes,
+                targets: attributes.targets || [],
+                publishing: {
+                    status,
+                    lastSynced: ws?.files?.[key]?.mtimeMs || null
+                },
+                filePath
+            };
+        } catch (e) {
+            console.warn(`Failed to parse artifact at ${filePath}: `, e.message);
+            return null;
+        }
+    }
+
+    _parseFrontMatter(content) {
+        const match = content.match(/^---\n([\s\S]*?)\n---\n([\s\S]*)$/);
+        if (match) {
+            const yaml = match[1];
+            const body = match[2];
+            const attributes = {};
+            yaml.split('\n').forEach(line => {
+                const parts = line.split(':');
+                if (parts.length >= 2) {
+                    const k = parts[0].trim();
+                    const v = parts.slice(1).join(':').trim();
+                    if (k && v) {
+                        try {
+                            attributes[k] = JSON.parse(v);
+                        } catch (e) {
+                            attributes[k] = v;
+                        }
+                    }
+                }
+            });
+            return { attributes, body: body.trim() };
+        }
+        return { attributes: {}, body: content.trim() };
+    }
+}
+
+module.exports = ArtifactManager;

package/dist/cli/services/doctor/fixers.js

@@ -92,7 +92,7 @@ async function fixIpfsKeys(context = {}) {
                     if (!envContent.includes('PINATA_SECRET_API_KEY=')) envContent += `\nPINATA_SECRET_API_KEY=${answers.secret}`;
                     if (answers.jwt && !envContent.includes('PINATA_JWT=')) envContent += `\nPINATA_JWT=${answers.jwt}`;
                     fs.writeFileSync(envPath, envContent);
-                    try { require('dotenv').config(); } catch(_){}
+                    try { config.loadEnv(); } catch(_){}
                     console.log('✅ Added Pinata keys to .env');
                 }
             }

package/dist/cli/services/mcp/env-loader.js

@@ -55,6 +55,8 @@ function hydrateEnvFromSageConfig(options = {}) {
       SUBDAO_FACTORY_ADDRESS: addresses.SUBDAO_FACTORY_ADDRESS || addresses.SUBDAO_FACTORY,
       LIBRARY_REGISTRY_ADDRESS: addresses.LIBRARY_REGISTRY_ADDRESS || addresses.LIBRARY_REGISTRY,
       SXXX_TOKEN_ADDRESS: addresses.SXXX_TOKEN_ADDRESS || addresses.SXXX,
+      SUBGRAPH_URL: addresses.SAGE_SUBGRAPH_URL || addresses.SUBGRAPH_URL,
+      SAGE_SUBGRAPH_URL: addresses.SAGE_SUBGRAPH_URL,
     };
     for (const [key, value] of Object.entries(mapping)) {
       if (value && typeof value === 'string' && !process.env[key]) {

package/dist/cli/services/mcp/prompt-result-formatter.js

@@ -23,7 +23,14 @@ function formatUnifiedResults(items = [], { total = 0, page = 1, pageSize = 10 }
     const libraryName = entry?.library?.name ? `   🗂️ Library: ${entry.library.name}\n` : '';
     const cidLine = entry?.cid ? `   🔗 CID: ${entry.cid}\n` : '';
     const origin = entry?.origin || entry?.source || 'unknown';
-    return `${absoluteIndex}. **${promptName}**\n   📜 ${description}\n${libraryName}${cidLine}   🔖 Tags: ${tags}\n   🌐 Source: ${origin}\n`;
+
+    // New unified fields
+    const kind = entry?.kind ? `   🔹 Kind: ${entry.kind}\n` : '';
+    const publishable = entry?.publishable !== undefined ? `   📡 Publishable: ${entry.publishable}\n` : '';
+    const status = entry?.publishing?.status ? `   📊 Status: ${entry.publishing.status}\n` : '';
+    const project = entry?.project ? `   🏗️ Project: ${entry.project}\n` : '';
+
+    return `${absoluteIndex}. **${promptName}**\n   📜 ${description}\n${kind}${publishable}${status}${project}${libraryName}${cidLine}   🔖 Tags: ${tags}\n   🌐 Source: ${origin}\n`;
   }).join('\n');
 
   return head + lines;

package/dist/cli/services/mcp/quick-start.js

@@ -60,13 +60,12 @@ function createQuickStart({
         // Since LibraryManager doesn't expose "addPrompt", we'll implement it here for now
         // In a real refactor, we should move this to LibraryManager
 
-        const libDir = libraryManager.ensureLibrariesDir();
-        const manifestPath = path.join(libDir, `${targetLib.cid}.json`);
-
         // Create prompt file
         // We'll store it in a 'prompts' subdirectory next to the manifest if possible, 
         // but for local libraries, they are flat in ~/.sage/libraries/
         // Let's create a prompts directory inside ~/.sage/libraries/prompts/
+        const libDir = libraryManager.ensureLibrariesDir();
+        const manifestPath = libraryManager.getManifestPath(targetLib.cid);
         const promptsDir = path.join(libDir, 'prompts');
         if (!fs.existsSync(promptsDir)) {
             fs.mkdirSync(promptsDir, { recursive: true });
@@ -114,7 +113,7 @@ function createQuickStart({
             cid: '' // Local prompt
         });
 
-        fs.writeFileSync(manifestPath, JSON.stringify(manifest, null, 2), 'utf8');
+        libraryManager.writeManifest(targetLib.cid, manifest);
 
         return {
             success: true,
@@ -129,19 +128,18 @@ function createQuickStart({
         if (!key) throw new Error('Key is required');
 
         // Find the prompt
-        const pinned = libraryManager.listPinned();
+            const pinned = libraryManager.listPinned();
         let found = null;
         let foundLib = null;
 
         for (const lib of pinned) {
-            const { manifest } = libraryManager.loadPinned(lib.cid);
-            const prompt = manifest.prompts?.find(p => p.key === key);
-            if (prompt) {
-                found = prompt;
-                const libDir = libraryManager.ensureLibrariesDir();
-                foundLib = { ...lib, manifest, manifestPath: path.join(libDir, `${lib.cid}.json`) };
-                break;
-            }
+                const { manifest } = libraryManager.loadPinned(lib.cid);
+                const prompt = manifest.prompts?.find(p => p.key === key);
+                if (prompt) {
+                    found = prompt;
+                    foundLib = { ...lib, manifest };
+                    break;
+                }
         }
 
         if (!found) {
@@ -150,13 +148,13 @@ function createQuickStart({
 
         // Update content if provided
         if (content) {
-            const libDir = libraryManager.ensureLibrariesDir();
             let promptFilePath;
 
             if (found.files && found.files.length > 0) {
                 // Use existing file
                 const relativePath = found.files[0];
                 // Handle potential path issues
+                const libDir = libraryManager.ensureLibrariesDir();
                 promptFilePath = path.join(libDir, relativePath);
 
                 // Backup existing
@@ -166,6 +164,7 @@ function createQuickStart({
                 }
             } else {
                 // Create new file if none existed (legacy/imported)
+                const libDir = libraryManager.ensureLibrariesDir();
                 const promptsDir = path.join(libDir, 'prompts');
                 if (!fs.existsSync(promptsDir)) fs.mkdirSync(promptsDir, { recursive: true });
                 const promptFileName = `${foundLib.cid}_${key}.md`;
@@ -210,7 +209,7 @@ function createQuickStart({
         }
 
         // Save manifest
-        fs.writeFileSync(foundLib.manifestPath, JSON.stringify(foundLib.manifest, null, 2), 'utf8');
+        libraryManager.writeManifest(foundLib.cid, foundLib.manifest);
 
         return {
             success: true,