compact-agent 1.15.0 → 1.16.0

package/dist/tools/apply-patch.d.ts

@@ -0,0 +1,35 @@
+/**
+ * apply_patch — multi-file diff tool inspired by OpenAI codex-cli.
+ *
+ * One tool call instead of N edit_file/write_file calls. The envelope
+ * format is self-describing so the model can batch related changes
+ * (renames, adds, deletes, edits) into a single auditable diff:
+ *
+ *   *** Begin Patch
+ *   *** Update File: src/foo.ts
+ *   @@ class Foo
+ *   -  oldLine
+ *   +  newLine
+ *   *** Add File: src/bar.ts
+ *   +contents line 1
+ *   +contents line 2
+ *   *** Delete File: src/old.ts
+ *   *** Move to: src/other.ts
+ *   *** End Patch
+ *
+ * Why this is better than chained edit_file calls:
+ *   - One permission prompt covering the whole refactor
+ *   - The diff is reviewable as a unit; no half-applied state
+ *   - Renames + content edits in the same call (rare-but-real refactor pattern)
+ *   - Multi-file refactors cost one tool round-trip
+ *
+ * Parser notes:
+ *   - Lines starting with `*** ` are control lines (begin/end/file ops)
+ *   - Hunk header lines start with `@@` — symbol anchor or line number
+ *   - Body lines start with `-` (remove), `+` (add), or ` ` (context)
+ *   - We require minimum 2 chars context (or `@@` anchor) for each hunk
+ *   - Match validation: every `-` line must be findable in the current
+ *     file content; otherwise the whole patch rejects (no partial apply)
+ */
+import type { Tool } from './types.js';
+export declare const ApplyPatchTool: Tool;

package/dist/tools/apply-patch.js

