agent-sh 0.12.17 → 0.12.19

package/dist/agent/agent-loop.js

@@ -995,8 +995,7 @@ export class AgentLoop {
                 const absPath = path.resolve(process.cwd(), args.path);
                 this.fileReadCache.delete(absPath);
             }
-            // Compute result display: tool-provided → default (none)
-            const resultDisplay = tool.formatResult?.(args, result);
+            const resultDisplay = result.display ?? tool.formatResult?.(args, result);
             // Emit completion events (via transform pipe so extensions can override)
             this.bus.emitTransform("agent:tool-completed", {
                 toolCallId: id, exitCode: result.exitCode,

package/dist/agent/conversation-state.d.ts

@@ -59,6 +59,9 @@ export declare class ConversationState {
     private hasOpenToolCalls;
     private flushPendingNotes;
     getMessages(): ChatCompletionMessageParam[];
+    /** Drop tool messages with no matching preceding tool_call — strict
+     *  providers (DeepSeek) 400, and compaction can leave such orphans. */
+    private dropOrphanToolMessages;
     /**
      * If a stream was interrupted mid-tool-execution, an assistant message
      * with tool_calls can land in history without matching tool results.

package/dist/agent/conversation-state.js

@@ -163,7 +163,24 @@ export class ConversationState {
         this.invalidateMessagesCache();
     }
     getMessages() {
-        return this.normalizeReasoningConsistency(this.stubDanglingToolCalls(this.messages));
+        return this.normalizeReasoningConsistency(this.stubDanglingToolCalls(this.dropOrphanToolMessages(this.messages)));
+    }
+    /** Drop tool messages with no matching preceding tool_call — strict
+     *  providers (DeepSeek) 400, and compaction can leave such orphans. */
+    dropOrphanToolMessages(messages) {
+        const knownIds = new Set();
+        const result = [];
+        for (const msg of messages) {
+            if (msg.role === "assistant" && "tool_calls" in msg && msg.tool_calls) {
+                for (const tc of msg.tool_calls)
+                    knownIds.add(tc.id);
+            }
+            if (msg.role === "tool" && !knownIds.has(msg.tool_call_id)) {
+                continue;
+            }
+            result.push(msg);
+        }
+        return result;
     }
     /**
      * If a stream was interrupted mid-tool-execution, an assistant message
@@ -582,19 +599,23 @@ export class ConversationState {
     slimTurn(messages) {
         const MAX_RESULT_LEN = 1500;
         const result = [];
-        const readOnlyToolIds = new Set();
+        const droppedToolIds = new Set();
         for (const msg of messages) {
             if (msg.role === "assistant" && "tool_calls" in msg && msg.tool_calls) {
                 const kept = msg.tool_calls.filter((tc) => {
                     if (!("function" in tc))
                         return true;
                     if (READ_ONLY_TOOLS.has(tc.function.name)) {
-                        readOnlyToolIds.add(tc.id);
+                        droppedToolIds.add(tc.id);
                         return false;
                     }
                     return true;
                 });
                 if (kept.length === 0) {
+                    // No content + no tool_calls is malformed (DeepSeek 400); drop the husk.
+                    const text = typeof msg.content === "string" ? msg.content.trim() : "";
+                    if (!text)
+                        continue;
                     const { tool_calls: _, ...rest } = msg;
                     result.push(rest);
                 }
@@ -604,7 +625,7 @@ export class ConversationState {
                 continue;
             }
             if (msg.role === "tool") {
-                if (readOnlyToolIds.has(msg.tool_call_id))
+                if (droppedToolIds.has(msg.tool_call_id))
                     continue;
                 const content = typeof msg.content === "string" ? msg.content : "";
                 if (content.length > MAX_RESULT_LEN) {

package/dist/agent/tools/edit-file.js

@@ -69,13 +69,7 @@ export function createEditFileTool(getCwd) {
             icon: "✎",
             locations: [{ path: args.path }],
         }),
-        formatResult: (_args, result) => {
-            if (result.isError)
-                return {};
-            const m = result.content.match(/\((\+\d+(?:\s-\d+)?)\)/);
-            return m ? { summary: m[1] } : {};
-        },
-        async execute(args, onChunk) {
+        async execute(args) {
             const filePath = expandHome(args.path);
             const oldText = args.old_text;
             const newText = args.new_text;
@@ -120,26 +114,16 @@ export function createEditFileTool(getCwd) {
                     ? newContent.replace(/\n/g, "\r\n")
                     : newContent;
                 await fs.writeFile(absPath, finalContent);
-                // Compute and stream diff for display. Batch into one onChunk —
-                // per-line emits trigger N TUI renders for large hunks.
                 const diff = computeEditDiff(normalized, normalizedOld, normalizedNew, replaceAll);
-                if (onChunk && diff.hunks.length > 0) {
-                    const parts = [];
-                    for (const hunk of diff.hunks) {
-                        for (const line of hunk.lines) {
-                            const prefix = line.type === "added" ? "+" : line.type === "removed" ? "-" : " ";
-                            parts.push(`${prefix}${line.text}\n`);
-                        }
-                    }
-                    onChunk(parts.join(""));
-                }
-                const stats = diff.isNewFile
-                    ? `+${diff.added}`
-                    : `+${diff.added} -${diff.removed}`;
+                const stats = diff.isNewFile ? `+${diff.added}` : `+${diff.added} -${diff.removed}`;
                 return {
                     content: `Edited ${absPath} (${stats})`,
                     exitCode: 0,
                     isError: false,
+                    display: {
+                        summary: stats,
+                        body: { kind: "diff", diff, filePath: absPath },
+                    },
                 };
             }
             catch (err) {

package/dist/agent/tools/write-file.js

@@ -29,13 +29,7 @@ export function createWriteFileTool(getCwd) {
             icon: "✎",
             locations: [{ path: args.path }],
         }),
-        formatResult: (_args, result) => {
-            if (result.isError)
-                return {};
-            const m = result.content.match(/\((\+\d+(?:\s-\d+)?)\)/);
-            return m ? { summary: m[1] } : {};
-        },
-        async execute(args, onChunk) {
+        async execute(args) {
             const filePath = expandHome(args.path);
             const content = args.content;
             const absPath = path.resolve(getCwd(), filePath);
@@ -49,28 +43,18 @@ export function createWriteFileTool(getCwd) {
                 }
                 await fs.mkdir(path.dirname(absPath), { recursive: true });
                 await fs.writeFile(absPath, content);
-                // Compute and stream diff for display. Batch into one onChunk —
-                // per-line emits trigger N TUI renders for large files.
                 const diff = computeDiff(oldContent, content);
-                if (onChunk && diff.hunks.length > 0) {
-                    const parts = [];
-                    for (const hunk of diff.hunks) {
-                        for (const line of hunk.lines) {
-                            const prefix = line.type === "added" ? "+" : line.type === "removed" ? "-" : " ";
-                            parts.push(`${prefix}${line.text}\n`);
-                        }
-                    }
-                    onChunk(parts.join(""));
-                }
-                const stats = diff.isNewFile
-                    ? `+${diff.added}`
-                    : `+${diff.added} -${diff.removed}`;
+                const stats = diff.isNewFile ? `+${diff.added}` : `+${diff.added} -${diff.removed}`;
                 return {
                     content: oldContent === null
                         ? `Created ${absPath} (${stats})`
                         : `Wrote ${absPath} (${stats})`,
                     exitCode: 0,
                     isError: false,
+                    display: {
+                        summary: stats,
+                        body: { kind: "diff", diff, filePath: absPath },
+                    },
                 };
             }
             catch (err) {

package/dist/agent/types.d.ts

@@ -19,6 +19,8 @@ export interface ToolResult {
     content: string;
     exitCode: number | null;
     isError: boolean;
+    /** When set, takes precedence over `tool.formatResult()`. */
+    display?: ToolResultDisplay;
 }
 /** Structured result display — returned by formatResult or computed by defaults. */
 export interface ToolResultDisplay {

package/dist/extensions/tui-renderer.js

@@ -652,22 +652,33 @@ export default function activate(ctx) {
     function renderDiffBody(diff, filePath, width) {
         if (diff.isIdentical)
             return [];
-        const boxW = Math.min(120, width - 2); // -2 for writeLine indent
+        const boxW = Math.min(120, width - 2);
         const contentW = boxW - 4;
-        const diffLines = renderDiff(diff, {
-            width: contentW,
-            filePath,
-            maxLines: getSettings().diffMaxLines,
-            trueColor: true,
-        });
-        const body = diffLines.length > 1 ? ["", ...diffLines.slice(1), ""] : diffLines;
-        const footer = undefined;
+        let body;
+        if (diff.isNewFile) {
+            const lines = diff.hunks.flatMap(h => h.lines.map(l => l.text));
+            const preview = getSettings().newFilePreviewLines;
+            const head = lines.slice(0, preview);
+            const truncated = head.map(l => l.length > contentW ? l.slice(0, contentW - 1) + "…" : l);
+            const more = lines.length > preview
+                ? [`${p.dim}… ${lines.length - preview} more lines${p.reset}`]
+                : [];
+            body = ["", ...truncated, ...more, ""];
+        }
+        else {
+            const diffLines = renderDiff(diff, {
+                width: contentW,
+                filePath,
+                maxLines: getSettings().diffMaxLines,
+                trueColor: true,
+            });
+            body = diffLines.length > 1 ? ["", ...diffLines.slice(1), ""] : diffLines;
+        }
         return renderBoxFrame(body, {
             width: boxW,
             style: "rounded",
             borderColor: p.dim,
             title: diffTitle(filePath, diff),
-            footer,
         });
     }
     /** Render output lines with truncation. */

package/dist/settings.d.ts

@@ -67,6 +67,8 @@ export interface Settings {
     readOutputMaxLines?: number;
     /** Max diff lines rendered in the TUI (Infinity = no limit). */
     diffMaxLines?: number;
+    /** Lines of head content shown when a brand-new file is created. */
+    newFilePreviewLines?: number;
     /** Tool protocol:
      *   "api" — all tools sent with full schema.
      *   "deferred" — extensions dispatched through `use_extension(name, args)` meta-tool.

package/dist/settings.js

@@ -30,6 +30,7 @@ const DEFAULTS = {
     maxCommandOutputLines: 3,
     readOutputMaxLines: 10,
     diffMaxLines: Infinity,
+    newFilePreviewLines: 5,
     skillPaths: [],
     diagnose: false,
     startupBanner: true,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agent-sh",
-  "version": "0.12.17",
+  "version": "0.12.19",
   "description": "A shell-first terminal where AI is one keystroke away",
   "type": "module",
   "main": "dist/core.js",