@code-yeongyu/senpi-codemode 2026.9.23 → 2026.9.24-3

package/src/tool/render.ts

@@ -1,7 +1,6 @@
 // allow: SIZE_OK — one eval render pipeline avoids the runtime/render TDZ that motivated this module boundary.
 import {
 	type AgentToolResult,
-	highlightCode,
 	sanitizeTerminalLabel,
 	type Theme,
 	type ThemeColor,
@@ -9,8 +8,10 @@ import {
 	type ToolRenderResultOptions,
 	truncateToVisualLines,
 } from "@code-yeongyu/senpi";
-import { formatTruncationWarning, stripOutputNotice, type TruncationMeta } from "../output/output-meta.ts";
-import { clampEvalSummary } from "./eval-request.ts";
+import type { TruncationMeta } from "../output/output-meta.ts";
+import { highlightedCode } from "./code-preview.ts";
+import { displayCode } from "./display-code.ts";
+import { normalizeEvalSummary } from "./eval-request.ts";
 import {
 	JSON_TREE_MAX_DEPTH_COLLAPSED,
 	JSON_TREE_MAX_DEPTH_EXPANDED,
@@ -25,7 +26,6 @@ import { codePointPrefix, formatDuration, renderToolCallWidget } from "./tool-wi
 import type {
 	EvalCellResult,
 	EvalInputSchema,
-	EvalLanguage,
 	EvalResultDetails,
 	EvalStatusEvent,
 	EvalToolDetails,
@@ -65,6 +65,7 @@ type RenderBlock =
 	| { readonly kind: "dynamic"; readonly render: (width: number) => readonly string[] };
 
 const CODE_PREVIEW_LINES = 4;
+const SUMMARY_PREVIEW_LINES = 3;
 const OUTPUT_PREVIEW_LINES = 8;
 const STATUS_PREVIEW_COUNT = 3;
 const SPINNER_FRAMES = ["⠋", "⠙", "⠹", "⠸", "⠼", "⠴", "⠦", "⠧", "⠇", "⠏"] as const;
@@ -183,6 +184,22 @@ function renderAllVisualLines(text: string, width: number): string[] {
 	return truncateToVisualLines(text, Number.POSITIVE_INFINITY, width).visualLines.map((line) => line.trimEnd());
 }
 
+// A summary has no length limit, so a collapsed block shows its first lines and marks the cut.
+function summaryVisualLines(summary: string, width: number, expanded: boolean): string[] {
+	const lines = renderAllVisualLines(summary, width);
+	if (expanded || lines.length <= SUMMARY_PREVIEW_LINES) return lines;
+	const kept = renderAllVisualLines(summary, Math.max(1, width - 1)).slice(0, SUMMARY_PREVIEW_LINES);
+	kept[SUMMARY_PREVIEW_LINES - 1] = `${kept[SUMMARY_PREVIEW_LINES - 1] ?? ""}\u2026`;
+	return kept;
+}
+
+function summaryBlock(summary: string, theme: Theme | undefined, expanded: boolean): RenderBlock {
+	return {
+		kind: "dynamic",
+		render: (width) => summaryVisualLines(summary, width, expanded).map((line) => style(theme, "muted", line)),
+	};
+}
+
 function renderTextBlock(block: Extract<RenderBlock, { kind: "text" }>, width: number): string[] {
 	if (block.maxVisualLines === undefined) return renderAllVisualLines(block.text, width);
 	const result = truncateToVisualLines(block.text, block.maxVisualLines, width);
@@ -251,6 +268,8 @@ type RenderEnvironment = {
 	readonly meta: TruncationMeta | undefined;
 	/** Render-time clock, injected so elapsed time is deterministic under test. */
 	readonly now: number;
+	/** Repaints the row once a background-formatted code preview is ready; absent while args stream. */
+	readonly repaint?: () => void;
 };
 type CellBadges = {
 	readonly reset: boolean;
@@ -270,27 +289,6 @@ function assertNever(value: never): never {
 	throw new TypeError(`Unhandled eval render variant: ${String(value)}`);
 }
 
-function languageForHighlighter(language: EvalLanguage): "python" | "javascript" | "ruby" | "julia" {
-	switch (language) {
-		case "py":
-			return "python";
-		case "js":
-			return "javascript";
-		case "rb":
-			return "ruby";
-		case "jl":
-			return "julia";
-		default:
-			return assertNever(language);
-	}
-}
-
-function highlightedCode(code: string, language: EvalLanguage, theme: Theme | undefined): string {
-	const normalizedCode = code.trim().length > 0 ? code : "...";
-	const lines = highlightCode(normalizedCode, languageForHighlighter(language));
-	return (theme === undefined ? lines.map((line) => line.replace(/\u001b\[[0-9;]*m/gu, "")) : lines).join("\n");
-}
-
 function spinner(frame: number | undefined): string {
 	return SPINNER_FRAMES.at((frame ?? 0) % SPINNER_FRAMES.length) ?? SPINNER_FRAMES[0];
 }
@@ -619,16 +617,14 @@ function renderCell(cell: EvalCellResult, environment: RenderEnvironment, badges
 	if (cell.summary !== undefined) {
 		appendLines(
 			lines,
-			renderPrefixed(style(environment.theme, "muted", cell.summary), environment, {
-				prefix: "│ ",
-				continuation: "│ ",
-				color: "muted",
-			}),
+			summaryVisualLines(cell.summary, Math.max(1, environment.width - 2), environment.expanded).map(
+				(line) => `${style(environment.theme, "muted", "│ ")}${style(environment.theme, "muted", line)}`,
+			),
 		);
 	}
 	const innerWidth = Math.max(1, environment.width - 2);
 	const codePreview = previewText(
-		highlightedCode(cell.code, cell.language, environment.theme),
+		highlightedCode(cell.code, cell.language, environment.theme, environment.repaint),
 		environment.expanded ? Number.POSITIVE_INFINITY : CODE_PREVIEW_LINES,
 		innerWidth,
 	);
@@ -645,7 +641,7 @@ function renderCell(cell: EvalCellResult, environment: RenderEnvironment, badges
 	for (const line of codePreview.lines) {
 		appendLines(lines, renderPrefixed(line, environment, { prefix: "│ ", continuation: "│ ", color: "borderMuted" }));
 	}
-	const output = stripOutputNotice(cell.output, environment.meta).trimEnd();
+	const output = cell.output.trimEnd();
 	if (output.length > 0) {
 		appendLines(lines, renderPrefixed("output", environment, { prefix: "├─ ", continuation: "│  ", color: "dim" }));
 		const outputColor: ThemeColor = cell.status === "error" ? "error" : "toolOutput";
@@ -757,24 +753,13 @@ function renderDetailedLines(
 				context.environment.width,
 			),
 		);
-	if (details.notice !== undefined)
-		appendLines(
-			lines,
-			renderAllVisualLines(style(context.environment.theme, "dim", details.notice), context.environment.width),
-		);
-	const warning = formatTruncationWarning(details.meta) ?? (details.truncated ? "[eval output truncated]" : null);
-	if (warning !== null)
-		appendLines(
-			lines,
-			renderAllVisualLines(style(context.environment.theme, "warning", warning), context.environment.width),
-		);
 	return lines;
 }
 
 function textOutput(result: AgentToolResult<EvalResultDetails>, showImageFallback: boolean): string {
 	const lines: string[] = [];
 	for (const part of result.content) {
-		if (part.type === "text") lines.push(part.text);
+		if (part.type === "text" && part.audience !== "model") lines.push(part.text);
 		else if (showImageFallback && part.type === "image") {
 			lines.push(`[image: ${sanitizeTerminalLabel(part.mimeType)}]`);
 		}
@@ -884,11 +869,11 @@ function resultMetadata(
 	return [{ kind: "text", text: style(theme, "muted", metadata.join(" | ")) }];
 }
 
-// The call renderer reads the assistant message's raw arguments, which now keep the provider's
-// original summary (senpi#1472 detached preparation from the message). The advertised display
-// limit is enforced here instead, idempotently: an already-clamped value is returned unchanged.
+// The call renderer reads the assistant message's raw arguments, which keep the provider's
+// original summary (senpi#1472 detached preparation from the message), so it normalizes here,
+// idempotently: an already-normalized value is returned unchanged.
 function displaySummary(summary: string | undefined): string | undefined {
-	return clampEvalSummary(summary);
+	return normalizeEvalSummary(summary);
 }
 
 export function renderEvalCall(
@@ -915,10 +900,16 @@ export function renderEvalCall(
 			{ kind: "text", text: style(theme, "toolTitle", `eval ${args.language}${reset}${timeout}`) },
 			...(displaySummary(args.summary) === undefined
 				? []
-				: [{ kind: "text" as const, text: style(theme, "muted", displaySummary(args.summary) ?? "") }]),
+				: [summaryBlock(displaySummary(args.summary) ?? "", theme, context.expanded)]),
 			{
 				kind: "text",
-				text: style(theme, "mdCodeBlock", args.code.trim().length > 0 ? args.code : "..."),
+				text: style(
+					theme,
+					"mdCodeBlock",
+					args.code.trim().length > 0
+						? displayCode(args.code, args.language, context.argsComplete ? context.invalidate : undefined)
+						: "...",
+				),
 				maxVisualLines: context.expanded ? undefined : CODE_PREVIEW_LINES,
 				collapseKind: "code",
 				theme,
@@ -937,6 +928,7 @@ export function renderEvalCall(
 					width,
 					meta: undefined,
 					now: renderNow(context),
+					...(context.argsComplete ? { repaint: context.invalidate } : {}),
 				};
 				const cell: EvalCellResult = {
 					index: 0,
@@ -989,6 +981,7 @@ export function renderEvalResult(
 							width,
 							meta: details.meta,
 							now: renderNow(context),
+							repaint: context.invalidate,
 						},
 						args: context.args,
 						showImageFallback: context.showImages && imageProtocol === null,
@@ -1006,14 +999,12 @@ export function renderEvalResult(
 	const status = resultStatus(details, options, context.isError);
 	const blocks: RenderBlock[] = [
 		{ kind: "text", text: resultHeader(details, status, theme) },
-		...(details?.summary === undefined
-			? []
-			: [{ kind: "text" as const, text: style(theme, "muted", details.summary) }]),
+		...(details?.summary === undefined ? [] : [summaryBlock(details.summary, theme, expanded)]),
 		...resultMetadata(details, options, theme, status),
 		{ kind: "blank" },
 	];
 	const rawOutput = textOutput(result, context.showImages && imageProtocol === null);
-	const output = stripOutputNotice(rawOutput, details?.meta).trimEnd();
+	const output = rawOutput.trimEnd();
 	const hasRenderedImage =
 		context.showImages && imageProtocol !== null && result.content.some((part) => part.type === "image");
 	if (output.length > 0) {
@@ -1070,10 +1061,6 @@ export function renderEvalResult(
 	const calls = toolCallRows(details);
 	const nestedCalls = nestedToolCallBlock(details, theme, context.cwd, expanded);
 	if (calls.length > 0) blocks.push({ kind: "blank" }, nestedCalls ?? { kind: "toolCalls", calls, expanded, theme });
-	if (details?.notice !== undefined)
-		blocks.push({ kind: "blank" }, { kind: "text", text: style(theme, "dim", details.notice) });
-	const warning = formatTruncationWarning(details?.meta) ?? (details?.truncated ? "[eval output truncated]" : null);
-	if (warning !== null) blocks.push({ kind: "blank" }, { kind: "text", text: style(theme, "warning", warning) });
 	component.setBlocks(blocks);
 	return component;
 }

package/src/tool/types.ts

@@ -17,8 +17,6 @@ export function enabledLanguageList(enabled: EnabledEvalLanguages): EvalLanguage
 	return evalLanguageOrder.filter((language) => enabled[language]);
 }
 
-export const EVAL_SUMMARY_MAX_LENGTH = 80;
-
 /** The deadlines the schema teaches the model; every number comes from the resolved settings. */
 export interface EvalDeadlineSeconds {
 	readonly runBudgetSeconds: number;
@@ -67,6 +65,12 @@ export type EvalControlInput =
 
 export type EvalToolRequest = EvalToolInput | EvalControlInput;
 
+// Like `summary`, `language` and `code` stay optional in the wire schema because control
+// actions share it; the description teaches the requirement and parseEvalRequest enforces it.
+const LANGUAGE_FIELD_DESCRIPTION =
+	"REQUIRED for run. Kernel that runs the cell; each language keeps its own persistent state across eval calls.";
+const CODE_FIELD_DESCRIPTION = "REQUIRED for run. Cell body, verbatim.";
+
 function evalInputProperties<Language extends TSchema>(languageSchema: Language, deadlines: EvalDeadlineSeconds) {
 	return {
 		action: Type.Optional(
@@ -76,12 +80,11 @@ function evalInputProperties<Language extends TSchema>(languageSchema: Language,
 			}),
 		),
 		language: Type.Optional(languageSchema),
-		code: Type.Optional(Type.String({ description: "Cell body, verbatim." })),
+		code: Type.Optional(Type.String({ description: CODE_FIELD_DESCRIPTION })),
 		summary: Type.Optional(
 			Type.String({
-				maxLength: EVAL_SUMMARY_MAX_LENGTH,
 				description:
-					"REQUIRED for run. ONE line in the USER'S conversational language (Korean conversation -> Korean summary) stating WHAT this cell does and FOR WHAT PURPOSE; shown in the TUI while the cell runs. Longer values are force-truncated to 80 chars.",
+					"REQUIRED for run. One line in the language the user writes in: a progress update saying what you are doing and why, not a label for the code; shown in the TUI while the cell runs.",
 			}),
 		),
 		timeout: Type.Optional(Type.Number({ minimum: 1, description: timeoutFieldDescription(deadlines) })),
@@ -99,11 +102,15 @@ function evalInputProperties<Language extends TSchema>(languageSchema: Language,
 	};
 }
 
+function evalLanguageUnion(languages: readonly EvalLanguage[]) {
+	return Type.Union(
+		languages.map((item) => Type.Literal(item)),
+		{ description: LANGUAGE_FIELD_DESCRIPTION },
+	);
+}
+
 const fullEvalInputSchema = Type.Object(
-	evalInputProperties(
-		Type.Union([Type.Literal("js"), Type.Literal("py"), Type.Literal("rb"), Type.Literal("jl")]),
-		defaultEvalDeadlineSeconds,
-	),
+	evalInputProperties(evalLanguageUnion(evalLanguageOrder), defaultEvalDeadlineSeconds),
 );
 
 /** Runtime accepts a discriminated run/control union. */
@@ -115,10 +122,7 @@ export function createEvalInputSchema(
 ): EvalInputSchema {
 	const languages = enabledLanguageList(enabled);
 	if (languages.length === 0) throw new Error("eval requires at least one enabled language");
-	const languageSchema =
-		languages.length === 1
-			? Type.Union([Type.Literal(languages[0])])
-			: Type.Union(languages.map((item) => Type.Literal(item)));
+	const languageSchema = evalLanguageUnion(languages);
 	return Type.Unsafe<EvalToolRequest>(
 		Type.Object(evalInputProperties(languageSchema, deadlines), {
 			anyOf: [