pi-zentui 0.26.1 → 0.27.0

package/docs/configuration.md

@@ -225,7 +225,8 @@ Reference only—not a starter file. Prefer the minimal overrides above. Optiona
           "contextThresholds": {
             "warning": 70,
             "error": 90
-          }
+          },
+          "separator": "dash"
         }
       }
     },
@@ -246,6 +247,7 @@ Reference only—not a starter file. Prefer the minimal overrides above. Optiona
     },
     "workingLine": {
       "enabled": false,
+      "placement": "above",
       "turnSummary": true,
       "spinner": "star-bloom",
       "spinnerIntervalMs": 100,
@@ -422,6 +424,7 @@ Reference only—not a starter file. Prefer the minimal overrides above. Optiona
 - `components.thinkingSteps` independently owns opt-in **Thinking (Experimental)** display. It defaults to `{ "enabled": false, "mode": "tree" }`; canonical modes are `rail | tree | streaming`. The former persisted `streaming-experimental` value is accepted only as a migration alias and is normalized to `streaming` on save.
 - All three modes decorate Pi's private host renderer and are tested on exact Pi versions 0.80.5, 0.82.1, 0.83.0, 0.84.0, 0.84.4, and 0.85.1. Active Streaming can switch live to Rail or Tree, and Rail and Tree can switch live between each other. Entering Streaming from a structural mode, first enable, and re-enable after live disable require restart; live disable restores native thinking. Disabled mode changes only preconfigure.
 - `components.workingLine.enabled` is the sole Working-line ownership switch. Thinking (Experimental) never enables, configures, or owns the Working line and leaves the existing **Thinking time** option unchanged.
+- `components.workingLine.placement` (`above | border`) selects the default floating row or the Minimalist/Opencode top border. Accent Rail supports only Above. Disabled, native, unavailable, or unsafe/narrow editors and Pi versions without working-row visibility control fall back to Above without changing saved choices. Legacy `input` normalizes to `above`; the prompt remains available for typing.
 - `components.selectorBorders` owns selector-border enablement, fixed `zentui` style, and color source. Disable it for native Pi behavior.
 - `components.footer` owns `native | starship | hidden` style selection, color source, model label, and Starship options. Hidden hides its main segments, retaining only allowed extension statuses; an empty status line occupies no rows.
 - Starship's package-version segment reads the project manifest and is distinct from the runtime segment, which reports the installed toolchain.
@@ -531,7 +534,7 @@ Set `ZENTUI_DEBUG=1` when launching Pi to log the workaround diagnostic without
 
 Set `components.editor.style` to `minimalist` or select it in `/zentui`. The rounded frame places viewport counts, Bash state, current/completed turn duration, and explicit session name at top left; cost, model, thinking, context, and optional latest-prompt cache hit rate at top right; viewport count plus Git at bottom left; and configured path at bottom right. Unnamed sessions add no placeholder.
 
-Path examples are `src` (`compact`), `zentui/src` (`project`), and `~/Projects/zentui/src` (`full`). Context can render as `11%`, `11%/372k`, or, with the gauge enabled and enough room, `[█░░░░] 11%/372k`. Enable `showCacheHit` to append values such as `Cache 98.2%`; it defaults to `false`, omits missing data, yields before context at narrow widths, and remains independent of Footer. The gauge shortens or disappears before the context text at narrow widths. Session name, timer, cost, cache hit rate, and Git can be hidden independently; model, thinking, and context remain structurally stable.
+Path examples are `src` (`compact`), `zentui/src` (`project`), and `~/Projects/zentui/src` (`full`). Context can render as `11%`, `11%/372k`, or, with the gauge enabled and enough room, `[█░░░░] 11%/372k`. Enable `showCacheHit` to append values such as `Cache 98.2%`; it defaults to `false`, omits missing data, yields before context at narrow widths, and remains independent of Footer. The gauge shortens or disappears before the context text at narrow widths. Session name, timer, cost, cache hit rate, and Git can be hidden independently; model, thinking, and context remain structurally stable. Metadata items are joined with dashes by default (`separator: "dash"`) or dots (`separator: "dot"`).
 
 Autocomplete stays inside the frame when Pi output can be split safely. Unknown third-party layouts fail open. Footer visibility remains independently controlled by `components.footer.style`; Minimalist does not remove Pi's header.
 

package/extensions/zentui/config.ts

@@ -54,10 +54,12 @@ export type WorkingLineSpinner =
 	| "claude-inspired"
 	| "pulse";
 export type WorkingLineTextAnimation = "classic" | "kitt" | "disabled";
+export type WorkingLinePlacement = "above" | "border";
 export type ThinkingStepsMode = "rail" | "tree" | "streaming";
 export type ComponentStyleOwner = "editor" | "userMessages" | "selectorBorders" | "footer";
 export type MinimalistPathDisplayMode = "compact" | "project" | "full";
 export type MinimalistContextFormat = "percent" | "percent-total";
+export type MinimalistEditorSeparator = "dash" | "dot";
 export type EditorBorderColorMode = "static" | "adaptive";
 export type CompletionMenuStyle = "native" | "palette";
 export type CompactFooterMaxLines = 1 | 2 | 3 | "unlimited";
@@ -142,6 +144,7 @@ export type MinimalistEditorStyleConfig = {
 	showCacheHit: boolean;
 	showGit: boolean;
 	contextThresholds: ContextThresholds;
+	separator: MinimalistEditorSeparator;
 };
 
 /** Temporary name retained for existing settings consumers. */
@@ -258,6 +261,7 @@ export type WorkingLineComponentConfig = {
 	colorSource: ColorSource;
 	messages: WorkingLineMessagesConfig;
 	segments: WorkingLineSegmentsConfig;
+	placement: WorkingLinePlacement;
 };
 
 export type WorkingLineComponentPatch = Partial<
@@ -498,6 +502,7 @@ const defaultMinimalistStyle: MinimalistEditorStyleConfig = {
 	showCacheHit: false,
 	showGit: true,
 	contextThresholds: { warning: 70, error: 90 },
+	separator: "dash",
 };
 
 const defaultStarshipStyle: StarshipFooterStyleConfig = {
@@ -557,6 +562,7 @@ const defaultComponents: ComponentsConfig = {
 		colorSource: "theme",
 		messages: { custom: true, values: [...PI_WORKING_LINE_MESSAGES] },
 		segments: { tool: true, elapsed: true, thought: true, tokens: true },
+		placement: "above",
 	},
 	selectorBorders: { enabled: true, style: "zentui", colorSource: "theme" },
 	footer: {
@@ -1405,6 +1411,10 @@ function resolveComponents(config: ConfigRecord): ComponentsConfig {
 					showCacheHit: parseBoolean(minimalist.showCacheHit, defaultMinimalistStyle.showCacheHit),
 					showGit: parseBoolean(minimalist.showGit, defaultMinimalistStyle.showGit),
 					contextThresholds: minimalistThresholds,
+					separator:
+						minimalist.separator === "dash" || minimalist.separator === "dot"
+							? minimalist.separator
+							: defaultMinimalistStyle.separator,
 				},
 			},
 		},
@@ -1466,6 +1476,10 @@ function resolveComponents(config: ConfigRecord): ComponentsConfig {
 				workingLine.textAnimation === "disabled"
 					? workingLine.textAnimation
 					: defaultComponents.workingLine.textAnimation,
+			placement:
+				workingLine.placement === "border"
+					? workingLine.placement
+					: defaultComponents.workingLine.placement,
 			colorSource: parseColorSource(
 				workingLine.colorSource,
 				defaultComponents.workingLine.colorSource,
@@ -1903,6 +1917,7 @@ function applyMinimalistStylePatch(
 	if (patch.showCost !== undefined) style.showCost = patch.showCost;
 	if (patch.showCacheHit !== undefined) style.showCacheHit = patch.showCacheHit;
 	if (patch.showGit !== undefined) style.showGit = patch.showGit;
+	if (patch.separator !== undefined) style.separator = patch.separator;
 	if (patch.contextThresholds !== undefined) {
 		style.contextThresholds = { ...style.contextThresholds, ...patch.contextThresholds };
 	}
@@ -1970,6 +1985,7 @@ export function saveWorkingLineComponentPatch(
 			if (patch.textIntervalMs !== undefined) component.textIntervalMs = patch.textIntervalMs;
 			if (patch.textAnimation !== undefined) component.textAnimation = patch.textAnimation;
 			if (patch.colorSource !== undefined) component.colorSource = patch.colorSource;
+			if (patch.placement !== undefined) component.placement = patch.placement;
 			if (patch.messages?.custom !== undefined) component.messages.custom = patch.messages.custom;
 			if (patch.messages?.values !== undefined) {
 				component.messages.values = normalizeWorkingLineMessages([...patch.messages.values]);

package/extensions/zentui/index.ts

@@ -240,6 +240,13 @@ export default function (pi: ExtensionAPI) {
 	let editorInstalled = false;
 	let editorInstallMode: EditorInstallMode = "none";
 	let installedEditorFactory: EditorFactory | undefined;
+	let activeEditor:
+		| {
+				editor: PolishedEditor | WrappedPolishedEditor;
+				factory: EditorFactory;
+				generation: number;
+		  }
+		| undefined;
 	let wrappedEditorFactory: EditorFactory | undefined;
 	let stopSessionTimer: () => void = () => {};
 	let stopMinimalistDurationUpdates: () => void = () => {};
@@ -330,7 +337,28 @@ export default function (pi: ExtensionAPI) {
 		Date.now,
 		() => interactionMetrics.currentThought(),
 		() => invalidateWorkingLinePublisherState(),
+		undefined,
+		(ctx) => {
+			if (!activeTuiContext || ctx.ui !== activeTuiContext.ui) return false;
+			if (!ownsInstalledEditorFactory()) {
+				activeEditor = undefined;
+				return false;
+			}
+			return Boolean(
+				activeEditor &&
+					sessionLifecycle.isCurrent(activeEditor.generation) &&
+					activeEditor.factory === installedEditorFactory &&
+					effectiveEditorEnabled() &&
+					currentConfig.components.editor.style !== "accent-rail" &&
+					activeEditor.editor.canEmbedWorkingLineBorder(),
+			);
+		},
 	);
+	workingLine.setRequestRender(() => {
+		if (sessionLifecycle.isCurrent()) {
+			requestEditorRender?.();
+		}
+	});
 	let workingLineSessionReady = false;
 	const workingLineExtensions = new WorkingLineExtensionSegments(
 		pi.events,
@@ -567,6 +595,7 @@ export default function (pi: ExtensionAPI) {
 
 	const refreshInteractiveState = (ctx: ExtensionContext, project = false) => {
 		if (!sessionLifecycle.isCurrent() || !ctx.hasUI) return;
+		if (activeTuiContext?.ui === ctx.ui) activeTuiContext = ctx;
 		if (editorInstalled && !ownsInstalledEditorFactory()) reconcileObservedEditorOwnership(ctx);
 		syncFooterState(ctx);
 		if (project && needsProjectRefresh()) scheduleProjectRefresh(ctx);
@@ -768,6 +797,8 @@ export default function (pi: ExtensionAPI) {
 	};
 
 	const clearEditorOwnership = () => {
+		activeEditor = undefined;
+		if (activeTuiContext && workingLineSessionReady) workingLine.reconcile(activeTuiContext);
 		setMinimalistDecorationActive(false);
 		requestEditorRender = undefined;
 		wrappedEditorFactory = undefined;
@@ -779,6 +810,7 @@ export default function (pi: ExtensionAPI) {
 
 	const trackZentuiEditorFactory = (factory: EditorFactory): boolean => {
 		if (!isOwnedEditorFactory(factory)) return false;
+		if (activeEditor?.factory !== factory) activeEditor = undefined;
 		const baseFactory = getZentuiEditorBaseFactory(factory);
 		wrappedEditorFactory = baseFactory;
 		installedEditorFactory = factory;
@@ -799,7 +831,11 @@ export default function (pi: ExtensionAPI) {
 
 	const reconcileObservedEditorOwnership = (ctx: ExtensionContext) => {
 		const observed = observeEditorFactory(ctx);
-		if (!observed.known) return observed;
+		if (!observed.known) {
+			activeEditor = undefined;
+			if (workingLineSessionReady) workingLine.reconcile(ctx);
+			return observed;
+		}
 		if (observed.factory && isOwnedEditorFactory(observed.factory)) {
 			trackZentuiEditorFactory(observed.factory);
 		} else {
@@ -820,39 +856,78 @@ export default function (pi: ExtensionAPI) {
 		return editor;
 	};
 
+	const isActiveEditor = (editor: PolishedEditor | WrappedPolishedEditor, generation: number) =>
+		sessionLifecycle.isCurrent(generation) && activeEditor?.editor === editor;
+
+	const editorBorderCapabilityChanged = (
+		editor: PolishedEditor | WrappedPolishedEditor,
+		generation: number,
+	) => {
+		if (!isActiveEditor(editor, generation) || !activeTuiContext || !workingLineSessionReady)
+			return;
+		workingLine.reconcile(activeTuiContext);
+		if (workingLine.isAvailable()) requestEditorRender?.();
+	};
+
+	const editorWorkingLineFrame = (
+		editor: PolishedEditor | WrappedPolishedEditor,
+		generation: number,
+	) => (isActiveEditor(editor, generation) ? workingLine.currentWorkingLineFrame() : undefined);
+
 	const makeEditorFactory = (ctx: ExtensionContext): ZentuiEditorFactory => {
 		const sessionTheme = ctx.ui.theme;
+		const generation = sessionLifecycle.currentGeneration();
 		const factory = ((tui: TUI, theme: EditorTheme, keybindings: KeybindingsManager) => {
-			requestEditorRender = () => tui.requestRender();
-			return markOwnedAccentRailEditor(
+			const editor: PolishedEditor = markOwnedAccentRailEditor(
 				new PolishedEditor(
 					tui,
 					theme,
 					keybindings,
 					sessionTheme,
 					getCurrentConfig,
-					() => getEditorMeta(ctx),
+					() => getEditorMeta(activeTuiContext ?? ctx),
 					getThinkingLevel,
-					() => ({
-						codexQuota: getEditorQuota(),
-						cwd: ctx.cwd,
-						projectRoot: minimalistProjectRoot,
-						branch: state.branch,
-						dirty: state.dirty,
-						ahead: state.ahead,
-						behind: state.behind,
-						costLabel: state.costLabel,
-						modelLabel: modelLabelFor(state, currentConfig.components.editor.modelLabel),
-						thinkingLevel: getThinkingLevel(),
-						...getEditorContextMetadata(ctx),
-						cacheHitRate: state.usageTotals.latestCacheHitRate,
-						sessionName: ctx.sessionManager.getSessionName() ?? "",
-						agentDurationMs: getAgentDurationMs(),
-						agentActive: agentRunActive,
-					}),
-					setMinimalistDecorationActive,
+					() => {
+						const workingLineFrame = editorWorkingLineFrame(editor, generation);
+						if (currentConfig.components.editor.style !== "minimalist") {
+							return { cwd: "", workingLineFrame };
+						}
+						return {
+							codexQuota: getEditorQuota(),
+							cwd: (activeTuiContext ?? ctx).cwd,
+							projectRoot: minimalistProjectRoot,
+							branch: state.branch,
+							dirty: state.dirty,
+							ahead: state.ahead,
+							behind: state.behind,
+							costLabel: state.costLabel,
+							modelLabel: modelLabelFor(state, currentConfig.components.editor.modelLabel),
+							thinkingLevel: getThinkingLevel(),
+							...getEditorContextMetadata(activeTuiContext ?? ctx),
+							cacheHitRate: state.usageTotals.latestCacheHitRate,
+							sessionName: (activeTuiContext ?? ctx).sessionManager.getSessionName() ?? "",
+							agentDurationMs: getAgentDurationMs(),
+							agentActive: agentRunActive,
+							workingLineFrame,
+						};
+					},
+					(active) => {
+						if (isActiveEditor(editor, generation)) setMinimalistDecorationActive(active);
+					},
+					() => editorBorderCapabilityChanged(editor, generation),
 				),
 			);
+			const observed = observeEditorFactory(ctx);
+			if (
+				sessionLifecycle.isCurrent(generation) &&
+				activeTuiContext?.ui === ctx.ui &&
+				observed.known &&
+				observed.factory === factory
+			) {
+				activeEditor = { editor, factory, generation };
+				requestEditorRender = () => tui.requestRender();
+			}
+			return editor;
 		}) as ZentuiEditorFactory;
 		factory[ZENTUI_EDITOR_FACTORY] = true;
 		factory[ZENTUI_EDITOR_OWNER] = editorOwnerToken;
@@ -864,35 +939,56 @@ export default function (pi: ExtensionAPI) {
 		baseFactory: EditorFactory,
 	): ZentuiEditorFactory => {
 		const sessionTheme = ctx.ui.theme;
+		const generation = sessionLifecycle.currentGeneration();
 		const factory = ((tui: TUI, theme: EditorTheme, keybindings: KeybindingsManager) => {
-			requestEditorRender = () => tui.requestRender();
-			return markOwnedAccentRailEditor(
+			const editor: WrappedPolishedEditor = markOwnedAccentRailEditor(
 				new WrappedPolishedEditor(
 					baseFactory(tui, theme, keybindings),
 					sessionTheme,
 					getCurrentConfig,
-					() => getEditorMeta(ctx),
+					() => getEditorMeta(activeTuiContext ?? ctx),
 					getThinkingLevel,
-					() => ({
-						codexQuota: getEditorQuota(),
-						cwd: ctx.cwd,
-						projectRoot: minimalistProjectRoot,
-						branch: state.branch,
-						dirty: state.dirty,
-						ahead: state.ahead,
-						behind: state.behind,
-						costLabel: state.costLabel,
-						modelLabel: modelLabelFor(state, currentConfig.components.editor.modelLabel),
-						thinkingLevel: getThinkingLevel(),
-						...getEditorContextMetadata(ctx),
-						cacheHitRate: state.usageTotals.latestCacheHitRate,
-						sessionName: ctx.sessionManager.getSessionName() ?? "",
-						agentDurationMs: getAgentDurationMs(),
-						agentActive: agentRunActive,
-					}),
-					setMinimalistDecorationActive,
+					() => {
+						const workingLineFrame = editorWorkingLineFrame(editor, generation);
+						if (currentConfig.components.editor.style !== "minimalist") {
+							return { cwd: "", workingLineFrame };
+						}
+						return {
+							codexQuota: getEditorQuota(),
+							cwd: (activeTuiContext ?? ctx).cwd,
+							projectRoot: minimalistProjectRoot,
+							branch: state.branch,
+							dirty: state.dirty,
+							ahead: state.ahead,
+							behind: state.behind,
+							costLabel: state.costLabel,
+							modelLabel: modelLabelFor(state, currentConfig.components.editor.modelLabel),
+							thinkingLevel: getThinkingLevel(),
+							...getEditorContextMetadata(activeTuiContext ?? ctx),
+							cacheHitRate: state.usageTotals.latestCacheHitRate,
+							sessionName: (activeTuiContext ?? ctx).sessionManager.getSessionName() ?? "",
+							agentDurationMs: getAgentDurationMs(),
+							agentActive: agentRunActive,
+							workingLineFrame,
+						};
+					},
+					(active) => {
+						if (isActiveEditor(editor, generation)) setMinimalistDecorationActive(active);
+					},
+					() => editorBorderCapabilityChanged(editor, generation),
 				),
 			);
+			const observed = observeEditorFactory(ctx);
+			if (
+				sessionLifecycle.isCurrent(generation) &&
+				activeTuiContext?.ui === ctx.ui &&
+				observed.known &&
+				observed.factory === factory
+			) {
+				activeEditor = { editor, factory, generation };
+				requestEditorRender = () => tui.requestRender();
+			}
+			return editor;
 		}) as ZentuiEditorFactory;
 		factory[ZENTUI_EDITOR_FACTORY] = true;
 		factory[ZENTUI_EDITOR_OWNER] = editorOwnerToken;
@@ -1141,6 +1237,8 @@ export default function (pi: ExtensionAPI) {
 				ok: false,
 				reason: "the editor could not be reconciled safely; reload Pi to apply this change",
 			};
+		} finally {
+			if (workingLineSessionReady) workingLine.reconcile(ctx);
 		}
 	};
 
@@ -1231,6 +1329,7 @@ export default function (pi: ExtensionAPI) {
 	const cleanupUi = (ctx?: ExtensionContext) => {
 		if (!ctx || !sessionLifecycle.isCurrent()) return;
 		sessionLifecycle.shutdown();
+		activeEditor = undefined;
 		extensionStatuses.dispose();
 		codexQuota.stop();
 		stopSessionTimer();
@@ -1290,6 +1389,7 @@ export default function (pi: ExtensionAPI) {
 		usageTotals.invalidate();
 		footerTelemetry.reset();
 		const lifecycleGeneration = sessionLifecycle.start();
+		activeEditor = undefined;
 		// A new generation must not expose or route extension segments through the previous
 		// session while asynchronous TUI startup is still pending.
 		workingLineSessionReady = false;
@@ -1350,6 +1450,7 @@ export default function (pi: ExtensionAPI) {
 			if (currentConfig.components.editor.style !== "minimalist") {
 				setMinimalistDecorationActive(false);
 			}
+			workingLine.reconcile(ctx);
 			reconcileUserMessages();
 			reconcileFooter(ctx);
 			reconcileProjectRefresh(ctx, effectiveFooterStyle() !== previousFooterStyle);
@@ -1404,6 +1505,7 @@ export default function (pi: ExtensionAPI) {
 			if (patch.style !== undefined && patch.style !== "minimalist") {
 				setMinimalistDecorationActive(false);
 			}
+			workingLine.reconcile(ctx);
 			syncFooterUsage(ctx);
 			if (patch.modelLabel !== undefined) syncFooterState(ctx);
 			reconcileProjectRefresh(ctx);

package/extensions/zentui/minimalist-editor.ts

@@ -58,6 +58,8 @@ export type MinimalistEditorMetadata = {
 	sessionName?: string;
 	agentDurationMs?: number;
 	agentActive?: boolean;
+	/** Controller-gated border content; never resolve canonical placement in the renderer. */
+	workingLineFrame?: string;
 };
 
 export type MinimalistFrameOptions = {
@@ -182,6 +184,7 @@ function renderTopLeft(
 				: safeThemeFg(uiTheme, "muted", duration),
 		);
 	}
+	if (metadata.workingLineFrame) parts.push(metadata.workingLineFrame);
 	const sessionName = includeSessionName
 		? sanitizeEditorMetadataText(metadata.sessionName ?? "")
 		: "";
@@ -209,8 +212,9 @@ function renderTopRight(
 ): string {
 	const source = config.components.editor.colorSource;
 	const parts: string[] = [];
+	const separator = config.components.editor.styles.minimalist.separator === "dot" ? " · " : " – ";
 	const joinParts = (values: string[]) =>
-		values.map((part, index) => (index > 0 ? `${renderBorder(" – ")}${part}` : part)).join("");
+		values.map((part, index) => (index > 0 ? `${renderBorder(separator)}${part}` : part)).join("");
 	const cost = config.components.editor.styles.minimalist.showCost
 		? sanitizeEditorMetadataText(metadata.costLabel ?? "")
 		: "";
@@ -498,6 +502,7 @@ export function renderMinimalistFrame({
 	const topFallbacks = [
 		joinStyled([topViewport, topOperational], separator),
 		topOperational,
+		...(metadata.workingLineFrame ? [metadata.workingLineFrame] : []),
 	].filter((value, index, values) => value !== topLeft && values.indexOf(value) === index);
 	const top = renderLabeledBorder({
 		width,

package/extensions/zentui/settings-command.ts

@@ -45,6 +45,7 @@ import {
 	MAX_WORKING_LINE_INTERVAL_MS,
 	MIN_WORKING_LINE_INTERVAL_MS,
 	type MinimalistConfig,
+	type MinimalistEditorSeparator,
 	type ModelLabelSource,
 	type PathDisplayConfig,
 	type PolishedCopyFriendlyEditorStyleConfig,
@@ -57,6 +58,7 @@ import {
 	type UserMessageStyle,
 	type UserMessagesComponentConfig,
 	type WorkingLineComponentPatch,
+	type WorkingLinePlacement,
 	type WorkingLineSpinner,
 	type WorkingLineTextAnimation,
 } from "./config";
@@ -126,6 +128,7 @@ const completionMenuValues: CompletionMenuStyle[] = ["palette", "native"];
 const accentRailSurfaceValues = ["filled", "transparent"];
 const minimalistPathDisplayValues = ["compact", "project", "full"];
 const minimalistContextFormatValues = ["percent", "percent-total"];
+const minimalistSeparatorValues: MinimalistEditorSeparator[] = ["dash", "dot"];
 const editorBorderColorModeValues: EditorBorderColorMode[] = ["static", "adaptive"];
 const compactFooterMaxLineValues = ["1", "2", "3", "unlimited"];
 const featureStateValues: FeatureState[] = ["enabled", "disabled"];
@@ -151,6 +154,11 @@ const speedValues = (presets: readonly { label: string }[]) => [
 	...presets.map(({ label }) => label),
 	"Custom…",
 ];
+const workingLinePlacementLabels: Record<WorkingLinePlacement, string> = {
+	above: "Above",
+	border: "Border",
+};
+const workingLinePlacementValues = Object.values(workingLinePlacementLabels);
 const workingLineTextAnimationValues: WorkingLineTextAnimation[] = ["classic", "kitt", "disabled"];
 const thinkingStepsModeLabels: Record<ThinkingStepsMode, string> = {
 	rail: "Rail",
@@ -728,6 +736,13 @@ function buildMinimalistEditorStyleItems(config: PolishedTuiConfig): SettingItem
 			currentValue: featureValue(minimalist.showGit),
 			values: featureStateValues,
 		},
+		{
+			id: "minimalistSeparator",
+			label: "Separator",
+			description: "Choose dash (–) or dot (·) between editor metadata items.",
+			currentValue: minimalist.separator,
+			values: minimalistSeparatorValues,
+		},
 	];
 }
 
@@ -796,6 +811,16 @@ function buildWorkingLineItems(config: PolishedTuiConfig): SettingItem[] {
 			currentValue: featureValue(workingLine.enabled),
 			values: featureStateValues,
 		},
+		...(config.components.editor.enabled && config.components.editor.style !== "accent-rail"
+			? [
+					{
+						id: "workingLinePlacement",
+						label: "Placement",
+						currentValue: workingLinePlacementLabels[workingLine.placement],
+						values: workingLinePlacementValues,
+					},
+				]
+			: []),
 		{
 			id: "workingLineTurnSummary",
 			label: "Turn summary",
@@ -1745,6 +1770,14 @@ export function registerZentuiSettingsCommand(pi: ExtensionAPI, deps: SettingsCo
 													{ contextFormat: newValue as MinimalistConfig["contextFormat"] },
 													ctx,
 												);
+											else if (
+												id === "minimalistSeparator" &&
+												(newValue === "dash" || newValue === "dot")
+											)
+												deps.setMinimalist(
+													{ separator: newValue as MinimalistEditorSeparator },
+													ctx,
+												);
 											else if (enabled !== undefined) {
 												const key =
 													id === "minimalistContextGauge"
@@ -1817,6 +1850,21 @@ export function registerZentuiSettingsCommand(pi: ExtensionAPI, deps: SettingsCo
 											notifyWorkingLineChange("Turn summary", newValue, result, false);
 											return;
 										}
+										if (id === "workingLinePlacement") {
+											const editor = deps.getConfig().components.editor;
+											if (!editor.enabled || editor.style === "accent-rail") return;
+											const placement = (
+												Object.entries(workingLinePlacementLabels) as Array<
+													[WorkingLinePlacement, string]
+												>
+											).find(([, label]) => label === newValue)?.[0];
+											if (placement) {
+												const result = deps.setWorkingLineComponent({ placement }, ctx);
+												settingsList.updateValue(id, newValue);
+												notifyWorkingLineChange("Placement", newValue, result);
+												return;
+											}
+										}
 										const selectedWorkingLineSpinner =
 											id === "workingLineSpinner" ? workingLineSpinnerId(newValue) : undefined;
 										if (selectedWorkingLineSpinner) {

package/extensions/zentui/ui.ts

@@ -35,6 +35,9 @@ import {
 	safeThemeFg,
 } from "./style";
 
+// Reserve at least four label cells beside Minimalist metadata.
+const MIN_WORKING_LINE_BORDER_WIDTH = 16;
+
 const LEGACY_SPLIT_POLISHED_FRAME = Symbol.for("pi-zentui.polished-frame");
 
 export type ViewportCounts = {
@@ -117,6 +120,7 @@ export type PolishedEditorFrameOptions = {
 	modelMeta: EditorMeta;
 	thinkingLevel?: string;
 	rightStatus?: string;
+	workingLineFrame?: string;
 	shellMode?: boolean;
 	borderColor?: (text: string) => string;
 };
@@ -134,6 +138,8 @@ type PolishedFrameOptions = {
 	shellMode?: boolean;
 	ownedFrame?: PolishedFrameSplit;
 	trustedBaseFrame?: boolean;
+	getWorkingLineFrame: () => string | undefined;
+	reportWorkingLineBorder: (active: boolean) => void;
 	borderColor?: (text: string) => string;
 };
 
@@ -162,7 +168,8 @@ type MinimalistFrameAdapterOptions = {
 	uiTheme: Theme;
 	config: ZentuiConfig;
 	inputText: string;
-	metadata: MinimalistEditorMetadata;
+	getMetadata: () => MinimalistEditorMetadata;
+	reportWorkingLineBorder: (active: boolean) => void;
 	ownedFrame?: PolishedFrameSplit;
 	trustedBaseFrame?: boolean;
 	borderColor?: (text: string) => string;
@@ -694,7 +701,8 @@ function renderMinimalistFrameFromBase({
 	uiTheme,
 	config,
 	inputText,
-	metadata,
+	getMetadata,
+	reportWorkingLineBorder,
 	ownedFrame,
 	trustedBaseFrame = false,
 	borderColor,
@@ -733,6 +741,16 @@ function renderMinimalistFrameFromBase({
 		below: parsedBottom?.count,
 	};
 	const editorLines = ownedFrame?.editorLines ?? editorFrame.slice(1, -1);
+	// Publish safe geometry before reading the controller-gated Working frame.
+	reportWorkingLineBorder(
+		width >= MIN_WORKING_LINE_BORDER_WIDTH &&
+			Boolean(
+				ownedFrame ||
+					(typeof autocompleteSource.isShowingAutocomplete === "function" &&
+						autocompleteCapture?.compatible),
+			),
+	);
+	const metadata = getMetadata();
 	const lines = renderMinimalistFrame({
 		width,
 		editorLines,
@@ -764,6 +782,8 @@ function renderPolishedFrame({
 	shellMode = false,
 	ownedFrame,
 	trustedBaseFrame = false,
+	getWorkingLineFrame,
+	reportWorkingLineBorder,
 	borderColor,
 }: PolishedFrameOptions): PolishedFrameResult {
 	if (width <= 2) return { lines: clampRenderedLines(baseRendered, width), decorated: false };
@@ -804,6 +824,16 @@ function renderPolishedFrame({
 		above: parsedTop?.count,
 		below: parsedBottom?.count,
 	};
+	// Publish safe geometry before reading the controller-gated Working frame.
+	reportWorkingLineBorder(
+		width >= MIN_WORKING_LINE_BORDER_WIDTH &&
+			Boolean(
+				ownedFrame ||
+					(typeof autocompleteSource.isShowingAutocomplete === "function" &&
+						autocompleteCapture?.compatible),
+			),
+	);
+	const workingLineFrame = getWorkingLineFrame();
 	const lines = renderPolishedEditorFrame({
 		width,
 		editorLines,
@@ -814,6 +844,7 @@ function renderPolishedFrame({
 		modelMeta,
 		thinkingLevel,
 		rightStatus,
+		workingLineFrame,
 		shellMode,
 		borderColor,
 	});
@@ -848,6 +879,7 @@ export function renderPolishedEditorFrame({
 	modelMeta,
 	thinkingLevel,
 	rightStatus,
+	workingLineFrame,
 	shellMode = false,
 	borderColor,
 }: PolishedEditorFrameOptions): string[] {
@@ -920,13 +952,23 @@ export function renderPolishedEditorFrame({
 			return renderStaticBorder(text);
 		}
 	};
-	const top = renderBorder(
+	let top = renderBorder(
 		renderEditorBorder(
 			width,
 			"above",
 			config.components.editor.viewportIndicators ? viewport.above : undefined,
 		),
 	);
+	if (workingLineFrame && width >= MIN_WORKING_LINE_BORDER_WIDTH) {
+		const label = truncateToWidth(workingLineFrame, width - 6, "…");
+		top = `${renderBorder("── ")}${label}${renderBorder(
+			` ${renderEditorBorder(
+				width - visibleWidth(label) - 4,
+				"above",
+				config.components.editor.viewportIndicators ? viewport.above : undefined,
+			)}`,
+		)}`;
+	}
 	const bottom = renderBorder(
 		renderEditorBorder(
 			width,
@@ -977,6 +1019,7 @@ export class PolishedEditor extends CustomEditor {
 	private readonly uiTheme: Theme;
 
 	private readonly mouse = new EditorMouseForwarder();
+	private workingLineBorderCapable = false;
 
 	constructor(
 		tui: TUI,
@@ -988,6 +1031,7 @@ export class PolishedEditor extends CustomEditor {
 		getThinkingLevel: () => string | undefined,
 		getMinimalistMetadata: () => MinimalistEditorMetadata = () => ({ cwd: "" }),
 		onMinimalistDecorationChange: (active: boolean) => void = () => {},
+		private readonly onWorkingLineBorderCapabilityChange: () => void = () => {},
 	) {
 		super(tui, theme, keybindings, { paddingX: 0 });
 		this.borderColor = (text: string) => safeThemeFg(uiTheme, "border", text);
@@ -997,6 +1041,18 @@ export class PolishedEditor extends CustomEditor {
 		this.getThinkingLevel = getThinkingLevel;
 		this.getMinimalistMetadata = getMinimalistMetadata;
 		this.onMinimalistDecorationChange = onMinimalistDecorationChange;
+		// Pi defines focused as an instance field; observe its public focus lifecycle
+		// without shadowing the native cursor's value with a prototype accessor.
+		let focused = this.focused;
+		Object.defineProperty(this, "focused", {
+			configurable: true,
+			enumerable: true,
+			get: () => focused,
+			set: (value: boolean) => {
+				focused = value;
+				if (!value) this.reportWorkingLineBorder(false);
+			},
+		});
 		// Resolve subclass prototype overrides before installing the instance adapter.
 		// Their super call reaches the native prototype directly, so translate once.
 		const handleMouse = (this as unknown as { handleMouse?: EditorMouseHandler }).handleMouse;
@@ -1018,20 +1074,42 @@ export class PolishedEditor extends CustomEditor {
 		return this.mouse.baseRendered(width, super.render(width));
 	}
 
+	canEmbedWorkingLineBorder(): boolean {
+		return this.focused && this.workingLineBorderCapable;
+	}
+
+	private reportWorkingLineBorder = (active: boolean): void => {
+		active = active && this.focused;
+		if (this.workingLineBorderCapable === active) return;
+		this.workingLineBorderCapable = active;
+		this.onWorkingLineBorderCapabilityChange();
+	};
+
+	private renderFallback(lines: string[], width: number): string[] {
+		this.reportWorkingLineBorder(false);
+		return clampRenderedLines(lines, width);
+	}
+
 	render(width: number): string[] {
-		return this.mouse.rendered(this.renderDecorated(width));
+		try {
+			return this.mouse.rendered(this.renderDecorated(width));
+		} catch (error) {
+			this.reportWorkingLineBorder(false);
+			throw error;
+		}
 	}
 
 	private renderDecorated(width: number): string[] {
 		const config = this.getConfig();
 		if (!config.components.editor.enabled) {
 			this.reportMinimalistDecoration(false);
-			return clampRenderedLines(this.renderBase(width), width);
+			return this.renderFallback(this.renderBase(width), width);
 		}
 		if (config.components.editor.style === "accent-rail") {
+			this.reportWorkingLineBorder(false);
 			this.reportMinimalistDecoration(false);
 			if (width < ACCENT_RAIL_CHROME_WIDTH + 1) {
-				return clampRenderedLines(this.renderBase(width), width);
+				return this.renderFallback(this.renderBase(width), width);
 			}
 			let captured: { value: string[]; capture?: AutocompleteCapture };
 			try {
@@ -1040,7 +1118,7 @@ export class PolishedEditor extends CustomEditor {
 					() => this.renderBase(width - ACCENT_RAIL_CHROME_WIDTH),
 				);
 			} catch {
-				return clampRenderedLines(this.renderBase(width), width);
+				return this.renderFallback(this.renderBase(width), width);
 			}
 			try {
 				const result = renderAccentRailFrameFromBase({
@@ -1057,12 +1135,12 @@ export class PolishedEditor extends CustomEditor {
 			} catch {
 				// Decoration is optional; preserve the completed same-render rows below.
 			}
-			return clampRenderedLines(captured.value, width);
+			return this.renderFallback(captured.value, width);
 		}
 		if (config.components.editor.style === "minimalist") {
 			if (width <= 4) {
 				this.reportMinimalistDecoration(false);
-				return clampRenderedLines(this.renderBase(width), width);
+				return this.renderFallback(this.renderBase(width), width);
 			}
 			let captured: { value: string[]; capture?: AutocompleteCapture };
 			try {
@@ -1072,7 +1150,7 @@ export class PolishedEditor extends CustomEditor {
 				);
 			} catch {
 				this.reportMinimalistDecoration(false);
-				return clampRenderedLines(this.renderBase(width), width);
+				return this.renderFallback(this.renderBase(width), width);
 			}
 			try {
 				const result = renderMinimalistFrameFromBase({
@@ -1083,20 +1161,22 @@ export class PolishedEditor extends CustomEditor {
 					uiTheme: this.uiTheme,
 					config,
 					inputText: this.getText(),
-					metadata: this.getMinimalistMetadata(),
+					getMetadata: this.getMinimalistMetadata,
+					reportWorkingLineBorder: this.reportWorkingLineBorder,
 					trustedBaseFrame: true,
 					borderColor: this.borderColor,
 				});
 				this.reportMinimalistDecoration(result.decorated);
+				if (!result.decorated) this.reportWorkingLineBorder(false);
 				return result.lines;
 			} catch {
 				this.reportMinimalistDecoration(false);
-				return clampRenderedLines(captured.value, width);
+				return this.renderFallback(captured.value, width);
 			}
 		}
 		this.reportMinimalistDecoration(false);
 		if (width <= 2) {
-			return clampRenderedLines(this.renderBase(width), width);
+			return this.renderFallback(this.renderBase(width), width);
 		}
 
 		const shellMode = isShellModeInput(this.getText());
@@ -1108,7 +1188,7 @@ export class PolishedEditor extends CustomEditor {
 				this.renderBase(innerWidth),
 			);
 		} catch {
-			return clampRenderedLines(this.renderBase(width), width);
+			return this.renderFallback(this.renderBase(width), width);
 		}
 		try {
 			const result = renderPolishedFrame({
@@ -1119,6 +1199,8 @@ export class PolishedEditor extends CustomEditor {
 				uiTheme: this.uiTheme,
 				config,
 				modelMeta: this.getModelMeta(),
+				getWorkingLineFrame: () => this.getMinimalistMetadata().workingLineFrame,
+				reportWorkingLineBorder: this.reportWorkingLineBorder,
 				thinkingLevel: this.getThinkingLevel(),
 				shellMode,
 				trustedBaseFrame: true,
@@ -1128,7 +1210,7 @@ export class PolishedEditor extends CustomEditor {
 		} catch {
 			// Decoration is optional; preserve the completed same-render rows below.
 		}
-		return clampRenderedLines(captured.value, width);
+		return this.renderFallback(captured.value, width);
 	}
 }
 
@@ -1141,6 +1223,7 @@ export class WrappedPolishedEditor implements EditorComponent {
 	declare readonly setAutocompleteMaxVisible?: (maxVisible: number) => void;
 
 	private readonly mouse = new EditorMouseForwarder();
+	private workingLineBorderCapable = false;
 
 	constructor(
 		private readonly base: WrappedEditor,
@@ -1150,6 +1233,7 @@ export class WrappedPolishedEditor implements EditorComponent {
 		private readonly getThinkingLevel: () => string | undefined,
 		private readonly getMinimalistMetadata: () => MinimalistEditorMetadata = () => ({ cwd: "" }),
 		private readonly onMinimalistDecorationChange: (active: boolean) => void = () => {},
+		private readonly onWorkingLineBorderCapabilityChange: () => void = () => {},
 	) {
 		if (typeof base.handleMouse === "function") {
 			this.handleMouse = (event) => {
@@ -1178,7 +1262,11 @@ export class WrappedPolishedEditor implements EditorComponent {
 		return Boolean(this.base.focused);
 	}
 	set focused(value: boolean) {
-		this.base.focused = value;
+		try {
+			this.base.focused = value;
+		} finally {
+			if (!value) this.reportWorkingLineBorder(false);
+		}
 	}
 
 	get borderColor(): ((str: string) => string) | undefined {
@@ -1259,20 +1347,42 @@ export class WrappedPolishedEditor implements EditorComponent {
 		return this.mouse.baseRendered(width, this.base.render(width));
 	}
 
+	canEmbedWorkingLineBorder(): boolean {
+		return this.focused && this.workingLineBorderCapable;
+	}
+
+	private reportWorkingLineBorder = (active: boolean): void => {
+		active = active && this.focused;
+		if (this.workingLineBorderCapable === active) return;
+		this.workingLineBorderCapable = active;
+		this.onWorkingLineBorderCapabilityChange();
+	};
+
+	private renderFallback(lines: string[], width: number): string[] {
+		this.reportWorkingLineBorder(false);
+		return clampRenderedLines(lines, width);
+	}
+
 	render(width: number): string[] {
-		return this.mouse.rendered(this.renderDecorated(width));
+		try {
+			return this.mouse.rendered(this.renderDecorated(width));
+		} catch (error) {
+			this.reportWorkingLineBorder(false);
+			throw error;
+		}
 	}
 
 	private renderDecorated(width: number): string[] {
 		const config = this.getConfig();
 		if (!config.components.editor.enabled) {
 			this.reportMinimalistDecoration(false);
-			return clampRenderedLines(this.renderBase(width), width);
+			return this.renderFallback(this.renderBase(width), width);
 		}
 		if (config.components.editor.style === "accent-rail") {
+			this.reportWorkingLineBorder(false);
 			this.reportMinimalistDecoration(false);
 			if (width < ACCENT_RAIL_CHROME_WIDTH + 1) {
-				return clampRenderedLines(this.renderBase(width), width);
+				return this.renderFallback(this.renderBase(width), width);
 			}
 			let captured: { value: string[]; capture?: AutocompleteCapture };
 			try {
@@ -1280,7 +1390,7 @@ export class WrappedPolishedEditor implements EditorComponent {
 					this.renderBase(width - ACCENT_RAIL_CHROME_WIDTH),
 				);
 			} catch {
-				return clampRenderedLines(this.renderBase(width), width);
+				return this.renderFallback(this.renderBase(width), width);
 			}
 			try {
 				const provenance = inspectPolishedFrameProvenance(
@@ -1305,12 +1415,12 @@ export class WrappedPolishedEditor implements EditorComponent {
 			} catch {
 				// Decoration is optional; preserve the completed same-render rows below.
 			}
-			return clampRenderedLines(captured.value, width);
+			return this.renderFallback(captured.value, width);
 		}
 		if (config.components.editor.style === "minimalist") {
 			if (width <= 4) {
 				this.reportMinimalistDecoration(false);
-				return clampRenderedLines(this.renderBase(width), width);
+				return this.renderFallback(this.renderBase(width), width);
 			}
 			let captured: { value: string[]; capture?: AutocompleteCapture };
 			try {
@@ -1319,7 +1429,7 @@ export class WrappedPolishedEditor implements EditorComponent {
 				);
 			} catch {
 				this.reportMinimalistDecoration(false);
-				return clampRenderedLines(this.renderBase(width), width);
+				return this.renderFallback(this.renderBase(width), width);
 			}
 			try {
 				const provenance = inspectPolishedFrameProvenance(
@@ -1337,7 +1447,8 @@ export class WrappedPolishedEditor implements EditorComponent {
 						uiTheme: this.uiTheme,
 						config,
 						inputText: this.base.getText(),
-						metadata: this.getMinimalistMetadata(),
+						getMetadata: this.getMinimalistMetadata,
+						reportWorkingLineBorder: this.reportWorkingLineBorder,
 						ownedFrame: provenance.ownedFrame,
 						borderColor: this.borderColor,
 					});
@@ -1350,10 +1461,10 @@ export class WrappedPolishedEditor implements EditorComponent {
 				// Decoration is optional; preserve the completed same-render rows below.
 			}
 			this.reportMinimalistDecoration(false);
-			return clampRenderedLines(captured.value, width);
+			return this.renderFallback(captured.value, width);
 		}
 		this.reportMinimalistDecoration(false);
-		if (width <= 2) return clampRenderedLines(this.renderBase(width), width);
+		if (width <= 2) return this.renderFallback(this.renderBase(width), width);
 
 		const shellMode = isShellModeInput(this.base.getText());
 		const { railWidth } = getEditorChromeWidths(config, this.uiTheme, "\x1b[0m", shellMode);
@@ -1362,7 +1473,7 @@ export class WrappedPolishedEditor implements EditorComponent {
 		try {
 			captured = renderWithAutocompleteCapture(this.base, () => this.renderBase(innerWidth));
 		} catch {
-			return clampRenderedLines(this.renderBase(width), width);
+			return this.renderFallback(this.renderBase(width), width);
 		}
 		let result: PolishedFrameResult | undefined;
 		try {
@@ -1381,6 +1492,8 @@ export class WrappedPolishedEditor implements EditorComponent {
 					uiTheme: this.uiTheme,
 					config,
 					modelMeta: this.getModelMeta(),
+					getWorkingLineFrame: () => this.getMinimalistMetadata().workingLineFrame,
+					reportWorkingLineBorder: this.reportWorkingLineBorder,
 					thinkingLevel: this.getThinkingLevel(),
 					rightStatus: readVimStatus(this.base, this.uiTheme),
 					shellMode,
@@ -1392,7 +1505,7 @@ export class WrappedPolishedEditor implements EditorComponent {
 			// Decoration is optional; preserve the completed same-render rows below.
 		}
 		if (result?.decorated) return result.lines;
-		return clampRenderedLines(captured.value, width);
+		return this.renderFallback(captured.value, width);
 	}
 
 	invalidate(): void {

package/extensions/zentui/working-line.ts

@@ -59,6 +59,7 @@ type GraphemeCell = { text: string; start: number; width: number };
 type WorkingLineUi = {
 	setWorkingMessage(message?: string): void;
 	setWorkingIndicator(options?: { frames?: string[]; intervalMs?: number }): void;
+	setWorkingVisible?(visible: boolean): void;
 };
 
 type WorkingLineContext = {
@@ -1144,6 +1145,13 @@ export class WorkingLineController {
 	private ownsIndicator = false;
 	private ownsMessage = false;
 	private agentActive = false;
+	private animationTimer?: ReturnType<typeof setInterval>;
+	private animationIntervalMs: number | undefined;
+	private hiddenWorkingVisible = false;
+	private restoreWorkingVisible: (() => void) | undefined;
+	private installedUi: WorkingLineUi | undefined;
+	private placementContext: WorkingLineContext | undefined;
+	private requestRender: () => void = () => {};
 	private selectedMessage: string | undefined;
 	private frameKey: string | undefined;
 	private installedPhase: InstalledAnimationPhase | undefined;
@@ -1172,9 +1180,11 @@ export class WorkingLineController {
 		private readonly getThought: () => WorkingLineRuntimeSegments["thought"] = () => this.thought,
 		private readonly onUnavailable: () => void = () => {},
 		private readonly metricScheduler: WorkingLineMetricScheduler = defaultMetricScheduler,
+		private readonly canEmbedBorder: (ctx: WorkingLineContext) => boolean = () => false,
 	) {}
 
 	startSession(ctx: WorkingLineContext): WorkingLineReconcileResult {
+		this.reset(ctx);
 		this.clearRuntime();
 		this.selectedMessage = undefined;
 		this.installedPhase = undefined;
@@ -1190,6 +1200,7 @@ export class WorkingLineController {
 			// stored indicator so the subsequently constructed Loader begins at intended frame zero.
 			this.install(ctx, true, true);
 		}
+		this.reconcilePlacement(ctx);
 		this.reconcileElapsedUpdates(ctx);
 	}
 
@@ -1254,9 +1265,12 @@ export class WorkingLineController {
 
 	finishAgent(ctx: WorkingLineContext): void {
 		this.agentActive = false;
+		this.stopAnimationTicks();
+		this.releaseWorkingVisibility();
 		this.activeTools.clear();
 		this.deactivateElapsedUpdates();
 		this.updateIndicator(ctx);
+		this.requestRender();
 	}
 
 	flushMetrics(
@@ -1303,6 +1317,26 @@ export class WorkingLineController {
 		return this.selectedMessage;
 	}
 
+	setRequestRender(requestRender: () => void): void {
+		this.requestRender = requestRender;
+	}
+
+	/** Only the currently capable, owned border renderer may consume this frame. */
+	currentWorkingLineFrame(): string | undefined {
+		if (!this.placementContext || !this.reconcilePlacement(this.placementContext)) return undefined;
+		const frames = this.installedIndicatorOptions?.frames;
+		if (!frames || frames.length === 0) {
+			return this.selectedMessage;
+		}
+		if (!this.installedPhase || this.installedPhase.frameStates.length === 0) {
+			return frames[0];
+		}
+		const interval = this.installedPhase.intervalMs > 0 ? this.installedPhase.intervalMs : 100;
+		const elapsedMs = Math.max(0, this.now() - this.installedPhase.frameEpochMs);
+		const frameIndex = Math.max(0, Math.floor(elapsedMs / interval)) % frames.length;
+		return frames[frameIndex] ?? this.selectedMessage;
+	}
+
 	/** Whether this controller currently claims both required public Working-row surfaces. */
 	isAvailable(): boolean {
 		return (
@@ -1321,12 +1355,14 @@ export class WorkingLineController {
 	): WorkingLineReconcileResult {
 		this.cancelMetricIndicator();
 		const ui = workingLineUi(ctx);
+		if (this.installedUi && this.installedUi !== ui) this.reset(ctx);
 		if (!ui) {
-			this.installed = false;
-			this.deactivateElapsedUpdates();
+			this.reset(ctx);
 			this.invalidateUnavailableExtensionSegments();
 			return { applied: false, reason: "Working line requires a newer Pi TUI" };
 		}
+		this.installedUi = ui;
+		this.placementContext = ctx;
 		const rootConfig = this.getConfig();
 		const config = rootConfig.components.workingLine;
 		const nextMessage =
@@ -1339,6 +1375,7 @@ export class WorkingLineController {
 			}
 			this.applyIndicator(ui, rootConfig, nextMessage, forceIndicator, rebasePhase);
 			this.selectedMessage = nextMessage;
+			this.reconcilePlacement(ctx);
 			this.reconcileElapsedUpdates(ctx);
 			return { applied: true };
 		} catch {
@@ -1471,12 +1508,22 @@ export class WorkingLineController {
 	private updateIndicator(ctx: WorkingLineContext): boolean {
 		this.cancelMetricIndicator();
 		const rootConfig = this.getConfig();
-		if (!rootConfig.components.workingLine.enabled || !this.installed) return false;
+		if (!rootConfig.components.workingLine.enabled) {
+			this.reset(ctx);
+			return false;
+		}
 		const ui = workingLineUi(ctx);
-		if (!ui) return false;
+		if (!ui || this.installedUi !== ui) {
+			this.reset(ctx);
+			this.invalidateUnavailableExtensionSegments();
+			return false;
+		}
+		if (!this.installed) return false;
+		this.placementContext = ctx;
 		const snapshot = this.installationSnapshot();
 		try {
 			this.applyIndicator(ui, rootConfig);
+			this.reconcilePlacement(ctx);
 			return !this.extensionSegmentsDirty;
 		} catch {
 			// A transient last-writer/public-API failure must not break the agent turn.
@@ -1527,7 +1574,86 @@ export class WorkingLineController {
 		this.metricUpdateScheduled = false;
 		this.metricUpdateHandle = undefined;
 	}
+	/** Placement is independent of the cached row contents and never changes user choices. */
+	private reconcilePlacement(ctx: WorkingLineContext): boolean {
+		let canEmbed = false;
+		const ui = this.installedUi;
+		try {
+			canEmbed = Boolean(
+				this.agentActive &&
+					this.isAvailable() &&
+					this.getConfig().components.workingLine.placement === "border" &&
+					ui &&
+					workingLineUi(ctx) === ui &&
+					typeof ui.setWorkingVisible === "function" &&
+					this.canEmbedBorder(ctx),
+			);
+		} catch {
+			// Capability probes, including predecessor editor getters, must fail open.
+		}
+		if (!canEmbed || !ui) {
+			this.stopAnimationTicks();
+			this.releaseWorkingVisibility();
+			return false;
+		}
+		if (!this.hiddenWorkingVisible) {
+			// A failed restoration remains attached to its original UI, even after reset.
+			this.releaseWorkingVisibility();
+			if (this.restoreWorkingVisible) return false;
+			try {
+				const setVisible = ui.setWorkingVisible;
+				if (typeof setVisible !== "function") return false;
+				this.restoreWorkingVisible = () => setVisible.call(ui, true);
+				setVisible.call(ui, false);
+				this.hiddenWorkingVisible = true;
+			} catch {
+				// A throwing setter may already have hidden the row. Restore without claiming it.
+				this.stopAnimationTicks();
+				this.releaseWorkingVisibility();
+				return false;
+			}
+		}
+		this.startAnimationTicks();
+		return true;
+	}
+
+	private releaseWorkingVisibility(): void {
+		this.hiddenWorkingVisible = false;
+		if (!this.restoreWorkingVisible) return;
+		try {
+			this.restoreWorkingVisible();
+			this.restoreWorkingVisible = undefined;
+		} catch {
+			// Keep the original setter for a later cleanup attempt, even without row ownership.
+		}
+	}
+
+	private startAnimationTicks(): void {
+		const interval = this.installedPhase?.intervalMs;
+		if (!interval || interval <= 0) {
+			this.stopAnimationTicks();
+			return;
+		}
+		if (this.animationTimer !== undefined && this.animationIntervalMs === interval) return;
+		this.stopAnimationTicks();
+		this.animationIntervalMs = interval;
+		this.animationTimer = setInterval(() => {
+			const ctx = this.placementContext;
+			if (!ctx || !this.reconcilePlacement(ctx)) {
+				this.stopAnimationTicks();
+				return;
+			}
+			this.requestRender();
+		}, interval);
+	}
 
+	private stopAnimationTicks(): void {
+		if (this.animationTimer !== undefined) {
+			clearInterval(this.animationTimer);
+			this.animationTimer = undefined;
+		}
+		this.animationIntervalMs = undefined;
+	}
 	private reconcileElapsedUpdates(ctx: WorkingLineContext): void {
 		this.elapsedUpdatesContext = ctx;
 		const config = this.getConfig().components.workingLine;
@@ -1594,6 +1720,7 @@ export class WorkingLineController {
 		try {
 			ui.setWorkingIndicator(snapshot.indicatorOptions);
 			if (snapshot.ownsMessage) ui.setWorkingMessage("");
+			if (this.placementContext) this.reconcilePlacement(this.placementContext);
 		} catch {
 			// Recovery is deliberately direct rather than recursive. If either setter cannot
 			// restore the last successful public state, release both unkeyed surfaces.
@@ -1611,7 +1738,10 @@ export class WorkingLineController {
 	}
 
 	private releaseAfterFailure(ui: WorkingLineUi): void {
+		this.cancelMetricIndicator();
 		this.deactivateElapsedUpdates();
+		this.stopAnimationTicks();
+		this.releaseWorkingVisibility();
 		if (this.ownsIndicator) {
 			try {
 				ui.setWorkingIndicator();
@@ -1632,14 +1762,17 @@ export class WorkingLineController {
 		this.frameKey = undefined;
 		this.installedPhase = undefined;
 		this.installedIndicatorOptions = undefined;
+		this.installedUi = undefined;
+		this.placementContext = undefined;
 		this.invalidateUnavailableExtensionSegments();
 	}
 
 	private reset(ctx: WorkingLineContext): void {
 		this.cancelMetricIndicator();
 		this.deactivateElapsedUpdates();
-		if (!this.ownsIndicator && !this.ownsMessage) return;
-		const ui = workingLineUi(ctx);
+		this.stopAnimationTicks();
+		this.releaseWorkingVisibility();
+		const ui = this.installedUi ?? workingLineUi(ctx);
 		if (ui && this.ownsIndicator) {
 			try {
 				ui.setWorkingIndicator();
@@ -1660,6 +1793,8 @@ export class WorkingLineController {
 		this.frameKey = undefined;
 		this.installedPhase = undefined;
 		this.installedIndicatorOptions = undefined;
+		this.installedUi = undefined;
+		this.placementContext = undefined;
 	}
 
 	private clearRuntime(): void {

package/package.json

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