@evomap/evolver 1.88.3 → 1.89.0

package/src/proxy/trace/usage.js

@@ -0,0 +1,105 @@
+'use strict';
+
+// Per-run token-usage rollup over the proxy trace log.
+//
+// The local proxy (src/proxy) meters real Anthropic input/output tokens for
+// every Hand /v1/messages call into proxy-traces.jsonl. This reads that log
+// back -- decrypting encrypted rows with the local EvoMap node secret -- and
+// sums the real tokens spent within a time window, giving solidify the
+// MEASURED cost of a derive loop.
+//
+// Best-effort by design: returns measured:false (and never throws) when the
+// proxy was inactive, the node secret is missing, no rows fall in the window,
+// or the in-window rows carried no usage (e.g. streamed-but-unobserved calls).
+// Callers fall back to a grounded estimate in that case.
+
+const fs = require('fs');
+const {
+  resolveTraceFile,
+  resolveEvomapNodeSecret,
+  decryptTraceEnvelope,
+} = require('./extractor');
+
+const EMPTY = Object.freeze({
+  input_tokens: 0,
+  output_tokens: 0,
+  total_tokens: 0,
+  calls: 0,
+  measured: false,
+});
+
+function _rowTimestampMs(row) {
+  const iso = row && (row.timestamp || row.createdAtIso);
+  if (iso) {
+    const ms = Date.parse(iso);
+    if (Number.isFinite(ms)) return ms;
+  }
+  // createdAt is unix seconds in the Prism trace shape.
+  if (row && Number.isFinite(Number(row.createdAt))) return Number(row.createdAt) * 1000;
+  return null;
+}
+
+/**
+ * Sum the real token usage the proxy recorded within a run's time window.
+ *
+ * @param {object} opts
+ * @param {string} opts.sinceIso - REQUIRED lower bound (e.g. last_run.created_at).
+ *   Without a window we cannot attribute traces to this run, so we report
+ *   unmeasured rather than summing unrelated calls.
+ * @param {string} [opts.untilIso] - upper bound; defaults to now.
+ * @returns {{input_tokens:number,output_tokens:number,total_tokens:number,calls:number,measured:boolean}}
+ */
+function sumRunUsage(opts = {}) {
+  const sinceMs = opts && opts.sinceIso != null ? Date.parse(opts.sinceIso) : NaN;
+  if (!Number.isFinite(sinceMs)) return { ...EMPTY };
+  const untilMs = opts && opts.untilIso != null && Number.isFinite(Date.parse(opts.untilIso))
+    ? Date.parse(opts.untilIso)
+    : Date.now();
+
+  let raw;
+  try {
+    const file = resolveTraceFile();
+    if (!fs.existsSync(file)) return { ...EMPTY };
+    raw = fs.readFileSync(file, 'utf8');
+  } catch (_) {
+    return { ...EMPTY };
+  }
+
+  let secret = null;
+  try { secret = resolveEvomapNodeSecret(); } catch (_) { secret = null; }
+
+  let input = 0;
+  let output = 0;
+  let calls = 0;
+  for (const line of raw.split('\n')) {
+    const s = line.trim();
+    if (!s) continue;
+    let row;
+    try { row = JSON.parse(s); } catch (_) { continue; }
+    if (row && row.encrypted) {
+      if (!secret) continue; // cannot decrypt -> treat as unobserved
+      try { row = decryptTraceEnvelope(row, secret); } catch (_) { continue; }
+    }
+    if (!row || typeof row !== 'object') continue;
+    const ms = _rowTimestampMs(row);
+    if (ms == null || ms < sinceMs || ms > untilMs) continue;
+    const i = Number(row.input_tokens);
+    const o = Number(row.output_tokens);
+    const hasI = Number.isFinite(i) && i > 0;
+    const hasO = Number.isFinite(o) && o > 0;
+    if (hasI) input += i;
+    if (hasO) output += o;
+    if (hasI || hasO) calls += 1;
+  }
+
+  if (calls === 0) return { ...EMPTY };
+  return {
+    input_tokens: input,
+    output_tokens: output,
+    total_tokens: input + output,
+    calls,
+    measured: true,
+  };
+}
+
+module.exports = { sumRunUsage };

package/CONTRIBUTING.md

