specmem-hardwicksoftware 3.7.36 → 3.7.38

package/scripts/specmem-init.cjs

@@ -1317,11 +1317,26 @@ fi
       if (fs.existsSync(portFile)) try { fs.unlinkSync(portFile); } catch {}
     } catch {}
     // Spawn fresh proxy daemon
+    // Capture original ANTHROPIC_BASE_URL BEFORE we override it to localhost proxy.
+    // If it's a custom API (MiniMax, etc.), pass it as COMPACTION_PROXY_UPSTREAM so the
+    // proxy knows where to forward. For native Claude (no custom URL), leave unset so
+    // proxy defaults to api.anthropic.com with original OAuth headers intact.
+    const originalBaseUrl = process.env.ANTHROPIC_BASE_URL || '';
+    const isCustomApi = originalBaseUrl && !originalBaseUrl.includes('127.0.0.1') && !originalBaseUrl.includes('localhost');
+    const daemonEnv = { ...process.env, SPECMEM_DAEMON: '1' };
+    if (isCustomApi) {
+      daemonEnv.COMPACTION_PROXY_UPSTREAM = originalBaseUrl;
+      initLog(`Custom API detected: ${originalBaseUrl} → COMPACTION_PROXY_UPSTREAM`);
+      // Pass through API key and model for custom upstream
+      if (process.env.ANTHROPIC_AUTH_TOKEN) daemonEnv.COMPACTION_PROXY_API_KEY = process.env.ANTHROPIC_AUTH_TOKEN;
+      else if (process.env.ANTHROPIC_API_KEY) daemonEnv.COMPACTION_PROXY_API_KEY = process.env.ANTHROPIC_API_KEY;
+      if (process.env.ANTHROPIC_MODEL) daemonEnv.COMPACTION_PROXY_MODEL = process.env.ANTHROPIC_MODEL;
+    }
     try {
       const daemonPath = require.resolve('specmem-hardwicksoftware/dist/mcp/compactionProxyDaemon.js');
       const { spawn } = require('child_process');
       const child = spawn(process.execPath, [daemonPath], {
-        detached: true, stdio: 'ignore', env: { ...process.env, SPECMEM_DAEMON: '1' }
+        detached: true, stdio: 'ignore', env: daemonEnv
       });
       child.unref();
       // Wait for daemon to write port file (up to 5s)
@@ -1331,9 +1346,19 @@ fi
           const p = fs.readFileSync(portWaitFile, 'utf8').trim();
           if (p && parseInt(p) > 0) {
             proxyPort = p;
-            // Verify the daemon process is still alive (signal 0 = existence check)
-            try { process.kill(child.pid, 0); proxyAlive = true; } catch {}
-            initLog(`Proxy daemon port file appeared (port ${p}, PID ${child.pid}, alive=${proxyAlive})`);
+            // Verify daemon is alive AND actually listening (not just port file exists)
+            try { process.kill(child.pid, 0); } catch { break; }
+            // TCP liveness check — port file can outlive a crashed daemon
+            try {
+              const { execSync: _tcpCheck } = require('child_process');
+              _tcpCheck(`bash -c 'echo > /dev/tcp/127.0.0.1/${p}'`, { stdio: 'ignore', timeout: 2000 });
+              proxyAlive = true;
+            } catch {
+              // Proxy wrote port file but isn't listening yet — wait and retry
+              initLog(`Port file exists but proxy not listening on port ${p}, retrying...`);
+              continue;
+            }
+            initLog(`Proxy daemon confirmed listening (port ${p}, PID ${child.pid})`);
             break;
           }
         }
