@junghanacs/entwurf 0.33.0 → 0.34.1

package/pi/pi-durable/bootstrap.mjs

@@ -50,18 +50,27 @@
 // its initialization, and its default export is a native durable Extension, handed to `openDurable`
 // by reference after the contact. Initialization runs before the TUI or the runtime is imported —
 // the runtime creates the provider runtime before it installs any extension (carrier/runtime.js
-// 140-146), so an extension object cannot carry an environment phase. Entwurf checks only what the
+// 142-148), so an extension object cannot carry an environment phase. Entwurf checks only what the
 // ingress needs: a default export object with a name, no extension name the app installs itself (a
 // same-name install REPLACES), and no tool name of the contact. Every other field is the native
 // registry's to validate. The module is trusted operator code: the identity carriers and the
 // process directory are compared across its initialization and a change is refused by name — a
-// mistake guard, not a sandbox, and nothing is rolled back. Nothing is discovered: no directory,
-// setting, environment variable or profile names a module.
+// mistake guard, not a sandbox, and nothing is rolled back. Nothing is discovered: no ambient or
+// default directory, setting, environment variable or profile names a module.
+//
+// `--native-module-dir <absolute directory>` (#134) is the paired form, exclusive with the file
+// ingress: the operator-named directory is read ONCE, top level only, and a name is a module exactly
+// when it matches `*.extension.mjs` and does not start with a dot. Every other name (helpers, tests,
+// subdirectories, directory symlinks) is ignored unopened; a matching name must resolve to a regular
+// file. The modules initialize one by one in byte-wise name order, each under the same guards; two
+// modules naming one extension or one tool are refused by name, because the native registry would
+// REPLACE the first extension or keep both tools. A refusal at module k leaves modules before it
+// evaluated: nothing is rolled back. No watch, no recursion, nothing persisted.
 //
 // Without that resolver the carrier's first pi-coding-agent internal import fails by name (an
 // unsupported entwurf-pi-dist: URL scheme), and that failure is the honest one.
