smashimo/oh-my-pi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(coding-agent): prevented streaming output duplication in scrollback

Browse Source 
- Clamped tool output preview height to the available viewport rows to stop redundant banner commits.
- Added `outputBlockContentWidth` helper to accurately measure visual lines for scrollback budget calculations.
- Updated `bash` and `eval-render` output wrapping to account for block padding and inner content width.
- Added regression test confirming streaming tool output maintains a stable line count without duplicating headers.
This commit is contained in:
can1357
2026-06-22 21:43:19 +02:00
parent 5c21b28786
commit a8a0cc8a40
5 changed files with 217 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/coding-agent/src/tools/bash.ts
+9 -2
View File
@@ -19,7 +19,7 @@ import bashDescription from "../prompts/tools/bash.md" with { type: "text" };
import type { ClientBridgeTerminalExitStatus, ClientBridgeTerminalOutput } from "../session/client-bridge";
import { DEFAULT_MAX_BYTES, enforceInlineByteCap, streamTailUpdates, TailBuffer } from "../session/streaming-output";
import { renderStatusLine } from "../tui";
import { CachedOutputBlock, markFramedBlockComponent } from "../tui/output-block";
import { CachedOutputBlock, markFramedBlockComponent, outputBlockContentWidth } from "../tui/output-block";
import { getSixelLineMask } from "../utils/sixel";
import type { ToolSession } from ".";
import { truncateForPrompt } from "./approval";
@@ -1334,7 +1334,14 @@ export function createShellRenderer<TArgs>(config: ShellRendererConfig<TArgs>) {
.map(line => uiTheme.fg("toolOutput", replaceTabs(line)))
.join("\n");
const textContent = styledOutput;
const result = truncateToVisualLines(textContent, previewLines, width);
// Cap the collapsed/streaming output to a viewport-sized tail and
// measure it at the box's INNER width. Otherwise a growing tail
// window scrolls its (mutating) rows above the live-region window
// and the engine re-commits a fresh snapshot every frame —
// spraying duplicate "… ctrl+o to expand" banners into native
// scrollback (the box never overflows the viewport now).
const previewBudget = Math.min(previewLines, previewWindow);
const result = truncateToVisualLines(textContent, previewBudget, outputBlockContentWidth(width));
if (result.skippedCount > 0) {
outputLines.push(
uiTheme.fg(
packages/coding-agent/src/tools/eval-render.ts
+29 -13
View File
@@ -18,7 +18,7 @@ import type { RenderResultOptions } from "../extensibility/custom-tools/types";
import { formatContextUsage } from "../modes/components/status-line/context-thresholds";
import { truncateToVisualLines } from "../modes/components/visual-truncate";
import { getMarkdownTheme, type Theme } from "../modes/theme/theme";
import { markFramedBlockComponent, renderCodeCell } from "../tui";
import { markFramedBlockComponent, outputBlockContentWidth, renderCodeCell } from "../tui";
import {
JSON_TREE_MAX_DEPTH_COLLAPSED,
JSON_TREE_MAX_DEPTH_EXPANDED,
@@ -468,23 +468,33 @@ function formatCellOutputLines(
return { lines: [], hiddenCount: 0 };
}
// Cell output lands in renderCodeCell → renderOutputBlock, which re-wraps it
// at the box's inner content width. Bound the collapsed tail by VISUAL rows
// at that width so a long-line tail can't wrap into more rows than budgeted
// and scroll its mutating preview above the live-region window — the
// duplicate "ctrl+o to expand" scrollback spray.
const innerWidth = outputBlockContentWidth(width);
if (cell.hasMarkdown && cell.status !== "error") {
const md = new Markdown(cell.output, 0, 0, getMarkdownTheme());
const allLines = md.render(width);
const allLines = md.render(innerWidth);
const displayLines = expanded ? allLines : allLines.slice(-previewLines);
const hiddenCount = allLines.length - displayLines.length;
return { lines: displayLines, hiddenCount };
}
const rawLines = cell.output.split("\n");
const displayLines = expanded ? rawLines : rawLines.slice(-previewLines);
const hiddenCount = rawLines.length - displayLines.length;
const outputLines = displayLines.map(line => {
const cleaned = replaceTabs(line);
return cell.status === "error" ? theme.fg("error", cleaned) : theme.fg("toolOutput", cleaned);
});
return { lines: outputLines, hiddenCount };
const styledOutput = cell.output
.split("\n")
.map(line => {
const cleaned = replaceTabs(line);
return cell.status === "error" ? theme.fg("error", cleaned) : theme.fg("toolOutput", cleaned);
})
.join("\n");
if (expanded) {
return { lines: styledOutput.split("\n"), hiddenCount: 0 };
}
const { visualLines, skippedCount } = truncateToVisualLines(styledOutput, previewLines, innerWidth);
return { lines: visualLines, hiddenCount: skippedCount };
}
export const evalToolRenderer = {
@@ -586,7 +596,10 @@ export const evalToolRenderer = {
return markFramedBlockComponent({
render: (width: number): readonly string[] => {
const expanded = options.renderContext?.expanded ?? options.expanded;
const previewLines = options.renderContext?.previewLines ?? EVAL_DEFAULT_PREVIEW_LINES;
const previewLines = Math.min(
options.renderContext?.previewLines ?? EVAL_DEFAULT_PREVIEW_LINES,
previewWindowRows(),
);
const key = `${expanded}|${previewLines}|${options.spinnerFrame}|${previewWindowRows()}`;
if (cached && cached.key === key && cached.width === width) {
return cached.result;
@@ -717,7 +730,10 @@ export const evalToolRenderer = {
return {
render: (width: number): readonly string[] => {
const previewLines = options.renderContext?.previewLines ?? EVAL_DEFAULT_PREVIEW_LINES;
const previewLines = Math.min(
options.renderContext?.previewLines ?? EVAL_DEFAULT_PREVIEW_LINES,
previewWindowRows(),
);
if (cachedLines === undefined || cachedWidth !== width || cachedPreviewLines !== previewLines) {
const result = truncateToVisualLines(textContent, previewLines, width);
cachedLines = result.visualLines;