agent-sh 0.15.3 → 0.15.4

package/dist/agent/providers/openai-compatible.d.ts

@@ -1,7 +1,9 @@
 /**
  * OpenAI Chat Completions-compatible local/3rd-party server (Ollama, LM
- * Studio, vLLM, llama.cpp, …). No reasoning hook — the right shape depends
- * on which model the server is serving; user extensions can add one.
+ * Studio, vLLM, llama.cpp, …). Emits the common `reasoning_effort` shape,
+ * with `"none"` to disable — the value most local servers honor. A server
+ * wanting a different disable token can override via `reasoningShape` or a
+ * user extension.
  */
 import type { AgentContext } from "../host-types.js";
 export default function activate(ctx: AgentContext): void;

package/dist/agent/providers/openai-compatible.js

@@ -5,6 +5,11 @@ export default function activate(ctx) {
     // Local servers often need no key; SDK still wants a non-empty string.
     const apiKey = process.env.OPENAI_API_KEY || "no-key";
     const id = "openai-compatible";
+    ctx.agent.providers.configure(id, {
+        reasoningParams: (level) => level === "off"
+            ? { reasoning_effort: "none" }
+            : { reasoning_effort: level === "xhigh" ? "high" : level },
+    });
     ctx.agent.providers.register({ id, apiKey, baseURL, models: [] });
     fetchModels(baseURL, apiKey).then((models) => {
         if (models.length === 0)

package/dist/utils/diff-renderer.js

@@ -157,7 +157,7 @@ function highlightInlineChanges(oldLine, newLine, oldPalette, newPalette, useTru
             }
             else {
                 // Changed tokens: emphasis background, no syntax highlighting (emphasis stands out)
-                result += palette.emphBg + p.bold + tokens[i].text + p.reset;
+                result += palette.emphBg + tokens[i].text + p.reset;
             }
         }
         return result;
@@ -246,55 +246,56 @@ function renderUnifiedHunk(hunk, layout) {
     const { noW, lineTextW, textWidth, useTrueColor, gutterLine, lang, removedPalette, addedPalette } = layout;
     const out = [];
     const pairs = findChangePairs(hunk);
-    const renderedAsPartOfPair = new Set();
     const bgWidth = Math.max(1, textWidth - noW - 3);
     const gutter = (n) => `${p.dim}${n} │${p.reset} `;
     const change = (no, sigil, bg, fg, text) => {
         if (!gutterLine) {
-            return `${bg}${fg}${padToWidth(`${no} ${sigil} ${preserveBg(text, bg)}`, textWidth)}${p.reset}`;
+            return `${bg}${padToWidth(`${fg}${no} ${sigil}${p.diffText} ${preserveBg(text, bg)}`, textWidth)}${p.reset}`;
         }
         if (useTrueColor)
-            return gutter(no) + padToWidth(`${bg}${fg}${sigil} ${preserveBg(text, bg)}`, bgWidth) + p.reset;
+            return gutter(no) + padToWidth(`${bg}${fg}${sigil}${p.diffText} ${preserveBg(text, bg)}`, bgWidth) + p.reset;
         return `${gutter(no)}${fg}${sigil} ${text}${p.reset}`;
     };
+    const hlCache = new Map();
+    const highlightedPair = (pair) => {
+        let h = hlCache.get(pair);
+        if (!h) {
+            h = highlightInlineChanges(pair.removed.text, pair.added.text, removedPalette, addedPalette, useTrueColor, lang);
+            hlCache.set(pair, h);
+        }
+        return h;
+    };
     for (let i = 0; i < hunk.lines.length; i++) {
         const line = hunk.lines[i];
         const no = String(line.type === "removed" ? (line.oldNo ?? "") : (line.newNo ?? line.oldNo ?? "")).padStart(noW);
         if (line.type === "context") {
             const raw = truncateText(line.text, lineTextW);
             const text = lang ? highlightLine(raw, lang) : raw;
-            // The flush gutter dims only the line number; the code stays normal/highlighted.
             out.push(!gutterLine ? `${p.dim}${no}${p.reset}   ${text}` : `${gutter(no)}  ${p.dim}${text}${p.reset}`);
             continue;
         }
+        const pair = pairs.get(i);
         if (line.type === "removed") {
-            const pair = pairs.get(i);
             let removedText;
-            let addedText = null;
-            let addedNo = null;
-            if (pair && pair.removedIdx === i) {
-                const highlighted = highlightInlineChanges(line.text, pair.added.text, removedPalette, addedPalette, useTrueColor, lang);
-                removedText = truncateText(highlighted.old, lineTextW);
-                addedText = truncateText(highlighted.new, lineTextW);
-                addedNo = String(pair.added.newNo ?? "").padStart(noW);
-                renderedAsPartOfPair.add(pair.addedIdx);
+            if (pair) {
+                removedText = truncateText(highlightedPair(pair).old, lineTextW);
             }
             else {
                 const raw = truncateText(line.text, lineTextW);
                 removedText = lang ? highlightLine(raw, lang) : raw;
             }
             out.push(change(no, "-", p.errorBg, p.error, removedText));
-            if (addedText !== null && addedNo !== null) {
-                out.push(change(addedNo, "+", p.successBg, p.success, addedText));
-            }
-            continue;
         }
-        if (line.type === "added") {
-            if (renderedAsPartOfPair.has(i))
-                continue;
-            const raw = truncateText(line.text, lineTextW);
-            const text = lang ? highlightLine(raw, lang) : raw;
-            out.push(change(no, "+", p.successBg, p.success, text));
+        else {
+            let addedText;
+            if (pair) {
+                addedText = truncateText(highlightedPair(pair).new, lineTextW);
+            }
+            else {
+                const raw = truncateText(line.text, lineTextW);
+                addedText = lang ? highlightLine(raw, lang) : raw;
+            }
+            out.push(change(no, "+", p.successBg, p.success, addedText));
         }
     }
     return out;
@@ -362,7 +363,7 @@ function renderSplitHunk(hunk, layout) {
         }
         else if (row.left.type === "removed") {
             if (useTrueColor) {
-                leftCol = padToWidth(`${p.errorBg}${p.error}${leftNo} │ ${preserveBg(leftText, p.errorBg)}`, colWidth) + p.reset;
+                leftCol = padToWidth(`${p.errorBg}${p.error}${leftNo} │${p.diffText} ${preserveBg(leftText, p.errorBg)}`, colWidth) + p.reset;
             }
             else {
                 leftCol = padToWidth(`${p.error}${leftNo} │ ${leftText}${p.reset}`, colWidth);
@@ -376,7 +377,7 @@ function renderSplitHunk(hunk, layout) {
         }
         else if (row.right.type === "added") {
             if (useTrueColor) {
-                rightCol = padToWidth(`${p.successBg}${p.success}${rightNo} │ ${preserveBg(rightText, p.successBg)}`, colWidth) + p.reset;
+                rightCol = padToWidth(`${p.successBg}${p.success}${rightNo} │${p.diffText} ${preserveBg(rightText, p.successBg)}`, colWidth) + p.reset;
             }
             else {
                 rightCol = padToWidth(`${p.success}${rightNo} │ ${rightText}${p.reset}`, colWidth);

package/dist/utils/palette.d.ts

@@ -18,6 +18,7 @@ export interface ColorPalette {
     errorBg: string;
     successBgEmph: string;
     errorBgEmph: string;
+    diffText: string;
     bold: string;
     dim: string;
     italic: string;

package/dist/utils/palette.js

@@ -14,10 +14,11 @@ const defaultPalette = {
     warning: "\x1b[33m", // yellow
     error: "\x1b[31m", // red
     muted: "\x1b[90m", // gray
-    successBg: "\x1b[48;2;34;92;43m",
-    errorBg: "\x1b[48;2;122;41;54m",
-    successBgEmph: "\x1b[48;2;56;166;96m",
-    errorBgEmph: "\x1b[48;2;179;89;107m",
+    successBg: "\x1b[48;2;26;70;34m",
+    errorBg: "\x1b[48;2;92;32;42m",
+    successBgEmph: "\x1b[48;2;38;104;56m",
+    errorBgEmph: "\x1b[48;2;124;50;64m",
+    diffText: "\x1b[97m", // bright white — readable on the red/green tints
     bold: "\x1b[1m",
     dim: "\x1b[2m",
     italic: "\x1b[3m",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agent-sh",
-  "version": "0.15.3",
+  "version": "0.15.4",
   "description": "A composable agent runtime — pair any frontend with any agent backend over one shared extension layer",
   "type": "module",
   "workspaces": [

package/src/agent/providers/openai-compatible.ts

@@ -1,7 +1,9 @@
 /**
  * OpenAI Chat Completions-compatible local/3rd-party server (Ollama, LM
- * Studio, vLLM, llama.cpp, …). No reasoning hook — the right shape depends
- * on which model the server is serving; user extensions can add one.
+ * Studio, vLLM, llama.cpp, …). Emits the common `reasoning_effort` shape,
+ * with `"none"` to disable — the value most local servers honor. A server
+ * wanting a different disable token can override via `reasoningShape` or a
+ * user extension.
  */
 import type { AgentContext } from "../host-types.js";
 
@@ -13,6 +15,12 @@ export default function activate(ctx: AgentContext): void {
   const apiKey = process.env.OPENAI_API_KEY || "no-key";
   const id = "openai-compatible";
 
+  ctx.agent.providers.configure(id, {
+    reasoningParams: (level) =>
+      level === "off"
+        ? { reasoning_effort: "none" }
+        : { reasoning_effort: level === "xhigh" ? "high" : level },
+  });
   ctx.agent.providers.register({ id, apiKey, baseURL, models: [] });
   fetchModels(baseURL, apiKey).then((models) => {
     if (models.length === 0) return;

package/src/utils/diff-renderer.ts

@@ -216,7 +216,7 @@ function highlightInlineChanges(
         result += palette.rowBg + preserveBg(text, palette.rowBg);
       } else {
         // Changed tokens: emphasis background, no syntax highlighting (emphasis stands out)
-        result += palette.emphBg + p.bold + tokens[i].text + p.reset;
+        result += palette.emphBg + tokens[i].text + p.reset;
       }
     }
     return result;
@@ -337,18 +337,29 @@ function renderUnifiedHunk(hunk: DiffHunk, layout: UnifiedLayout): string[] {
   const out: string[] = [];
 
   const pairs = findChangePairs(hunk);
-  const renderedAsPartOfPair = new Set<number>();
   const bgWidth = Math.max(1, textWidth - noW - 3);
   const gutter = (n: string): string => `${p.dim}${n} │${p.reset} `;
 
   const change = (no: string, sigil: string, bg: string, fg: string, text: string): string => {
     if (!gutterLine) {
-      return `${bg}${fg}${padToWidth(`${no} ${sigil} ${preserveBg(text, bg)}`, textWidth)}${p.reset}`;
+      return `${bg}${padToWidth(`${fg}${no} ${sigil}${p.diffText} ${preserveBg(text, bg)}`, textWidth)}${p.reset}`;
     }
-    if (useTrueColor) return gutter(no) + padToWidth(`${bg}${fg}${sigil} ${preserveBg(text, bg)}`, bgWidth) + p.reset;
+    if (useTrueColor) return gutter(no) + padToWidth(`${bg}${fg}${sigil}${p.diffText} ${preserveBg(text, bg)}`, bgWidth) + p.reset;
     return `${gutter(no)}${fg}${sigil} ${text}${p.reset}`;
   };
 
+  const hlCache = new Map<ChangePair, { old: string; new: string }>();
+  const highlightedPair = (pair: ChangePair): { old: string; new: string } => {
+    let h = hlCache.get(pair);
+    if (!h) {
+      h = highlightInlineChanges(
+        pair.removed.text, pair.added.text, removedPalette, addedPalette, useTrueColor, lang,
+      );
+      hlCache.set(pair, h);
+    }
+    return h;
+  };
+
   for (let i = 0; i < hunk.lines.length; i++) {
     const line = hunk.lines[i];
     const no = String(
@@ -358,42 +369,29 @@ function renderUnifiedHunk(hunk: DiffHunk, layout: UnifiedLayout): string[] {
     if (line.type === "context") {
       const raw = truncateText(line.text, lineTextW);
       const text = lang ? highlightLine(raw, lang) : raw;
-      // The flush gutter dims only the line number; the code stays normal/highlighted.
       out.push(!gutterLine ? `${p.dim}${no}${p.reset}   ${text}` : `${gutter(no)}  ${p.dim}${text}${p.reset}`);
       continue;
     }
 
+    const pair = pairs.get(i);
     if (line.type === "removed") {
-      const pair = pairs.get(i);
       let removedText: string;
-      let addedText: string | null = null;
-      let addedNo: string | null = null;
-
-      if (pair && pair.removedIdx === i) {
-        const highlighted = highlightInlineChanges(
-          line.text, pair.added.text, removedPalette, addedPalette, useTrueColor, lang,
-        );
-        removedText = truncateText(highlighted.old, lineTextW);
-        addedText = truncateText(highlighted.new, lineTextW);
-        addedNo = String(pair.added.newNo ?? "").padStart(noW);
-        renderedAsPartOfPair.add(pair.addedIdx);
+      if (pair) {
+        removedText = truncateText(highlightedPair(pair).old, lineTextW);
       } else {
         const raw = truncateText(line.text, lineTextW);
         removedText = lang ? highlightLine(raw, lang) : raw;
       }
-
       out.push(change(no, "-", p.errorBg, p.error, removedText));
-      if (addedText !== null && addedNo !== null) {
-        out.push(change(addedNo, "+", p.successBg, p.success, addedText));
+    } else {
+      let addedText: string;
+      if (pair) {
+        addedText = truncateText(highlightedPair(pair).new, lineTextW);
+      } else {
+        const raw = truncateText(line.text, lineTextW);
+        addedText = lang ? highlightLine(raw, lang) : raw;
       }
-      continue;
-    }
-
-    if (line.type === "added") {
-      if (renderedAsPartOfPair.has(i)) continue;
-      const raw = truncateText(line.text, lineTextW);
-      const text = lang ? highlightLine(raw, lang) : raw;
-      out.push(change(no, "+", p.successBg, p.success, text));
+      out.push(change(no, "+", p.successBg, p.success, addedText));
     }
   }
   return out;
@@ -478,7 +476,7 @@ function renderSplitHunk(hunk: DiffHunk, layout: SplitLayout): string[] {
     } else if (row.left.type === "removed") {
       if (useTrueColor) {
         leftCol = padToWidth(
-          `${p.errorBg}${p.error}${leftNo} │ ${preserveBg(leftText, p.errorBg)}`, colWidth,
+          `${p.errorBg}${p.error}${leftNo} │${p.diffText} ${preserveBg(leftText, p.errorBg)}`, colWidth,
         ) + p.reset;
       } else {
         leftCol = padToWidth(`${p.error}${leftNo} │ ${leftText}${p.reset}`, colWidth);
@@ -492,7 +490,7 @@ function renderSplitHunk(hunk: DiffHunk, layout: SplitLayout): string[] {
     } else if (row.right.type === "added") {
       if (useTrueColor) {
         rightCol = padToWidth(
-          `${p.successBg}${p.success}${rightNo} │ ${preserveBg(rightText, p.successBg)}`, colWidth,
+          `${p.successBg}${p.success}${rightNo} │${p.diffText} ${preserveBg(rightText, p.successBg)}`, colWidth,
         ) + p.reset;
       } else {
         rightCol = padToWidth(`${p.success}${rightNo} │ ${rightText}${p.reset}`, colWidth);

package/src/utils/palette.ts

@@ -22,6 +22,7 @@ export interface ColorPalette {
   errorBg: string;        // subtle red tint for removed lines
   successBgEmph: string;  // stronger green for changed tokens
   errorBgEmph: string;    // stronger red for changed tokens
+  diffText: string;       // legible fg for diff row text on the tinted rows
 
   // ── Style modifiers ───────────────────────────────────────
   bold: string;
@@ -38,10 +39,11 @@ const defaultPalette: ColorPalette = {
   error:   "\x1b[31m",   // red
   muted:   "\x1b[90m",   // gray
 
-  successBg:     "\x1b[48;2;34;92;43m",
-  errorBg:       "\x1b[48;2;122;41;54m",
-  successBgEmph: "\x1b[48;2;56;166;96m",
-  errorBgEmph:   "\x1b[48;2;179;89;107m",
+  successBg:     "\x1b[48;2;26;70;34m",
+  errorBg:       "\x1b[48;2;92;32;42m",
+  successBgEmph: "\x1b[48;2;38;104;56m",
+  errorBgEmph:   "\x1b[48;2;124;50;64m",
+  diffText:      "\x1b[97m",   // bright white — readable on the red/green tints
 
   bold:      "\x1b[1m",
   dim:       "\x1b[2m",