wolverine-ai 6.2.2 → 6.3.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wolverine-ai",
-  "version": "6.2.2",
+  "version": "6.3.0",
   "description": "Self-healing Node.js server framework powered by AI. Catches crashes, diagnoses errors, generates fixes, verifies, and restarts — automatically.",
   "main": "src/index.js",
   "bin": {

package/src/backup/backup-manager.js

@@ -30,6 +30,7 @@ const NEVER_ROLLBACK = [
   "server/config/settings.json",
   "server/lib/db.js",
   "server/lib/redis.js",
+  "wolverine-claw/config/settings.json",
   ".env",
   ".env.local",
   ".wolverine/vault/master.key",
@@ -352,10 +353,9 @@ class BackupManager {
   }
 
   _collectServerFiles() {
-    const serverDir = path.join(this.projectRoot, "server");
-    if (!fs.existsSync(serverDir)) return [];
     const files = [];
     const SKIP = new Set(["node_modules", ".git", ".wolverine"]);
+    const maxFileSize = 10 * 1024 * 1024; // 10MB
 
     const walk = (dir) => {
       let entries;
@@ -365,11 +365,39 @@ class BackupManager {
         const fullPath = path.join(dir, entry.name);
         if (entry.isDirectory()) walk(fullPath);
         else {
-          try { if (fs.statSync(fullPath).size <= 10 * 1024 * 1024) files.push(fullPath); } catch {}
+          try { if (fs.statSync(fullPath).size <= maxFileSize) files.push(fullPath); } catch {}
         }
       }
     };
-    walk(serverDir);
+
+    // 1. server/ — user server code (original behavior)
+    const serverDir = path.join(this.projectRoot, "server");
+    if (fs.existsSync(serverDir)) walk(serverDir);
+
+    // 2. wolverine-claw/ — claw config, plugins, custom skills
+    //    Skip workspace/ (agent-generated files, can be large/numerous)
+    const clawDir = path.join(this.projectRoot, "wolverine-claw");
+    if (fs.existsSync(clawDir)) {
+      const clawSubdirs = ["config", "plugins", "skills"];
+      for (const sub of clawSubdirs) {
+        const subDir = path.join(clawDir, sub);
+        if (fs.existsSync(subDir)) walk(subDir);
+      }
+      // Also back up wolverine-claw/index.js directly
+      const clawIndex = path.join(clawDir, "index.js");
+      if (fs.existsSync(clawIndex)) files.push(clawIndex);
+    }
+
+    // 3. .openclaw/ — OpenClaw config (if user has one)
+    const openclawDir = path.join(this.projectRoot, ".openclaw");
+    if (fs.existsSync(openclawDir)) walk(openclawDir);
+
+    // 4. Top-level openclaw config files
+    for (const cfgName of ["openclaw.yml", "openclaw.yaml", ".openclaw.yml"]) {
+      const cfgPath = path.join(this.projectRoot, cfgName);
+      if (fs.existsSync(cfgPath)) files.push(cfgPath);
+    }
+
     return files;
   }
 }

package/src/claw/setup.js

@@ -522,6 +522,79 @@ function ensureEnvFile(cwd, env) {
   return result;
 }
 
+/**
+ * Ensure wolverine-ai is installed as a dependency.
+ * Skips if we're running from the wolverine repo itself.
+ */
+function ensureWolverineDep(cwd) {
+  // If we're inside the wolverine repo, skip
+  const pkgPath = path.join(cwd, "package.json");
+  try {
+    const pkg = JSON.parse(fs.readFileSync(pkgPath, "utf-8"));
+    if (pkg.name === "wolverine-ai") {
+      return { installed: true, isRepo: true, alreadyPresent: true };
+    }
+    // Already a dependency?
+    const deps = { ...pkg.dependencies, ...pkg.devDependencies };
+    if (deps["wolverine-ai"]) {
+      return { installed: true, alreadyPresent: true };
+    }
+  } catch {}
+
+  // Install it
+  if (!fs.existsSync(pkgPath)) {
+    return { installed: false, reason: "no package.json" };
+  }
+
+  try {
+    console.log(chalk.gray("  Installing wolverine-ai..."));
+    execSync("npm install wolverine-ai@latest 2>&1", {
+      cwd,
+      encoding: "utf-8",
+      timeout: 120000,
+      stdio: ["pipe", "pipe", "pipe"],
+    });
+    return { installed: true, alreadyPresent: false };
+  } catch (err) {
+    return { installed: false, reason: `npm install failed: ${err.message?.split("\n")[0]}` };
+  }
+}
+
+/**
+ * Add claw-related npm scripts to the user's package.json.
+ */
+function addClawScripts(cwd) {
+  const pkgPath = path.join(cwd, "package.json");
+  if (!fs.existsSync(pkgPath)) return { added: 0 };
+
+  try {
+    const pkg = JSON.parse(fs.readFileSync(pkgPath, "utf-8"));
+    if (!pkg.scripts) pkg.scripts = {};
+
+    const toAdd = {
+      "claw": "wolverine-claw",
+      "claw:direct": "wolverine-claw --direct",
+      "claw:info": "wolverine-claw --info",
+    };
+
+    let added = 0;
+    for (const [name, cmd] of Object.entries(toAdd)) {
+      if (!pkg.scripts[name]) {
+        pkg.scripts[name] = cmd;
+        added++;
+      }
+    }
+
+    if (added > 0) {
+      fs.writeFileSync(pkgPath, JSON.stringify(pkg, null, 2) + "\n");
+    }
+
+    return { added, skipped: added === 0 };
+  } catch {
+    return { added: 0 };
+  }
+}
+
 /**
  * Ensure openclaw is installed as a dependency.
  */
@@ -781,9 +854,21 @@ async function setup(cwd, options = {}) {
 
   log("");
 
-  // ── Step 6: Install OpenClaw ────────────────────────────────
+  // ── Step 6: Install dependencies ─────────────────────────────
+  log(chalk.bold("  Dependencies...\n"));
+
+  // 6a: Install wolverine-ai itself if not already a dep
+  const wolverineDepResult = ensureWolverineDep(cwd);
+  if (wolverineDepResult.installed) {
+    log(chalk.green(`  ✅ wolverine-ai ${wolverineDepResult.alreadyPresent ? "already installed" : "installed"}`));
+  } else if (wolverineDepResult.isRepo) {
+    log(chalk.gray("  ○ wolverine-ai (running from repo)"));
+  } else {
+    log(chalk.yellow(`  ⚠️  wolverine-ai: ${wolverineDepResult.reason}`));
+  }
+
+  // 6b: Install openclaw if not already present
   if (!env.openclaw.localInstall) {
-    log(chalk.bold("  Dependencies...\n"));
     const depResult = ensureOpenClawDep(cwd);
     if (depResult.installed) {
       log(chalk.green(`  ✅ openclaw ${depResult.alreadyPresent ? "already installed" : "installed"}`));
@@ -793,9 +878,18 @@ async function setup(cwd, options = {}) {
         log(chalk.gray(`     ${depResult.fallback}`));
       }
     }
-    log("");
   }
 
+  // 6c: Add claw npm scripts to user's package.json
+  const scriptsResult = addClawScripts(cwd);
+  if (scriptsResult.added > 0) {
+    log(chalk.green(`  ✅ Added ${scriptsResult.added} npm scripts (claw, claw:info, claw:direct)`));
+  } else if (scriptsResult.skipped) {
+    log(chalk.gray("  ○ npm scripts already present"));
+  }
+
+  log("");
+
   // ── Step 7: Validate ───────────────────────────────────────
   log(chalk.bold("  Validating...\n"));
 
@@ -924,4 +1018,6 @@ module.exports = {
   validate,
   ensureEnvFile,
   ensureOpenClawDep,
+  ensureWolverineDep,
+  addClawScripts,
 };

package/src/claw/standalone-agent.js

@@ -2,10 +2,9 @@
  * Wolverine Claw Standalone Agent
  *
  * When OpenClaw isn't installed (or Node < 22), this provides a built-in
- * agentic terminal REPL using wolverine's own AI client. Users get an
- * interactive coding agent that can read/write/edit files, run commands,
- * search code, and self-heal — all powered by the same AI pipeline as
- * wolverine's server healing.
+ * agentic terminal REPL using wolverine's full agent engine — all 32 tools
+ * (file ops, shell, git, diagnostics, database, network, deps, research,
+ * advanced monitoring) powered by the same AI pipeline as server healing.
  *
  * This makes wolverine-claw work immediately without any external deps,
  * and openclaw becomes an optional enhancement for multi-channel support.
@@ -15,266 +14,11 @@ const fs = require("fs");
 const path = require("path");
 const readline = require("readline");
 const chalk = require("chalk");
-const { execSync } = require("child_process");
-
-// ── Tool Definitions ────────────────────────────────────────────
-
-function buildTools(cwd, workspacePath, config) {
-  const sandbox = config.security?.sandbox !== false;
-
-  function resolveSafe(filePath) {
-    const resolved = path.resolve(cwd, filePath);
-    if (sandbox) {
-      // In sandbox mode, allow cwd and workspace
-      if (!resolved.startsWith(cwd)) return null;
-      // Block protected paths
-      const rel = path.relative(cwd, resolved);
-      if (rel.startsWith("node_modules") || rel.startsWith(".env") || rel.startsWith("src/")) {
-        return null;
-      }
-    }
-    return resolved;
-  }
-
-  return [
-    {
-      name: "read_file",
-      description: "Read a file's contents. Use offset and limit for large files.",
-      input_schema: {
-        type: "object",
-        properties: {
-          path: { type: "string", description: "File path relative to project root" },
-          offset: { type: "number", description: "Start line (0-indexed)" },
-          limit: { type: "number", description: "Max lines to read" },
-        },
-        required: ["path"],
-      },
-      execute: ({ path: p, offset, limit }) => {
-        const resolved = resolveSafe(p);
-        if (!resolved) return `[ERROR] Access denied: ${p}`;
-        try {
-          let content = fs.readFileSync(resolved, "utf-8");
-          if (offset || limit) {
-            const lines = content.split("\n");
-            const start = offset || 0;
-            const end = limit ? start + limit : lines.length;
-            content = lines.slice(start, end).join("\n");
-          }
-          if (content.length > 8000) content = content.slice(0, 8000) + "\n... (truncated)";
-          return content;
-        } catch (e) { return `[ERROR] ${e.message}`; }
-      },
-    },
-    {
-      name: "write_file",
-      description: "Write content to a file. Creates directories if needed.",
-      input_schema: {
-        type: "object",
-        properties: {
-          path: { type: "string", description: "File path relative to project root" },
-          content: { type: "string", description: "File content" },
-        },
-        required: ["path", "content"],
-      },
-      execute: ({ path: p, content }) => {
-        const resolved = resolveSafe(p);
-        if (!resolved) return `[ERROR] Access denied: ${p}`;
-        try {
-          fs.mkdirSync(path.dirname(resolved), { recursive: true });
-          fs.writeFileSync(resolved, content);
-          return `Written: ${p} (${content.length} bytes)`;
-        } catch (e) { return `[ERROR] ${e.message}`; }
-      },
-    },
-    {
-      name: "edit_file",
-      description: "Find and replace text in a file. Surgical single-match edit.",
-      input_schema: {
-        type: "object",
-        properties: {
-          path: { type: "string", description: "File path relative to project root" },
-          find: { type: "string", description: "Exact text to find" },
-          replace: { type: "string", description: "Replacement text" },
-        },
-        required: ["path", "find", "replace"],
-      },
-      execute: ({ path: p, find, replace }) => {
-        const resolved = resolveSafe(p);
-        if (!resolved) return `[ERROR] Access denied: ${p}`;
-        try {
-          const content = fs.readFileSync(resolved, "utf-8");
-          if (!content.includes(find)) return `[ERROR] Text not found in ${p}`;
-          const count = content.split(find).length - 1;
-          if (count > 1) return `[ERROR] ${count} matches found — provide more context for a unique match`;
-          fs.writeFileSync(resolved, content.replace(find, replace));
-          return `Edited: ${p}`;
-        } catch (e) { return `[ERROR] ${e.message}`; }
-      },
-    },
-    {
-      name: "list_dir",
-      description: "List files and directories in a path.",
-      input_schema: {
-        type: "object",
-        properties: {
-          path: { type: "string", description: "Directory path relative to project root" },
-        },
-        required: ["path"],
-      },
-      execute: ({ path: p }) => {
-        const resolved = resolveSafe(p || ".");
-        if (!resolved) return `[ERROR] Access denied: ${p}`;
-        try {
-          const entries = fs.readdirSync(resolved, { withFileTypes: true });
-          return entries.map(e => {
-            const prefix = e.isDirectory() ? "[DIR]  " : "       ";
-            let size = "";
-            if (!e.isDirectory()) {
-              try { size = ` (${fs.statSync(path.join(resolved, e.name)).size}b)`; } catch {}
-            }
-            return `${prefix}${e.name}${size}`;
-          }).join("\n");
-        } catch (e) { return `[ERROR] ${e.message}`; }
-      },
-    },
-    {
-      name: "glob_files",
-      description: "Find files matching a glob pattern (e.g., **/*.js).",
-      input_schema: {
-        type: "object",
-        properties: {
-          pattern: { type: "string", description: "Glob pattern" },
-        },
-        required: ["pattern"],
-      },
-      execute: ({ pattern }) => {
-        try {
-          // Use Node's fs.globSync if available (Node 22+), else fallback to find
-          if (fs.globSync) {
-            const matches = fs.globSync(pattern, { cwd });
-            return matches.slice(0, 50).join("\n") || "No matches";
-          }
-          // Fallback: simple recursive walk with pattern matching
-          const simplePattern = pattern.replace(/\*\*/g, "").replace(/\*/g, "");
-          const ext = path.extname(simplePattern) || "";
-          const results = [];
-          function walk(dir, depth) {
-            if (depth > 5 || results.length > 50) return;
-            try {
-              for (const e of fs.readdirSync(dir, { withFileTypes: true })) {
-                if (e.name.startsWith(".") || e.name === "node_modules") continue;
-                const full = path.join(dir, e.name);
-                if (e.isDirectory()) walk(full, depth + 1);
-                else if (!ext || e.name.endsWith(ext)) results.push(path.relative(cwd, full));
-              }
-            } catch {}
-          }
-          walk(cwd, 0);
-          return results.join("\n") || "No matches";
-        } catch (e) { return `[ERROR] ${e.message}`; }
-      },
-    },
-    {
-      name: "grep_code",
-      description: "Search file contents for a regex pattern.",
-      input_schema: {
-        type: "object",
-        properties: {
-          pattern: { type: "string", description: "Regex pattern to search for" },
-          path: { type: "string", description: "File or directory to search in (default: .)" },
-        },
-        required: ["pattern"],
-      },
-      execute: ({ pattern, path: searchPath }) => {
-        const resolved = resolveSafe(searchPath || ".");
-        if (!resolved) return `[ERROR] Access denied`;
-        try {
-          const result = execSync(
-            `grep -rn --include="*.js" --include="*.json" --include="*.ts" --include="*.md" "${pattern.replace(/"/g, '\\"')}" "${resolved}" 2>/dev/null | head -30`,
-            { encoding: "utf-8", timeout: 10000, cwd }
-          );
-          return result.trim() || "No matches";
-        } catch {
-          // grep returns exit 1 on no match
-          return "No matches";
-        }
-      },
-    },
-    {
-      name: "bash_exec",
-      description: "Execute a shell command. 30s timeout. Dangerous commands blocked.",
-      input_schema: {
-        type: "object",
-        properties: {
-          command: { type: "string", description: "Shell command to run" },
-        },
-        required: ["command"],
-      },
-      execute: ({ command }) => {
-        // Block dangerous commands
-        const blocked = ["rm -rf /", "rm -rf /*", "mkfs", "dd if=", "shutdown", "reboot",
-          "format c:", "git push --force", "npm publish", "> /dev/sda"];
-        for (const b of blocked) {
-          if (command.includes(b)) return `[ERROR] Blocked dangerous command: ${b}`;
-        }
-        try {
-          const result = execSync(command, {
-            encoding: "utf-8",
-            timeout: 30000,
-            cwd,
-            maxBuffer: 1024 * 1024,
-          });
-          const trimmed = result.trim();
-          if (trimmed.length > 4000) return trimmed.slice(0, 4000) + "\n... (truncated)";
-          return trimmed || "(no output)";
-        } catch (e) {
-          return `[ERROR] ${e.message?.split("\n")[0] || "Command failed"}`;
-        }
-      },
-    },
-    {
-      name: "done",
-      description: "Signal that you have completed the user's request. Include a summary.",
-      input_schema: {
-        type: "object",
-        properties: {
-          summary: { type: "string", description: "Summary of what was done" },
-        },
-        required: ["summary"],
-      },
-      execute: ({ summary }) => summary,
-    },
-  ];
-}
-
-// ── Agent Loop ──────────────────────────────────────────────────
-
-/**
- * Run one agent turn: send messages to AI, execute tool calls, return.
- */
-async function agentTurn(aiCall, model, systemPrompt, messages, tools, maxTokens) {
-  // Convert tools to AI format
-  const toolDefs = tools.map(t => ({
-    name: t.name,
-    description: t.description,
-    input_schema: t.input_schema,
-  }));
-
-  const result = await aiCall({
-    model,
-    messages,
-    tools: toolDefs,
-    maxTokens,
-    category: "tool",
-  });
-
-  return result;
-}
 
 // ── REPL ────────────────────────────────────────────────────────
 
 /**
- * Start the standalone agent REPL.
+ * Start the standalone agent REPL with all 32 wolverine tools.
  */
 async function startRepl(config, options = {}) {
   const cwd = options.cwd || process.cwd();
@@ -297,27 +41,78 @@ async function startRepl(config, options = {}) {
     process.exit(1);
   }
 
-  const tools = buildTools(cwd, workspacePath, config);
+  // Load the real AgentEngine + TOOL_DEFINITIONS from wolverine's agent
+  let AgentEngine, TOOL_DEFINITIONS;
+  try {
+    const agentMod = require("../agent/agent-engine");
+    AgentEngine = agentMod.AgentEngine;
+    TOOL_DEFINITIONS = agentMod.TOOL_DEFINITIONS;
+  } catch (e) {
+    console.error(chalk.red(`  [CLAW] Failed to load agent engine: ${e.message}`));
+    process.exit(1);
+  }
+
+  // Use the real Sandbox — same security as heal pipeline
+  const { Sandbox } = require("../security/sandbox");
+  const sandbox = new Sandbox(cwd);
 
-  const systemPrompt = `You are Wolverine Claw, an agentic AI coding assistant running inside the Wolverine self-healing framework.
+  // Instantiate the agent engine for tool execution
+  const engine = new AgentEngine({
+    cwd,
+    sandbox,
+    maxTurns,
+    maxTokens: 100000,
+  });
+
+  // Count tools by category
+  const toolNames = TOOL_DEFINITIONS.map(t => t.function.name);
+  const categories = {
+    file: ["read_file", "write_file", "edit_file", "glob_files", "grep_code"],
+    shell: ["bash_exec", "git_log", "git_diff"],
+    diagnostics: ["list_dir", "move_file", "check_port", "check_env", "inspect_env", "check_memory", "list_processes", "check_logs", "check_network"],
+    database: ["inspect_db", "run_db_fix"],
+    deps: ["audit_deps", "check_migration"],
+    research: ["web_fetch"],
+    advanced: ["verify_node_modules", "inspect_certificate", "inspect_cache", "disk_cleanup", "check_file_descriptors", "check_event_loop", "check_websocket"],
+    env: ["add_env_var"],
+    server: ["restart_service"],
+    control: ["done"],
+  };
 
-You have access to tools for reading, writing, editing files, searching code, and running shell commands. You operate in the project at: ${cwd}
+  const systemPrompt = `You are Wolverine Claw, an agentic AI coding assistant running inside the Wolverine self-healing framework.
 
-Your workspace for creating new files is: ${workspacePath}
+You have access to ${TOOL_DEFINITIONS.length} tools across ${Object.keys(categories).length} categories:
+- FILE: read_file, write_file, edit_file, glob_files, grep_code
+- SHELL & GIT: bash_exec, git_log, git_diff
+- DIAGNOSTICS: list_dir, move_file, check_port, check_env, inspect_env, check_memory, list_processes, check_logs, check_network
+- DATABASE: inspect_db, run_db_fix (always inspect_db FIRST)
+- DEPENDENCIES: audit_deps, check_migration
+- RESEARCH: web_fetch
+- ADVANCED: verify_node_modules, inspect_certificate, inspect_cache, disk_cleanup, check_file_descriptors, check_event_loop, check_websocket
+- ENVIRONMENT: add_env_var
+- SERVER: restart_service
+- CONTROL: done
+
+Project root: ${cwd}
+Workspace for new files: ${workspacePath}
 
 Guidelines:
-- Read files before editing them. Understand existing code before making changes.
-- Use edit_file for surgical changes, write_file for new files.
-- Use grep_code and glob_files to explore the codebase before making assumptions.
-- Use bash_exec for git, npm, and system commands.
-- When done with a task, use the done tool with a summary.
-- Be concise. Fix what's asked, don't add unnecessary changes.
-- Protected paths (read-only): src/, node_modules/, .env files.`;
+- Read files before editing. Understand existing code first.
+- Use edit_file (old_text/new_text) for surgical changes, write_file for new files.
+- Use grep_code and glob_files to explore the codebase.
+- Use bash_exec for git, npm, system commands.
+- Use inspect_db before run_db_fix. Always check before modifying.
+- Use audit_deps when dependency issues are suspected.
+- Use check_port for EADDRINUSE, check_network for connectivity, inspect_certificate for TLS.
+- When done with a task, call the done tool with a summary.
+- Be concise. Fix what's asked.`;
 
   console.log(chalk.blue.bold("\n  🐾 Wolverine Claw — Interactive Agent\n"));
   console.log(chalk.gray(`  Model:     ${model}`));
   console.log(chalk.gray(`  Workspace: ${workspacePath}`));
-  console.log(chalk.gray(`  Tools:     ${tools.length} (read, write, edit, list, glob, grep, bash, done)`));
+  console.log(chalk.gray(`  Tools:     ${TOOL_DEFINITIONS.length} across ${Object.keys(categories).length} categories`));
+  console.log(chalk.gray(`             file(5) shell(3) diagnostics(9) database(2) deps(2)`));
+  console.log(chalk.gray(`             research(1) advanced(7) env(1) server(1) control(1)`));
   console.log(chalk.gray(`  Max turns: ${maxTurns}`));
   console.log(chalk.gray(`  Type 'exit' or Ctrl+C to quit.\n`));
 
@@ -327,7 +122,6 @@ Guidelines:
     prompt: chalk.blue("  🐾 > "),
   });
 
-  // Conversation history
   let messages = [];
 
   rl.prompt();
@@ -341,7 +135,6 @@ Guidelines:
       process.exit(0);
     }
 