@@ -1,11 +0,0 @@
-## Contributing
-
-Thank you for contributing. Please follow these rules:
-
-- Do not use emoji (except the DNA emoji in documentation if needed).
-- Keep changes small and reviewable.
-- Update related documentation when you change behavior.
-- Run `node index.js` for a quick sanity check.
-
-Submit PRs with clear intent and scope.
-

package/scripts/a2a_export.js

@@ -1,63 +0,0 @@
-const { loadGenes, loadCapsules, readAllEvents } = require('../src/gep/assetStore');
-const { exportEligibleCapsules, exportEligibleGenes, isAllowedA2AAsset } = require('../src/gep/a2a');
-const { buildPublish, buildHello, getTransport } = require('../src/gep/a2aProtocol');
-const { computeAssetId, SCHEMA_VERSION } = require('../src/gep/contentHash');
-
-function main() {
-  var args = process.argv.slice(2);
-  var asJson = args.includes('--json');
-  var asProtocol = args.includes('--protocol');
-  var withHello = args.includes('--hello');
-  var persist = args.includes('--persist');
-  var includeEvents = args.includes('--include-events');
-
-  var capsules = loadCapsules();
-  var genes = loadGenes();
-  var events = readAllEvents();
-
-  // Build eligible list: Capsules (filtered) + Genes (filtered) + Events (opt-in)
-  var eligibleCapsules = exportEligibleCapsules({ capsules: capsules, events: events });
-  var eligibleGenes = exportEligibleGenes({ genes: genes });
-  var eligible = eligibleCapsules.concat(eligibleGenes);
-
-  if (includeEvents) {
-    var eligibleEvents = (Array.isArray(events) ? events : []).filter(function (e) {
-      return isAllowedA2AAsset(e) && e.type === 'EvolutionEvent';
-    });
-    for (var ei = 0; ei < eligibleEvents.length; ei++) {
-      var ev = eligibleEvents[ei];
-      if (!ev.schema_version) ev.schema_version = SCHEMA_VERSION;
-      if (!ev.asset_id) { try { ev.asset_id = computeAssetId(ev); } catch (e) {} }
-    }
-    eligible = eligible.concat(eligibleEvents);
-  }
-
-  if (withHello || asProtocol) {
-    var hello = buildHello({ geneCount: genes.length, capsuleCount: capsules.length });
-    process.stdout.write(JSON.stringify(hello) + '\n');
-    if (persist) { try { getTransport().send(hello); } catch (e) {} }
-  }
-
-  if (asProtocol) {
-    for (var i = 0; i < eligible.length; i++) {
-      var msg = buildPublish({ asset: eligible[i] });
-      process.stdout.write(JSON.stringify(msg) + '\n');
-      if (persist) { try { getTransport().send(msg); } catch (e) {} }
-    }
-    return;
-  }
-
-  if (asJson) {
-    process.stdout.write(JSON.stringify(eligible, null, 2) + '\n');
-    return;
-  }
-
-  for (var j = 0; j < eligible.length; j++) {
-    process.stdout.write(JSON.stringify(eligible[j]) + '\n');
-  }
-}
-
-try { main(); } catch (e) {
-  process.stderr.write((e && e.message ? e.message : String(e)) + '\n');
-  process.exit(1);
-}

package/scripts/a2a_ingest.js

