@evomap/evolver 1.30.2 → 1.31.0

package/index.js

@@ -2,8 +2,8 @@
 const evolve = require('./src/evolve');
 const { solidify } = require('./src/gep/solidify');
 const path = require('path');
-// Hardened Env Loading: Ensure .env is loaded before anything else
-try { require('dotenv').config({ path: path.resolve(__dirname, './.env') }); } catch (e) { console.warn('[Evolver] Warning: dotenv not found or failed to load .env'); }
+const { getRepoRoot } = require('./src/gep/paths');
+try { require('dotenv').config({ path: path.join(getRepoRoot(), '.env') }); } catch (e) { console.warn('[Evolver] Warning: dotenv not found or failed to load .env'); }
 const fs = require('fs');
 const { spawn } = require('child_process');
 
@@ -24,6 +24,11 @@ function readJsonSafe(p) {
   }
 }
 
+/**
+ * Mark a pending evolution run as rejected (state-only, no git rollback).
+ * @param {string} statePath - Path to evolution_solidify_state.json
+ * @returns {boolean} true if a pending run was found and rejected
+ */
 function rejectPendingRun(statePath) {
   try {
     const state = readJsonSafe(statePath);
@@ -34,7 +39,9 @@ function rejectPendingRun(statePath) {
         reason: 'loop_bridge_disabled_autoreject_no_rollback',
         timestamp: new Date().toISOString(),
       };
-      fs.writeFileSync(statePath, JSON.stringify(state, null, 2) + '\n', 'utf8');
+      const tmp = `${statePath}.tmp`;
+      fs.writeFileSync(tmp, JSON.stringify(state, null, 2) + '\n', 'utf8');
+      fs.renameSync(tmp, statePath);
       return true;
     }
   } catch (e) {
@@ -120,8 +127,10 @@ async function main() {
         process.on('SIGTERM', () => { releaseLock(); process.exit(); });
 
         process.env.EVOLVE_LOOP = 'true';
-        process.env.EVOLVE_BRIDGE = 'false';
-        console.log('Loop mode enabled (internal daemon).');
+        if (!process.env.EVOLVE_BRIDGE) {
+          process.env.EVOLVE_BRIDGE = 'false';
+        }
+        console.log(`Loop mode enabled (internal daemon, bridge=${process.env.EVOLVE_BRIDGE}).`);
 
         const { getEvolutionDir } = require('./src/gep/paths');
         const solidifyStatePath = path.join(getEvolutionDir(), 'evolution_solidify_state.json');
@@ -458,6 +467,112 @@ async function main() {
       console.log('To reject and rollback:   node index.js review --reject');
     }
 
+  } else if (command === 'fetch') {
+    let skillId = null;
+    const eqFlag = args.find(a => typeof a === 'string' && (a.startsWith('--skill=') || a.startsWith('-s=')));
+    if (eqFlag) {
+      skillId = eqFlag.split('=').slice(1).join('=');
+    } else {
+      const sIdx = args.indexOf('-s');
+      const longIdx = args.indexOf('--skill');
+      const flagIdx = sIdx !== -1 ? sIdx : longIdx;
+      if (flagIdx !== -1 && args[flagIdx + 1] && !String(args[flagIdx + 1]).startsWith('-')) {
+        skillId = args[flagIdx + 1];
+      }
+    }
+    if (!skillId) {
+      const positional = args[1];
+      if (positional && !String(positional).startsWith('-')) skillId = positional;
+    }
+
+    if (!skillId) {
+      console.error('Usage: evolver fetch --skill <skill_id>');
+      console.error('       evolver fetch -s <skill_id>');
+      process.exit(1);
+    }
+
+    const { getHubUrl, getNodeId, buildHubHeaders, sendHelloToHub, getHubNodeSecret } = require('./src/gep/a2aProtocol');
+
+    const hubUrl = getHubUrl();
+    if (!hubUrl) {
+      console.error('[fetch] A2A_HUB_URL is not configured.');
+      console.error('Set it via environment variable or .env file:');
+      console.error('  export A2A_HUB_URL=https://evomap.ai');
+      process.exit(1);
+    }
+
+    try {
+      if (!getHubNodeSecret()) {
+        console.log('[fetch] No node_secret found. Sending hello to Hub to register...');
+        const helloResult = await sendHelloToHub();
+        if (!helloResult || !helloResult.ok) {
+          console.error('[fetch] Failed to register with Hub:', helloResult && helloResult.error || 'unknown');
+          process.exit(1);
+        }
+        console.log('[fetch] Registered as ' + getNodeId());
+      }
+
+      const endpoint = hubUrl.replace(/\/+$/, '') + '/a2a/skill/store/' + encodeURIComponent(skillId) + '/download';
+      const nodeId = getNodeId();
+
+      console.log('[fetch] Downloading skill: ' + skillId);
+
+      const resp = await fetch(endpoint, {
+        method: 'POST',
+        headers: buildHubHeaders(),
+        body: JSON.stringify({ sender_id: nodeId }),
+        signal: AbortSignal.timeout(30000),
+      });
+
+      if (!resp.ok) {
+        const body = await resp.text().catch(() => '');
+        let msg = 'HTTP ' + resp.status;
+        try { const j = JSON.parse(body); msg = j.error || j.message || msg; } catch (_) {}
+        console.error('[fetch] Download failed: ' + msg);
+        if (resp.status === 404) console.error('  Skill not found or not publicly available.');
+        if (resp.status === 401) console.error('  Authentication failed. Try deleting ~/.evomap/node_secret and retry.');
+        if (resp.status === 402) console.error('  Insufficient credits.');
+        process.exit(1);
+      }
+
+      const data = await resp.json();
+      const outFlag = args.find(a => typeof a === 'string' && a.startsWith('--out='));
+      const safeId = String(data.skill_id || skillId).replace(/[^a-zA-Z0-9_\-\.]/g, '_');
+      const outDir = outFlag
+        ? outFlag.slice('--out='.length)
+        : path.join('.', 'skills', safeId);
+
+      if (!fs.existsSync(outDir)) fs.mkdirSync(outDir, { recursive: true });
+
+      if (data.content) {
+        fs.writeFileSync(path.join(outDir, 'SKILL.md'), data.content, 'utf8');
+      }
+
+      const bundled = Array.isArray(data.bundled_files) ? data.bundled_files : [];
+      for (const file of bundled) {
+        if (!file || !file.name || typeof file.content !== 'string') continue;
+        const safeName = path.basename(file.name);
+        fs.writeFileSync(path.join(outDir, safeName), file.content, 'utf8');
+      }
+
+      console.log('[fetch] Skill downloaded to: ' + outDir);
+      console.log('  Name:    ' + (data.name || skillId));
+      console.log('  Version: ' + (data.version || '?'));
+      console.log('  Files:   SKILL.md' + (bundled.length > 0 ? ', ' + bundled.map(f => f.name).join(', ') : ''));
+      if (data.already_purchased) {
+        console.log('  Cost:    free (already purchased)');
+      } else {
+        console.log('  Cost:    ' + (data.credit_cost || 0) + ' credits');
+      }
+    } catch (error) {
+      if (error && error.name === 'TimeoutError') {
+        console.error('[fetch] Request timed out. Check your network and A2A_HUB_URL.');
+      } else {
+        console.error('[fetch] Error:', error && error.message || error);
+      }
+      process.exit(1);
+    }
+
   } else if (command === 'asset-log') {
     const { summarizeCallLog, readCallLog, getLogPath } = require('./src/gep/assetCallLog');
 
@@ -502,7 +617,10 @@ async function main() {
     }
 
   } else {
-    console.log(`Usage: node index.js [run|/evolve|solidify|review|distill|asset-log] [--loop]
+    console.log(`Usage: node index.js [run|/evolve|solidify|review|distill|fetch|asset-log] [--loop]
+  - fetch flags:
+    - --skill=<id> | -s <id>   (skill ID to download)
+    - --out=<dir>              (output directory, default: ./skills/<skill_id>)
   - solidify flags:
     - --dry-run
     - --no-rollback

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@evomap/evolver",
-  "version": "1.30.2",
+  "version": "1.31.0",
   "description": "A GEP-powered self-evolution engine for AI agents. Features automated log analysis and Genome Evolution Protocol (GEP) for auditable, reusable evolution assets.",
   "main": "index.js",
   "bin": {

package/src/evolve.js

@@ -2,7 +2,7 @@ const fs = require('fs');
 const path = require('path');
 const os = require('os');
 const { execSync } = require('child_process');
-const { getRepoRoot, getMemoryDir, getSessionScope } = require('./gep/paths');
+const { getRepoRoot, getWorkspaceRoot, getMemoryDir, getSessionScope } = require('./gep/paths');
 const { extractSignals } = require('./gep/signals');
 const {
   loadGenes,
@@ -492,7 +492,7 @@ function clearDormantHypothesis() {
 }
 // Read MEMORY.md and USER.md from the WORKSPACE root (not the evolver plugin dir).
 // This avoids symlink breakage if the target file is temporarily deleted.
-const WORKSPACE_ROOT = process.env.OPENCLAW_WORKSPACE || path.resolve(REPO_ROOT, '../..');
+const WORKSPACE_ROOT = getWorkspaceRoot();
 const ROOT_MEMORY = path.join(WORKSPACE_ROOT, 'MEMORY.md');
 const DIR_MEMORY = path.join(MEMORY_DIR, 'MEMORY.md');
 const MEMORY_FILE = fs.existsSync(ROOT_MEMORY) ? ROOT_MEMORY : (fs.existsSync(DIR_MEMORY) ? DIR_MEMORY : ROOT_MEMORY);
@@ -1532,7 +1532,6 @@ async function run() {
   try {
     const runId = `run_${Date.now()}`;
     const parentEventId = getLastEventId();
-    const selectedBy = memoryAdvice && memoryAdvice.preferredGeneId ? 'memory_graph+selector' : 'selector';
 
     // Baseline snapshot (before any edits).
     let baselineUntracked = [];

package/src/gep/a2aProtocol.js

@@ -778,6 +778,7 @@ module.exports = {
   consumeOverdueTasks,
   getSkillStoreHint,
   queueCommitmentUpdate,
+  getHubUrl,
   getHubNodeSecret,
   buildHubHeaders,
   getNoveltyHint,

package/src/gep/solidify.js

@@ -383,12 +383,12 @@ function readStateForSolidify() {
 }
 
 function writeStateForSolidify(state) {
-  const memoryDir = getMemoryDir();
-  const statePath = path.join(getEvolutionDir(), 'evolution_solidify_state.json');
+  const evolutionDir = getEvolutionDir();
+  const statePath = path.join(evolutionDir, 'evolution_solidify_state.json');
   try {
-    if (!fs.existsSync(memoryDir)) fs.mkdirSync(memoryDir, { recursive: true });
+    if (!fs.existsSync(evolutionDir)) fs.mkdirSync(evolutionDir, { recursive: true });
   } catch (e) {
-    console.warn('[evolver] writeStateForSolidify mkdir failed:', memoryDir, e && e.message || e);
+    console.warn('[evolver] writeStateForSolidify mkdir failed:', evolutionDir, e && e.message || e);
   }
   const tmp = `${statePath}.tmp`;
   fs.writeFileSync(tmp, JSON.stringify(state, null, 2) + '\n', 'utf8');