pi-zentui 0.29.2 → 0.29.3

package/extensions/zentui/index.ts

@@ -336,9 +336,9 @@ export default function (pi: ExtensionAPI, host: ZentuiHost = {}) {
 			return undefined;
 		}
 	};
-	// Layered visibility is read-only recognition; installation ownership above stays exclusive.
-	// Data, demand, and timer consumers read the visible editor through these two helpers; anything
-	// that installs, restores, or mutates host UI must keep using ownsInstalledEditorFactory().
+	// Layered visibility does not grant installation ownership: editor install/restore stays exclusive.
+	// Data, demand, and timer consumers use these helpers; Working-line placement additionally
+	// requires focused, rendered border capability before its controller hides its own host row.
 	// Ownership counts before Pi constructs its editor; layered visibility requires the recorded
 	// instance to remain reachable through the current factory.
 	const layeredVisibleEditor = () => layeredEditor.editorVisibleThrough(currentEditorFactory());
@@ -402,17 +402,13 @@ export default function (pi: ExtensionAPI, host: ZentuiHost = {}) {
 		undefined,
 		(ctx) => {
 			if (!activeTuiContext || ctx.ui !== activeTuiContext.ui) return false;
-			if (!ownsInstalledEditorFactory()) {
-				activeEditor = undefined;
-				return false;
-			}
+			// Factory visibility alone is insufficient: the current focused editor must have
+			// rendered safe border geometry before the separately owned Working row can hide.
 			return Boolean(
-				activeEditor &&
-					sessionLifecycle.isCurrent(activeEditor.generation) &&
-					activeEditor.factory === installedEditorFactory &&
+				sessionLifecycle.isCurrent() &&
 					effectiveEditorEnabled() &&
 					currentConfig.components.editor.style !== "accent-rail" &&
-					activeEditor.editor.canEmbedWorkingLineBorder(),
+					visibleEditor()?.canEmbedWorkingLineBorder(),
 			);
 		},
 	);
@@ -939,10 +935,7 @@ export default function (pi: ExtensionAPI, host: ZentuiHost = {}) {
 		return observed;
 	};
 
-	// Exclusive: gates mutation of host UI such as the Working row.
-	const isActiveEditor = (editor: PolishedEditor | WrappedPolishedEditor, generation: number) =>
-		sessionLifecycle.isCurrent(generation) && activeEditor?.editor === editor;
-	// Read-only: also true for an editor still visible beneath a foreign wrapper.
+	// Also true for an editor still visible beneath a foreign wrapper; installation stays exclusive.
 	const isVisibleEditor = (editor: PolishedEditor | WrappedPolishedEditor, generation: number) =>
 		sessionLifecycle.isCurrent(generation) && visibleEditor() === editor;
 