@@ -1,79 +0,0 @@
-var fs = require('fs');
-var assetStore = require('../src/gep/assetStore');
-var a2a = require('../src/gep/a2a');
-var memGraph = require('../src/gep/memoryGraphAdapter');
-var contentHash = require('../src/gep/contentHash');
-var a2aProto = require('../src/gep/a2aProtocol');
-
-function readStdin() {
-  try { return fs.readFileSync(0, 'utf8'); } catch (e) { return ''; }
-}
-
-function parseSignalsFromEnv() {
-  var raw = process.env.A2A_SIGNALS || '';
-  if (!raw) return [];
-  try {
-    var maybe = JSON.parse(raw);
-    if (Array.isArray(maybe)) return maybe.map(String).filter(Boolean);
-  } catch (e) {}
-  return String(raw).split(',').map(function (s) { return s.trim(); }).filter(Boolean);
-}
-
-function main() {
-  var args = process.argv.slice(2);
-  var inputPath = '';
-  for (var i = 0; i < args.length; i++) {
-    if (args[i] && !args[i].startsWith('--')) { inputPath = args[i]; break; }
-  }
-  var source = process.env.A2A_SOURCE || 'external';
-  var factor = Number.isFinite(Number(process.env.A2A_EXTERNAL_CONFIDENCE_FACTOR))
-    ? Number(process.env.A2A_EXTERNAL_CONFIDENCE_FACTOR) : 0.6;
-
-  var text = inputPath ? a2a.readTextIfExists(inputPath) : readStdin();
-  var parsed = a2a.parseA2AInput(text);
-  var signals = parseSignalsFromEnv();
-
-  var accepted = 0;
-  var rejected = 0;
-  var emitDecisions = process.env.A2A_EMIT_DECISIONS === 'true';
-
-  for (var j = 0; j < parsed.length; j++) {
-    var obj = parsed[j];
-    if (!a2a.isAllowedA2AAsset(obj)) continue;
-
-    if (obj.asset_id && typeof obj.asset_id === 'string') {
-      if (!contentHash.verifyAssetId(obj)) {
-        rejected += 1;
-        if (emitDecisions) {
-          try {
-            var dm = a2aProto.buildDecision({ assetId: obj.asset_id, localId: obj.id, decision: 'reject', reason: 'asset_id integrity check failed' });
-            a2aProto.getTransport().send(dm);
-          } catch (e) {}
-        }
-        continue;
-      }
-    }
-
-    var staged = a2a.lowerConfidence(obj, { source: source, factor: factor });
-    if (!staged) continue;
-
-    assetStore.appendExternalCandidateJsonl(staged);
-    try { memGraph.recordExternalCandidate({ asset: staged, source: source, signals: signals }); } catch (e) {}
-
-    if (emitDecisions) {
-      try {
-        var dm2 = a2aProto.buildDecision({ assetId: staged.asset_id, localId: staged.id, decision: 'quarantine', reason: 'staged as external candidate' });
-        a2aProto.getTransport().send(dm2);
-      } catch (e) {}
-    }
-
-    accepted += 1;
-  }
-
-  process.stdout.write('accepted=' + accepted + ' rejected=' + rejected + '\n');
-}
-
-try { main(); } catch (e) {
-  process.stderr.write((e && e.message ? e.message : String(e)) + '\n');
-  process.exit(1);
-}

package/scripts/a2a_promote.js

