codemaxxing 1.0.0 → 1.0.2

package/dist/index.js

@@ -7,15 +7,19 @@ import TextInput from "ink-text-input";
 import { CodingAgent } from "./agent.js";
 import { loadConfig, saveConfig, detectLocalProvider, detectLocalProviderDetailed, parseCLIArgs, applyOverrides, listModels } from "./config.js";
 import { listSessions, getSession, loadMessages, deleteSession } from "./utils/sessions.js";
-import { execSync } from "child_process";
-import { isGitRepo, getBranch, getStatus, getDiff, undoLastCommit } from "./utils/git.js";
+import { isGitRepo, getBranch, getStatus } from "./utils/git.js";
+import { tryHandleGitCommand } from "./commands/git.js";
+import { tryHandleOllamaCommand } from "./commands/ollama.js";
+import { dispatchRegisteredCommands } from "./commands/registry.js";
 import { getTheme, listThemes, THEMES, DEFAULT_THEME } from "./themes.js";
+import { tryHandleUiCommand } from "./commands/ui.js";
 import { PROVIDERS, getCredentials, openRouterOAuth, anthropicSetupToken, importCodexToken, importQwenToken, copilotDeviceFlow } from "./utils/auth.js";
-import { listInstalledSkills, installSkill, removeSkill, getRegistrySkills, searchRegistry, createSkillScaffold, getActiveSkills, getActiveSkillCount } from "./utils/skills.js";
+import { listInstalledSkills, installSkill, removeSkill, getRegistrySkills, getActiveSkills, getActiveSkillCount } from "./utils/skills.js";
 import { listServers, addServer, removeServer, getConnectedServers } from "./utils/mcp.js";
+import { tryHandleSkillsCommand } from "./commands/skills.js";
 import { detectHardware, formatBytes } from "./utils/hardware.js";
 import { getRecommendationsWithLlmfit, getFitIcon, isLlmfitAvailable } from "./utils/models.js";
-import { isOllamaInstalled, isOllamaRunning, getOllamaInstallCommand, startOllama, stopOllama, pullModel, listInstalledModelsDetailed, deleteModel, getGPUMemoryUsage } from "./utils/ollama.js";
+import { isOllamaInstalled, isOllamaRunning, getOllamaInstallCommand, startOllama, stopOllama, pullModel, listInstalledModelsDetailed, deleteModel } from "./utils/ollama.js";
 import { createRequire } from "module";
 const _require = createRequire(import.meta.url);
 const VERSION = _require("../package.json").version;