@@ -950,7 +943,7 @@ export default function (pi: ExtensionAPI, host: ZentuiHost = {}) {
 		editor: PolishedEditor | WrappedPolishedEditor,
 		generation: number,
 	) => {
-		if (!isActiveEditor(editor, generation) || !activeTuiContext || !workingLineSessionReady)
+		if (!isVisibleEditor(editor, generation) || !activeTuiContext || !workingLineSessionReady)
 			return;
 		if (!host.skinOnly) workingLine.reconcile(activeTuiContext);
 		if (workingLine.isAvailable()) requestEditorRepaint();
@@ -966,10 +959,12 @@ export default function (pi: ExtensionAPI, host: ZentuiHost = {}) {
 	const editorWorkingLineFrame = (
 		editor: PolishedEditor | WrappedPolishedEditor,
 		generation: number,
-	) =>
-		!host.skinOnly && isActiveEditor(editor, generation)
-			? workingLine.currentWorkingLineFrame()
-			: undefined;
+	) => {
+		if (host.skinOnly || !sessionLifecycle.isCurrent(generation)) return undefined;
+		// Even a stale instance render must release a row whose current border disappeared.
+		const frame = workingLine.currentWorkingLineFrame();
+		return isVisibleEditor(editor, generation) ? frame : undefined;
+	};
 
 	/** Records a freshly constructed editor as owned (exclusive) or visible beneath a foreign wrapper. */
 	const registerConstructedEditor = (

package/extensions/zentui/layered-editor.ts

@@ -8,9 +8,9 @@
  * and redraw requests. The record is valid only while the outer factory observed at construction is
  * still the current editor factory, so any replacement of the chain invalidates it.
  *
- * Visibility is only evidence that a wrapper constructed the editor, not that its rows reach the
- * screen, so surfaces that mutate host UI (for example hiding the native Working row) must keep
- * requiring exclusive installation ownership instead of consulting this record.
+ * Construction alone cannot authorize hiding the Working row: its controller additionally requires
+ * a focused editor that has rendered safe border geometry. A wrapper that renders then discards those
+ * rows remains undetectable; supporting such wrappers requires an explicit host visibility contract.
  */
 export class LayeredEditorConsumer<Factory, Editor = unknown> {
 	private record?: {

package/extensions/zentui/minimalist-editor.ts

@@ -172,9 +172,11 @@ function renderTopLeft(
 	metadata: MinimalistEditorMetadata,
 	uiTheme: Theme,
 	config: ZentuiConfig,
+	renderBorder: (text: string) => string,
 	includeSessionName = true,
 ): string {
 	const source = config.components.editor.colorSource;
+	const separator = safeThemeFg(uiTheme, "muted", " · ");
 	const bashMode = bashModeLabel(inputText);
 	const parts: string[] = [];
 	if (bashMode) {
@@ -206,16 +208,20 @@ function renderTopLeft(
 		? sanitizeEditorMetadataText(metadata.sessionName ?? "")
 		: "";
 	if (config.components.editor.styles.minimalist.showSessionName && sessionName) {
-		parts.push(
-			renderStyleForSource(
-				uiTheme,
-				source,
-				componentColor(config, "editor", "sessionName"),
-				sessionName,
-			),
+		return joinStyled(
+			[
+				joinStyled(parts, separator),
+				renderStyleForSource(
+					uiTheme,
+					source,
+					componentColor(config, "editor", "sessionName"),
+					sessionName,
+				),
+			],
+			metadata.workingLineFrame ? renderBorder(" ─ ") : separator,
 		);
 	}
-	return joinStyled(parts, safeThemeFg(uiTheme, "muted", " · "));
+	return joinStyled(parts, separator);
 }
 
 function renderTopRight(
@@ -448,6 +454,7 @@ function renderTemplateBuiltin(
 				{ cwd: "", sessionName: metadata.sessionName },
 				uiTheme,
 				explicitConfig,
+				renderBorder,
 			);
 		case "turn_duration":
 			return renderTopLeft(
@@ -455,6 +462,7 @@ function renderTemplateBuiltin(
 				{ cwd: "", agentDurationMs: metadata.agentDurationMs, agentActive: metadata.agentActive },
 				uiTheme,
 				explicitConfig,
+				renderBorder,
 			);
 		case "model":
 			isolated.modelLabel = metadata.modelLabel;
@@ -693,8 +701,8 @@ export function renderMinimalistFrame({
 		if (!count || !/^[1-9]\d*$/.test(count)) return "";
 		return safeThemeFg(uiTheme, "muted", `${direction === "above" ? "↑" : "↓"} ${count} more`);
 	};
-	const topMetadata = renderTopLeft(inputText, metadata, uiTheme, config);
-	const topOperational = renderTopLeft(inputText, metadata, uiTheme, config, false);
+	const topMetadata = renderTopLeft(inputText, metadata, uiTheme, config, renderBorder);
+	const topOperational = renderTopLeft(inputText, metadata, uiTheme, config, renderBorder, false);
 	const topViewport = viewportLabel("above", viewport?.above);
 	const topLeft = joinStyled([topViewport, topMetadata], separator);
 	const topRightBudget = Math.max(0, width - 8 - visibleWidth(topLeft));
@@ -775,6 +783,7 @@ export function renderMinimalistFrame({
 									{ cwd: "", workingLineFrame: metadata.workingLineFrame },
 									uiTheme,
 									config,
+									renderBorder,
 									false,
 								)
 							: "";
@@ -784,13 +793,18 @@ export function renderMinimalistFrame({
 					if (visibleWidth(prefix) > budget) prefix = operational;
 					if (visibleWidth(prefix) > budget)
 						prefix = truncateToWidth(prefix, Math.max(0, budget), "…");
+					const metadataSeparator =
+						operational && metadata.workingLineFrame ? renderBorder(" ─ ") : separator;
 					rendered = renderMinimalistTemplate(
 						format,
 						resolve,
 						customNames,
-						Math.max(0, budget - visibleWidth(prefix) - (prefix ? visibleWidth(separator) : 0)),
+						Math.max(
+							0,
+							budget - visibleWidth(prefix) - (prefix ? visibleWidth(metadataSeparator) : 0),
+						),
 					);
-					return joinStyled([prefix, rendered], separator);
+					return joinStyled([prefix, rendered], metadataSeparator);
 				}
 				switch (slot) {
 					case "topLeft": {

package/extensions/zentui/user-message.ts

@@ -179,18 +179,20 @@ function nativeMarkdown(instance: PatchableUserMessagePrototype):
 	}
 	const children = direct;
 	if (!Array.isArray(children) || children.length !== 1) return undefined;
-	const box = children[0];
-	if (!isRecord(box) || !Array.isArray(box.children) || box.children.length !== 1) return undefined;
-	const renderer = box.children[0];
+	// Pi >=1.0 holds the Markdown directly (it pads/colors itself); older Pi
+	// wrapped it in a Box. Accept both shapes.
+	let renderer = children[0];
+	const direct1 = isNativeMarkdown(renderer);
+	if (isRecord(renderer) && !direct1) {
+		const box = renderer;
+		if (!Array.isArray(box.children) || box.children.length !== 1) return undefined;
+		renderer = box.children[0];
+	}
 	if (!isNativeMarkdown(renderer)) return undefined;
 	const child = renderer as unknown as Record<string, unknown>;
-	if (
-		typeof child.text !== "string" ||
-		child.paddingX !== 0 ||
-		child.paddingY !== 0 ||
-		!isRecord(child.theme)
-	)
-		return undefined;
+	if (typeof child.text !== "string" || !isRecord(child.theme)) return undefined;
+	// Box-wrapped (older Pi) Markdown must be unpadded; Pi >=1.0 pads it itself.
+	if (!direct1 && (child.paddingX !== 0 || child.paddingY !== 0)) return undefined;
 	for (const key of [
 		"heading",
 		"link",
@@ -217,6 +219,8 @@ function nativeMarkdown(instance: PatchableUserMessagePrototype):
 	)
 		return undefined;
 	if (child.defaultTextStyle !== undefined && !isRecord(child.defaultTextStyle)) return undefined;
+	// Pi >=1.0 puts the message background in defaultTextStyle; Zentui frames draw their own.
+	const { bgColor: _bg, ...textStyle } = (child.defaultTextStyle ?? {}) as Record<string, unknown>;
 	return {
 		renderer: renderer as unknown as Markdown,
 		text: child.text,
@@ -224,9 +228,9 @@ function nativeMarkdown(instance: PatchableUserMessagePrototype):
 			theme: child.theme as unknown as NonNullable<
 				UserMessageStyleRenderInput["markdown"]
 			>["theme"],
-			defaultTextStyle: child.defaultTextStyle as NonNullable<
-				UserMessageStyleRenderInput["markdown"]
-			>["defaultTextStyle"],
+			defaultTextStyle: (child.defaultTextStyle === undefined
+				? undefined
+				: textStyle) as NonNullable<UserMessageStyleRenderInput["markdown"]>["defaultTextStyle"],
 			options: child.options as NonNullable<UserMessageStyleRenderInput["markdown"]>["options"],
 		},
 	};

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "pi-zentui",
-	"version": "0.29.2",
+	"version": "0.29.3",
 	"description": "Modular UI components for Pi and Oh My Pi — customizable editors, messages, progress displays, and statuslines.",
 	"type": "module",
 	"license": "MIT",