@@ -1,118 +0,0 @@
-var assetStore = require('../src/gep/assetStore');
-var solidifyMod = require('../src/gep/solidify');
-var contentHash = require('../src/gep/contentHash');
-var a2aProto = require('../src/gep/a2aProtocol');
-
-function parseArgs(argv) {
-  var out = { flags: new Set(), kv: new Map(), positionals: [] };
-  for (var i = 0; i < argv.length; i++) {
-    var a = argv[i];
-    if (!a) continue;
-    if (a.startsWith('--')) {
-      var eq = a.indexOf('=');
-      if (eq > -1) { out.kv.set(a.slice(2, eq), a.slice(eq + 1)); }
-      else {
-        var key = a.slice(2);
-        var next = argv[i + 1];
-        if (next && !String(next).startsWith('--')) { out.kv.set(key, next); i++; }
-        else { out.flags.add(key); }
-      }
-    } else { out.positionals.push(a); }
-  }
-  return out;
-}
-
-function main() {
-  var args = parseArgs(process.argv.slice(2));
-  var id = String(args.kv.get('id') || '').trim();
-  var typeRaw = String(args.kv.get('type') || '').trim().toLowerCase();
-  var validated = args.flags.has('validated') || String(args.kv.get('validated') || '') === 'true';
-  var limit = Number.isFinite(Number(args.kv.get('limit'))) ? Number(args.kv.get('limit')) : 500;
-
-  if (!id || !typeRaw) throw new Error('Usage: node scripts/a2a_promote.js --type capsule|gene|event --id <id> --validated');
-  if (!validated) throw new Error('Refusing to promote without --validated (local verification must be done first).');
-
-  var type = typeRaw === 'capsule' ? 'Capsule' : typeRaw === 'gene' ? 'Gene' : typeRaw === 'event' ? 'EvolutionEvent' : '';
-  if (!type) throw new Error('Invalid --type. Use capsule, gene, or event.');
-
-  var external = assetStore.readRecentExternalCandidates(limit);
-  var candidate = null;
-  for (var i = 0; i < external.length; i++) {
-    if (external[i] && external[i].type === type && String(external[i].id) === id) { candidate = external[i]; break; }
-  }
-  if (!candidate) throw new Error('Candidate not found in external zone: type=' + type + ' id=' + id);
-
-  if (type === 'Gene') {
-    var validation = Array.isArray(candidate.validation) ? candidate.validation : [];
-    for (var j = 0; j < validation.length; j++) {
-      var c = String(validation[j] || '').trim();
-      if (!c) continue;
-      if (!solidifyMod.isValidationCommandAllowed(c)) {
-        throw new Error('Refusing to promote Gene ' + id + ': validation command rejected by safety check: "' + c + '". Only node/npm/npx commands without shell operators are allowed.');
-      }
-    }
-  }
-
-  var promoted = JSON.parse(JSON.stringify(candidate));
-  if (!promoted.a2a || typeof promoted.a2a !== 'object') promoted.a2a = {};
-  promoted.a2a.status = 'promoted';
-  promoted.a2a.promoted_at = new Date().toISOString();
-  if (!promoted.schema_version) promoted.schema_version = contentHash.SCHEMA_VERSION;
-  promoted.asset_id = contentHash.computeAssetId(promoted);
-
-  var emitDecisions = process.env.A2A_EMIT_DECISIONS === 'true';
-
-  if (type === 'EvolutionEvent') {
-    assetStore.appendEventJsonl(promoted);
-    if (emitDecisions) {
-      try {
-        var dmEv = a2aProto.buildDecision({ assetId: promoted.asset_id, localId: id, decision: 'accept', reason: 'event promoted for provenance tracking' });
-        a2aProto.getTransport().send(dmEv);
-      } catch (e) {}
-    }
-    process.stdout.write('promoted_event=' + id + '\n');
-    return;
-  }
-
-  if (type === 'Capsule') {
-    assetStore.appendCapsule(promoted);
-    if (emitDecisions) {
-      try {
-        var dm = a2aProto.buildDecision({ assetId: promoted.asset_id, localId: id, decision: 'accept', reason: 'capsule promoted after validation' });
-        a2aProto.getTransport().send(dm);
-      } catch (e) {}
-    }
-    process.stdout.write('promoted_capsule=' + id + '\n');
-    return;
-  }
-
-  var localGenes = assetStore.loadGenes();
-  var exists = false;
-  for (var k = 0; k < localGenes.length; k++) {
-    if (localGenes[k] && localGenes[k].type === 'Gene' && String(localGenes[k].id) === id) { exists = true; break; }
-  }
-  if (exists) {
-    if (emitDecisions) {
-      try {
-        var dm2 = a2aProto.buildDecision({ assetId: promoted.asset_id, localId: id, decision: 'reject', reason: 'local gene with same ID already exists' });
-        a2aProto.getTransport().send(dm2);
-      } catch (e) {}
-    }
-    process.stdout.write('conflict_keep_local_gene=' + id + '\n');
-    return;
-  }
-
-  assetStore.upsertGene(promoted);
-  if (emitDecisions) {
-    try {
-      var dm3 = a2aProto.buildDecision({ assetId: promoted.asset_id, localId: id, decision: 'accept', reason: 'gene promoted after safety audit' });
-      a2aProto.getTransport().send(dm3);
-    } catch (e) {}
-  }
-  process.stdout.write('promoted_gene=' + id + '\n');
-}
-
-try { main(); } catch (e) {
-  process.stderr.write((e && e.message ? e.message : String(e)) + '\n');
-  process.exit(1);
-}

package/scripts/analyze_by_skill.js