@@ -1364,8 +1389,8 @@ fi
       if (fs.existsSync(bashrcPath)) {
         const bashrc = fs.readFileSync(bashrcPath, 'utf8');
         hasProxyFix = bashrc.includes(proxyMarker);
-        // Detect old unconditional version (no port file check) — needs upgrade to conditional
-        if (hasProxyFix && !bashrc.includes('.compaction-proxy-port')) {
+        // Detect old version (no port file check OR no COMPACTION_PROXY_UPSTREAM) — needs upgrade
+        if (hasProxyFix && (!bashrc.includes('.compaction-proxy-port') || !bashrc.includes('COMPACTION_PROXY_UPSTREAM'))) {
           needsUpgrade = true;
         }
       }
@@ -1389,7 +1414,12 @@ fi
       const proxyFix = `
 ${proxyMarker}
 # SpecMem: Route API calls through compaction proxy when it's running
+# Captures original ANTHROPIC_BASE_URL as COMPACTION_PROXY_UPSTREAM before overriding,
+# so the proxy knows where to forward (custom API like MiniMax, or default Anthropic).
 if [ -f "\$HOME/.claude/.compaction-proxy-port" ]; then
+  if [ -n "\$ANTHROPIC_BASE_URL" ] && ! echo "\$ANTHROPIC_BASE_URL" | grep -q '127.0.0.1\\|localhost'; then
+    export COMPACTION_PROXY_UPSTREAM="\$ANTHROPIC_BASE_URL"
+  fi
   export ANTHROPIC_BASE_URL="http://127.0.0.1:\$(cat "\$HOME/.claude/.compaction-proxy-port")"
 fi
 `;
@@ -4060,7 +4090,7 @@ async function coldStartEmbeddingDocker(projectPath, modelConfig, ui, codebaseRe
           try {
             const parsed = JSON.parse(line);
             // Skip "processing" heartbeat - model is still loading
-            if (parsed.status === 'processing') {
+            if (parsed.status === 'working') {
               ui.setSubStatus(`⏳ Processing... (${elapsed}s)`);
               continue;
             }
@@ -4492,7 +4522,7 @@ async function indexCodebase(projectPath, ui, embeddingResult) {
             try {
               const parsed = JSON.parse(completeLine);
               // skip heartbeat/processing status - keep waiting
-              if (parsed.status === 'processing') {
+              if (parsed.status === 'working') {
                 continue;
               }
               // got actual response - check if embedding was returned
@@ -5088,7 +5118,7 @@ async function indexCodebase(projectPath, ui, embeddingResult) {
                 const parsed = JSON.parse(completeLine);
 
                 // FIX: Track heartbeats to detect server backpressure/overload
-                if (parsed.status === 'processing') {
+                if (parsed.status === 'working') {
                   heartbeatCount++;
                   if (heartbeatCount > HEARTBEAT_LIMIT) {
                     settled = true;
@@ -5276,7 +5306,7 @@ async function indexCodebase(projectPath, ui, embeddingResult) {
 
                 // Skip heartbeat/processing status - keep waiting for actual embedding
                 // FIX: Track heartbeats to detect server overload
-                if (parsed.status === 'processing') {
+                if (parsed.status === 'working') {
                   heartbeatCount++;
                   if (heartbeatCount > 20) { // Single embed shouldn't take this long
                     settled = true;
@@ -5495,7 +5525,7 @@ async function indexCodebase(projectPath, ui, embeddingResult) {
             try {
               const resp = JSON.parse(line);
               if (resp.error) { clearTimeout(timeout); settled = true; client.end(); reject(new Error(resp.error)); return; }
-              if (resp.status === 'processing') continue;
+              if (resp.status === 'working') continue;
               if (resp.total_processed !== undefined || resp.processed !== undefined) {
                 clearTimeout(timeout); settled = true; client.end(); resolve(resp); return;
               }
@@ -6745,7 +6775,7 @@ async function extractSessions(projectPath, ui, embeddingResult = null) {
               data = data.slice(newlineIdx + 1);
               try {
                 const parsed = JSON.parse(completeLine);
-                if (parsed.status === 'processing') continue;
+                if (parsed.status === 'working') continue;
                 client.destroy();
                 if (parsed.error) {
                   reject(new Error('Batch embedding error: ' + parsed.error));
@@ -7353,6 +7383,10 @@ async function launchScreenSessions(projectPath, ui) {
         if (fs.existsSync(proxyPortFile)) {
           const pPort = fs.readFileSync(proxyPortFile, 'utf8').trim();
           if (pPort && parseInt(pPort) > 0) {
+            // ANTHROPIC_BASE_URL tells Claude to route through the proxy.
+            // The proxy daemon already has COMPACTION_PROXY_UPSTREAM from its spawn env —
+            // do NOT set it here, because process.env.ANTHROPIC_BASE_URL is already
+            // overwritten to localhost by this point (would create a loop).
             proxyEnv = `ANTHROPIC_BASE_URL="http://127.0.0.1:${pPort}" `;
           }
         }
@@ -7612,6 +7646,37 @@ function syncHooksAndSettings() {
       const hookEventCount = Object.keys(mergedSettings.hooks || {}).length;
       initLog('[HOOKS-SYNC] settings.json merged: ' + hookEventCount + ' hook events, ' + hookCount + ' hook files');
 
+      // ALSO sync to project-level .claude/settings.json if it exists
+      const projectPath = process.cwd();
+      const projectClaudeDir = path.join(projectPath, '.claude');
+      const projectSettingsPath = path.join(projectClaudeDir, 'settings.json');
+
+      if (fs.existsSync(projectSettingsPath)) {
+        try {
+          const projectSettings = JSON.parse(fs.readFileSync(projectSettingsPath, 'utf8'));
+
+          // Merge hooks from src into project settings
+          const srcSettings = JSON.parse(fs.readFileSync(srcSettingsPath, 'utf8'));
+          const mergedProjectHooks = { ...projectSettings.hooks, ...srcSettings.hooks };
+
+          // Preserve existing non-hook settings (env, mcpServers, etc)
+          const finalProjectSettings = {
+            ...projectSettings,
+            hooks: mergedProjectHooks
+          };
+
+          // Backup project settings
+          const projBackup = projectSettingsPath + '.backup.' + Date.now();
+          fs.copyFileSync(projectSettingsPath, projBackup);
+
+          fs.writeFileSync(projectSettingsPath, JSON.stringify(finalProjectSettings, null, 2));
+          const projHookEvents = Object.keys(finalProjectSettings.hooks || {}).length;
+          initLog('[HOOKS-SYNC] Project-level settings.json updated: ' + projHookEvents + ' hook events');
+        } catch (e) {
+          initLog('[HOOKS-SYNC] Project settings merge failed: ' + e.message);
+        }
+      }
+
       // Verify
       const verifySettings = JSON.parse(fs.readFileSync(claudeSettingsPath, 'utf8'));
       const preToolHooks = verifySettings.hooks?.PreToolUse || [];
@@ -8824,6 +8889,28 @@ CREATE INDEX IF NOT EXISTS idx_embedding_queue_project ON embedding_queue (proje
         const permCount = (mergedSettings.permissions?.allow || []).length;
         initLog('[SETUP] settings.json deep-merged: ' + hookEventCount + ' hook events, ' + permCount + ' permissions (user hooks preserved)');
 
+        // ALSO sync hooks to project-level .claude/settings.json if it exists
+        const projectClaudeDir = path.join(projectPath, '.claude');
+        const projectSettingsPath = path.join(projectClaudeDir, 'settings.json');
+
+        if (fs.existsSync(projectSettingsPath)) {
+          try {
+            const projectSettings = JSON.parse(fs.readFileSync(projectSettingsPath, 'utf8'));
+            const mergedProjectHooks = { ...projectSettings.hooks, ...srcSettings.hooks };
+            const finalProjectSettings = { ...projectSettings, hooks: mergedProjectHooks };
+
+            // Backup first
+            const projBackup = projectSettingsPath + '.backup.' + Date.now();
+            fs.copyFileSync(projectSettingsPath, projBackup);
+
+            fs.writeFileSync(projectSettingsPath, JSON.stringify(finalProjectSettings, null, 2));
+            const projHookEvents = Object.keys(finalProjectSettings.hooks || {}).length;
+            initLog('[SETUP] Project-level settings.json updated: ' + projHookEvents + ' hook events');
+          } catch (e) {
+            initLog('[SETUP] Project settings merge failed: ' + e.message);
+          }
+        }
+
         // VERIFICATION: Confirm hooks are properly configured
         const verifySettings = JSON.parse(fs.readFileSync(claudeSettingsPath, 'utf8'));
         const hookEvents = Object.keys(verifySettings.hooks || {});

package/specmem/supervisord.conf

@@ -1,6 +1,6 @@
 ; ============================================
 ; SPECMEM BRAIN CONTAINER - DYNAMIC SUPERVISORD CONFIG
-; Generated by specmem-init at 2026-03-02T00:36:22.804Z
+; Generated by specmem-init at 2026-03-06T01:46:58.539Z
 ; Thread counts from model-config.json resourcePool
 ; ============================================
 

package/claude-hooks/agent-chooser-hook.js

@@ -1,179 +0,0 @@
-#!/usr/bin/env node
-/**
- * Agent Chooser Hook - Interactive Agent Deployment
- * ==================================================
- *
- * PreToolUse hook that INTERCEPTS Agent tool calls and:
- *   1. BLOCKS automatic deployment
- *   2. Injects instructions for  to ask user for preferences
- *   3. User chooses agent type, model, settings PER DEPLOYMENT
- *
- * This gives users FULL CONTROL over every agent that gets deployed!
- *
- * Hook Event: PreToolUse
- * Matcher: Agent
- *
- * To disable interactive mode, set SPECMEM_AGENT_AUTO=1
- */
-
-const fs = require('fs');
-const path = require('path');
-
-// Check if auto mode is enabled (skip interactive)
-const AUTO_MODE = process.env.SPECMEM_AGENT_AUTO === '1' || process.env.SPECMEM_AGENT_AUTO === 'true';
-
-// Check if chooser is disabled
-const CHOOSER_DISABLED = process.env.SPECMEM_NO_CHOOSER === '1' || process.env.SPECMEM_NO_CHOOSER === 'true';
-
-// Marker to prevent re-processing
-const CHOOSER_MARKER = '[AGENT_CHOOSER_CONFIRMED]';
-
-/**
- * Load user config
- */
-function loadConfig() {
-  const configPaths = [
-    path.join(process.cwd(), '.specmem', 'agent-config.json'),
-    path.join(process.env.HOME || '', '.specmem', 'agent-config.json')
-  ];
-
-  for (const p of configPaths) {
-    try {
-      if (fs.existsSync(p)) {
-        return JSON.parse(fs.readFileSync(p, 'utf8'));
-      }
-    } catch (e) {}
-  }
-
-  return {
-    defaults: { model: 'sonnet', background: true },
-    agents: {}
-  };
-}
-
-/**
- * Build the chooser context that instructs  to ask the user
- */
-function buildChooserContext(description, currentType, currentModel, config) {
-  const agentTypes = [
-    { name: 'general-purpose', desc: 'Full toolset for complex multi-step tasks' },
-    { name: 'Explore', desc: 'Fast codebase exploration and search' },
-    { name: 'feature-dev:code-explorer', desc: 'Deep code analysis with tracing' },
-    { name: 'feature-dev:code-architect', desc: 'Architecture design blueprints' },
-    { name: 'feature-dev:code-reviewer', desc: 'Code review with confidence filtering' },
-    { name: 'Bash', desc: 'Shell/git/CLI command specialist' },
-    { name: 'Plan', desc: 'Architecture and implementation planning' }
-  ];
-
-  const models = [
-    { name: 'haiku', desc: 'Fastest, cheapest - simple tasks' },
-    { name: 'sonnet', desc: 'Balanced speed and quality (default)' },
-    { name: 'opus', desc: 'Deepest thinking - complex analysis' }
-  ];
-
-  return `
-[AGENT-CHOOSER]
-🎛️ AGENT DEPLOYMENT PAUSED - Confirm settings
-
-Mission: "${description}"
-Agent: ${currentType || 'general-purpose'} | Model: ${currentModel || config.defaults?.model || 'sonnet'}
-
-Call AskUserQuestion NOW:
-{
-  "questions": [
-    {
-      "question": "Agent for: ${description.slice(0, 40)}...?",
-      "header": "Agent",
-      "options": [
-        {"label": "${currentType || 'general-purpose'}", "description": "Current"},
-        {"label": "Explore", "description": "Fast search"},
-        {"label": "feature-dev:code-explorer", "description": "Deep analysis"},
-        {"label": "Plan", "description": "Architecture"}
-      ],
-      "multiSelect": false
-    },
-    {
-      "question": "Model?",
-      "header": "Model",
-      "options": [
-        {"label": "sonnet", "description": "Balanced (recommended)"},
-        {"label": "opus", "description": "Deepest thinking"},
-        {"label": "haiku", "description": "Fastest"}
-      ],
-      "multiSelect": false
-    }
-  ]
-}
-
-After response: Re-deploy Agent with choices + "${CHOOSER_MARKER}" in prompt.
-[/AGENT-CHOOSER]
-`;
-}
-
-async function main() {
-  let input = '';
-  process.stdin.setEncoding('utf8');
-  for await (const chunk of process.stdin) {
-    input += chunk;
-  }
-
-  try {
-    const data = JSON.parse(input);
-    const toolName = data.tool_name || '';
-    const toolInput = data.tool_input || {};
-
-    // Only intercept Agent tool
-    if (toolName !== 'Agent') {
-      process.exit(0);
-    }
-
-    // Skip if chooser is disabled
-    if (CHOOSER_DISABLED) {
-      process.exit(0);  // Let other hooks handle it
-    }
-
-    // Skip if auto mode is enabled
-    if (AUTO_MODE) {
-      process.exit(0);  // Let other hooks handle it
-    }
-
-    const prompt = toolInput.prompt || '';
-    const description = toolInput.description || 'agent task';
-    const agentType = toolInput.subagent_type || '';
-    const model = toolInput.model || '';
-
-    // Skip if already confirmed by user (has our marker)
-    if (prompt.includes(CHOOSER_MARKER)) {
-      // User confirmed - let it proceed (other hooks will process)
-      process.exit(0);
-    }
-
-    // Load config for defaults
-    const config = loadConfig();
-
-    // Build the chooser context
-    const chooserContext = buildChooserContext(description, agentType, model, config);
-
-    // BLOCK the deployment and inject instructions for  to ask user
-    console.log(JSON.stringify({
-      continue: false,  // Block the tool call
-      stopReason: `Agent deployment requires user confirmation. Use AskUserQuestion to let user choose settings.`,
-      hookSpecificOutput: {
-        hookEventName: 'PreToolUse',
-        permissionDecision: 'deny',
-        permissionDecisionReason: `🛑 Agent chooser: Awaiting user confirmation for "${description.slice(0, 40)}"`,
-        additionalContext: chooserContext
-      }
-    }));
-
-  } catch (e) {
-    // LOW-44 FIX: Log errors before exit
-    console.error('[agent-chooser-hook] Error:', e.message || e);
-    process.exit(0);
-  }
-}
-
-main().catch((e) => {
-  console.error('[agent-chooser-hook] Unhandled error:', e.message || e);
-  process.exit(0);
-});