@evomap/evolver 1.89.15 → 1.89.18

package/README.ja-JP.md

@@ -1,6 +1,6 @@
 # 🧬 Evolver
 
-[![GitHub stars](https://img.shields.io/badge/Stars-8.7k-2b3137?logo=github&logoColor=white)](https://github.com/EvoMap/evolver/stargazers)
+[![GitHub stars](https://img.shields.io/badge/Stars-8.8k-2b3137?logo=github&logoColor=white)](https://github.com/EvoMap/evolver/stargazers)
 [![License: GPL-3.0](https://img.shields.io/badge/License-GPL--3.0-blue.svg)](https://opensource.org/licenses/GPL-3.0)
 [![Node.js >= 18](https://img.shields.io/badge/Node.js-%3E%3D%2018-green.svg)](https://nodejs.org/)
 [![npm downloads](https://img.shields.io/npm/dm/@evomap/evolver.svg)](https://www.npmjs.com/package/@evomap/evolver)

package/README.ko-KR.md

@@ -1,6 +1,6 @@
 # 🧬 Evolver
 
-[![GitHub stars](https://img.shields.io/badge/Stars-8.7k-2b3137?logo=github&logoColor=white)](https://github.com/EvoMap/evolver/stargazers)
+[![GitHub stars](https://img.shields.io/badge/Stars-8.8k-2b3137?logo=github&logoColor=white)](https://github.com/EvoMap/evolver/stargazers)
 [![License: GPL-3.0](https://img.shields.io/badge/License-GPL--3.0-blue.svg)](https://opensource.org/licenses/GPL-3.0)
 [![Node.js >= 18](https://img.shields.io/badge/Node.js-%3E%3D%2018-green.svg)](https://nodejs.org/)
 [![npm downloads](https://img.shields.io/npm/dm/@evomap/evolver.svg)](https://www.npmjs.com/package/@evomap/evolver)

package/README.md

@@ -1,6 +1,6 @@
 # 🧬 Evolver
 
-[![GitHub stars](https://img.shields.io/badge/Stars-8.7k-2b3137?logo=github&logoColor=white)](https://github.com/EvoMap/evolver/stargazers)
+[![GitHub stars](https://img.shields.io/badge/Stars-8.8k-2b3137?logo=github&logoColor=white)](https://github.com/EvoMap/evolver/stargazers)
 [![License: GPL-3.0](https://img.shields.io/badge/License-GPL--3.0-blue.svg)](https://opensource.org/licenses/GPL-3.0)
 [![Node.js >= 18](https://img.shields.io/badge/Node.js-%3E%3D%2018-green.svg)](https://nodejs.org/)
 [![npm downloads](https://img.shields.io/npm/dm/@evomap/evolver.svg)](https://www.npmjs.com/package/@evomap/evolver)

package/README.zh-CN.md

@@ -1,6 +1,6 @@
 # 🧬 Evolver
 
-[![GitHub stars](https://img.shields.io/badge/Stars-8.7k-2b3137?logo=github&logoColor=white)](https://github.com/EvoMap/evolver/stargazers)
+[![GitHub stars](https://img.shields.io/badge/Stars-8.8k-2b3137?logo=github&logoColor=white)](https://github.com/EvoMap/evolver/stargazers)
 [![License: GPL-3.0](https://img.shields.io/badge/License-GPL--3.0-blue.svg)](https://opensource.org/licenses/GPL-3.0)
 [![Node.js >= 18](https://img.shields.io/badge/Node.js-%3E%3D%2018-green.svg)](https://nodejs.org/)
 [![npm downloads](https://img.shields.io/npm/dm/@evomap/evolver.svg)](https://www.npmjs.com/package/@evomap/evolver)

package/index.js

@@ -464,6 +464,68 @@ function writeCycleProgressAtomic(progressPath, fields) {
   }
 }
 
+function handleCycleTimeout({ error, cycleProgressPath, progressFields, suicideEnabled, args, logPath, spawnReplacementFn }) {
+  const msg = error && error.message ? String(error.message) : String(error);
+  console.error('[Daemon] ' + msg);
+
+  if (!suicideEnabled) {
+    console.warn('[Daemon] Cycle hard-timeout treated as non-fatal because EVOLVER_SUICIDE=false.');
+    writeCycleProgressAtomic(cycleProgressPath, Object.assign({}, progressFields, {
+      phase: 'cycle_timeout_nonfatal',
+    }));
+    return { action: 'continue' };
+  }
+
+  writeCycleProgressAtomic(cycleProgressPath, Object.assign({}, progressFields, {
+    phase: 'cycle_timeout_respawn',
+  }));
+  spawnReplacementFn({
+    reason: 'cycle_hard_timeout',
+    args: args,
+    logPath: logPath,
+  });
+  return { action: 'respawn' };
+}
+
+function logTimedOutEvolveRejection(error, logFn) {
+  const lateMsg = error && error.message ? String(error.message) : String(error);
+  try {
+    logFn('[Daemon] Timed-out evolve.run() eventually rejected: ' + lateMsg);
+  } catch (logError) {
+    const fallbackMsg = logError && logError.message ? String(logError.message) : String(logError);
+    console.error('[Daemon] Failed to log timed-out evolve.run() rejection: ' + fallbackMsg);
+  }
+}
+
+function observeTimedOutEvolvePromise(evolvePromise, logFn = console.error) {
+  if (!evolvePromise || typeof evolvePromise.then !== 'function') {
+    return { status: 'ignored' };
+  }
+
+  Promise.resolve(evolvePromise).then(
+    function () {},
+    function (error) {
+      logTimedOutEvolveRejection(error, logFn);
+    }
+  );
+
+  return { status: 'observing' };
+}
+
+async function waitForTimedOutEvolvePromise(evolvePromise, logFn = console.error) {
+  if (!evolvePromise || typeof evolvePromise.then !== 'function') {
+    return { status: 'ignored' };
+  }
+
+  try {
+    await evolvePromise;
+    return { status: 'resolved' };
+  } catch (error) {
+    logTimedOutEvolveRejection(error, logFn);
+    return { status: 'rejected' };
+  }
+}
+
 function getLastSignals(statePath) {
   try {
     const st = readJsonSafe(statePath);
@@ -1357,6 +1419,7 @@ async function main() {
             const { startProxy } = require('./src/proxy');
             const proxyInfo = await startProxy({
               hubUrl: process.env.A2A_HUB_URL,
+              clientSettings: {},
             });
             console.log('[Proxy] Started on ' + proxyInfo.url);
             try {
@@ -1592,13 +1655,12 @@ async function main() {
             if (typeof progressTicker.unref === 'function') progressTicker.unref();
           }
           let cycleTimeoutHandle = null;
-          let cycleTimedOut = false;
+          let evolvePromise = null;
           try {
-            const evolvePromise = evolve.run();
+            evolvePromise = evolve.run();
             if (cycleTimeoutEnabled && cycleTimeoutMs > 0) {
               const timeoutPromise = new Promise(function (_, reject) {
                 cycleTimeoutHandle = setTimeout(function () {
-                  cycleTimedOut = true;
                   reject(new CycleTimeoutError(cycleTimeoutMs, 'evolve.run', cycleCount));
                 }, cycleTimeoutMs);
                 if (cycleTimeoutHandle && typeof cycleTimeoutHandle.unref === 'function') cycleTimeoutHandle.unref();
@@ -1621,25 +1683,32 @@ async function main() {
           } catch (error) {
             const msg = error && error.message ? String(error.message) : String(error);
             if (error && error.code === 'CYCLE_TIMEOUT') {
-              console.error('[Daemon] ' + msg);
               if (progressTicker) { clearInterval(progressTicker); progressTicker = null; }
               if (cycleTimeoutHandle) { clearTimeout(cycleTimeoutHandle); cycleTimeoutHandle = null; }
-              writeCycleProgressAtomic(cycleProgressPath, {
-                pid: process.pid,
-                outer_cycle: cycleCount,
-                inner_cycle: cycleCount,
-                started_at: t0,
-                phase: 'cycle_timeout_respawn',
-              });
-              spawnReplacementProcess({
-                reason: 'cycle_hard_timeout',
-                args: args,
+              const timeoutAction = handleCycleTimeout({
+                error,
+                cycleProgressPath,
+                progressFields: {
+                  pid: process.pid,
+                  outer_cycle: cycleCount,
+                  inner_cycle: cycleCount,
+                  started_at: t0,
+                },
+                suicideEnabled,
+                args,
                 logPath: getEvolverLogPath(),
+                spawnReplacementFn: spawnReplacementProcess,
               });
-              releaseLock();
-              process.exit(1);
+              if (timeoutAction.action === 'respawn') {
+                releaseLock();
+                process.exit(1);
+              }
+              if (timeoutAction.action === 'continue') {
+                await waitForTimedOutEvolvePromise(evolvePromise);
+              }
+            } else {
+              console.error(`Evolution cycle failed: ${msg}`);
             }
-            console.error(`Evolution cycle failed: ${msg}`);
           } finally {
             if (progressTicker) { clearInterval(progressTicker); progressTicker = null; }
             if (cycleTimeoutHandle) { clearTimeout(cycleTimeoutHandle); cycleTimeoutHandle = null; }
@@ -3328,5 +3397,8 @@ module.exports = {
   parseBoolEnv,
   CycleTimeoutError,
   writeCycleProgressAtomic,
+  handleCycleTimeout,
+  observeTimedOutEvolvePromise,
+  waitForTimedOutEvolvePromise,
   spawnReplacementProcess,
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@evomap/evolver",
-  "version": "1.89.15",
+  "version": "1.89.18",
   "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/adapters/claudeCode.js

@@ -1,12 +1,41 @@
 const fs = require('fs');
 const path = require('path');
-const { mergeJsonFile, copyHookScripts, appendSectionToFile, removeHookScripts, removeMarkedSection, assertSafeConfigDir } = require('./hookAdapter');
+const { mergeJsonFile, copyHookScripts, appendSectionToFile, removeHookScripts, removeMarkedSection, assertSafeConfigDir, isEvolverHookCommand } = require('./hookAdapter');
 
 const HOOK_SCRIPTS_DIR_NAME = 'hooks';
 const EVOLVER_MARKER = '<!-- evolver-evolution-memory -->';
 
-function buildClaudeHooks(evolverRoot) {
-  const scriptsBase = '.claude/hooks';
+function shellSingleQuote(value) {
+  return `'${String(value).replace(/'/g, "'\\''")}'`;
+}
+
+function quoteEvalScript(script) {
+  if (process.platform === 'win32') {
+    if (script.includes('"')) {
+      throw new Error('unexpected double quote in generated hook wrapper');
+    }
+    return `"${script}"`;
+  }
+  return shellSingleQuote(script);
+}
+
+function buildSafeNodeHookCommand(scriptPath) {
+  const encodedPath = Buffer.from(String(scriptPath), 'utf8').toString('base64');
+  const js = [
+    "const {spawnSync}=require('child_process')",
+    `const p=Buffer.from('${encodedPath}','base64').toString('utf8')`,
+    "const r=spawnSync(process.execPath,[p],{stdio:'inherit',shell:false})",
+    "if(r.error){throw r.error}",
+    'process.exit(r.status == null ? 1 : r.status)',
+  ].join(';');
+  return `node -e ${quoteEvalScript(js)} ${path.basename(scriptPath)}`;
+}
+
+function buildClaudeHooks(evolverRoot, configRoot) {
+  const scriptsBase = configRoot
+    ? path.join(configRoot, '.claude', 'hooks')
+    : path.join('.claude', 'hooks');
+  const hookCommand = (scriptName) => buildSafeNodeHookCommand(path.join(scriptsBase, scriptName));
   return {
     hooks: {
       SessionStart: [
@@ -14,7 +43,7 @@ function buildClaudeHooks(evolverRoot) {
           hooks: [
             {
               type: 'command',
-              command: `node ${scriptsBase}/evolver-session-start.js`,
+              command: hookCommand('evolver-session-start.js'),
               timeout: 3,
             },
           ],
@@ -32,7 +61,7 @@ function buildClaudeHooks(evolverRoot) {
               // ABOVE that watchdog, so the host never kills the script
               // mid-write. A stuck/slow recall can never block or erase the
               // user's prompt.
-              command: `node ${scriptsBase}/evolver-task-recall.js`,
+              command: hookCommand('evolver-task-recall.js'),
               timeout: 5,
             },
           ],
@@ -44,7 +73,7 @@ function buildClaudeHooks(evolverRoot) {
           hooks: [
             {
               type: 'command',
-              command: `node ${scriptsBase}/evolver-signal-detect.js`,
+              command: hookCommand('evolver-signal-detect.js'),
               timeout: 2,
             },
           ],
@@ -55,7 +84,7 @@ function buildClaudeHooks(evolverRoot) {
           hooks: [
             {
               type: 'command',
-              command: `node ${scriptsBase}/evolver-session-end.js`,
+              command: hookCommand('evolver-session-end.js'),
               timeout: 8,
             },
           ],
@@ -99,7 +128,7 @@ function install({ configRoot, evolverRoot, force }) {
 
   fs.mkdirSync(claudeDir, { recursive: true });
 
-  const hooksCfg = buildClaudeHooks(evolverRoot);
+  const hooksCfg = buildClaudeHooks(evolverRoot, configRoot);
   mergeJsonFile(settingsPath, hooksCfg);
   console.log('[claude-code] Wrote ' + settingsPath);
 
@@ -146,7 +175,7 @@ function uninstall({ configRoot }) {
                 const innerBefore = matcher.hooks.length;
                 const filtered = matcher.hooks.filter(h => {
                   const cmd = (h && h.command) || '';
-                  return !cmd.includes('evolver-session') && !cmd.includes('evolver-signal') && !cmd.includes('evolver-task-recall');
+                  return !isEvolverHookCommand(cmd);
                 });
                 // A matcher containing both evolver and user hooks shrinks
                 // its inner array without changing the outer matcher count.

package/src/adapters/codex.js

@@ -1,6 +1,6 @@
 const fs = require('fs');
 const path = require('path');
-const { mergeJsonFile, copyHookScripts, appendSectionToFile, removeHookScripts, removeMarkedSection, assertSafeConfigDir } = require('./hookAdapter');
+const { mergeJsonFile, copyHookScripts, appendSectionToFile, removeHookScripts, removeMarkedSection, assertSafeConfigDir, isEvolverHookCommand } = require('./hookAdapter');
 
 const HOOK_SCRIPTS_DIR_NAME = 'hooks';
 const EVOLVER_MARKER = '<!-- evolver-evolution-memory -->';
@@ -166,7 +166,7 @@ function uninstall({ configRoot }) {
             const before = data.hooks[event].length;
             data.hooks[event] = data.hooks[event].filter(h => {
               const cmd = (h && h.command) || '';
-              return !cmd.includes('evolver-session') && !cmd.includes('evolver-signal');
+              return !isEvolverHookCommand(cmd);
             });
             if (data.hooks[event].length !== before) touched = true;
             if (data.hooks[event].length === 0) delete data.hooks[event];

package/src/adapters/hookAdapter.js

@@ -10,7 +10,30 @@ const PLATFORMS = {
   opencode: { name: 'opencode', configDir: '.opencode', detector: '.opencode' },
 };
 
+function detectPlatformFromEnv(env = process.env) {
+  const hasStrongClaudeSignal = env.CLAUDECODE || env.CLAUDE_CODE_ENTRYPOINT;
+  if (hasStrongClaudeSignal) {
+    return 'claude-code';
+  }
+
+  const hasCursorSignal =
+    env.CURSOR_TRACE_ID ||
+    env.CURSOR_SESSION_ID ||
+    env.CURSOR_PROJECT_DIR ||
+    String(env.TERM_PROGRAM || '').toLowerCase() === 'cursor';
+  if (hasCursorSignal) {
+    return 'cursor';
+  }
+  if (env.CLAUDE_PROJECT_DIR) {
+    return 'claude-code';
+  }
+  return null;
+}
+
 function detectPlatform(cwd) {
+  const envPlatform = detectPlatformFromEnv();
+  if (envPlatform) return envPlatform;
+
   const root = cwd || process.cwd();
   const home = os.homedir();
   for (const [id, meta] of Object.entries(PLATFORMS)) {
@@ -76,7 +99,7 @@ function mergeWithHooksUnion(target, source) {
       if (tArr && sArr) {
         const isEvolverOwned = (entry) => {
           const cmds = collectCommands(entry);
-          return cmds.some(c => c.includes('evolver-session') || c.includes('evolver-signal') || c.includes('evolver-task-recall'));
+          return cmds.some(isEvolverHookCommand);
         };
         const userEntries = tArr.filter(e => !isEvolverOwned(e));
         result.hooks[event] = [...userEntries, ...sArr];
@@ -101,6 +124,17 @@ function collectCommands(entry) {
   return out;
 }
 
+function isEvolverHookCommand(command) {
+  if (typeof command !== 'string') return false;
+  return command.includes('evolver-session') ||
+    command.includes('evolver-signal') ||
+    command.includes('evolver-task-recall') ||
+    // Legacy installs briefly shipped this companion daemon hook. Treat it
+    // as evolver-owned so reinstall/merge can remove it instead of preserving
+    // a stale supervisor that may point clients at a dead proxy.
+    command.includes('evolver-daemon-start');
+}
+
 function deepMerge(target, source) {
   const result = { ...target };
   for (const key of Object.keys(source)) {
@@ -226,7 +260,7 @@ function removeEvolverHooks(filePath, { markerKey = '_evolver_managed' } = {}) {
           const before = data.hooks[event].length;
           data.hooks[event] = data.hooks[event].filter(h => {
             const cmd = h.command || '';
-            return !cmd.includes('evolver-session') && !cmd.includes('evolver-signal') && !cmd.includes('evolver-task-recall');
+            return !isEvolverHookCommand(cmd);
           });
           if (data.hooks[event].length !== before) changed = true;
           if (data.hooks[event].length === 0) delete data.hooks[event];
@@ -351,6 +385,7 @@ async function setupHooks({ platform, cwd, force, uninstall, evolverRoot } = {})
 }
 
 module.exports = {
+  detectPlatformFromEnv,
   detectPlatform,
   resolveConfigRoot,
   loadAdapter,
@@ -358,6 +393,7 @@ module.exports = {
   deepMerge,
   mergeWithHooksUnion,
   collectCommands,
+  isEvolverHookCommand,
   copyHookScripts,
   appendSectionToFile,
   assertSafeConfigDir,

package/src/adapters/scripts/evolver-session-start.js

@@ -14,6 +14,180 @@ const { filterRelevantOutcomes } = require('./_memoryFiltering');
 // _maybeRestartDaemon's catch-all and silently disable daemon auto-restart.
 const lockPaths = require('./_lockPaths');
 
+function _readJson(file) {
+  try {
+    if (!file || !fs.existsSync(file)) return null;
+    return JSON.parse(fs.readFileSync(file, 'utf8'));
+  } catch (_) {
+    return null;
+  }
+}
+
+function _isLoopbackProxyUrl(value) {
+  const raw = String(value || '').trim();
+  if (!raw) return false;
+  try {
+    const u = new URL(raw);
+    const host = u.hostname.toLowerCase();
+    return u.protocol === 'http:' && (host === '127.0.0.1' || host === 'localhost' || host === '::1' || host === '[::1]');
+  } catch (_) {
+    return false;
+  }
+}
+
+function _stripTomlComment(line) {
+  let out = '';
+  let quote = null;
+  let escaped = false;
+  for (const ch of String(line || '')) {
+    if (escaped) {
+      out += ch;
+      escaped = false;
+      continue;
+    }
+    if (ch === '\\' && quote === '"') {
+      out += ch;
+      escaped = true;
+      continue;
+    }
+    if ((ch === '"' || ch === "'") && !quote) {
+      quote = ch;
+      out += ch;
+      continue;
+    }
+    if (ch === quote) {
+      quote = null;
+      out += ch;
+      continue;
+    }
+    if (ch === '#' && !quote) break;
+    out += ch;
+  }
+  return out.trim();
+}
+
+function _tomlStringValue(value) {
+  const raw = _stripTomlComment(value);
+  const match = raw.match(/^(['"])([\s\S]*)\1$/);
+  return match ? match[2] : raw.trim();
+}
+
+function _codexConfigPath() {
+  if (process.env.CODEX_CONFIG_FILE || process.env.EVOMAP_CODEX_CONFIG_FILE) {
+    return process.env.CODEX_CONFIG_FILE || process.env.EVOMAP_CODEX_CONFIG_FILE;
+  }
+  const home = process.env.HOME || os.homedir();
+  return home ? path.join(home, '.codex', 'config.toml') : null;
+}
+
+function _codexConfigExpectsProxy() {
+  const file = _codexConfigPath();
+  if (!file || !fs.existsSync(file)) return false;
+  let selectedProvider = null;
+  let section = '';
+  const providerUrls = {};
+  try {
+    const content = fs.readFileSync(file, 'utf8');
+    for (const line of content.split(/\r?\n/)) {
+      const clean = _stripTomlComment(line);
+      if (!clean) continue;
+      const sectionMatch = clean.match(/^\[([^\]]+)\]$/);
+      if (sectionMatch) {
+        section = sectionMatch[1].trim();
+        continue;
+      }
+      const kv = clean.match(/^([A-Za-z0-9_.-]+)\s*=\s*([\s\S]+)$/);
+      if (!kv) continue;
+      const key = kv[1].trim();
+      const value = _tomlStringValue(kv[2]);
+      if (!section && key === 'model_provider') {
+        selectedProvider = value;
+        continue;
+      }
+      const providerMatch = section.match(/^model_providers\.([A-Za-z0-9_.-]+)$/);
+      if (providerMatch && key === 'base_url') {
+        providerUrls[providerMatch[1]] = value;
+        continue;
+      }
+      if (!section && key === 'base_url' && _isLoopbackProxyUrl(value)) return true;
+    }
+  } catch {
+    return false;
+  }
+  if (selectedProvider && _isLoopbackProxyUrl(providerUrls[selectedProvider])) return true;
+  return Object.keys(providerUrls).some(name =>
+    /(?:evomap|proxy)/i.test(name) && _isLoopbackProxyUrl(providerUrls[name])
+  );
+}
+
+function _proxyExpected() {
+  if (String(process.env.EVOMAP_PROXY || '').trim() === '1') return true;
+  if (String(process.env.A2A_TRANSPORT || '').trim().toLowerCase() === 'mailbox') return true;
+  if (_isLoopbackProxyUrl(process.env.EVOMAP_PROXY_URL) || _isLoopbackProxyUrl(process.env.ANTHROPIC_BASE_URL)) return true;
+  if (_codexConfigExpectsProxy()) return true;
+
+  const home = process.env.HOME || os.homedir();
+  const settingsFile = process.env.CLAUDE_SETTINGS_FILE || process.env.EVOMAP_CLAUDE_SETTINGS_FILE ||
+    (home ? path.join(home, '.claude', 'settings.json') : null);
+  const settings = _readJson(settingsFile);
+  const cfg = settings && settings.env;
+  return !!(cfg && (
+    _isLoopbackProxyUrl(cfg.EVOMAP_PROXY_URL) ||
+    (String(cfg.EVOMAP_PROXY_AUTO_INJECTED || '') === '1' && _isLoopbackProxyUrl(cfg.ANTHROPIC_BASE_URL))
+  ));
+}
+
+function _proxyReachable(url, token) {
+  if (!_isLoopbackProxyUrl(url) || !token) return false;
+  try {
+    const { execFileSync } = require('child_process');
+    execFileSync(process.execPath, ['-e', `
+const fs = require('fs');
+const http = require('http');
+const url = process.argv[1].replace(/\\/+$/, '') + '/proxy/status';
+const token = fs.readFileSync(0, 'utf8').trim();
+if (!token) process.exit(1);
+const req = http.get(url, { headers: { Authorization: 'Bearer ' + token } }, (res) => {
+  let body = '';
+  res.setEncoding('utf8');
+  res.on('data', (chunk) => {
+    body += chunk;
+    if (body.length > 1024 * 1024) req.destroy(new Error('response too large'));
+  });
+  res.on('end', () => {
+    if (res.statusCode < 200 || res.statusCode >= 300) process.exit(1);
+    let parsed;
+    try { parsed = JSON.parse(body); } catch (_) { process.exit(1); }
+    if (parsed && parsed.status === 'running' && (parsed.proxy_protocol_version || parsed.schema_version || parsed.node_id != null)) {
+      process.exit(0);
+    }
+    process.exit(1);
+  });
+});
+req.setTimeout(700, () => req.destroy(new Error('timeout')));
+req.on('error', () => process.exit(1));
+`, url], { input: String(token), stdio: ['pipe', 'ignore', 'ignore'], timeout: 1200, windowsHide: true });
+    return true;
+  } catch (_) {
+    return false;
+  }
+}
+
+function _proxyHealthyIfExpected() {
+  if (!_proxyExpected()) return true;
+  const dir = process.env.EVOLVER_SETTINGS_DIR || path.join(os.homedir(), '.evolver');
+  const settings = _readJson(path.join(dir, 'settings.json'));
+  const proxy = settings && settings.proxy;
+  if (!proxy || !proxy.url) return false;
+  if (proxy.pid) {
+    try { process.kill(proxy.pid, 0); } catch (e) {
+      if (!(e && e.code === 'EPERM')) return false;
+    }
+  }
+  if (!proxy.token) return false;
+  return _proxyReachable(proxy.url, proxy.token);
+}
+
 // Auto-restart guard: if the evolver daemon is not running when a new agent
 // session starts, attempt a background restart. This covers the "idle-death"
 // scenario: the user closed the machine (macOS sleep), the process died due to
@@ -69,7 +243,7 @@ function _maybeRestartDaemon(evolverRoot) {
       }
     } catch (_) { /* lock file unreadable or absent: assume not running */ }
 
-    if (daemonRunning) return; // already alive, nothing to do
+    if (daemonRunning && _proxyHealthyIfExpected()) return; // already alive, nothing to do
 
     // Daemon appears dead. Spawn lifecycle.js start in the background so
     // this session-start script exits immediately (< 50 ms) and does not
@@ -305,5 +479,11 @@ function main() {
 if (require.main === module) {
   main();
 } else {
-  module.exports = { belongsToWorkspace };
+  module.exports = {
+    belongsToWorkspace,
+    _isLoopbackProxyUrl,
+    _proxyExpected,
+    _proxyReachable,
+    _proxyHealthyIfExpected,
+  };
 }

package/src/atp/atpExecute.js

@@ -31,6 +31,7 @@ const {
   getHubUrl,
   getHubNodeSecret,
   buildHubHeaders,
+  buildNodeScopedHubHeaders,
   sendHelloToHub,
 } = require('../gep/a2aProtocol');
 const { submitDelivery } = require('./hubClient');
@@ -126,9 +127,10 @@ function _publishUrl() {
 
 async function _postJson(urlStr, body, timeoutMs) {
   const payload = JSON.stringify(body || {});
+  const buildHeaders = buildNodeScopedHubHeaders || buildHubHeaders;
   const headers = Object.assign(
     { 'Content-Type': 'application/json' },
-    buildHubHeaders() || {},
+    buildHeaders() || {},
   );
 
   try {

package/src/atp/hubClient.js

@@ -15,7 +15,7 @@
 // bound to 127.0.0.1).
 
 const http = require('http');
-const { getHubUrl, buildHubHeaders, getNodeId } = require('../gep/a2aProtocol');
+const { getHubUrl, buildHubHeaders, buildNodeScopedHubHeaders, getNodeId } = require('../gep/a2aProtocol');
 const { hubFetch } = require('../gep/hubFetch');
 const { getProxyUrl, getProxyToken } = require('../proxy/server/settings');
 
@@ -95,9 +95,10 @@ function _hubPost(pathSuffix, body, timeoutMs) {
   if (!hubUrl) return Promise.resolve({ ok: false, error: 'no_hub_url' });
   const endpoint = hubUrl.replace(/\/+$/, '') + pathSuffix;
   const timeout = timeoutMs || require('../config').HTTP_TRANSPORT_TIMEOUT_MS;
+  const buildHeaders = buildNodeScopedHubHeaders || buildHubHeaders;
   return hubFetch(endpoint, {
     method: 'POST',
-    headers: buildHubHeaders(),
+    headers: buildHeaders(),
     body: JSON.stringify(body),
     signal: AbortSignal.timeout(timeout),
   })
@@ -123,9 +124,10 @@ function _hubGet(pathSuffix, timeoutMs) {
   if (!hubUrl) return Promise.resolve({ ok: false, error: 'no_hub_url' });
   const endpoint = hubUrl.replace(/\/+$/, '') + pathSuffix;
   const timeout = timeoutMs || require('../config').HTTP_TRANSPORT_TIMEOUT_MS;
+  const buildHeaders = buildNodeScopedHubHeaders || buildHubHeaders;
   return hubFetch(endpoint, {
     method: 'GET',
-    headers: buildHubHeaders(),
+    headers: buildHeaders(),
     signal: AbortSignal.timeout(timeout),
   })
     .then(function (res) {

package/src/atp/serviceHelper.js

@@ -1,14 +1,15 @@
 // ATP Service Helper -- wraps marketplace service publishing for merchant agents.
 
-const { getNodeId, buildHubHeaders, getHubUrl } = require('../gep/a2aProtocol');
+const { getNodeId, buildHubHeaders, buildNodeScopedHubHeaders, getHubUrl } = require('../gep/a2aProtocol');
 const { hubFetch } = require('../gep/hubFetch');
 const { HTTP_TRANSPORT_TIMEOUT_MS } = require('../config');
 
 async function postService(endpoint, body) {
   try {
+    const buildHeaders = buildNodeScopedHubHeaders || buildHubHeaders;
     const res = await hubFetch(endpoint, {
       method: 'POST',
-      headers: Object.assign({ 'Content-Type': 'application/json' }, buildHubHeaders() || {}),
+      headers: Object.assign({ 'Content-Type': 'application/json' }, buildHeaders() || {}),
       body: JSON.stringify(body),
       signal: AbortSignal.timeout(HTTP_TRANSPORT_TIMEOUT_MS),
     });