Files
llama.cpp/tools/ui/src/lib/utils/compute-line-diff.ts
T
Aleksander Grygier 32beb244f5 ui: Agentic Content UX improvements (#25450)
* feat: Add shimmer text animation for processing state indicators

* feat: Redesign CollapsibleContentBlock component with improved UX

* feat: Add conditional setting display support with dependsOn field

* feat: Add showAgenticTurnStats setting for per-turn statistics

* feat: Update ChatMessageAgenticContent with improved UI and new features

* feat: Enhance file read tool UI/UX

* feat: Refine styling of collapsible content and code preview blocks

* feat: add terminal variant to CollapsibleContentBlock

* feat: add built-in tools UI registry

* feat: extract ChatMessageReasoningBlock and ChatMessageToolCallBlock

* refactor: simplify ChatMessageAgenticContent to use extracted blocks

* fix: correct markdown content block margin spacing

* fix: reorganize SettingsChatFields layout and reset button positioning

* fix: use direct map access in agentic store session methods

* refactor: remove reasoning preview/throttle system from CollapsibleContentBlock

* feat: add auto-scroll to reasoning block and remove showThoughtInProgress

* feat: add ChatMessageToolCallDateTime component and support for new tool types

* feat: improve auto-scroll reliability in reasoning block with RAF coalescing and MutationObserver

* feat: show MCP server favicon for tools without a built-in icon

* feat: add search-results parsing utilities and tests

* feat: add ChatMessageToolCallSearchResults component

* feat: integrate search results rendering into ChatMessageAgenticContent

* feat: display tool call input alongside output in ChatMessageToolCallBlock

* style: use muted foreground color in reasoning block content

* chore: Format

* feat: Refine reasoning block layout and make pending thoughts display configurable

* feat: Stream tool call code blocks with auto-scroll and handle partial JSON

* feat: add streaming permission gate infrastructure

* feat: wire permission gate into the agentic loop

* fix: bail out on abort and skip already-approved tool calls

* fix: clear partial tool calls on abort and savePartialResponse

* test: cover partial tool call cleanup end-to-end

* refactor: Remove streaming permission gate logic

* fix: Correct autoscroll and streaming gates for tool calls and reasoning blocks

* refactor: Chat Message Assistant componentization

* fix: Show health metadata for disabled MCP servers and promote connections on enable

* fix: Inherit global enabled state for missing MCP per-chat overrides

* refactor: Cleanup

* refactor: Split ChatMessageToolCallBlock into dedicated components

* feat: Add live streaming and auto-scroll for tool execution output

* feat: Add line numbers and change markers to file edit diffs

* chore: Formatting

* feat: Add type definitions and utilities for recommended MCP servers

* feat: Add recommended MCP servers configuration and storage key

* feat: Add McpServerCardCompact component for recommended servers

* feat: Add recommended servers section to Add New Server dialog

* feat: Update McpServerForm to support authorization requirements

* feat: Add select-none classes for text selection prevention

* feat: Add recommended MCP server icon assets

* refactor: Store dismissed MCP recommendations as a boolean flag

* feat: Render tool results as JSON or Markdown based on detected content type

* feat: UI improvement

* feat: Render search block early and update heading to show execution state

* fix: Prevent non-web-search tools from triggering the search UI block

* refactor: Cleanup

* refactor: Extract hardcoded icon size classes into shared constants

* refactor: Extract hardcoded tool result separator into a shared constant

* refactor: Tool Calls UI/logic

* refactor: Cleanup

* refactor: Cleanup

* refactor: Cleanup
2026-07-15 20:31:45 +02:00

106 lines
3.2 KiB
TypeScript

/**
* Line-level unified diff for tool result rendering.
*
* Pure functions: no DOM, no Svelte, no highlight.js dependency. The
* returned `DiffLine[]` carries enough information both to render a
* custom diff block (per-entry kind/text) and to fold back into a
* unified-diff-format string for off-the-shelf highlighter languages
* (`renderUnifiedDiff`).
*
* Algorithm: LCS dynamic programming with a soft "remove before add"
* tiebreak so the resulting diff reads `(old -> new)` left to right.
* O(m*n) time/space which is fine for the handful of lines an
* `edit_file` snippet typically carries.
*/
import { DiffLineKind } from '$lib/enums';
export interface DiffLine {
kind: DiffLineKind;
text: string;
/** 1-indexed line number in the OLD content. Undefined for `add` lines. */
oldLine?: number;
/** 1-indexed line number in the NEW content. Undefined for `remove` lines. */
newLine?: number;
}
export function computeLineDiff(oldText: string, newText: string): DiffLine[] {
const oldLines = splitLines(oldText);
const newLines = splitLines(newText);
const m = oldLines.length;
const n = newLines.length;
if (m === 0 && n === 0) return [];
if (m === 0) return newLines.map((t, k) => ({ kind: DiffLineKind.ADD, text: t, newLine: k + 1 }));
if (n === 0)
return oldLines.map((t, k) => ({ kind: DiffLineKind.REMOVE, text: t, oldLine: k + 1 }));
const lcs: number[][] = Array.from({ length: m + 1 }, () => new Array(n + 1).fill(0));
for (let i = 1; i <= m; i++) {
for (let j = 1; j <= n; j++) {
if (oldLines[i - 1] === newLines[j - 1]) {
lcs[i][j] = lcs[i - 1][j - 1] + 1;
} else {
lcs[i][j] = Math.max(lcs[i - 1][j], lcs[i][j - 1]);
}
}
}
const result: DiffLine[] = [];
let i = m;
let j = n;
while (i > 0 && j > 0) {
if (oldLines[i - 1] === newLines[j - 1]) {
result.push({
kind: DiffLineKind.CONTEXT,
text: oldLines[i - 1],
oldLine: i,
newLine: j
});
i--;
j--;
} else if (lcs[i - 1][j] >= lcs[i][j - 1]) {
result.push({ kind: DiffLineKind.REMOVE, text: oldLines[i - 1], oldLine: i });
i--;
} else {
result.push({ kind: DiffLineKind.ADD, text: newLines[j - 1], newLine: j });
j--;
}
}
while (i > 0) {
result.push({ kind: DiffLineKind.REMOVE, text: oldLines[i - 1], oldLine: i });
i--;
}
while (j > 0) {
result.push({ kind: DiffLineKind.ADD, text: newLines[j - 1], newLine: j });
j--;
}
result.reverse();
return result;
}
/** Folds `DiffLine[]` into a unified-diff-format text (`` ` ``/`+`/`-` prefixes).
* Pass to a diff-aware highlighter (e.g., SyntaxHighlightedCode with
* `language="diff"`) for colorization.
*/
export function renderUnifiedDiff(lines: DiffLine[]): string {
if (lines.length === 0) return '';
return lines.map((l) => prefixFor(l.kind) + l.text).join('\n');
}
/** Column-1 marker for a `DiffLine`: ` `, `+`, or `-`. */
export function prefixFor(kind: DiffLineKind): string {
if (kind === DiffLineKind.ADD) return '+';
if (kind === DiffLineKind.REMOVE) return '-';
return ' ';
}
function splitLines(text: string): string[] {
if (text === '') return [];
const parts = text.split('\n');
if (parts[parts.length - 1] === '') parts.pop();
return parts.map((l) => (l.endsWith('\r') ? l.slice(0, -1) : l));
}