@@ -0,0 +1,324 @@
+/**
+ * apply_patch — multi-file diff tool inspired by OpenAI codex-cli.
+ *
+ * One tool call instead of N edit_file/write_file calls. The envelope
+ * format is self-describing so the model can batch related changes
+ * (renames, adds, deletes, edits) into a single auditable diff:
+ *
+ *   *** Begin Patch
+ *   *** Update File: src/foo.ts
+ *   @@ class Foo
+ *   -  oldLine
+ *   +  newLine
+ *   *** Add File: src/bar.ts
+ *   +contents line 1
+ *   +contents line 2
+ *   *** Delete File: src/old.ts
+ *   *** Move to: src/other.ts
+ *   *** End Patch
+ *
+ * Why this is better than chained edit_file calls:
+ *   - One permission prompt covering the whole refactor
+ *   - The diff is reviewable as a unit; no half-applied state
+ *   - Renames + content edits in the same call (rare-but-real refactor pattern)
+ *   - Multi-file refactors cost one tool round-trip
+ *
+ * Parser notes:
+ *   - Lines starting with `*** ` are control lines (begin/end/file ops)
+ *   - Hunk header lines start with `@@` — symbol anchor or line number
+ *   - Body lines start with `-` (remove), `+` (add), or ` ` (context)
+ *   - We require minimum 2 chars context (or `@@` anchor) for each hunk
+ *   - Match validation: every `-` line must be findable in the current
+ *     file content; otherwise the whole patch rejects (no partial apply)
+ */
+import { readFileSync, writeFileSync, unlinkSync, existsSync, mkdirSync } from 'node:fs';
+import { dirname } from 'node:path';
+import { resolveUserPath } from './path-utils.js';
+/**
+ * Parse the envelope into a list of file ops. Throws on malformed input
+ * with a clear message — the model can read the error and retry.
+ */
+function parsePatch(text, cwd) {
+    const lines = text.split(/\r?\n/);
+    let i = 0;
+    // Skip leading blanks
+    while (i < lines.length && lines[i].trim() === '')
+        i++;
+    if (i >= lines.length || lines[i].trim() !== '*** Begin Patch') {
+        throw new Error('apply_patch: envelope must start with "*** Begin Patch"');
+    }
+    i++;
+    const ops = [];
+    let current = null;
+    let hunk = null;
+    function flushHunk() {
+        if (current && current.kind === 'update' && hunk && (hunk.oldLines.length > 0 || hunk.newLines.length > 0)) {
+            current.hunks = current.hunks || [];
+            current.hunks.push(hunk);
+        }
+        hunk = null;
+    }
+    function flushOp() {
+        flushHunk();
+        if (current)
+            ops.push(current);
+        current = null;
+    }
+    while (i < lines.length) {
+        const line = lines[i];
+        const trimmed = line.trimEnd(); // preserve leading whitespace
+        if (trimmed === '*** End Patch') {
+            flushOp();
+            return ops;
+        }
+        if (trimmed.startsWith('*** Update File: ')) {
+            flushOp();
+            current = { kind: 'update', path: resolveUserPath(cwd, trimmed.slice('*** Update File: '.length).trim()), hunks: [] };
+            hunk = null;
+            i++;
+            continue;
+        }
+        if (trimmed.startsWith('*** Add File: ')) {
+            flushOp();
+            current = { kind: 'add', path: resolveUserPath(cwd, trimmed.slice('*** Add File: '.length).trim()), content: '' };
+            i++;
+            continue;
+        }
+        if (trimmed.startsWith('*** Delete File: ')) {
+            flushOp();
+            current = { kind: 'delete', path: resolveUserPath(cwd, trimmed.slice('*** Delete File: '.length).trim()) };
+            i++;
+            continue;
+        }
+        if (trimmed.startsWith('*** Move to: ')) {
+            // Move applies to the *current* update op (rare but supported)
+            if (!current || current.kind !== 'update') {
+                throw new Error(`apply_patch: "*** Move to:" must follow "*** Update File:" (line ${i + 1})`);
+            }
+            current.kind = 'move';
+            current.movePath = resolveUserPath(cwd, trimmed.slice('*** Move to: '.length).trim());
+            i++;
+            continue;
+        }
+        // Hunk header for Update / Move ops
+        if (trimmed.startsWith('@@') && current && (current.kind === 'update' || current.kind === 'move')) {
+            flushHunk();
+            hunk = { anchor: trimmed.slice(2).trim() || undefined, oldLines: [], newLines: [] };
+            i++;
+            continue;
+        }
+        // Body lines
+        if (current?.kind === 'add') {
+            // Add-file body: every non-empty line should start with '+', but be lenient
+            if (line.startsWith('+'))
+                current.content = (current.content || '') + line.slice(1) + '\n';
+            else if (line === '')
+                current.content = (current.content || '') + '\n';
+            else
+                throw new Error(`apply_patch: Add File body must start with '+' (line ${i + 1}: "${line.slice(0, 60)}")`);
+            i++;
+            continue;
+        }
+        if (current?.kind === 'update' || current?.kind === 'move') {
+            if (!hunk) {
+                // Allow implicit hunk if first body line is a diff line
+                if (line.startsWith('+') || line.startsWith('-') || line.startsWith(' ')) {
+                    hunk = { oldLines: [], newLines: [] };
+                }
+                else {
+                    // Unrelated line — skip (e.g. blank between header and hunk)
+                    i++;
+                    continue;
+                }
+            }
+            if (line.startsWith('-'))
+                hunk.oldLines.push(line.slice(1));
+            else if (line.startsWith('+'))
+                hunk.newLines.push(line.slice(1));
+            else if (line.startsWith(' ')) {
+                hunk.oldLines.push(line.slice(1));
+                hunk.newLines.push(line.slice(1));
+            }
+            else if (line === '') {
+                hunk.oldLines.push('');
+                hunk.newLines.push('');
+            }
+            else
+                throw new Error(`apply_patch: unrecognized hunk line (line ${i + 1}: "${line.slice(0, 60)}")`);
+            i++;
+            continue;
+        }
+        // Outside any op — skip blanks, error on stray content
+        if (line.trim() === '') {
+            i++;
+            continue;
+        }
+        throw new Error(`apply_patch: stray content outside any file op (line ${i + 1}: "${line.slice(0, 60)}")`);
+    }
+    throw new Error('apply_patch: envelope did not end with "*** End Patch"');
+}
+/**
+ * Apply one hunk to a file's current content. Returns the new content
+ * or throws if the hunk doesn't match.
+ */
+function applyHunk(content, hunk) {
+    const oldBlock = hunk.oldLines.join('\n');
+    const newBlock = hunk.newLines.join('\n');
+    if (oldBlock === '') {
+        // Pure insertion — append at end (or at anchor if specified)
+        return content + (content.endsWith('\n') ? '' : '\n') + newBlock + '\n';
+    }
+    // Locate the old block. We use exact substring match for safety.
+    let idx = content.indexOf(oldBlock);
+    if (idx === -1) {
+        // Try a more forgiving match: collapse whitespace
+        const flexible = oldBlock.replace(/\s+/g, ' ').trim();
+        const collapsed = content.replace(/\s+/g, ' ');
+        const ci = collapsed.indexOf(flexible);
+        if (ci === -1) {
+            throw new Error(`apply_patch: hunk did not match file. Looking for:\n---\n${oldBlock.slice(0, 200)}\n---`);
+        }
+        throw new Error(`apply_patch: hunk only matches with whitespace differences — clean up the diff to match exactly`);
+    }
+    // Disambiguate if the old block appears multiple times: require anchor
+    const next = content.indexOf(oldBlock, idx + 1);
+    if (next !== -1 && !hunk.anchor) {
+        throw new Error(`apply_patch: hunk matches in multiple places — add an @@ anchor line above the change`);
+    }
+    if (next !== -1 && hunk.anchor) {
+        // Prefer the occurrence closest to the anchor symbol
+        const anchorIdx = content.indexOf(hunk.anchor);
+        if (anchorIdx !== -1) {
+            // Find the occurrence with the closest preceding anchor
+            const occurrences = [];
+            let pos = content.indexOf(oldBlock);
+            while (pos !== -1) {
+                occurrences.push(pos);
+                pos = content.indexOf(oldBlock, pos + 1);
+            }
+            let best = occurrences[0];
+            let bestDist = Math.abs(best - anchorIdx);
+            for (const o of occurrences) {
+                const d = Math.abs(o - anchorIdx);
+                if (d < bestDist) {
+                    best = o;
+                    bestDist = d;
+                }
+            }
+            idx = best;
+        }
+    }
+    return content.slice(0, idx) + newBlock + content.slice(idx + oldBlock.length);
+}
+/**
+ * Validate every op against the disk state. Throws on the first
+ * problem so we never apply a half-broken patch. This is the "validate
+ * then commit" boundary.
+ */
+function validate(ops) {
+    for (const op of ops) {
+        if (op.kind === 'add') {
+            if (existsSync(op.path)) {
+                throw new Error(`apply_patch: cannot Add File "${op.path}" — already exists. Use Update File instead.`);
+            }
+        }
+        else if (op.kind === 'update' || op.kind === 'move') {
+            if (!existsSync(op.path)) {
+                throw new Error(`apply_patch: cannot Update File "${op.path}" — does not exist. Use Add File for new files.`);
+            }
+            if (op.kind === 'move' && !op.movePath) {
+                throw new Error(`apply_patch: Move op requires a destination path`);
+            }
+            // Dry-apply all hunks to surface mismatches before any write
+            let content = readFileSync(op.path, 'utf-8');
+            for (const h of op.hunks || []) {
+                content = applyHunk(content, h);
+            }
+        }
+        else if (op.kind === 'delete') {
+            if (!existsSync(op.path)) {
+                throw new Error(`apply_patch: cannot Delete File "${op.path}" — does not exist`);
+            }
+        }
+    }
+}
+/**
+ * Apply the validated ops. Mutates disk. Run validate() first.
+ */
+function commit(ops) {
+    const log = [];
+    for (const op of ops) {
+        if (op.kind === 'add') {
+            mkdirSync(dirname(op.path), { recursive: true });
+            writeFileSync(op.path, op.content || '', 'utf-8');
+            const lines = (op.content || '').split('\n').length;
+            log.push(`+ ${op.path} (${lines} lines)`);
+        }
+        else if (op.kind === 'update') {
+            let content = readFileSync(op.path, 'utf-8');
+            for (const h of op.hunks || [])
+                content = applyHunk(content, h);
+            writeFileSync(op.path, content, 'utf-8');
+            const hunkCount = (op.hunks || []).length;
+            log.push(`~ ${op.path} (${hunkCount} hunk${hunkCount === 1 ? '' : 's'})`);
+        }
+        else if (op.kind === 'move') {
+            let content = readFileSync(op.path, 'utf-8');
+            for (const h of op.hunks || [])
+                content = applyHunk(content, h);
+            mkdirSync(dirname(op.movePath), { recursive: true });
+            writeFileSync(op.movePath, content, 'utf-8');
+            unlinkSync(op.path);
+            log.push(`~ ${op.path} → ${op.movePath}`);
+        }
+        else if (op.kind === 'delete') {
+            unlinkSync(op.path);
+            log.push(`- ${op.path}`);
+        }
+    }
+    return log.join('\n');
+}
+export const ApplyPatchTool = {
+    name: 'apply_patch',
+    description: 'Apply a multi-file patch as a single atomic operation. Use this for ' +
+        'refactors touching 2+ files, file renames, or any change you would have ' +
+        'made with multiple edit_file/write_file calls. Format:\n\n' +
+        '*** Begin Patch\n' +
+        '*** Update File: src/foo.ts\n' +
+        '@@ class Foo\n' +
+        '-  oldLine\n' +
+        '+  newLine\n' +
+        '*** Add File: src/bar.ts\n' +
+        '+contents line 1\n' +
+        '+contents line 2\n' +
+        '*** Delete File: src/old.ts\n' +
+        '*** End Patch\n\n' +
+        'Rules: validate-then-commit (any hunk mismatch rejects the whole patch); ' +
+        'Update File requires the target to exist; Add File requires the target NOT ' +
+        'to exist; @@ anchors disambiguate when the old block matches multiple places; ' +
+        'do NOT re-read the file after this tool returns — the changes are on disk.',
+    parameters: {
+        type: 'object',
+        properties: {
+            patch: { type: 'string', description: 'The envelope text, beginning with "*** Begin Patch"' },
+        },
+        required: ['patch'],
+    },
+    isReadOnly: false,
+    isDestructive: true,
+    async call(input, cwd) {
+        try {
+            const ops = parsePatch(input.patch, cwd);
+            if (ops.length === 0)
+                return { output: 'apply_patch: empty patch (no file ops).', isError: false };
+            validate(ops);
+            const log = commit(ops);
+            return { output: `Applied ${ops.length} file op(s):\n${log}`, isError: false };
+        }
+        catch (e) {
+            const msg = e instanceof Error ? e.message : String(e);
+            return { output: msg, isError: true };
+        }
+    },
+};
+//# sourceMappingURL=apply-patch.js.map

