@oh-my-pi/pi-coding-agent 14.9.3 → 14.9.7

package/src/config/settings-schema.ts

@@ -905,7 +905,7 @@ export const SETTINGS_SCHEMA = {
 
 	"ask.timeout": {
 		type: "number",
-		default: 30,
+		default: 0,
 		ui: {
 			tab: "interaction",
 			label: "Ask Timeout",
@@ -1662,16 +1662,6 @@ export const SETTINGS_SCHEMA = {
 		},
 	},
 
-	"python.sharedGateway": {
-		type: "boolean",
-		default: true,
-		ui: {
-			tab: "editing",
-			label: "Shared Python Gateway",
-			description: "Share IPython kernel gateway across pi instances",
-		},
-	},
-
 	// ────────────────────────────────────────────────────────────────────────
 	// Tools
 	// ────────────────────────────────────────────────────────────────────────

package/src/edit/index.ts

@@ -204,6 +204,7 @@ async function executeSinglePathEntries(
 	const contentTexts: string[] = [];
 	const diffTexts: string[] = [];
 	let firstChangedLine: number | undefined;
+	let errorCount = 0;
 
 	for (let i = 0; i < runs.length; i++) {
 		const isLast = i === runs.length - 1;
@@ -221,6 +222,7 @@ async function executeSinglePathEntries(
 		} catch (err) {
 			const errorText = err instanceof Error ? err.message : String(err);
 			contentTexts.push(`Error editing ${path}: ${errorText}`);
+			errorCount++;
 		}
 
 		if (!isLast && onUpdate) {
@@ -230,6 +232,7 @@ async function executeSinglePathEntries(
 					diff: diffTexts.join("\n"),
 					firstChangedLine,
 				},
+				...(errorCount > 0 ? { isError: true } : {}),
 			});
 		}
 	}
@@ -240,6 +243,11 @@ async function executeSinglePathEntries(
 			diff: diffTexts.join("\n"),
 			firstChangedLine,
 		},
+		// Any per-entry failure marks the aggregate result as an error so the
+		// renderer takes the error branch instead of falling through to the
+		// streaming-edit preview (which displays the *proposed* diff and looks
+		// indistinguishable from success).
+		...(errorCount > 0 ? { isError: true } : {}),
 	};
 }
 

package/src/edit/renderer.ts

@@ -148,6 +148,8 @@ export interface EditRenderContext {
 	editDiffPreview?: DiffResult | DiffError;
 	/** Multi-file streaming diff preview (edits spanning several files) */
 	perFileDiffPreview?: PerFileDiffPreview[];
+	/** Raw in-flight edit text shown while a computed diff preview is unavailable */
+	editStreamingFallback?: string;
 	/** Function to render diff text with syntax highlighting */
 	renderDiff?: (diffText: string, options?: { filePath?: string }) => string;
 }