-    // Special commands
     if (input === "/clear") {
       messages = [];
       console.log(chalk.gray("  Conversation cleared.\n"));
@@ -349,44 +142,35 @@ Guidelines:
       return;
     }
     if (input === "/status") {
-      console.log(chalk.gray(`  Messages: ${messages.length}, Model: ${model}`));
+      console.log(chalk.gray(`  Messages: ${messages.length}, Model: ${model}, Tools: ${TOOL_DEFINITIONS.length}`));
+      rl.prompt();
+      return;
+    }
+    if (input === "/tools") {
+      for (const [cat, names] of Object.entries(categories)) {
+        console.log(chalk.gray(`  ${cat}: ${names.join(", ")}`));
+      }
+      console.log("");
       rl.prompt();
       return;
     }
 
-    // Add user message
     messages.push({ role: "user", content: input });
 
-    // Agent loop
-    // aiCallWithHistory returns OpenAI-shaped responses:
-    //   {choices: [{message: {role, content, tool_calls}}], usage}
-    // Tool calls come as: {id, type:"function", function:{name, arguments:JSON_STRING}}
-    // Tool defs must be: {type:"function", function:{name, description, parameters}}
     let turn = 0;
     let done = false;
 
-    // Build OpenAI-format tool definitions once
-    const toolDefs = tools.map(t => ({
-      type: "function",
-      function: {
-        name: t.name,
-        description: t.description,
-        parameters: t.input_schema,
-      },
-    }));
-
     while (turn < maxTurns && !done) {
       turn++;
       try {
         const response = await aiCallWithHistory({
           model,
           messages: [{ role: "system", content: systemPrompt }, ...messages],
-          tools: toolDefs,
+          tools: TOOL_DEFINITIONS,
           maxTokens: 4096,
           category: "tool",
         });
 
-        // Extract from OpenAI-shaped response
         const msg = response.choices?.[0]?.message;
         if (!msg) {
           console.log(chalk.yellow("  (empty response)\n"));
@@ -397,14 +181,11 @@ Guidelines:
         const textContent = msg.content || "";
         const toolCalls = msg.tool_calls || [];
 
-        // Handle text content
         if (textContent) {
           console.log(chalk.white(`\n  ${textContent.replace(/\n/g, "\n  ")}\n`));
         }
 
-        // Handle tool calls
         if (toolCalls.length > 0) {
-          // Store assistant message with tool calls
           messages.push({
             role: "assistant",
             content: textContent || null,
@@ -420,33 +201,36 @@ Guidelines:
                 : (tc.function?.arguments || tc.input || {});
             } catch { toolInput = {}; }
 
-            const tool = tools.find(t => t.name === toolName);
-
-            if (!tool) {
-              console.log(chalk.yellow(`  [tool] Unknown: ${toolName}`));
-              messages.push({ role: "tool", tool_call_id: tc.id, content: `[ERROR] Unknown tool: ${toolName}` });
-              continue;
-            }
-
             if (toolName === "done") {
-              const summary = tool.execute(toolInput);
+              const summary = toolInput.summary || toolInput.message || "Task completed.";
               console.log(chalk.green(`  ✅ ${summary}\n`));
               messages.push({ role: "tool", tool_call_id: tc.id, content: summary });
               done = true;
               break;
             }
 
-            console.log(chalk.gray(`  [${toolName}] ${JSON.stringify(toolInput).slice(0, 100)}`));
-            const toolResult = tool.execute(toolInput);
-            const displayResult = toolResult.length > 200
-              ? toolResult.slice(0, 200) + "..."
+            console.log(chalk.gray(`  [${toolName}] ${JSON.stringify(toolInput).slice(0, 120)}`));
+
+            // Execute via the real AgentEngine — same tools as heal pipeline
+            let toolResult;
+            try {
+              const result = await engine._executeTool({
+                function: { name: toolName, arguments: JSON.stringify(toolInput) },
+              });
+              toolResult = typeof result === "string" ? result : (result?.content || JSON.stringify(result));
+            } catch (e) {
+              toolResult = `[ERROR] ${e.message}`;
+            }
+
+            // Cap display output
+            const displayResult = toolResult.length > 300
+              ? toolResult.slice(0, 300) + "..."
               : toolResult;
             console.log(chalk.gray(`  → ${displayResult.replace(/\n/g, "\n    ")}`));
 
             messages.push({ role: "tool", tool_call_id: tc.id, content: toolResult });
           }
         } else if (textContent) {
-          // Text-only response, no tool calls — done for this turn
           messages.push({ role: "assistant", content: textContent });
           done = true;
         } else {
@@ -476,7 +260,6 @@ Guidelines:
       process.send({ type: "claw_health", status: "running", detail: "standalone-agent", timestamp: Date.now() });
     } catch {}
 
-    // Heartbeat
     setInterval(() => {
       try {
         process.send({ type: "claw_heartbeat", uptime: process.uptime(), memory: process.memoryUsage(), timestamp: Date.now() });
@@ -485,4 +268,16 @@ Guidelines:
   }
 }
 
-module.exports = { startRepl, buildTools };
+/**
+ * Get tool definitions for external use (e.g., tests).
+ */
+function getToolDefinitions() {
+  try {
+    const { TOOL_DEFINITIONS } = require("../agent/agent-engine");
+    return TOOL_DEFINITIONS;
+  } catch {
+    return [];
+  }
+}
+
+module.exports = { startRepl, getToolDefinitions };