-import { realpathSync, statSync } from "node:fs";
-import { isAbsolute } from "node:path";
+import { readdirSync, realpathSync, statSync } from "node:fs";
+import { isAbsolute, join } from "node:path";
 import { fileURLToPath, pathToFileURL } from "node:url";
 import { decodeOmpBootstrapPayload } from "../../mcp/entwurf-bridge/dist/pi-extensions/meta-bridge-omp.js";
 import {
@@ -83,7 +92,14 @@ export const PACKAGED_BRIDGE_ENTRY = fileURLToPath(
 
 /** Flags that take a value. Anything else but `--continue`/`-c` is an unknown argument — a bridge
  * entry included: the launch argv cannot point the contact at another bridge. */
-const VALUE_FLAGS = ["--provider", "--model", "--width", "--entwurf-bootstrap", "--native-module"];
+const VALUE_FLAGS = [
+	"--provider",
+	"--model",
+	"--width",
+	"--entwurf-bootstrap",
+	"--native-module",
+	"--native-module-dir",
+];
 /** Flags only a NEW session can honour. */
 const FRESH_ONLY_FLAGS = ["--provider", "--model", "--width", "--entwurf-bootstrap"];
 
@@ -93,6 +109,8 @@ const FRESH_ONLY_FLAGS = ["--provider", "--model", "--width", "--entwurf-bootstr
  * carrier/subagent.js:25). The native registry REPLACES an installed extension of the same name.
  */
 const RESERVED_EXTENSION_NAMES = [PI_DURABLE_EXTENSION_NAME, "coding-tools", "pi-prompt", "subagent"];
+/** A directory entry that is an operator module: `*.extension.mjs`, not a dotfile. */
+const MODULE_ENTRY = /^[^.].*\.extension\.mjs$/;
 /** The identity carriers a module's initialization must leave as it found them, every ENTWURF_* included. */
 const IDENTITY_KEYS = ["PI_SESSION_ID", "PI_CODING_AGENT_DIR", "HOME"];
 
@@ -131,6 +149,51 @@ function nativeModuleFile(value) {
 	return file;
 }
 
+/**
+ * The operator's module directory: absolute, resolving to a directory, read once at the top level. The
+ * matching entries in byte-wise name order, each resolved to a regular file and none twice. Decided
+ * before anything loads.
+ */
+function nativeModuleDirFiles(named) {
+	if (!isAbsolute(named))
+		throw refuse("native-module-path-not-absolute", `--native-module-dir takes an absolute path, got ${named}`);
+	let dir;
+	try {
+		dir = realpathSync(named);
+	} catch (error) {
+		throw Object.assign(refuse("native-module-path-invalid", `${named} does not resolve`), { cause: error });
+	}
+	if (!statSync(dir).isDirectory()) throw refuse("native-module-path-invalid", `${named} is not a directory`);
+	const names = readdirSync(dir)
+		.filter((name) => MODULE_ENTRY.test(name))
+		.sort((a, b) => Buffer.compare(Buffer.from(a), Buffer.from(b)));
+	if (names.length === 0) {
+		throw refuse("native-module-dir-empty", `${named} holds no *.extension.mjs module at its top level`);
+	}
+	const seen = new Map();
+	return names.map((name) => {
+		let file;
+		try {
+			file = realpathSync(join(dir, name));
+		} catch (error) {
+			throw Object.assign(refuse("native-module-path-invalid", `${name} in ${named} does not resolve`), {
+				cause: error,
+			});
+		}
+		if (!statSync(file).isFile()) {
+			throw refuse(
+				"native-module-path-invalid",
+				`${name} in ${named} matches *.extension.mjs but is not a regular file`,
+			);
+		}
+		if (seen.has(file)) {
+			throw refuse("native-module-dir-duplicate-target", `${seen.get(file)} and ${name} in ${named} are the same file`);
+		}
+		seen.set(file, name);
+		return file;
+	});
+}
+
 /** The module's default export, checked only for what the ingress needs and returned BY REFERENCE. */
 function nativeExtensionOf(extension, file) {
 	if (typeof extension === "function") {
@@ -187,6 +250,31 @@ async function loadNativeModule(file) {
 	return nativeExtensionOf(namespace.default, file);
 }
 
+/**
+ * Initialize the operator's modules in order. A later module that names an extension or a tool an
+ * earlier one already did is refused by name: the native registry would replace that extension, or keep
+ * both tools, without a word.
+ */
+async function loadNativeModules(files) {
+	const extensions = [];
+	const owners = new Map();
+	for (const file of files) {
+		const extension = await loadNativeModule(file);
+		const names = [
+			`extension ${extension.name}`,
+			...(Array.isArray(extension.tools) ? extension.tools : []).map((tool) => `tool ${tool?.name}`),
+		];
+		for (const name of names) {
+			if (owners.has(name)) {
+				throw refuse("native-module-name-duplicate", `${file} and ${owners.get(name)} both name ${name}`);
+			}
+		}
+		for (const name of names) owners.set(name, file);
+		extensions.push(extension);
+	}
+	return extensions;
+}
+
 /**
  * Open the durable app with the contact installed, then birth the citizen and arm its doorbell on
  * the root conversation, then admit the first input (when given) to the root once. On any failure
@@ -198,8 +286,8 @@ async function loadNativeModule(file) {
  * roots; tests also pass a connector). `open` replaces the runtime's `openDurable` for tests.
  * `bridgeEntry` defaults to this package's own compiled bridge; only a programmatic caller (the
  * checkout-only gates, which drive a private bundle) passes another one — never the launch argv.
- * `extensions` are the operator's native extensions (`--native-module`), installed after the
- * contact, by reference.
+ * `extensions` are the operator's native extensions (`--native-module` or `--native-module-dir`),
+ * installed after the contact, by reference.
  *
  * @param {{
  *   bridgeEntry?: string,
@@ -320,7 +408,19 @@ function parseArgs(argv) {
 		);
 	}
 	const moduleArg = values.get("--native-module");
-	const nativeModule = moduleArg === undefined ? {} : { nativeModule: nativeModuleFile(moduleArg) };
+	const dirArg = values.get("--native-module-dir");
+	if (moduleArg !== undefined && dirArg !== undefined) {
+		throw refuse(
+			"native-module-ingress-exclusive",
+			"--native-module and --native-module-dir are two forms of one ingress; name the file or the directory",
+		);
+	}
+	const nativeModule =
+		moduleArg !== undefined
+			? { nativeModules: [nativeModuleFile(moduleArg)] }
+			: dirArg !== undefined
+				? { nativeModules: nativeModuleDirFiles(dirArg) }
+				: {};
 	if (continueSession) return { continueSession, ...nativeModule };
 	const provider = values.get("--provider");
 	if (provider === undefined) {
@@ -368,10 +468,10 @@ function parseArgs(argv) {
  */
 export async function main(argv, { loadTui = () => import(TUI), open, contact, bridgeEntry } = {}) {
 	// Every argument refusal is decided here, before any module, the TUI or the app loads.
-	const { nativeModule, ...args } = parseArgs(argv);
+	const { nativeModules = [], ...args } = parseArgs(argv);
 	// The caller's directory, fixed before any operator code runs and handed to the app explicitly.
 	const cwd = process.cwd();
-	const extensions = nativeModule === undefined ? [] : [await loadNativeModule(nativeModule)];
+	const extensions = await loadNativeModules(nativeModules);
 	// Loaded before anything opens, as upstream main.ts imports it statically: a TUI that cannot
 	// load opens no session, mints no citizen and leaves nothing to clean up.
 	const { runDurableTui } = await loadTui();

package/pi/pi-durable/carrier/runtime.js

@@ -58,8 +58,10 @@ const context = BACKGROUND_CONTEXT;
 	                                                       
 	                                         
 	                                    
-	                                                        
+	                                                                                                  
 	                           
+	                                                                 
+	                             
  
 
                                     
@@ -213,6 +215,7 @@ export async function openDurable(options                     = {})
 			conversations: summaries,
 			models: models(),
 			notices: [],
+			tasksPanel: true,
 		};
 		const listeners = new Set            ();
 		let notifying = false;
@@ -330,17 +333,8 @@ export async function openDurable(options                     = {})
 					const thinking                     = agentOf(state.conversation).thinkingLevel ?? "off";
 					await current.configure({ model: ref, thinkingLevel: clampThinkingLevel(model, thinking) }, context);
 				}),
-			toggleTasks: () =>
-				command(async () => {
-					if (tasks !== undefined) {
-						closeTasks();
-						update({ tasks: undefined });
-						return;
-					}
-					const graph = await opened.taskGraph(context);
-					tasks = graph;
-					unsubscribeTasks = graph.subscribe((value) => update({ tasks: value }));
-				}),
+			// Only the panel: the graph stays observed, so live background work is never out of view.
+			toggleTasks: () => command(async () => update({ tasksPanel: !state.tasksPanel })),
 			switchConversation: (id) =>
 				command(async () => {
 					const next = await opened.conversation(id, context);
@@ -360,8 +354,11 @@ export async function openDurable(options                     = {})
 			notice("warning", `Saved model is unavailable: ${saved.provider}/${saved.modelId}`);
 		}
 		if (initial?.fallbackMessage !== undefined) notice("info", initial.fallbackMessage);
-		// The task panel starts open; /tasks hides it.
-		await controller.toggleTasks();
+		// The task graph is observed until close; its panel starts open and /tasks hides it.
+		const graph = await opened.taskGraph(context);
+		tasks = graph;
+		update({ tasks: graph.value });
+		unsubscribeTasks = graph.subscribe((value) => update({ tasks: value }));
 		// Recovered work from an interrupted turn continues now.
 		harness.resume();
 

package/pi/pi-durable/carrier/tui.js

@@ -23,12 +23,14 @@ import {
 	SelectList,
 	                     
 	Spacer,
+	                
 	setCapabilityOverrides,
 	setKeybindings,
 	Text,
 	TruncatedText,
 	TuiAltScreen,
 	VStack,
+	visibleWidth,
 } from "@earendil-works/pi-tui";
 import { getAgentDir } from "entwurf-pi-dist:config.js";
 import { KeybindingsManager } from "entwurf-pi-dist:core/keybindings.js";
@@ -150,10 +152,75 @@ class CompactionComponent extends Box {
 	                      
  
 
+/**
+ * The live background-task badge: the dock's first row, never shrunk, so live background work stays on
+ * screen however small the terminal gets. It counts the graph's background tasks whatever their kind and
+ * names the ones that are not running; with none it renders nothing and the dock is upstream's.
+ */
+export class TaskBadge                      {
+	#count = 0;
+	#detail = "";
+
+	get count()         {
+		return this.#count;
+	}
+
+	set(graph                       )       {
+		const nodes = Object.values(graph?.tasks ?? {}).filter((node) => node.background);
+		const tally = (state        , match                                  )           => {
+			const n = nodes.filter(match).length;
+			return n === 0 ? [] : [`${n} ${state}`];
+		};
+		this.#count = nodes.length;
+		this.#detail = [
+			...tally("aborting", (node) => node.abortRequested),
+			...tally("completing", (node) => !node.abortRequested && node.state.status === "completing"),
+			...tally("waiting", (node) => !node.abortRequested && node.state.status === "waiting"),
+			...tally("pending", (node) => !node.abortRequested && node.state.status === "pending"),
+		].join(", ");
+	}
+
+	/** The widest form that fits, padded when there is room; narrower terminals drop detail, then words. */
+	render(width        )           {
+		const n = this.#count;
+		if (n === 0) return [];
+		const tasks = `⏳ ${n} ${n === 1 ? "task" : "tasks"}`;
+		const detailed = this.#detail ? [`${tasks} (${this.#detail})`] : [];
+		const forms = [...detailed, tasks, `⏳ ${n}`, `⏳${n}`, `*${n}`, "*+", "*"];
+		for (const form of forms) {
+			if (visibleWidth(form) < width) return [theme.fg("accent", ` ${form}`)];
+			if (visibleWidth(form) === width) return [theme.fg("accent", form)];
+		}
+		return [theme.fg("accent", "*")];
+	}
+
+	invalidate()       {}
+}
+
+/**
+ * The screen: the transcript above the dock. The badge is the dock's first row and never shrinks, so the
+ * renderer, which clips from the bottom, drops the editor and the footer before it; a one-row terminal
+ * with live background work shows the badge instead of the transcript.
+ */
+export function durableLayout(transcript           , badge           , dock                       )         {
+	return new VStack([
+		{
+			component: transcript,
+			basis: 0,
+			grow: 1,
+			shrink: 1,
+			minSize: 1,
+			visible: (viewport) => badge.count === 0 || viewport.height > 1,
+		},
+		{ component: new VStack([{ component: badge, shrink: 0 }, ...dock]), basis: "auto", grow: 0, shrink: 1, minSize: 1 },
+	]);
+}
+
 class DurableTui {
 	static          #renderers                                = createAllToolRenderers();
 	         #ui              ;
 	         #chat = new Container();
+	         #taskBadge = new TaskBadge();
 	         #tasks = new Container();
 	         #queue = new Container();
 	         #notices = new Container();
@@ -216,15 +283,9 @@ class DurableTui {
 		content.addChild(new Spacer(1));
 		const transcript = new ScrollView(content, { follow: "end", primary: true, overscroll: "chain" });
 		this.#transcript = transcript;
-		const dock = new VStack([
-			{ component: this.#tasks, shrink: 1, minSize: 0 },
-			{ component: this.#queue, shrink: 1, minSize: 0 },
-			{ component: this.#notices, shrink: 1, minSize: 0 },
-			{ component: this.#editorContainer, shrink: 1, minSize: 3 },
-			{ component: this.#footer, shrink: 1, minSize: 0 },
-		]);
 		for (const component of [
 			this.#chat,
+			this.#taskBadge,
 			this.#tasks,
 			this.#queue,
 			this.#notices,
@@ -234,9 +295,12 @@ class DurableTui {
 			this.#ui.addChild(component);
 		}
 		this.#ui.setLayoutRoot(
-			new VStack([
-				{ component: transcript, basis: 0, grow: 1, shrink: 1, minSize: 1 },
-				{ component: dock, basis: "auto", grow: 0, shrink: 1, minSize: 1 },
+			durableLayout(transcript, this.#taskBadge, [
+				{ component: this.#tasks, shrink: 1, minSize: 0 },
+				{ component: this.#queue, shrink: 1, minSize: 0 },
+				{ component: this.#notices, shrink: 1, minSize: 0 },
+				{ component: this.#editorContainer, shrink: 1, minSize: 3 },
+				{ component: this.#footer, shrink: 1, minSize: 0 },
 			]),
 		);
 		this.#ui.setFocus(this.#editor);
@@ -299,7 +363,8 @@ class DurableTui {
 				);
 			}
 		}
-		this.#syncTasks(view.tasks);
+		this.#taskBadge.set(view.tasks);
+		this.#syncTasks(view.tasksPanel ? view.tasks : undefined);
 		this.#syncQueue((view.conversation.docs["pi.inbox"] ?? { items: [] })              );
 		this.#syncNotices(view);
 		this.#editor.borderColor = theme.getThinkingBorderColor(agentOf(view.conversation).thinkingLevel ?? "off");

package/pi/pi-durable/overlay/runtime-contacts.patch

@@ -1,5 +1,5 @@
 diff --git a/packages/coding-agent/src/experimental/durable/runtime.ts b/packages/coding-agent/src/experimental/durable/runtime.ts
-index fcd6e523..929dbc79 100644
+index fcd6e523..7f00e27f 100644
 --- a/packages/coding-agent/src/experimental/durable/runtime.ts
 +++ b/packages/coding-agent/src/experimental/durable/runtime.ts
 @@ -8,7 +8,9 @@ import {
@@ -12,7 +12,19 @@ index fcd6e523..929dbc79 100644
  	type ModelRef,
  	ROOT_CONVERSATION_ID,
  	type Submission,
-@@ -81,6 +83,10 @@ export interface DurableController {
+@@ -56,8 +58,10 @@ export interface DurableView {
+ 	readonly conversations: readonly ConversationSummary[];
+ 	readonly models: readonly ModelSummary[];
+ 	readonly notices: readonly Notice[];
+-	/** The live task graph while the task panel is open. */
++	/** The live task graph, observed for the session's lifetime whether or not its panel is shown. */
+ 	readonly tasks?: TaskGraph;
++	/** Whether the task panel is shown; /tasks toggles only this. */
++	readonly tasksPanel: boolean;
+ }
+ 
+ export interface DurableViewSource {
+@@ -81,6 +85,10 @@ export interface DurableController {
  export interface OpenDurableOptions {
  	readonly cwd?: string;
  	readonly continueSession?: boolean;
@@ -23,7 +35,7 @@ index fcd6e523..929dbc79 100644
  }
  
  export interface OpenDurableResult {
-@@ -88,6 +94,8 @@ export interface OpenDurableResult {
+@@ -88,6 +96,8 @@ export interface OpenDurableResult {
  	readonly controller: DurableController;
  	/** pi's settings, for the TUI's theme and terminal capabilities. */
  	readonly settings: SettingsManager;
@@ -32,7 +44,7 @@ index fcd6e523..929dbc79 100644
  	close(): Promise<void>;
  }
  
-@@ -122,6 +130,9 @@ function titleOf(entry: EntryRecord | undefined): { title?: string } {
+@@ -122,6 +132,9 @@ function titleOf(entry: EntryRecord | undefined): { title?: string } {
  }
  
  export async function openDurable(options: OpenDurableOptions = {}): Promise<OpenDurableResult> {
@@ -42,7 +54,7 @@ index fcd6e523..929dbc79 100644
  	const location = await selectSession(options.cwd ?? process.cwd(), options.continueSession ?? false);
  	const envs = new ExecutionEnvs(location.cwd);
  	let harness: Harness | undefined;
-@@ -132,6 +143,7 @@ export async function openDurable(options: OpenDurableOptions = {}): Promise<Ope
+@@ -132,6 +145,7 @@ export async function openDurable(options: OpenDurableOptions = {}): Promise<Ope
  		const settings = createHarnessSettings(settingsManager);
  		const registry = createCodingRegistry(settingsManager, location.cwd);
  		registry.install(Subagent);
@@ -50,7 +62,7 @@ index fcd6e523..929dbc79 100644
  
  		const pendingReports: unknown[] = [];
  		let report: (error: unknown) => void = (error) => pendingReports.push(error);
-@@ -146,7 +158,29 @@ export async function openDurable(options: OpenDurableOptions = {}): Promise<Ope
+@@ -146,7 +160,29 @@ export async function openDurable(options: OpenDurableOptions = {}): Promise<Ope
  			},
  			context,
  		);
@@ -81,7 +93,49 @@ index fcd6e523..929dbc79 100644
  		const root = await harness.root(context, {
  			agent: {
  				cwd: location.cwd,
-@@ -342,6 +376,7 @@ export async function openDurable(options: OpenDurableOptions = {}): Promise<Ope
+@@ -179,6 +215,7 @@ export async function openDurable(options: OpenDurableOptions = {}): Promise<Ope
+ 			conversations: summaries,
+ 			models: models(),
+ 			notices: [],
++			tasksPanel: true,
+ 		};
+ 		const listeners = new Set<() => void>();
+ 		let notifying = false;
+@@ -296,17 +333,8 @@ export async function openDurable(options: OpenDurableOptions = {}): Promise<Ope
+ 					const thinking: ModelThinkingLevel = agentOf(state.conversation).thinkingLevel ?? "off";
+ 					await current.configure({ model: ref, thinkingLevel: clampThinkingLevel(model, thinking) }, context);
+ 				}),
+-			toggleTasks: () =>
+-				command(async () => {
+-					if (tasks !== undefined) {
+-						closeTasks();
+-						update({ tasks: undefined });
+-						return;
+-					}
+-					const graph = await opened.taskGraph(context);
+-					tasks = graph;
+-					unsubscribeTasks = graph.subscribe((value) => update({ tasks: value }));
+-				}),
++			// Only the panel: the graph stays observed, so live background work is never out of view.
++			toggleTasks: () => command(async () => update({ tasksPanel: !state.tasksPanel })),
+ 			switchConversation: (id) =>
+ 				command(async () => {
+ 					const next = await opened.conversation(id, context);
+@@ -326,8 +354,11 @@ export async function openDurable(options: OpenDurableOptions = {}): Promise<Ope
+ 			notice("warning", `Saved model is unavailable: ${saved.provider}/${saved.modelId}`);
+ 		}
+ 		if (initial?.fallbackMessage !== undefined) notice("info", initial.fallbackMessage);
+-		// The task panel starts open; /tasks hides it.
+-		await controller.toggleTasks();
++		// The task graph is observed until close; its panel starts open and /tasks hides it.
++		const graph = await opened.taskGraph(context);
++		tasks = graph;
++		update({ tasks: graph.value });
++		unsubscribeTasks = graph.subscribe((value) => update({ tasks: value }));
+ 		// Recovered work from an interrupted turn continues now.
+ 		harness.resume();
+ 
+@@ -342,6 +373,7 @@ export async function openDurable(options: OpenDurableOptions = {}): Promise<Ope
  			},
  			controller,
  			settings: settingsManager,
@@ -89,3 +143,141 @@ index fcd6e523..929dbc79 100644
  			close() {
  				closing ??= (async () => {
  					unsubscribe();
+diff --git a/packages/coding-agent/src/experimental/durable/tui.ts b/packages/coding-agent/src/experimental/durable/tui.ts
+index 397b276c..6a8fce8f 100644
+--- a/packages/coding-agent/src/experimental/durable/tui.ts
++++ b/packages/coding-agent/src/experimental/durable/tui.ts
+@@ -23,12 +23,14 @@ import {
+ 	SelectList,
+ 	type SelectListTheme,
+ 	Spacer,
++	type StackEntry,
+ 	setCapabilityOverrides,
+ 	setKeybindings,
+ 	Text,
+ 	TruncatedText,
+ 	TuiAltScreen,
+ 	VStack,
++	visibleWidth,
+ } from "@earendil-works/pi-tui";
+ import { getAgentDir } from "../../config.ts";
+ import { KeybindingsManager } from "../../core/keybindings.ts";
+@@ -150,10 +152,75 @@ interface Handlers {
+ 	cycleThinking(): void;
+ }
+ 
++/**
++ * The live background-task badge: the dock's first row, never shrunk, so live background work stays on
++ * screen however small the terminal gets. It counts the graph's background tasks whatever their kind and
++ * names the ones that are not running; with none it renders nothing and the dock is upstream's.
++ */
++export class TaskBadge implements Component {
++	#count = 0;
++	#detail = "";
++
++	get count(): number {
++		return this.#count;
++	}
++
++	set(graph: TaskGraph | undefined): void {
++		const nodes = Object.values(graph?.tasks ?? {}).filter((node) => node.background);
++		const tally = (state: string, match: (node: TaskGraphNode) => boolean): string[] => {
++			const n = nodes.filter(match).length;
++			return n === 0 ? [] : [`${n} ${state}`];
++		};
++		this.#count = nodes.length;
++		this.#detail = [
++			...tally("aborting", (node) => node.abortRequested),
++			...tally("completing", (node) => !node.abortRequested && node.state.status === "completing"),
++			...tally("waiting", (node) => !node.abortRequested && node.state.status === "waiting"),
++			...tally("pending", (node) => !node.abortRequested && node.state.status === "pending"),
++		].join(", ");
++	}
++
++	/** The widest form that fits, padded when there is room; narrower terminals drop detail, then words. */
++	render(width: number): string[] {
++		const n = this.#count;
++		if (n === 0) return [];
++		const tasks = `⏳ ${n} ${n === 1 ? "task" : "tasks"}`;
++		const detailed = this.#detail ? [`${tasks} (${this.#detail})`] : [];
++		const forms = [...detailed, tasks, `⏳ ${n}`, `⏳${n}`, `*${n}`, "*+", "*"];
++		for (const form of forms) {
++			if (visibleWidth(form) < width) return [theme.fg("accent", ` ${form}`)];
++			if (visibleWidth(form) === width) return [theme.fg("accent", form)];
++		}
++		return [theme.fg("accent", "*")];
++	}
++
++	invalidate(): void {}
++}
++
++/**
++ * The screen: the transcript above the dock. The badge is the dock's first row and never shrinks, so the
++ * renderer, which clips from the bottom, drops the editor and the footer before it; a one-row terminal
++ * with live background work shows the badge instead of the transcript.
++ */
++export function durableLayout(transcript: Component, badge: TaskBadge, dock: readonly StackEntry[]): VStack {
++	return new VStack([
++		{
++			component: transcript,
++			basis: 0,
++			grow: 1,
++			shrink: 1,
++			minSize: 1,
++			visible: (viewport) => badge.count === 0 || viewport.height > 1,
++		},
++		{ component: new VStack([{ component: badge, shrink: 0 }, ...dock]), basis: "auto", grow: 0, shrink: 1, minSize: 1 },
++	]);
++}
++
+ class DurableTui {
+ 	static readonly #renderers: Record<string, ToolRenderers> = createAllToolRenderers();
+ 	readonly #ui: TuiAltScreen;
+ 	readonly #chat = new Container();
++	readonly #taskBadge = new TaskBadge();
+ 	readonly #tasks = new Container();
+ 	readonly #queue = new Container();
+ 	readonly #notices = new Container();
+@@ -216,15 +283,9 @@ class DurableTui {
+ 		content.addChild(new Spacer(1));
+ 		const transcript = new ScrollView(content, { follow: "end", primary: true, overscroll: "chain" });
+ 		this.#transcript = transcript;
+-		const dock = new VStack([
+-			{ component: this.#tasks, shrink: 1, minSize: 0 },
+-			{ component: this.#queue, shrink: 1, minSize: 0 },
+-			{ component: this.#notices, shrink: 1, minSize: 0 },
+-			{ component: this.#editorContainer, shrink: 1, minSize: 3 },
+-			{ component: this.#footer, shrink: 1, minSize: 0 },
+-		]);
+ 		for (const component of [
+ 			this.#chat,
++			this.#taskBadge,
+ 			this.#tasks,
+ 			this.#queue,
+ 			this.#notices,
+@@ -234,9 +295,12 @@ class DurableTui {
+ 			this.#ui.addChild(component);
+ 		}
+ 		this.#ui.setLayoutRoot(
+-			new VStack([
+-				{ component: transcript, basis: 0, grow: 1, shrink: 1, minSize: 1 },
+-				{ component: dock, basis: "auto", grow: 0, shrink: 1, minSize: 1 },
++			durableLayout(transcript, this.#taskBadge, [
++				{ component: this.#tasks, shrink: 1, minSize: 0 },
++				{ component: this.#queue, shrink: 1, minSize: 0 },
++				{ component: this.#notices, shrink: 1, minSize: 0 },
++				{ component: this.#editorContainer, shrink: 1, minSize: 3 },
++				{ component: this.#footer, shrink: 1, minSize: 0 },
+ 			]),
+ 		);
+ 		this.#ui.setFocus(this.#editor);
+@@ -299,7 +363,8 @@ class DurableTui {
+ 				);
+ 			}
+ 		}
+-		this.#syncTasks(view.tasks);
++		this.#taskBadge.set(view.tasks);
++		this.#syncTasks(view.tasksPanel ? view.tasks : undefined);
+ 		this.#syncQueue((view.conversation.docs["pi.inbox"] ?? { items: [] }) as InboxState);
+ 		this.#syncNotices(view);
+ 		this.#editor.borderColor = theme.getThinkingBorderColor(agentOf(view.conversation).thinkingLevel ?? "off");

package/pi/pi-durable/overlay/upstream-pin.json

@@ -23,14 +23,14 @@
 				"source": "packages/coding-agent/src/experimental/durable/runtime.ts",
 				"patched": true,
 				"blob": "fcd6e5239e999ebf17dea0335fb3dc9cd7f7ce45",
-				"sha256": "ca0ee10dc904a57d46bb33b37fcc4efe48dfa08b2f0d10e79e7bc22136871f0a"
+				"sha256": "bfd88844fae61e8bd32d57b5b986f48056c64eebb5466d9826318a0783ac9005"
 			},
 			{
 				"name": "tui.js",
 				"source": "packages/coding-agent/src/experimental/durable/tui.ts",
-				"patched": false,
+				"patched": true,
 				"blob": "397b276cbeb1c90e1fbc96c3cc59e6a25f92dad7",
-				"sha256": "bef1ea4bd6e8ab150273752a9b94552d8ce672b518ba3d1ed1a209b8405be1b3"
+				"sha256": "f61cc68e5d32552a8196785093ae9e2f4a946088fe71582bb05690517db8c5b4"
 			},
 			{
 				"name": "harness-setup.js",