@@ -1,121 +0,0 @@
-const fs = require('fs');
-const path = require('path');
-
-const REPO_ROOT = path.resolve(__dirname, '..');
-const LOG_FILE = path.join(REPO_ROOT, 'evolution_history_full.md');
-const OUT_FILE = path.join(REPO_ROOT, 'evolution_detailed_report.md');
-
-function analyzeEvolution() {
-    if (!fs.existsSync(LOG_FILE)) {
-        console.error("Source file missing.");
-        return;
-    }
-
-    const content = fs.readFileSync(LOG_FILE, 'utf8');
-    // Split by divider
-    const entries = content.split('---').map(e => e.trim()).filter(e => e.length > 0);
-
-    const skillUpdates = {}; // Map<SkillName, Array<Changes>>
-    const generalUpdates = []; // Array<Changes>
-
-    // Regex to detect skills/paths
-    // e.g. `skills/feishu-card/send.js` or **Target**: `skills/git-sync`
-    const skillRegex = /skills\/([a-zA-Z0-9\-_]+)/;
-    const actionRegex = /Action:\s*([\s\S]*?)(?=\n\n|\n[A-Z]|$)/i; // Capture Action text
-    const statusRegex = /Status:\s*\[?([A-Z\s_]+)\]?/i;
-
-    entries.forEach(entry => {
-        // Extract basic info
-        const statusMatch = entry.match(statusRegex);
-        const status = statusMatch ? statusMatch[1].trim().toUpperCase() : 'UNKNOWN';
-        
-        // Skip routine checks if we want a *detailed evolution* report (focus on changes)
-        // But user asked for "what happened", so routine scans might be boring unless they found something.
-        // Let's filter out "STABILITY" or "RUNNING" unless there is a clear "Mutated" or "Fixed" keyword.
-        const isInteresting = 
-            entry.includes('Fixed') || 
-            entry.includes('Hardened') || 
-            entry.includes('Optimized') || 
-            entry.includes('Patched') || 
-            entry.includes('Created') || 
-            entry.includes('Added') ||
-            status === 'SUCCESS' ||
-            status === 'COMPLETED';
-
-        if (!isInteresting) return;
-
-        // Find associated skill
-        const skillMatch = entry.match(skillRegex);
-        let skillName = 'General / System';
-        if (skillMatch) {
-            skillName = skillMatch[1];
-        } else {
-            // Try heuristics
-            if (entry.toLowerCase().includes('feishu card')) skillName = 'feishu-card';
-            else if (entry.toLowerCase().includes('git sync')) skillName = 'git-sync';
-            else if (entry.toLowerCase().includes('logger')) skillName = 'interaction-logger';
-            else if (entry.toLowerCase().includes('evolve')) skillName = 'capability-evolver';
-        }
-
-        // Extract description
-        let description = "";
-        const actionMatch = entry.match(actionRegex);
-        if (actionMatch) {
-            description = actionMatch[1].trim();
-        } else {
-            // Fallback: take lines that look like bullet points or text after header
-            const lines = entry.split('\n');
-            description = lines.filter(l => l.match(/^[•\-\*]|\w/)).slice(1).join('\n').trim();
-        }
-
-        // Clean up description (remove duplicate "Action:" prefix if captured)
-        description = description.replace(/^Action:\s*/i, '');
-
-        if (!skillUpdates[skillName]) skillUpdates[skillName] = [];
-        
-        // Dedup descriptions slightly (simple check)
-        const isDuplicate = skillUpdates[skillName].some(u => u.desc.includes(description.substring(0, 20)));
-        if (!isDuplicate) {
-            // Extract Date if possible
-            const dateMatch = entry.match(/\((\d{4}\/\d{1,2}\/\d{1,2}.*?)\)/);
-            const date = dateMatch ? dateMatch[1] : 'Unknown';
-            
-            skillUpdates[skillName].push({
-                date,
-                status,
-                desc: description
-            });
-        }
-    });
-
-    // Generate Markdown
-    let md = "# Detailed Evolution Report (By Skill)\n\n> Comprehensive breakdown of system changes.\n\n";
-
-    // Sort skills alphabetically
-    const sortedSkills = Object.keys(skillUpdates).sort();
-
-    sortedSkills.forEach(skill => {
-        md += `## ${skill}\n`;
-        const updates = skillUpdates[skill];
-        
-        updates.forEach(u => {
-            // Icon based on content
-            let icon = '*';
-            const lowerDesc = u.desc.toLowerCase();
-            if (lowerDesc.includes('optimiz')) icon = '[optimize]';
-            if (lowerDesc.includes('secur') || lowerDesc.includes('harden') || lowerDesc.includes('permission')) icon = '[security]';
-            if (lowerDesc.includes('fix') || lowerDesc.includes('patch')) icon = '[repair]';
-            if (lowerDesc.includes('creat') || lowerDesc.includes('add')) icon = '[add]';
-
-            md += `### ${icon} ${u.date}\n`;
-            md += `${u.desc}\n\n`;
-        });
-        md += `---\n`;
-    });
-
-    fs.writeFileSync(OUT_FILE, md);
-    console.log(`Generated report for ${sortedSkills.length} skills.`);
-}
-
-analyzeEvolution();
-