ikie-cli 0.1.13 → 0.1.14

package/dist/agent.js

@@ -530,12 +530,13 @@ export class Agent {
             if (name === 'edit_file' && !result.startsWith('Error')) {
                 const oldStr = String(input.old_string ?? '');
                 const newStr = String(input.new_string ?? '');
-                block = toolDiffBlock(oldStr, newStr, ms);
+                const path = typeof input.path === 'string' ? input.path : undefined;
+                block = toolDiffBlock(oldStr, newStr, ms, { path, indent: this.indent });
             }
             else {
-                block = toolOutputBlock(result, ms);
+                block = toolOutputBlock(result, ms, this.indent);
             }
-            process.stdout.write(`${this.indent}${block}\n`);
+            process.stdout.write(`${block}\n`);
             return result;
         }
         catch (err) {

package/dist/theme.d.ts

@@ -62,9 +62,16 @@ export declare class InlineSpinner {
 }
 export declare function toolLine(name: string, args: string): string;
 /** Multi-line output block shown after a tool runs. */
-export declare function toolOutputBlock(result: string, ms: number): string;
-/** Colored diff block for edit_file / write_file. */
-export declare function toolDiffBlock(oldStr: string, newStr: string, ms: number): string;
+export declare function toolOutputBlock(result: string, ms: number, indent?: string): string;
+interface DiffOpts {
+    path?: string;
+    indent?: string;
+}
+/**
+ * Render an edit as a polished unified diff: line-number gutter, a few lines of
+ * surrounding context pulled from the file, and full-width muted red/green rows.
+ */
+export declare function toolDiffBlock(oldStr: string, newStr: string, ms: number, opts?: DiffOpts): string;
 export declare function toolSuccessLine(ms: number, preview?: string): string;
 export declare function toolErrorLine(msg: string): string;
 export declare function successLine(msg: string): string;
@@ -72,3 +79,4 @@ export declare function errorLine(msg: string): string;
 export declare function warnLine(msg: string): string;
 export declare function infoLine(msg: string): string;
 export declare function permissionPrompt(toolName: string, preview: string): string;
+export {};

package/dist/theme.js

@@ -375,55 +375,159 @@ export function toolLine(name, args) {
     return `${tint('●')} ${c.white.bold(verb + badge)}${c.dim('(')}${c.muted(args)}${c.dim(')')}`;
 }
 /** Multi-line output block shown after a tool runs. */
-export function toolOutputBlock(result, ms) {
+export function toolOutputBlock(result, ms, indent = '  ') {
     const time = c.muted(formatDuration(ms));
     const lines = result.split('\n').filter(l => l.trim() !== '');
     if (!lines.length)
-        return `  ${c.muted('⎿')} ${time}`;
+        return `${indent}${c.muted('⎿')} ${time}`;
     const MAX = 5;
     const shown = lines.slice(0, MAX);
     const hidden = lines.length - MAX;
+    const cont = indent + '  ';
     const out = [];
-    out.push(`  ${c.muted('⎿')} ${time}  ${c.dim(clampLine(shown[0]))}`);
+    out.push(`${indent}${c.muted('⎿')} ${time}  ${c.dim(clampLine(shown[0]))}`);
     for (let i = 1; i < shown.length; i++) {
-        out.push(`    ${c.dim(clampLine(shown[i]))}`);
+        out.push(`${cont}${c.dim(clampLine(shown[i]))}`);
     }
     if (hidden > 0) {
-        out.push(`    ${c.muted(`… +${hidden} lines`)}`);
+        out.push(`${cont}${c.muted(`… +${hidden} lines`)}`);
     }
     return out.join('\n');
 }
-/** Colored diff block for edit_file / write_file. */
-export function toolDiffBlock(oldStr, newStr, ms) {
-    const time = c.muted(formatDuration(ms));
-    const removed = oldStr.split('\n');
-    const added = newStr.split('\n');
-    const nRemoved = removed.filter(l => l.trim()).length;
-    const nAdded = added.filter(l => l.trim()).length;
-    const parts = [];
-    if (nAdded)
-        parts.push(`Added ${nAdded} line${nAdded === 1 ? '' : 's'}`);
-    if (nRemoved)
-        parts.push(`removed ${nRemoved} line${nRemoved === 1 ? '' : 's'}`);
-    const summary = parts.join(', ') || 'no changes';
+// ── Diff rendering ────────────────────────────────────────────────────────────
+// Diff palette (256-color, muted — chalk degrades gracefully on low-color TTYs).
+const diffColors = {
+    delBg: chalk.bgAnsi256(52), // deep red
+    insBg: chalk.bgAnsi256(22), // deep green
+    delGutter: chalk.ansi256(210),
+    insGutter: chalk.ansi256(151),
+    onBg: chalk.ansi256(255),
+    ctxGutter: chalk.ansi256(240),
+    ctxCode: chalk.ansi256(248),
+};
+/** Classic LCS line diff — interleaves equal/removed/added like a real unified diff. */
+function lineDiff(a, b) {
+    const n = a.length, m = b.length;
+    const dp = Array.from({ length: n + 1 }, () => new Array(m + 1).fill(0));
+    for (let i = n - 1; i >= 0; i--) {
+        for (let j = m - 1; j >= 0; j--) {
+            dp[i][j] = a[i] === b[j] ? dp[i + 1][j + 1] + 1 : Math.max(dp[i + 1][j], dp[i][j + 1]);
+        }
+    }
     const out = [];
-    out.push(`  ${c.muted('⎿')} ${time}  ${c.dim(summary)}`);
-    const MAX = 10;
-    let shown = 0;
-    for (const line of removed) {
-        if (shown >= MAX)
-            break;
-        out.push(chalk.bgRed.white(`  - ${clampLine(line, 116)}`));
-        shown++;
+    let i = 0, j = 0;
+    while (i < n && j < m) {
+        if (a[i] === b[j]) {
+            out.push({ t: 'eq', s: a[i] });
+            i++;
+            j++;
+        }
+        else if (dp[i + 1][j] >= dp[i][j + 1]) {
+            out.push({ t: 'del', s: a[i] });
+            i++;
+        }
+        else {
+            out.push({ t: 'ins', s: b[j] });
+            j++;
+        }
+    }
+    while (i < n)
+        out.push({ t: 'del', s: a[i++] });
+    while (j < m)
+        out.push({ t: 'ins', s: b[j++] });
+    return out;
+}
+/**
+ * Render an edit as a polished unified diff: line-number gutter, a few lines of
+ * surrounding context pulled from the file, and full-width muted red/green rows.
+ */
+export function toolDiffBlock(oldStr, newStr, ms, opts = {}) {
+    const indent = opts.indent ?? '  ';
+    const cols = Math.max(40, (process.stdout.columns ?? 100));
+    const time = c.muted(formatDuration(ms));
+    const oldLines = oldStr.split('\n');
+    const newLines = newStr.split('\n');
+    const ops = lineDiff(oldLines, newLines);
+    const nDel = ops.filter(o => o.t === 'del').length;
+    const nIns = ops.filter(o => o.t === 'ins').length;
+    // Anchor line numbers + context lines by locating the new text in the file.
+    let anchor = 1;
+    let fileLines = null;
+    const CTX = 3;
+    if (opts.path) {
+        try {
+            const content = readFileSync(opts.path, 'utf-8');
+            const idx = content.indexOf(newStr);
+            if (idx >= 0) {
+                anchor = (content.slice(0, idx).match(/\n/g)?.length ?? 0) + 1;
+                fileLines = content.split('\n');
+            }
+        }
+        catch { /* no context — fall back to anchorless diff */ }
     }
-    for (const line of added) {
-        if (shown >= MAX)
-            break;
-        out.push(chalk.bgGreen.black(`  + ${clampLine(line, 116)}`));
-        shown++;
+    const summaryParts = [];
+    if (nIns)
+        summaryParts.push(`Added ${nIns} line${nIns === 1 ? '' : 's'}`);
+    if (nDel)
+        summaryParts.push(`removed ${nDel} line${nDel === 1 ? '' : 's'}`);
+    const summary = summaryParts.join(', ') || 'no changes';
+    // Width of the line-number gutter.
+    const maxNum = anchor + Math.max(oldLines.length, newLines.length) + CTX;
+    const gw = String(maxNum).length;
+    const rowsRaw = [];
+    // Leading context (lines just before the edit).
+    if (fileLines) {
+        for (let k = Math.max(1, anchor - CTX); k < anchor; k++) {
+            rowsRaw.push({ kind: 'eq', num: k, text: fileLines[k - 1] ?? '' });
+        }
+    }
+    // The diff body — track separate old/new line counters off the same anchor.
+    let oldNum = anchor, newNum = anchor;
+    for (const op of ops) {
+        if (op.t === 'eq') {
+            rowsRaw.push({ kind: 'eq', num: newNum, text: op.s });
+            oldNum++;
+            newNum++;
+        }
+        else if (op.t === 'del') {
+            rowsRaw.push({ kind: 'del', num: oldNum, text: op.s });
+            oldNum++;
+        }
+        else {
+            rowsRaw.push({ kind: 'ins', num: newNum, text: op.s });
+            newNum++;
+        }
+    }
+    // Trailing context (lines just after the edit).
+    if (fileLines) {
+        const afterStart = newNum;
+        for (let k = afterStart; k < afterStart + CTX && k <= fileLines.length; k++) {
+            rowsRaw.push({ kind: 'eq', num: k, text: fileLines[k - 1] ?? '' });
+        }
+    }
+    const out = [];
+    out.push(`${indent}${c.muted('⎿')} ${time}  ${c.dim(summary)}`);
+    const MAX = 16;
+    const codeWidth = cols - indent.length - gw - 4; // gutter + " x " marker + space
+    const render = rowsRaw.slice(0, MAX);
+    for (const r of render) {
+        const numStr = String(r.num).padStart(gw);
+        const code = r.text.length > codeWidth ? r.text.slice(0, codeWidth - 1) + '…' : r.text;
+        if (r.kind === 'eq') {
+            out.push(`${indent}${diffColors.ctxGutter(numStr)}   ${diffColors.ctxCode(code)}`);
+        }
+        else {
+            const marker = r.kind === 'del' ? '-' : '+';
+            const bg = r.kind === 'del' ? diffColors.delBg : diffColors.insBg;
+            const gutter = r.kind === 'del' ? diffColors.delGutter : diffColors.insGutter;
+            const plainLen = numStr.length + 3 + code.length; // num + " x " + code
+            const pad = Math.max(0, cols - indent.length - plainLen);
+            const inner = `${gutter(numStr)} ${gutter(marker)} ${diffColors.onBg(code)}${' '.repeat(pad)}`;
+            out.push(`${indent}${bg(inner)}`);
+        }
     }
-    if (shown >= MAX && (removed.length + added.length > MAX)) {
-        out.push(`    ${c.muted(`… +${removed.length + added.length - MAX} lines`)}`);
+    if (rowsRaw.length > MAX) {
+        out.push(`${indent}${c.muted(`… +${rowsRaw.length - MAX} lines`)}`);
     }
     return out.join('\n');
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ikie-cli",
-  "version": "0.1.13",
+  "version": "0.1.14",
   "description": "Agentic coding CLI — your terminal AI pair programmer",
   "type": "module",
   "bin": {