package/dist/tools/apply-patch.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"apply-patch.js","sourceRoot":"","sources":["../../src/tools/apply-patch.ts"],"names":[],"mappings":"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"}

package/dist/tools/index.js

@@ -12,6 +12,7 @@ import { stitchConfigured } from '../stitch.js';
 import { MEMORY_TOOLS } from './memory.js';
 import { isMemoryEnabled } from '../mempalace/index.js';
 import { SkillViewTool } from './skill.js';
+import { ApplyPatchTool } from './apply-patch.js';
 // Stitch is only listed in the tool registry when configured — otherwise
 // free models hallucinate calls to it and waste turns on auth errors.
 const OPTIONAL_TOOLS = [];
@@ -28,6 +29,9 @@ export const ALL_TOOLS = [
     ReadTool,
     WriteTool,
     EditTool,
+    // apply_patch — multi-file atomic edits (replaces chained edit/write
+    // for refactors). Inspired by codex-cli's *** Begin Patch envelope.
+    ApplyPatchTool,
     GrepTool,
     GlobTool,
     ListDirTool,

package/dist/tools/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/tools/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AACrC,OAAO,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AACrC,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AACvC,OAAO,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AACrC,OAAO,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AACrC,OAAO,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AACrC,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAC9C,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAChD,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAC5C,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAChD,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAC3C,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AACxD,OAAO,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAE3C,yEAAyE;AACzE,sEAAsE;AACtE,MAAM,cAAc,GAAW,EAAE,CAAC;AAClC,IAAI,gBAAgB,EAAE;IAAE,cAAc,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;AAExD,qEAAqE;AACrE,sEAAsE;AACtE,uEAAuE;AACvE,uEAAuE;AACvE,yDAAyD;AACzD,MAAM,uBAAuB,GAAW,eAAe,EAAE,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,EAAE,CAAC;AAE9E,MAAM,CAAC,MAAM,SAAS,GAAW;IAC/B,QAAQ;IACR,QAAQ;IACR,SAAS;IACT,QAAQ;IACR,QAAQ;IACR,QAAQ;IACR,WAAW;IACX,YAAY;IACZ,aAAa;IACb,GAAG,uBAAuB;IAC1B,mEAAmE;IACnE,kEAAkE;IAClE,oEAAoE;IACpE,aAAa;IACb,GAAG,cAAc;CAClB,CAAC;AAEF,MAAM,UAAU,YAAY;IAC1B,OAAO,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;AACtC,CAAC;AAED,MAAM,UAAU,aAAa,CAAC,IAAY;IACxC,OAAO,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,IAAI,CAAC,CAAC;AAChD,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/tools/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AACrC,OAAO,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AACrC,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AACvC,OAAO,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AACrC,OAAO,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AACrC,OAAO,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AACrC,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAC9C,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAChD,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAC5C,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAChD,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAC3C,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AACxD,OAAO,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAC3C,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAElD,yEAAyE;AACzE,sEAAsE;AACtE,MAAM,cAAc,GAAW,EAAE,CAAC;AAClC,IAAI,gBAAgB,EAAE;IAAE,cAAc,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;AAExD,qEAAqE;AACrE,sEAAsE;AACtE,uEAAuE;AACvE,uEAAuE;AACvE,yDAAyD;AACzD,MAAM,uBAAuB,GAAW,eAAe,EAAE,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,EAAE,CAAC;AAE9E,MAAM,CAAC,MAAM,SAAS,GAAW;IAC/B,QAAQ;IACR,QAAQ;IACR,SAAS;IACT,QAAQ;IACR,qEAAqE;IACrE,oEAAoE;IACpE,cAAc;IACd,QAAQ;IACR,QAAQ;IACR,WAAW;IACX,YAAY;IACZ,aAAa;IACb,GAAG,uBAAuB;IAC1B,mEAAmE;IACnE,kEAAkE;IAClE,oEAAoE;IACpE,aAAa;IACb,GAAG,cAAc;CAClB,CAAC;AAEF,MAAM,UAAU,YAAY;IAC1B,OAAO,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;AACtC,CAAC;AAED,MAAM,UAAU,aAAa,CAAC,IAAY;IACxC,OAAO,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,IAAI,CAAC,CAAC;AAChD,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "compact-agent",
-  "version": "1.15.0",
+  "version": "1.16.0",
   "description": "A dense, feature-rich AI coding agent for the terminal. Built-in voice dictation (Whisper) + TTS readout (ElevenLabs) + screen-reader mode for blind / low-vision users. 80+ slash commands, 9 modes including Hermes self-improving loop, multi-agent orchestration, bundled everything-claude-code skills library, learning system, and observable LLM transport. Works with OpenRouter, OpenAI, Anthropic-compatible, Ollama, LM Studio, DeepSeek, or any OpenAI-compatible API.",
   "type": "module",
   "license": "MIT",