@selesai/code 0.13.40 → 0.14.3

package/dist/extensions/pi-zentui/test/thinking-experimental-tui.mjs

@@ -17,13 +17,7 @@ import {
 	hasExtensionLoaderDiagnostic,
 } from "./thinking-experimental-loader-diagnostics.mjs";
 
-const versions = process.env.ZENTUI_PI_VERSIONS?.split(",") ?? [
-	"0.80.5",
-	"0.82.1",
-	"0.83.0",
-	"0.84.0",
-	"0.84.4",
-];
+const versions = process.env.ZENTUI_PI_VERSIONS?.split(",") ?? ["0.85.0", "0.87.1"];
 const root = join(import.meta.dirname, "..");
 const workspace = mkdtempSync(join(tmpdir(), "zentui-thinking-tui-"));
 const npmCli = process.env.npm_execpath;
@@ -39,6 +33,7 @@ function resolveInstalledManifest(installRoot, packageName) {
 
 function attestInstalledVersions(installRoot, requestedVersion) {
 	const packages = {
+		...(requestedVersion === "0.85.0" ? { server: "@earendil-works/pi-server" } : {}),
 		codingAgent: "@earendil-works/pi-coding-agent",
 		tui: "@earendil-works/pi-tui",
 		ai: "@earendil-works/pi-ai",
@@ -237,6 +232,65 @@ import {
 import { Markdown, SettingsList, truncateToWidth, visibleWidth } from "@earendil-works/pi-tui";
 import { hasThinkingExperimentalMarkdownIdentity } from "./extensions/zentui/thinking-experimental.ts";
 
+function unwrapMouseRegion(component) {
+	const inner = component?.child;
+	if (
+		typeof component?.onMouse !== "function" ||
+		!inner ||
+		typeof inner !== "object" ||
+		typeof inner.render !== "function"
+	) {
+		return component;
+	}
+	return inner;
+}
+function assertNativeThinkingClicks(component, run = 0) {
+	if (!component.thinkingVisibilityOverrides) return;
+	for (const width of [1, 80]) {
+		for (const hidden of [true, false]) {
+			const region = component.contentContainer.children.filter((child) => typeof child.onMouse === "function")[run];
+			if (!region) throw new Error("thinking lost its native mouse region");
+			const rows = region.render(width);
+			const result = region.handleMouse({ type: "click", button: "left", x: 0, y: 0, width, height: rows.length, shift: false, alt: false, ctrl: false });
+			if (result?.handled !== true || component.thinkingVisibilityOverrides.get(run) !== hidden)
+				throw new Error("native thinking click did not toggle visibility");
+		}
+	}
+}
+
+function assertClicksAfterEmptyThinkingRun() {
+	for (const precedingRun of [false, true]) {
+		const component = new AssistantMessageComponent(undefined, false, getMarkdownTheme(), "Thinking...", 1, []);
+		if (!component.thinkingVisibilityOverrides) return;
+		component.updateContent({
+			...fixture,
+			timestamp: fixture.timestamp - (precedingRun ? 2 : 1),
+			content: [
+				...(precedingRun ? [{ type: "thinking", thinking: "# Earlier" }, { type: "text", text: "first separator" }] : []),
+				{ type: "thinking", thinking: " " },
+				{ type: "text", text: "separator" },
+				{ type: "thinking", thinking: "# Visible after empty run" },
+			],
+		}, true);
+		const run = precedingRun ? 1 : 0;
+		const expected = mode === "streaming" ? "FoldedThinkingSection" : "ThinkingStepsRows";
+		const assertDecorated = () => {
+			const region = component.contentContainer.children.filter((child) => typeof child.onMouse === "function")[run];
+			if (unwrapMouseRegion(region)?.constructor.name !== expected)
+				throw new Error("empty-run mouse toggle disabled thinking decoration");
+		};
+		assertDecorated();
+		assertNativeThinkingClicks(component, run);
+		assertDecorated();
+	}
+}
+
+function thinkingMarkdownChild(children, snippet) {
+	return (children ?? [])
+		.map(unwrapMouseRegion)
+		.find((child) => typeof child?.text === "string" && child.text.includes(snippet));
+}
+
 const originalUpdate = AssistantMessageComponent.prototype.updateContent;
 const originalDescriptor = Object.getOwnPropertyDescriptor(AssistantMessageComponent.prototype, "updateContent");
 const forwarded = [];
@@ -247,21 +301,19 @@ function predecessorProbe(...args) {
 Object.defineProperty(AssistantMessageComponent.prototype, "updateContent", { ...originalDescriptor, value: predecessorProbe });
 const nativeUpdate = predecessorProbe;
 const nativeDescriptor = Object.getOwnPropertyDescriptor(AssistantMessageComponent.prototype, "updateContent");
-const settingsInputDescriptor = Object.getOwnPropertyDescriptor(SettingsList.prototype, "handleInput");
-if (process.env.ZENTUI_DIRECT_RAIL === "1" && settingsInputDescriptor?.value) {
-	Object.defineProperty(SettingsList.prototype, "handleInput", {
-		...settingsInputDescriptor,
-		value: function directRailProbeInput(data) {
-			if (data === "\\x1c") {
-				const item = this.items?.[this.selectedIndex];
-				if (item?.currentValue === "Streaming" && item.values?.includes("Rail")) {
-					// Make one real SettingsList activation select Rail without notifying the
-					// controller about the intermediate cyclic Tree value.
-					item.currentValue = "Tree";
-					return Reflect.apply(settingsInputDescriptor.value, this, [" "]);
-				}
+const settingsRenderDescriptor = Object.getOwnPropertyDescriptor(SettingsList.prototype, "render");
+if (process.env.ZENTUI_DIRECT_RAIL === "1" && settingsRenderDescriptor?.value) {
+	Object.defineProperty(SettingsList.prototype, "render", {
+		...settingsRenderDescriptor,
+		value: function directRailProbeRender(...args) {
+			const item = this.items?.find((item) => item.id === "thinkingStepsMode");
+			if (item?.currentValue === "Streaming" && JSON.stringify(item.values) === JSON.stringify(["Streaming", "Tree", "Rail"])) {
+				// Reorder only this fixture's choices so one real panel Space activation
+				// selects Rail directly, without an intermediate Tree controller update.
+				// The panel owns activation; it no longer delegates SettingsList.handleInput.
+				item.values = ["Streaming", "Rail", "Tree"];
 			}
-			return Reflect.apply(settingsInputDescriptor.value, this, [data]);
+			return Reflect.apply(settingsRenderDescriptor.value, this, args);
 		},
 	});
 }
@@ -298,6 +350,7 @@ let stopProbeInput;
 const ownedProbeWidgets = new Set();
 export default function (pi) {
 	pi.on("session_start", (_event, ctx) => {
+		assertClicksAfterEmptyThinkingRun();
 		const setProbeWidget = (key, factory, options) => {
 			ctx.ui.setWidget(key, factory, options);
 			if (factory) ownedProbeWidgets.add(key);
@@ -405,8 +458,7 @@ export default function (pi) {
 					[],
 				);
 				const beforeWrapperCalls = forwarded.length;
-				if (version === "0.80.5" || version === "0.83.0") tested.updateContent(structuralFixture);
-				else tested.updateContent(structuralFixture, spec.active);
+				tested.updateContent(structuralFixture, spec.active);
 				if (generation === 0) {
 					initialCalls = forwarded.slice(beforeWrapperCalls).map((call) => ({
 						count: call.count,
@@ -423,8 +475,9 @@ export default function (pi) {
 					[],
 				);
 				Reflect.apply(originalUpdate, native, [structuralFixture, spec.active]);
-				const nativeMarkdown = (native.contentContainer?.children ?? []).find(
-					(child) => child instanceof Markdown && child.text.includes("PTY label 1"),
+				const nativeMarkdown = thinkingMarkdownChild(
+					native.contentContainer?.children,
+					"PTY label 1",
 				);
 				if (!nativeMarkdown) throw new Error("native structural Markdown shape missing");
 				const selected = mode === "rail" ? labels : labels.slice(-5);
@@ -433,13 +486,14 @@ export default function (pi) {
 					themeName: spec.themeName,
 					active: spec.active,
 					constructors: (tested.contentContainer?.children ?? []).map(
-						(child) => child.constructor.name,
+						(child) => unwrapMouseRegion(child).constructor.name,
 					),
 					comparisons: [20, 80].map((width) =>
 						compareAnsi(tested, nativeMarkdown, selected, spec.active, width),
 					),
 				};
 				structuralGenerations.push(record);
+				assertNativeThinkingClicks(tested);
 			};
 			createGeneration();
 			const hidden = new AssistantMessageComponent(
@@ -513,7 +567,7 @@ export default function (pi) {
 		const nativeLive = new AssistantMessageComponent(undefined, false, getMarkdownTheme(), "Thinking...", 1, []);
 		Reflect.apply(originalUpdate, nativeLive, [liveFixture, true]);
 		const nativeChildren = nativeLive.contentContainer?.children ?? [];
-		const nativeMarkdown = nativeChildren.find((child) => child instanceof Markdown && child.text.includes("LIVE rendered row 1"));
+		const nativeMarkdown = thinkingMarkdownChild(nativeChildren, "LIVE rendered row 1");
 		const nativeRows = nativeMarkdown ? cleanRows(nativeMarkdown.render(40)) : [];
 		const nativeScreenRows = cleanRows(nativeLive.render(100));
 		const importedAssistantIdentity = nativeLive.constructor === AssistantMessageComponent;
@@ -523,18 +577,21 @@ export default function (pi) {
 
 		const tested = new AssistantMessageComponent(undefined, false, getMarkdownTheme(), "Thinking...", 1, []);
 		const beforeWrapperCalls = forwarded.length;
-		if (version === "0.80.5" || version === "0.83.0") tested.updateContent(liveFixture);
-		else tested.updateContent(liveFixture, true);
+		tested.updateContent(liveFixture, true);
 		const testedCalls = forwarded.slice(beforeWrapperCalls).map((call) => ({
 			count: call.count,
 			isStreaming: call.isStreaming,
 			messageIdentity: call.message === liveFixture,
 		}));
 		const wrapperCalls = testedCalls.length;
-		const signature = (component) => (component.contentContainer?.children ?? []).map((child) => ({
-			constructor: child.constructor.name,
-			text: typeof child.text === "string" ? child.text : undefined,
-		}));
+		assertNativeThinkingClicks(tested);
+		const signature = (component) => (component.contentContainer?.children ?? []).map((child) => {
+			const visible = unwrapMouseRegion(child);
+			return {
+				constructor: visible.constructor.name,
+				text: typeof visible.text === "string" ? visible.text : undefined,
+			};
+		});
 		const collision = new AssistantMessageComponent(undefined, false, getMarkdownTheme(), "Thinking...", 1, []);
 		collision.updateContent({
 			...fixture,
@@ -651,7 +708,7 @@ export default function (pi) {
 		});
 
 		const hidden = new AssistantMessageComponent(undefined, true, getMarkdownTheme(), "Thinking...", 1, []);
-		hidden.updateContent(liveFixture, version === "0.80.5" || version === "0.83.0" ? undefined : true);
+		hidden.updateContent(liveFixture, true);
 		const hiddenFolded = cleanRows(hidden.render(40)).some((row) => row.includes("Thinking"));
 		const hiddenStatePreserved = hidden.hideThinkingBlock === true;
 
@@ -697,8 +754,8 @@ export default function (pi) {
 			}) + "\\n",
 		);
 		Object.defineProperty(AssistantMessageComponent.prototype, "updateContent", originalDescriptor);
-		if (settingsInputDescriptor)
-			Object.defineProperty(SettingsList.prototype, "handleInput", settingsInputDescriptor);
+		if (settingsRenderDescriptor)
+			Object.defineProperty(SettingsList.prototype, "render", settingsRenderDescriptor);
 	});
 }
 `;
@@ -997,11 +1054,17 @@ try:
     transition_sequence = []
     structural_snapshots = []
 
+    def settings_section_ready(label, index, selected_label):
+        tabs = "  Appearance / Editor / User messages / Thinking (Experimental) / Working line / Footer / Extension statuses"
+        header = tabs if len(tabs) <= cols else "  " + label + " (" + str(index) + "/7)"
+        lines = screen.text().split("\n")
+        return header in lines and any(row.startswith("→ " + selected_label + " ") for row in lines)
+
     def switch_thinking_mode(action, expected_mode, expected_active, expected_row):
         os.write(master, b"/zentui\r")
-        pump_until(lambda: "Appearance (1/9)" in screen.text(), "settings open")
+        pump_until(lambda: settings_section_ready("Appearance", 1, "Preset"), "settings open")
         os.write(master, b"\t\t\t")
-        pump_until(lambda: "Thinking (Experimental) (4/9)" in screen.text(), "Thinking settings section")
+        pump_until(lambda: settings_section_ready("Thinking (Experimental)", 4, "Enabled") and "Mode     " in screen.text(), "Thinking settings section")
         os.write(master, b"\x1b[B")
         before = screen.text()
         previous = [value for value in ("Streaming", "Tree", "Rail") if "Mode     " + value in before]
@@ -1038,7 +1101,7 @@ try:
     elif environment.get("ZENTUI_DIRECT_RAIL") == "1":
         pump_until(lambda: os.path.exists(probe_path) and os.path.getsize(probe_path) > 0 and "__ZENTUI_EXPERIMENTAL_TRANSITION_START_52F0A8__" in screen.text() and "__ZENTUI_RESOURCES__ input=1 timer=1" in screen.text(), "direct Rail transition readiness")
         folded = screen.text()
-        rail_transition = switch_thinking_mode(b"\x1c", "Rail", "Rail", "│ • Live transition 6")
+        rail_transition = switch_thinking_mode(b" ", "Rail", "Rail", "│ • Live transition 6")
         os.write(master, b"\x04")
         pump_until(lambda: status is not None, "process exit")
     elif environment.get("ZENTUI_THINKING_MODE") in ("rail", "tree"):
@@ -1468,6 +1531,8 @@ while True: time.sleep(1)
 				`@earendil-works/pi-ai@${version}`,
 				`@earendil-works/pi-coding-agent@${version}`,
 				`@earendil-works/pi-tui@${version}`,
+				// Pi 0.85.0's unbundled exports import pi-server but omit its dependency.
+				...(version === "0.85.0" ? [`@earendil-works/pi-server@${version}`] : []),
 			],
 			{ cwd: versionRoot, stdio: "inherit", timeout: 180_000 },
 		);
@@ -1724,7 +1789,6 @@ while True: time.sleep(1)
 		const extractedLiveBody = extractedLiveRows.filter(
 			(_row, index) => index !== extractedLiveHeaderIndexes[0],
 		);
-		const oldContract = runtimeVersion === "0.80.5" || runtimeVersion === "0.83.0";
 		const call = live?.testedCalls?.[0];
 		const signatures = live?.orderedIdentitySignatures;
 		const countConstructor = (signature, name) =>
@@ -1743,9 +1807,9 @@ while True: time.sleep(1)
 			importedMarkdownIdentity: live?.importedMarkdownIdentity === true,
 			wrapperCallCount: live?.wrapperCalls === 1,
 			testedCallCount: live?.testedCalls?.length === 1,
-			argumentCount: call?.count === (oldContract ? 1 : 2),
+			argumentCount: call?.count === 2,
 			messageIdentity: call?.messageIdentity === true,
-			streamingArgument: oldContract ? call?.isStreaming === undefined : call?.isStreaming === true,
+			streamingArgument: call?.isStreaming === true,
 			hiddenFolded: live?.hiddenFolded === true,
 			hiddenStatePreserved: live?.hiddenStatePreserved === true,
 		};
@@ -1756,8 +1820,7 @@ while True: time.sleep(1)
 			equalThinkingCount: countConstructor(signatures?.equal, "FoldedThinkingSection") === 1,
 			equalMarkdown: equalRows(markdownTexts(signatures?.equal), ["equal source"]),
 			contiguousThinkingCount:
-				countConstructor(signatures?.contiguous, "FoldedThinkingSection") ===
-				(runtimeVersion === "0.80.5" ? 2 : 1),
+				countConstructor(signatures?.contiguous, "FoldedThinkingSection") === 1,
 			toolSeparatedThinkingCount:
 				countConstructor(signatures?.toolSeparated, "FoldedThinkingSection") === 2,
 			toolSeparatedMarkdownCount: markdownTexts(signatures?.toolSeparated).length === 0,
@@ -2040,7 +2103,6 @@ while True: time.sleep(1)
 			const clean = (rows) => cleanExact(rows).filter((text) => text.trim().length > 0);
 			const generations = completedStructural?.structuralGenerations ?? [];
 			const snapshots = modeResult.structuralSnapshots ?? [];
-			const oldContract = runtimeVersion === "0.80.5" || runtimeVersion === "0.83.0";
 			const modeCall = structural?.testedCalls?.[0];
 			let generationFailure;
 			for (const generation of generations) {
@@ -2127,7 +2189,7 @@ while True: time.sleep(1)
 				ready: structural?.ready === true,
 				installed: structural?.installed === true,
 				wrapperCallCount: structural?.wrapperCalls === 1,
-				forwardedArgumentCount: modeCall?.count === (oldContract ? 1 : 2),
+				forwardedArgumentCount: modeCall?.count === 2,
 				forwardedMessageIdentity: modeCall?.messageIdentity === true,
 				generationCount: generations.length === 6,
 				snapshotCount: snapshots.length === 12,
@@ -2187,7 +2249,7 @@ while True: time.sleep(1)
 
 		assertNoTransientArtifacts(version, "normal PTY cases", versionRoot, agentDir, home);
 
-		if (runtimeVersion === "0.84.4") {
+		{
 			writeFileSync(
 				join(agentDir, "zentui.json"),
 				JSON.stringify({
@@ -2262,7 +2324,7 @@ while True: time.sleep(1)
 				) !== JSON.stringify(["__ZENTUI_RESOURCES__ input=1 timer=1"])
 			)
 				throw new Error(
-					`Pi 0.84.4 fullscreen live transition smoke failed: ${boundedJson({ fullscreenPairs, fullscreenTransitionsValid, fullscreenShutdown, exit: fullscreen.exit, groupAlive: fullscreen.groupAlive })}`,
+					`Pi ${runtimeVersion} fullscreen live transition smoke failed: ${boundedJson({ fullscreenPairs, fullscreenTransitionsValid, fullscreenShutdown, exit: fullscreen.exit, groupAlive: fullscreen.groupAlive })}`,
 				);
 			writeFileSync(
 				join(agentDir, "zentui.json"),
@@ -2312,16 +2374,16 @@ while True: time.sleep(1)
 				fullscreenActiveFinal?.widgetOwnershipCount !== 0
 			)
 				throw new Error(
-					`Pi 0.84.4 fullscreen active Streaming shutdown failed: ${boundedJson({ transitions: fullscreenActive.transitionSequence, fullscreenActiveFinal, exit: fullscreenActive.exit, groupAlive: fullscreenActive.groupAlive })}`,
+					`Pi ${runtimeVersion} fullscreen active Streaming shutdown failed: ${boundedJson({ transitions: fullscreenActive.transitionSequence, fullscreenActiveFinal, exit: fullscreenActive.exit, groupAlive: fullscreenActive.groupAlive })}`,
 				);
 			assertNoTransientArtifacts(version, "fullscreen PTY cases", versionRoot, agentDir, home);
 			console.log(
-				`0.84.4 fullscreen: live=Streaming->Tree,Tree->Rail entering-Streaming=restart-only rows/status/resources=exact active-Streaming-EOF=1/1->${fullscreenActiveFinal.controllerResources.inputs}/${fullscreenActiveFinal.controllerResources.timers} descriptor=${JSON.stringify(fullscreenActiveFinal.descriptorEvidence.fields)} widget-ownership=0 process-group=gone artifacts=none`,
+				`${runtimeVersion} fullscreen: live=Streaming->Tree,Tree->Rail entering-Streaming=restart-only rows/status/resources=exact active-Streaming-EOF=1/1->${fullscreenActiveFinal.controllerResources.inputs}/${fullscreenActiveFinal.controllerResources.timers} descriptor=${JSON.stringify(fullscreenActiveFinal.descriptorEvidence.fields)} widget-ownership=0 process-group=gone artifacts=none`,
 			);
 		}
 
 		console.log(
-			`${runtimeVersion}: measured=${JSON.stringify(attestation.versions)} live=Thinking sentinel-rows=${JSON.stringify(extractedLiveRows)} header-index=${extractedLiveHeaderIndexes[0]} native-tail=${JSON.stringify(expectedScreenTail)} exact=5/5 wrapped=row4-continuation+rows5-8 args=${call.count}:${String(call.isStreaming)} wrapperCalls=${live.wrapperCalls} identities=exact ordered-collisions=thinking2+text1/equal1+text1 contiguous=${runtimeVersion === "0.80.5" ? "legacy2" : "coalesced1"} tool-separated=2 binding=validated-ctrl+t descriptor=${JSON.stringify(probes.at(-1).descriptorEvidence.fields)} restored-completed=Thought folded=${JSON.stringify(foldedCompletedRows)} expanded=${JSON.stringify(expandedCompletedRows)} refolded=${JSON.stringify(refoldedCompletedRows)} live-transitions=Streaming->Tree,Tree->Rail entering-Streaming=restart-only states/resources=${JSON.stringify(result.transitionSequence.map(({ from, to, status, resources }) => ({ from, to, status, resources })))} tree=${JSON.stringify(treeTransitionRows)} rail=${JSON.stringify(railTransitionRows)} hidden-start=preserved widget=removed artifacts=none handshake=${result.supervisor.handshake} cleanup-signals=${JSON.stringify(result.supervisor.cleanupSignals ?? [])} python=${result.supervisor.pythonPid}:reaped pi=${result.supervisor.piPid}:reaped group=${result.supervisor.piPgid}:gone`,
+			`${runtimeVersion}: measured=${JSON.stringify(attestation.versions)} live=Thinking sentinel-rows=${JSON.stringify(extractedLiveRows)} header-index=${extractedLiveHeaderIndexes[0]} native-tail=${JSON.stringify(expectedScreenTail)} exact=5/5 wrapped=row4-continuation+rows5-8 args=${call.count}:${String(call.isStreaming)} wrapperCalls=${live.wrapperCalls} identities=exact ordered-collisions=thinking2+text1/equal1+text1 contiguous=coalesced1 tool-separated=2 binding=validated-ctrl+t descriptor=${JSON.stringify(probes.at(-1).descriptorEvidence.fields)} restored-completed=Thought folded=${JSON.stringify(foldedCompletedRows)} expanded=${JSON.stringify(expandedCompletedRows)} refolded=${JSON.stringify(refoldedCompletedRows)} live-transitions=Streaming->Tree,Tree->Rail entering-Streaming=restart-only states/resources=${JSON.stringify(result.transitionSequence.map(({ from, to, status, resources }) => ({ from, to, status, resources })))} tree=${JSON.stringify(treeTransitionRows)} rail=${JSON.stringify(railTransitionRows)} hidden-start=preserved widget=removed artifacts=none handshake=${result.supervisor.handshake} cleanup-signals=${JSON.stringify(result.supervisor.cleanupSignals ?? [])} python=${result.supervisor.pythonPid}:reaped pi=${result.supervisor.piPid}:reaped group=${result.supervisor.piPgid}:gone`,
 		);
 	}
 } finally {