@@ -54,12 +58,6 @@ const SLASH_COMMANDS = [
     { cmd: "/session delete", desc: "delete a session" },
     { cmd: "/resume", desc: "resume a past session" },
     { cmd: "/skills", desc: "manage skill packs" },
-    { cmd: "/skills install", desc: "install a skill" },
-    { cmd: "/skills remove", desc: "remove a skill" },
-    { cmd: "/skills list", desc: "show installed skills" },
-    { cmd: "/skills search", desc: "search registry" },
-    { cmd: "/skills on", desc: "enable skill for session" },
-    { cmd: "/skills off", desc: "disable skill for session" },
     { cmd: "/architect", desc: "toggle architect mode" },
     { cmd: "/lint", desc: "show auto-lint status" },
     { cmd: "/lint on", desc: "enable auto-lint" },
@@ -70,6 +68,7 @@ const SLASH_COMMANDS = [
     { cmd: "/mcp remove", desc: "remove MCP server" },
     { cmd: "/mcp reconnect", desc: "reconnect MCP servers" },
     { cmd: "/ollama", desc: "Ollama status & models" },
+    { cmd: "/ollama status", desc: "show Ollama status & models" },
     { cmd: "/ollama list", desc: "list installed models" },
     { cmd: "/ollama start", desc: "start Ollama server" },
     { cmd: "/ollama stop", desc: "stop Ollama server" },
@@ -407,8 +406,7 @@ function App() {
             if (selected) {
                 // Commands that need args (like /commit, /model) — fill input instead of executing
                 if (selected.cmd === "/commit" || selected.cmd === "/model" || selected.cmd === "/session delete" ||
-                    selected.cmd === "/skills install" || selected.cmd === "/skills remove" || selected.cmd === "/skills search" ||
-                    selected.cmd === "/skills on" || selected.cmd === "/skills off" || selected.cmd === "/architect") {
+                    selected.cmd === "/architect") {
                     setInput(selected.cmd + " ");
                     setCmdIndex(0);
                     setInputKey((k) => k + 1);
@@ -502,346 +500,42 @@ function App() {
             ].join("\n"));
             return;
         }
-        // ── Skills commands (work without agent) ──
-        if (trimmed === "/skills") {
-            setSkillsPicker("menu");
-            setSkillsPickerIndex(0);
-            return;
-        }
-        if (trimmed.startsWith("/skills install ")) {
-            const name = trimmed.replace("/skills install ", "").trim();
-            const result = installSkill(name);
-            addMsg(result.ok ? "info" : "error", result.ok ? `✅ ${result.message}` : `✗ ${result.message}`);
-            return;
-        }
-        if (trimmed.startsWith("/skills remove ")) {
-            const name = trimmed.replace("/skills remove ", "").trim();
-            const result = removeSkill(name);
-            addMsg(result.ok ? "info" : "error", result.ok ? `✅ ${result.message}` : `✗ ${result.message}`);
-            return;
-        }
-        if (trimmed === "/skills list") {
-            const installed = listInstalledSkills();
-            if (installed.length === 0) {
-                addMsg("info", "No skills installed. Use /skills to browse & install.");
-            }
-            else {
-                const active = getActiveSkills(process.cwd(), sessionDisabledSkills);
-                const lines = installed.map((s) => {
-                    const isActive = active.includes(s.name);
-                    const disabledBySession = sessionDisabledSkills.has(s.name);
-                    const status = disabledBySession ? " (off)" : isActive ? " (on)" : "";
-                    return `  ${isActive ? "●" : "○"} ${s.name} — ${s.description}${status}`;
-                });
-                addMsg("info", `Installed skills:\n${lines.join("\n")}`);
-            }
-            return;
-        }
-        if (trimmed.startsWith("/skills search ")) {
-            const query = trimmed.replace("/skills search ", "").trim();
-            const results = searchRegistry(query);
-            if (results.length === 0) {
-                addMsg("info", `No skills found matching "${query}".`);
-            }
-            else {
-                const installed = listInstalledSkills().map((s) => s.name);
-                const lines = results.map((s) => {
-                    const mark = installed.includes(s.name) ? " ✓" : "";
-                    return `  ${s.name} — ${s.description}${mark}`;
-                });
-                addMsg("info", `Registry matches:\n${lines.join("\n")}`);
-            }
-            return;
-        }
-        if (trimmed.startsWith("/skills create ")) {
-            const name = trimmed.replace("/skills create ", "").trim();
-            if (!name) {
-                addMsg("info", "Usage: /skills create <name>");
-                return;
-            }
-            const result = createSkillScaffold(name);
-            addMsg(result.ok ? "info" : "error", result.ok ? `✅ ${result.message}\n  Edit: ${result.path}/prompt.md` : `✗ ${result.message}`);
-            return;
-        }
-        if (trimmed.startsWith("/skills on ")) {
-            const name = trimmed.replace("/skills on ", "").trim();
-            const installed = listInstalledSkills().map((s) => s.name);
-            if (!installed.includes(name)) {
-                addMsg("error", `Skill "${name}" is not installed.`);
-                return;
-            }
-            setSessionDisabledSkills((prev) => { const next = new Set(prev); next.delete(name); return next; });
-            if (agent)
-                agent.enableSkill(name);
-            addMsg("info", `✅ Enabled skill: ${name}`);
-            return;
-        }
-        if (trimmed.startsWith("/skills off ")) {
-            const name = trimmed.replace("/skills off ", "").trim();
-            const installed = listInstalledSkills().map((s) => s.name);
-            if (!installed.includes(name)) {
-                addMsg("error", `Skill "${name}" is not installed.`);
-                return;
-            }
-            setSessionDisabledSkills((prev) => { const next = new Set(prev); next.add(name); return next; });
-            if (agent)
-                agent.disableSkill(name);
-            addMsg("info", `✅ Disabled skill: ${name} (session only)`);
-            return;
-        }
-        if (trimmed.startsWith("/theme")) {
-            const themeName = trimmed.replace("/theme", "").trim();
-            if (!themeName) {
-                const themeKeys = listThemes();
-                const currentIdx = themeKeys.indexOf(theme.name.toLowerCase());
-                setThemePicker(true);
-                setThemePickerIndex(currentIdx >= 0 ? currentIdx : 0);
-                return;
-            }
-            if (!THEMES[themeName]) {
-                addMsg("error", `Theme "${themeName}" not found. Use /theme to see available themes.`);
-                return;
-            }
-            setTheme(getTheme(themeName));
-            addMsg("info", `✅ Switched to theme: ${THEMES[themeName].name}`);
-            return;
-        }
-        // ── Architect commands (work without agent) ──
-        if (trimmed === "/architect") {
-            if (!agent) {
-                addMsg("info", "🏗️ Architect mode: no agent connected. Connect first with /login or /connect.");
-                return;
-            }
-            const current = agent.getArchitectModel();
-            if (current) {
-                agent.setArchitectModel(null);
-                addMsg("info", "🏗️ Architect mode OFF");
-            }
-            else {
-                // Use config default or a sensible default
-                const defaultModel = loadConfig().defaults.architectModel || agent.getModel();
-                agent.setArchitectModel(defaultModel);
-                addMsg("info", `🏗️ Architect mode ON (planner: ${defaultModel})`);
-            }
-            return;
-        }
-        if (trimmed.startsWith("/architect ")) {
-            const model = trimmed.replace("/architect ", "").trim();
-            if (!model) {
-                addMsg("info", "Usage: /architect <model> or /architect to toggle");
-                return;
-            }
-            if (agent) {
-                agent.setArchitectModel(model);
-                addMsg("info", `🏗️ Architect mode ON (planner: ${model})`);
-            }
-            else {
-                addMsg("info", "⚠ No agent connected. Connect first.");
-            }
-            return;
-        }
-        // ── Lint commands (work without agent) ──
-        if (trimmed === "/lint") {
-            const { detectLinter } = await import("./utils/lint.js");
-            const linter = detectLinter(process.cwd());
-            const enabled = agent ? agent.isAutoLintEnabled() : true;
-            if (linter) {
-                addMsg("info", `🔍 Auto-lint: ${enabled ? "ON" : "OFF"}\n  Detected: ${linter.name}\n  Command: ${linter.command} <file>`);
-            }
-            else {
-                addMsg("info", `🔍 Auto-lint: ${enabled ? "ON" : "OFF"}\n  No linter detected in this project.`);
-            }
-            return;
-        }
-        if (trimmed === "/lint on") {
-            if (agent)
-                agent.setAutoLint(true);
-            addMsg("info", "🔍 Auto-lint ON");
-            return;
-        }
-        if (trimmed === "/lint off") {
-            if (agent)
-                agent.setAutoLint(false);
-            addMsg("info", "🔍 Auto-lint OFF");
-            return;
-        }
-        // ── Ollama commands (work without agent) ──
-        if (trimmed === "/ollama" || trimmed === "/ollama status") {
-            const running = await isOllamaRunning();
-            const lines = [`Ollama: ${running ? "running" : "stopped"}`];
-            if (running) {
-                const models = await listInstalledModelsDetailed();
-                if (models.length > 0) {
-                    lines.push(`Installed models (${models.length}):`);
-                    for (const m of models) {
-                        const sizeGB = (m.size / (1024 * 1024 * 1024)).toFixed(1);
-                        lines.push(`  ${m.name}  (${sizeGB} GB)`);
-                    }
-                }
-                else {
-                    lines.push("No models installed.");
-                }
-                const gpuMem = getGPUMemoryUsage();
-                if (gpuMem)
-                    lines.push(`GPU: ${gpuMem}`);
-            }
-            else {
-                lines.push("Start with: /ollama start");
-            }
-            addMsg("info", lines.join("\n"));
-            return;
-        }
-        if (trimmed === "/ollama list") {
-            const running = await isOllamaRunning();
-            if (!running) {
-                addMsg("info", "Ollama is not running. Start with /ollama start");
-                return;
-            }
-            const models = await listInstalledModelsDetailed();
-            if (models.length === 0) {
-                addMsg("info", "No models installed. Pull one with /ollama pull <model>");
-            }
-            else {
-                const lines = models.map((m) => {
-                    const sizeGB = (m.size / (1024 * 1024 * 1024)).toFixed(1);
-                    return `  ${m.name}  (${sizeGB} GB)`;
-                });
-                addMsg("info", `Installed models:\n${lines.join("\n")}`);
-            }
-            return;
-        }
-        if (trimmed === "/ollama start") {
-            const running = await isOllamaRunning();
-            if (running) {
-                addMsg("info", "Ollama is already running.");
-                return;
-            }
-            if (!isOllamaInstalled()) {
-                addMsg("error", `Ollama is not installed. Install with: ${getOllamaInstallCommand(process.platform === "darwin" ? "macos" : process.platform === "win32" ? "windows" : "linux")}`);
-                return;
-            }
-            startOllama();
-            addMsg("info", "Starting Ollama server...");
-            // Wait for it to come up
-            for (let i = 0; i < 10; i++) {
-                await new Promise(r => setTimeout(r, 1000));
-                if (await isOllamaRunning()) {
-                    addMsg("info", "Ollama is running.");
-                    await refreshConnectionBanner();
-                    return;
-                }
-            }
-            addMsg("error", "Ollama did not start in time. Try running 'ollama serve' manually.");
-            return;
-        }
-        if (trimmed === "/ollama stop") {
-            const running = await isOllamaRunning();
-            if (!running) {
-                addMsg("info", "Ollama is not running.");
-                return;
-            }
-            addMsg("info", "Stopping Ollama...");
-            const result = await stopOllama();
-            addMsg(result.ok ? "info" : "error", result.ok ? `\u2705 ${result.message}` : `\u274C ${result.message}`);
-            if (result.ok)
-                await refreshConnectionBanner();
-            return;
-        }
-        if (trimmed === "/ollama pull") {
-            // No model specified — show picker
-            setOllamaPullPicker(true);
-            setOllamaPullPickerIndex(0);
-            return;
-        }
-        if (trimmed.startsWith("/ollama pull ")) {
-            const modelId = trimmed.replace("/ollama pull ", "").trim();
-            if (!modelId) {
-                setOllamaPullPicker(true);
-                setOllamaPullPickerIndex(0);
-                return;
-            }
-            if (!isOllamaInstalled()) {
-                addMsg("error", "Ollama is not installed.");
-                return;
-            }
-            // Ensure ollama is running
-            let running = await isOllamaRunning();
-            if (!running) {
-                startOllama();
-                addMsg("info", "Starting Ollama server...");
-                for (let i = 0; i < 10; i++) {
-                    await new Promise(r => setTimeout(r, 1000));
-                    if (await isOllamaRunning()) {
-                        running = true;
-                        break;
-                    }
-                }
-                if (!running) {
-                    addMsg("error", "Could not start Ollama. Run 'ollama serve' manually.");
-                    return;
-                }
-            }
-            setOllamaPulling({ model: modelId, progress: { status: "starting", percent: 0 } });
-            try {
-                await pullModel(modelId, (p) => {
-                    setOllamaPulling({ model: modelId, progress: p });
-                });
-                setOllamaPulling(null);
-                addMsg("info", `\u2705 Downloaded ${modelId}`);
-            }
-            catch (err) {
-                setOllamaPulling(null);
-                addMsg("error", `Failed to pull ${modelId}: ${err.message}`);
-            }
-            return;
-        }
-        if (trimmed === "/ollama delete") {
-            // Ensure Ollama is running so we can list models
-            let running = await isOllamaRunning();
-            if (!running) {
-                addMsg("info", "Starting Ollama to list models...");
-                startOllama();
-                for (let i = 0; i < 10; i++) {
-                    await new Promise(r => setTimeout(r, 1000));
-                    if (await isOllamaRunning()) {
-                        running = true;
-                        break;
-                    }
-                }
-                if (!running) {
-                    addMsg("error", "Could not start Ollama. Start it manually first.");
-                    return;
-                }
-            }
-            const models = await listInstalledModelsDetailed();
-            if (models.length === 0) {
-                addMsg("info", "No models installed.");
-                return;
-            }
-            setOllamaDeletePicker({ models: models.map(m => ({ name: m.name, size: m.size })) });
-            setOllamaDeletePickerIndex(0);
-            return;
-        }
-        if (trimmed.startsWith("/ollama delete ")) {
-            const modelId = trimmed.replace("/ollama delete ", "").trim();
-            if (!modelId) {
-                const models = await listInstalledModelsDetailed();
-                if (models.length === 0) {
-                    addMsg("info", "No models installed.");
-                    return;
-                }
-                setOllamaDeletePicker({ models: models.map(m => ({ name: m.name, size: m.size })) });
-                setOllamaDeletePickerIndex(0);
-                return;
-            }
-            // Look up size for confirmation
-            const models = await listInstalledModelsDetailed();
-            const found = models.find((m) => m.name === modelId || m.name.startsWith(modelId));
-            if (!found) {
-                addMsg("error", `Model "${modelId}" not found. Use /ollama list to see installed models.`);
-                return;
-            }
-            setOllamaDeleteConfirm({ model: found.name, size: found.size });
+        if (await dispatchRegisteredCommands([
+            () => tryHandleSkillsCommand({
+                trimmed,
+                cwd: process.cwd(),
+                addMsg,
+                agent,
+                sessionDisabledSkills,
+                setSkillsPicker,
+                setSkillsPickerIndex,
+                setSessionDisabledSkills,
+                setInput,
+                setInputKey,
+            }),
+            () => tryHandleOllamaCommand({
+                trimmed,
+                addMsg,
+                refreshConnectionBanner,
+                setOllamaPullPicker,
+                setOllamaPullPickerIndex,
+                setOllamaPulling,
+                setOllamaDeletePicker,
+                setOllamaDeletePickerIndex,
+                setOllamaDeleteConfirm,
+            }),
+            () => tryHandleGitCommand(trimmed, process.cwd(), addMsg),
+            () => tryHandleUiCommand({
+                trimmed,
+                cwd: process.cwd(),
+                addMsg,
+                agent,
+                theme,
+                setTheme,
+                setThemePicker,
+                setThemePickerIndex,
+            }),
+        ], { trimmed })) {
             return;
         }
         // ── MCP commands (partially work without agent) ──
@@ -992,16 +686,6 @@ function App() {
             }
             return;
         }
-        if (trimmed === "/diff") {
-            const diff = getDiff(process.cwd());
-            addMsg("info", diff);
-            return;
-        }
-        if (trimmed === "/undo") {
-            const result = undoLastCommit(process.cwd());
-            addMsg("info", result.success ? `✅ ${result.message}` : `✗ ${result.message}`);
-            return;
-        }
         if (trimmed === "/git on") {
             if (!agent.isGitEnabled()) {
                 addMsg("info", "✗ Not a git repository");
@@ -1096,32 +780,6 @@ function App() {
             setSessionPickerIndex(0);
             return;
         }
-        if (trimmed === "/push") {
-            try {
-                const output = execSync("git push", { cwd: process.cwd(), encoding: "utf-8", stdio: "pipe" });
-                addMsg("info", `✅ Pushed to remote${output.trim() ? "\n" + output.trim() : ""}`);
-            }
-            catch (e) {
-                addMsg("error", `Push failed: ${e.stderr || e.message}`);
-            }
-            return;
-        }
-        if (trimmed.startsWith("/commit")) {
-            const msg = trimmed.replace("/commit", "").trim();
-            if (!msg) {
-                addMsg("info", "Usage: /commit your commit message here");
-                return;
-            }
-            try {
-                execSync("git add -A", { cwd: process.cwd(), stdio: "pipe" });
-                execSync(`git commit -m "${msg.replace(/"/g, '\\"')}"`, { cwd: process.cwd(), stdio: "pipe" });
-                addMsg("info", `✅ Committed: ${msg}`);
-            }
-            catch (e) {
-                addMsg("error", `Commit failed: ${e.stderr || e.message}`);
-            }
-            return;
-        }
         setLoading(true);
         setStreaming(false);
         setSpinnerMsg(SPINNER_MESSAGES[Math.floor(Math.random() * SPINNER_MESSAGES.length)]);
@@ -2090,6 +1748,30 @@ process.stdout.write("\x1b[?2004h");
 // Bracketed paste: \x1b[200~ ... \x1b[201~
 let pasteBuffer = "";
 let inPaste = false;
+function emitPasteChunk(content) {
+    const normalized = content.replace(/\r\n/g, "\n").trim();
+    if (!normalized)
+        return true;
+    const lineCount = normalized.split("\n").length;
+    if (lineCount > 2) {
+        pasteEvents.emit("paste", { content: normalized, lines: lineCount });
+        return true;
+    }
+    const sanitized = normalized.replace(/\n/g, " ");
+    if (sanitized) {
+        origPush(sanitized, "utf-8");
+    }
+    return true;
+}
+function looksLikeRawMultilinePaste(data) {
+    const normalized = data.replace(/\x1b\[20[01]~/g, "");
+    const newlineMatches = normalized.match(/\r?\n/g) ?? [];
+    const newlineCount = newlineMatches.length;
+    const contentLength = normalized.replace(/[\r\n]/g, "").trim().length;
+    // Avoid swallowing normal Enter presses while still catching terminals that
+    // don't support bracketed paste and dump the whole paste as one raw chunk.
+    return newlineCount >= 2 || (newlineCount >= 1 && contentLength >= 40);
+}
 const origPush = process.stdin.push.bind(process.stdin);
 process.stdin.push = function (chunk, encoding) {
     if (chunk === null)
@@ -2105,26 +1787,18 @@ process.stdin.push = function (chunk, encoding) {
         data = data.replace(/\x1b\[201~/g, "");
         pasteBuffer += data;
         inPaste = false;
-        const content = pasteBuffer.trim();
+        const content = pasteBuffer;
         pasteBuffer = "";
-        const lineCount = content.split("\n").length;
-        if (lineCount > 2) {
-            // Multi-line paste → store as chunk, don't send to input
-            pasteEvents.emit("paste", { content, lines: lineCount });
-            return true;
-        }
-        // Short paste (1-2 lines) — send as normal input
-        const sanitized = content.replace(/\r?\n/g, " ");
-        if (sanitized) {
-            return origPush(sanitized, "utf-8");
-        }
-        return true;
+        return emitPasteChunk(content);
     }
     if (inPaste) {
         pasteBuffer += data;
         return true;
     }
     data = data.replace(/\x1b\[20[01]~/g, "");
+    if (looksLikeRawMultilinePaste(data)) {
+        return emitPasteChunk(data);
+    }
     return origPush(typeof chunk === "string" ? data : Buffer.from(data), encoding);
 };
 // Disable bracketed paste on exit

package/dist/tools/files.js

@@ -1,5 +1,5 @@
-import { readFileSync, writeFileSync, existsSync, readdirSync, statSync } from "fs";
-import { join, relative } from "path";
+import { readFileSync, writeFileSync, existsSync, readdirSync, statSync, mkdirSync } from "fs";
+import { join, relative, dirname } from "path";
 /**
  * Tool definitions for the OpenAI function calling API
  */
@@ -25,7 +25,7 @@ export const FILE_TOOLS = [
         type: "function",
         function: {
             name: "write_file",
-            description: "Write content to a file. Creates the file if it doesn't exist, overwrites if it does.",
+            description: "Write content to a file. Creates the file if it doesn't exist, overwrites if it does. Use this for new files or full rewrites only.",
             parameters: {
                 type: "object",
                 properties: {
@@ -42,6 +42,35 @@ export const FILE_TOOLS = [
             },
         },
     },
+    {
+        type: "function",
+        function: {
+            name: "edit_file",
+            description: "Edit an existing file by replacing exact text. Prefer this over write_file for small or localized changes.",
+            parameters: {
+                type: "object",
+                properties: {
+                    path: {
+                        type: "string",
+                        description: "Path to the file to edit (relative to project root)",
+                    },
+                    oldText: {
+                        type: "string",
+                        description: "Exact text to find in the file",
+                    },
+                    newText: {
+                        type: "string",
+                        description: "Replacement text",
+                    },
+                    replaceAll: {
+                        type: "boolean",
+                        description: "Replace all exact matches instead of only the first one (default: false)",
+                    },
+                },
+                required: ["path", "oldText", "newText"],
+            },
+        },
+    },
     {
         type: "function",
         function: {
@@ -120,6 +149,7 @@ export async function executeTool(name, args, cwd) {
         case "write_file": {
             const filePath = join(cwd, args.path);
             try {
+                mkdirSync(dirname(filePath), { recursive: true });
                 writeFileSync(filePath, args.content, "utf-8");
                 return `✅ Wrote ${args.content.length} bytes to ${args.path}`;
             }
@@ -127,6 +157,31 @@ export async function executeTool(name, args, cwd) {
                 return `Error writing file: ${e}`;
             }
         }
+        case "edit_file": {
+            const filePath = join(cwd, args.path);
+            if (!existsSync(filePath))
+                return `Error: File not found: ${args.path}`;
+            try {
+                const oldText = String(args.oldText ?? "");
+                const newText = String(args.newText ?? "");
+                const replaceAll = Boolean(args.replaceAll);
+                const content = readFileSync(filePath, "utf-8");
+                if (!oldText)
+                    return "Error: oldText cannot be empty.";
+                if (!content.includes(oldText)) {
+                    return `Error: Could not find exact text in ${args.path}`;
+                }
+                const matchCount = content.split(oldText).length - 1;
+                const nextContent = replaceAll
+                    ? content.split(oldText).join(newText)
+                    : content.replace(oldText, newText);
+                writeFileSync(filePath, nextContent, "utf-8");
+                return `✅ Edited ${args.path} (${replaceAll ? matchCount : 1} replacement${replaceAll ? (matchCount === 1 ? "" : "s") : ""})`;
+            }
+            catch (e) {
+                return `Error editing file: ${e}`;
+            }
+        }
         case "list_files": {
             const dirPath = join(cwd, args.path || ".");
             if (!existsSync(dirPath))

package/dist/utils/context.js

@@ -116,6 +116,12 @@ You help developers understand, write, debug, and refactor code. You have access
 - Use the run_command tool for building, testing, and linters
 - Never delete files without explicit confirmation
 
+## Editing Strategy
+- Prefer edit_file for small or localized changes — use it when you only need to change part of a file.
+- edit_file requires the exact text to be found in the file, so read the file first to confirm the exact content.
+- Use write_file only when creating a new file or when the changes affect most of the file.
+- When in doubt about scope, prefer edit_file — it is safer and easier to review.
+
 ## Repository Map
 The project context below includes a map of the codebase structure. Use this map to understand what files, functions, classes, and types exist where. Use read_file to see full implementations when needed.
 

package/dist/utils/mcp.d.ts

@@ -27,11 +27,16 @@ export declare function loadMCPConfig(cwd: string): MCPConfig;
 export declare function connectToServers(config: MCPConfig, onStatus?: (name: string, status: string) => void): Promise<ConnectedServer[]>;
 export declare function disconnectAll(): Promise<void>;
 export declare function getConnectedServers(): ConnectedServer[];
+export declare function buildMCPToolName(serverName: string, toolName: string): string;
 export declare function getAllMCPTools(servers: ConnectedServer[]): ChatCompletionTool[];
 /**
  * Parse an MCP tool call name to extract server name and tool name.
- * Format: mcp_<serverName>_<toolName>
- * Server names can contain hyphens but not underscores (by convention).
+ *
+ * New format (collision-safe):
+ *   mcp_<base64url(server)>__<base64url(tool)>
+ *
+ * Legacy format still supported for backwards compatibility:
+ *   mcp_<serverName>_<toolName>
  */
 export declare function parseMCPToolName(fullName: string): {
     serverName: string;