@@ -272,7 +274,7 @@ function formatMultiFileStreamingDiff(previews: PerFileDiffPreview[], uiTheme: T
 	const parts: string[] = [];
 	for (const preview of previews) {
 		if (!preview.diff && !preview.error) continue;
-		const header = uiTheme.fg("dim", `\n\n\u2500\u2500 ${shortenPath(preview.path)} \u2500\u2500`);
+		const header = uiTheme.fg("dim", `\n\n── ${shortenPath(preview.path)} ──`);
 		if (preview.error) {
 			parts.push(`${header}\n${uiTheme.fg("error", replaceTabs(preview.error, preview.path))}`);
 			continue;
@@ -306,6 +308,9 @@ function getCallPreview(
 	if (args.newText || args.patch) {
 		return renderPlainTextPreview(args.newText ?? args.patch ?? "", uiTheme, rawPath);
 	}
+	if (renderContext?.editStreamingFallback) {
+		return renderContext.editStreamingFallback;
+	}
 	return "";
 }
 

package/src/edit/streaming.ts

@@ -13,14 +13,19 @@
  * the injected `editMode` rather than probing argument shape.
  */
 
+import { sanitizeText } from "@oh-my-pi/pi-natives";
 import {
+	ABORT_MARKER,
+	BEGIN_PATCH_MARKER,
 	computeHashlineDiff,
 	computeHashlineSectionDiff,
 	containsRecognizableHashlineOperations,
+	END_PATCH_MARKER,
 	type HashlineInputSection,
 	splitHashlineInputs,
 } from "../hashline";
 import type { Theme } from "../modes/theme/theme";
+import { replaceTabs, truncateToWidth } from "../tools/render-utils";
 import { type EditMode, resolveEditMode } from "../utils/edit-mode";
 import { computeEditDiff, type DiffError, type DiffResult } from "./diff";
 import { type ApplyPatchEntry, expandApplyPatchToEntries, expandApplyPatchToPreviewEntries } from "./modes/apply-patch";
@@ -61,6 +66,52 @@ export interface EditStreamingStrategy<Args = unknown> {
 	renderStreamingFallback(args: Args, uiTheme: Theme): string;
 }
 
+const STREAMING_FALLBACK_LINES = 12;
+const STREAMING_FALLBACK_WIDTH = 80;
+
+function isHashlineHeaderLine(line: string): boolean {
+	const trimmed = line.trimEnd();
+	return trimmed.startsWith("@") && trimmed.length > 1;
+}
+
+function isHashlineEnvelopeMarkerLine(line: string): boolean {
+	const trimmed = line.trimEnd();
+	return trimmed === BEGIN_PATCH_MARKER || trimmed === END_PATCH_MARKER || trimmed === ABORT_MARKER;
+}
+
+function trimHashlineStreamingSyntax(lines: string[]): string[] {
+	let index = lines.findIndex(line => line.trim().length > 0);
+	if (index === -1) return [];
+
+	if (lines[index].trimEnd() === BEGIN_PATCH_MARKER) {
+		index++;
+		while (index < lines.length && lines[index].trim().length === 0) index++;
+	}
+	if (index < lines.length && isHashlineHeaderLine(lines[index])) {
+		index++;
+	}
+
+	return lines.slice(index).filter(line => !isHashlineEnvelopeMarkerLine(line));
+}
+
+function renderHashlineInputFallback(input: string, uiTheme: Theme): string {
+	const lines = trimHashlineStreamingSyntax(sanitizeText(input).split("\n"));
+	if (!lines.some(line => line.trim().length > 0)) return "";
+
+	const displayLines = lines.slice(-STREAMING_FALLBACK_LINES);
+	const hidden = lines.length - displayLines.length;
+	let text = "\n\n";
+	text += displayLines
+		.map(line => uiTheme.fg("toolOutput", truncateToWidth(replaceTabs(line), STREAMING_FALLBACK_WIDTH)))
+		.join("\n");
+	if (hidden > 0) {
+		text += uiTheme.fg("dim", `\n… (streaming +${hidden} lines)`);
+	} else {
+		text += uiTheme.fg("dim", "\n(streaming)");
+	}
+	return text;
+}
+
 // -----------------------------------------------------------------------------
 // Partial-JSON handling
 // -----------------------------------------------------------------------------
@@ -273,8 +324,8 @@ const hashlineStrategy: EditStreamingStrategy<HashlineArgs> = {
 		}
 		return previews.length > 0 ? previews : null;
 	},
-	renderStreamingFallback() {
-		return "";
+	renderStreamingFallback(args, uiTheme) {
+		return typeof args.input === "string" ? renderHashlineInputFallback(args.input, uiTheme) : "";
 	},
 };
 

package/src/eval/eval.lark

@@ -1,16 +1,36 @@
-start: cell+
+// Canonical Eval input. Each cell is introduced by a single header line:
+//
+//   *** Cell <LANG>:"<title>" [t:<duration>] [rst]
+//
+// Attribute order is fixed: language+title, then optional timeout, then
+// optional reset flag. Title may be empty (`py:""`).
+//
+// Tokens:
+//
+//   py:"..." | js:"..."             language plus title (required)
+//   t:<digits>(ms|s|m)?             per-cell timeout (default 30s)
+//   rst                             reset this language's kernel before running
+//
+// Everything between one header line and the next (or the optional trailing
+// `*** End`, or end of input) is the cell's code, verbatim. The runtime
+// parser additionally accepts content before the first header as an implicit
+// default-language cell, but that is lenient fallback and MUST NOT be relied
+// on.
 
-cell: begin_cell attr* code_line* end_cell
-begin_cell: "*** Begin " LANG LF
-end_cell: "*** End Cell" LF?
+start: cell+ end_marker
 
-attr: title | timeout | reset
-title:   "*** Title: " /(.+)/ LF
-timeout: "*** Timeout: " /\d+(ms|s|m)?/ LF
-reset:   "*** Reset" LF
+cell: cell_header code_line*
 
-code_line: /[^\r\n]*/ LF
+cell_header: "*** Cell" WS_INLINE LANG_TITLE (WS_INLINE T_ATTR)? (WS_INLINE RST_FLAG)? LF
 
-LANG: "JS" | "TS" | "PY"
+end_marker: "*** End" LF?
+
+code_line: CODE_TEXT LF | LF
+CODE_TEXT: /([^*\r\n]|\*\*?[^*\r\n])+\*{0,2}|\*{1,2}/
+
+LANG_TITLE: ("py" | "js") ":\"" /[^"\r\n]*/ "\""
+T_ATTR:     "t:" /\d+(ms|s|m)?/
+RST_FLAG:   "rst"
 
 %import common.LF
+%import common.WS_INLINE