osdy-pi 1.11.14 → 1.11.16

package/README.md

@@ -418,7 +418,7 @@ Animation is enabled by default with an intro animation. Configure it through `O
 
 In the extended framed editor, the active thinking level is rendered in bold in the top-right model metadata so it remains easy to scan.
 
-The full header and mascot render side by side only when the available width and height permit it without an additional width-limited mascot reduction. Otherwise, only the centered mascot renders—there is no scaled or stacked logo. Small and compact modes trim only fully empty mascot-art and tone-map margins before applying one proportional width-and-height scale; mascot width starts near four-fifths of the available width. The fallback mascot uses the available terminal rows, capped at 32 content rows, without reserving rows for a logo. The small-mode footer places the model and styled bare thinking level above usage, path/branch, and dynamic extension statuses. Pi Lens's footer status is hidden in small mode, but Pi Lens continues running. Usage includes input/output/cache-read/cache-write tokens, cost, and context. Extension statuses are supplied dynamically by Pi/extensions and may include Osdy Pi, MCP, or LSP; they are not hardcoded.
+The full header and mascot render side by side only when the available width and height permit it without an additional width-limited mascot reduction. Otherwise, only the centered mascot renders—there is no scaled or stacked logo. Small and compact modes trim only fully empty mascot-art and tone-map margins before applying one proportional width-and-height scale; mascot width starts near four-fifths of the available width. The fallback mascot uses the available terminal rows, capped at 32 content rows, without reserving rows for a logo. The small-mode footer places the model and styled bare thinking level above usage, path/branch, and dynamic extension statuses. Pi Lens's footer status is hidden in small mode, but Pi Lens continues running. Usage includes response speed, cache-read/cache-write tokens when space permits, cost, and context. Extension statuses are supplied dynamically by Pi/extensions and may include Osdy Pi, MCP, or LSP; they are not hardcoded.
 
 The enabled state, editor mode, working-tree visibility preference, header, and mascot persist globally across Pi reloads and sessions, shared by all projects. They are saved in `$PI_CODING_AGENT_DIR/extensions/osdy-pi/settings.json`, or `~/.pi/agent/extensions/osdy-pi/settings.json` when `PI_CODING_AGENT_DIR` is unset. Existing settings without the new visual fields safely default to `osdy-theme` and `current`; the former `raccoon` mascot value migrates to `bts`. The selected editor mode and working-tree placement are restored when the terminal moves normal → small → normal.
 
@@ -511,7 +511,15 @@ Pi renders the colored user card and assistant Markdown natively. User messages
 
 The default `auto` editor mode preserves the responsive behavior: it uses the framed editor when space permits and Pi's native editor on small terminals. Select `simple` for Pi's native editor at every width, or `extended` to request the framed editor explicitly: `/osdy-pi editor auto|extended|simple`. Simple mode actually unmounts the custom editor component rather than hiding it. Small terminals always use Pi's native editor, including when `extended` is selected. The legacy commands remain compatible where feasible: `on` maps to `extended`, `off` maps to `simple`, and `toggle` switches between extended and simple.
 
-In auto or extended mode at a non-small width, the framed editor shows the model and thinking level in its title and session usage in its footer. For an account-profile launch, the left title shows the active profile name instead of `Osdy-Pi`. When the native editor is effective (simple mode or any small terminal), the Osdy footer instead shows model, active profile when present, thinking, and usage rows before its path/branch and status rows. It uses the currently active Pi/Osdy theme palette; no separate editor theme selector exists. Usage covers input, output, cache read, cache write when present, cost, and context. If Pi supports autocomplete, the editor uses Pi's native autocomplete rendering while the completion UI is visible.
+In auto or extended mode at a non-small width, the framed editor shows the model and thinking level in its title and session usage in its footer. For an account-profile launch, the left title shows the active profile name instead of `Osdy-Pi`. When the native editor is effective (simple mode or any small terminal), the Osdy footer instead shows model, active profile when present, thinking, and usage rows before its path/branch and status rows. It uses the currently active Pi/Osdy theme palette; no separate editor theme selector exists. Usage shows response speed instead of cumulative input/output totals, alongside cache read/write when present, cost, and context. If Pi supports autocomplete, the editor uses Pi's native autocomplete rendering while the completion UI is visible.
+
+### Response speed
+
+The editor usage line (or native-mode footer) shows **`≈42.3 tok/s` while streaming**, estimated as accumulated streamed UTF-16 characters / 4 divided by seconds since the first nonempty output delta. Text, thinking, and tool-call argument deltas count once; snapshots and block-end events do not. This language-dependent heuristic is **not a tokenizer count or server-measured decode speed**. It updates on stream events, with no additional timer or editor remount.
+
+On successful message end, the label becomes **`42.3 tok/s`**: finalized output usage divided by the observed first-output-to-message-end interval. Output already includes reported reasoning tokens; input/cache tokens and subsequent tool execution are excluded. This is an observed response average, not server telemetry. Each assistant message starts a new reading. The completed reading remains until the next response; session replacement/reload clears it.
+
+**`tok/s …`** means pending or insufficient timing while streaming. **`tok/s —`** means idle or an unavailable reading after completion/interruption: missing/zero output usage, no output deltas, intervals under 100 ms, invalid timing, aborts, or errors. Narrow layouts simplify context and clip safely. Status and local analytics retain their existing token accounting; speed is volatile and never saved.
 
 While work is active, Osdy Pi centers an activity label and compact animated glyph above the editor:
 

package/extensions/osdy-pi/context-usage-ui.test.ts

@@ -56,7 +56,7 @@ void test("formats the selected single-line usage shape", () => {
 			percent: 60,
 			contextWindow: 272_000,
 		}),
-		"tok ↑0 ↓0 · $0.0000 · ctx <warning>[██████░░░░]</warning> 60%/272.0k",
+		"tok/s — · $0.0000 · ctx <warning>[██████░░░░]</warning> 60%/272.0k",
 	);
 });
 
@@ -76,14 +76,16 @@ void test("selects the full or compact usage line at the ANSI-aware width bounda
 		contextWindow: 272_000,
 	};
 	const full =
-		"tok ↑0 ↓0 · $0.0000 · ctx \u001B[33m[██████░░░░]\u001B[39m 60%/272.0k";
+		"tok/s — · $0.0000 · ctx \u001B[33m[██████░░░░]\u001B[39m 60%/272.0k";
 
-	assert.equal(visibleWidth(full), 49);
-	assert.equal(formatContextUsage(ansiTheme, usage, 49), full);
-	assert.equal(
-		formatContextUsage(ansiTheme, usage, 48),
-		"$0.0000 · ctx \u001B[33m[██████░░░░]\u001B[39m 60%",
-	);
+	const width = visibleWidth(full);
+	assert.equal(formatContextUsage(ansiTheme, usage, width), full);
+	const compact = formatContextUsage(ansiTheme, usage, width - 1);
+	assert.match(compact, /tok\/s —/);
+	assert.ok(visibleWidth(compact) <= width - 1);
+	for (let columns = 0; columns < width; columns++) {
+		assert.ok(visibleWidth(formatContextUsage(ansiTheme, usage, columns)) <= columns);
+	}
 });
 
 void test("formats a ten-cell green context bar at the inclusive 30% threshold", () => {
@@ -97,7 +99,7 @@ void test("formats a ten-cell green context bar at the inclusive 30% threshold",
 			percent: 30,
 			contextWindow: 272_000,
 		}),
-		"tok ↑0 ↓0 · $0.0000 · ctx <success>[███░░░░░░░]</success> 30%/272.0k",
+		"tok/s — · $0.0000 · ctx <success>[███░░░░░░░]</success> 30%/272.0k",
 	);
 });
 
@@ -112,7 +114,7 @@ void test("uses warning and error colors for higher rounded usage", () => {
 			percent: 30.5,
 			contextWindow: 200_000,
 		}),
-		"tok ↑1.5k ↓2.5m R12 W34 · $1.2000 · ctx <warning>[███░░░░░░░]</warning> 31%/200.0k",
+		"tok/s — R12 W34 · $1.2000 · ctx <warning>[███░░░░░░░]</warning> 31%/200.0k",
 	);
 	assert.equal(
 		formatContextUsage(theme, {
@@ -124,7 +126,7 @@ void test("uses warning and error colors for higher rounded usage", () => {
 			percent: 80.5,
 			contextWindow: 200_000,
 		}),
-		"tok ↑0 ↓0 · $1.2000 · ctx <error>[████████░░]</error> 81%/200.0k",
+		"tok/s — · $1.2000 · ctx <error>[████████░░]</error> 81%/200.0k",
 	);
 });
 
@@ -139,7 +141,7 @@ void test("clamps usage and safely represents missing context usage", () => {
 			percent: -10,
 			contextWindow: 200_000,
 		}),
-		"tok ↑0 ↓0 · $0.0000 · ctx <success>[░░░░░░░░░░]</success> 0%/200.0k",
+		"tok/s — · $0.0000 · ctx <success>[░░░░░░░░░░]</success> 0%/200.0k",
 	);
 	assert.equal(
 		formatContextUsage(theme, {
@@ -151,7 +153,7 @@ void test("clamps usage and safely represents missing context usage", () => {
 			percent: undefined,
 			contextWindow: 272_000,
 		}),
-		"tok ↑0 ↓0 · $0.0000 · ctx <success>[░░░░░░░░░░]</success> ?%/272.0k",
+		"tok/s — · $0.0000 · ctx <success>[░░░░░░░░░░]</success> ?%/272.0k",
 	);
 	assert.equal(
 		formatContextUsage(theme, {
@@ -163,6 +165,6 @@ void test("clamps usage and safely represents missing context usage", () => {
 			percent: undefined,
 			contextWindow: undefined,
 		}),
-		"tok ↑0 ↓0 · $0.0000 · ctx <success>[░░░░░░░░░░]</success> ?%/?",
+		"tok/s — · $0.0000 · ctx <success>[░░░░░░░░░░]</success> ?%/?",
 	);
 });

package/extensions/osdy-pi/context-usage-ui.ts

@@ -1,4 +1,5 @@
-import { visibleWidth } from "@earendil-works/pi-tui";
+import type { GenerationReading } from "./generation-meter.js";
+import { truncateToWidth, visibleWidth } from "@earendil-works/pi-tui";
 import { shortNumber } from "./format.js";
 
 export type ContextUsageDisplayData = {
@@ -7,6 +8,7 @@ export type ContextUsageDisplayData = {
 	cacheRead: number;
 	cacheWrite: number;
 	cost: number;
+	generation?: GenerationReading | undefined;
 	percent: number | undefined;
 	contextWindow: number | undefined;
 };
@@ -53,8 +55,17 @@ export function formatContextUsage(
 		usageTone(displayPercent),
 		`[${usageBar(displayPercent)}]`,
 	);
-	const full = `tok ↑${shortNumber(usage.input)} ↓${shortNumber(usage.output)}${cacheLabel} · $${usage.cost.toFixed(4)} · ctx ${bar} ${percentageLabel}%/${contextWindowLabel}`;
+	const generation = usage.generation;
+	const rate = generation?.kind === "complete" || generation?.kind === "streaming"
+		? generation.tokensPerSecond : null;
+	const speed = rate !== null && Number.isFinite(rate) && rate > 0
+		? `${generation?.kind === "streaming" ? "≈" : ""}${rate.toFixed(1)} tok/s`
+		: generation?.kind === "streaming" ? "tok/s …" : "tok/s —";
+	const full = `${speed}${cacheLabel} · $${usage.cost.toFixed(4)} · ctx ${bar} ${percentageLabel}%/${contextWindowLabel}`;
 	if (availableWidth === undefined || visibleWidth(full) <= availableWidth)
 		return full;
-	return `$${usage.cost.toFixed(4)} · ctx ${bar} ${percentageLabel}%`;
+	const compact = `${speed}${cacheLabel} · $${usage.cost.toFixed(4)} · ctx ${bar} ${percentageLabel}%`;
+	if (visibleWidth(compact) <= availableWidth) return compact;
+	const minimal = `${speed} · $${usage.cost.toFixed(4)} · ctx ${percentageLabel}%`;
+	return truncateToWidth(minimal, Math.max(0, availableWidth), "");
 }

package/extensions/osdy-pi/generation-meter.test.ts

@@ -0,0 +1,62 @@
+import assert from "node:assert/strict";
+import test from "node:test";
+// @ts-expect-error Native test runner resolves TypeScript source imports.
+import { createGenerationMeter } from "./generation-meter.ts";
+
+void test("estimates characters, then uses finalized output over first-output-to-end time", () => {
+	let now = 0;
+	const meter = createGenerationMeter(() => now);
+	assert.deepEqual(meter.start(), { kind: "streaming", tokensPerSecond: null });
+	now = 5000; // Request latency is not generation time.
+	meter.delta("abcd");
+	now = 6000;
+	assert.deepEqual(meter.delta("abcdefghijkl"), { kind: "streaming", tokensPerSecond: 4 });
+	now = 7000;
+	assert.deepEqual(meter.finish(100, "stop"), { kind: "complete", tokensPerSecond: 50 });
+	now = 9000;
+	assert.deepEqual(meter.delta("ignored"), { kind: "complete", tokensPerSecond: 50 });
+	assert.deepEqual(meter.start(), { kind: "streaming", tokensPerSecond: null });
+	assert.deepEqual(meter.reset(), { kind: "idle" });
+	assert.deepEqual(meter.finish(100, "stop"), { kind: "idle" });
+});
+
+void test("empty output, short/invalid intervals, invalid usage and interrupted responses are unavailable", () => {
+	for (const duration of [0, 99, -1, Number.NaN, Infinity]) {
+		let now = 0;
+		const meter = createGenerationMeter(() => now);
+		meter.start();
+		meter.delta("abcd");
+		now = duration;
+		assert.equal(meter.delta("").kind, "streaming");
+		assert.deepEqual(meter.finish(20, "stop"), { kind: "unavailable" });
+	}
+	for (const output of [undefined, 0, -1, 1.5, Number.NaN, Infinity]) {
+		let now = 0;
+		const meter = createGenerationMeter(() => now);
+		meter.start(); meter.delta("abcd"); now = 1000;
+		assert.deepEqual(meter.finish(output, "stop"), { kind: "unavailable" });
+	}
+	for (const reason of ["aborted", "error", "pending", "deferred", undefined]) {
+		let now = 0;
+		const meter = createGenerationMeter(() => now);
+		meter.start(); meter.delta("abcd"); now = 1000;
+		assert.deepEqual(meter.finish(20, reason), { kind: "unavailable" });
+	}
+	const meter = createGenerationMeter(() => 1000);
+	meter.start(); meter.delta("");
+	assert.deepEqual(meter.finish(20, "toolUse"), { kind: "unavailable" });
+	meter.start();
+	assert.deepEqual(meter.interrupt(), { kind: "unavailable" });
+});
+
+void test("clock regression invalidates the response, and normal length/tool-use endings are valid", () => {
+	for (const reason of ["length", "toolUse"]) {
+		let now = 1000;
+		const meter = createGenerationMeter(() => now);
+		meter.start(); meter.delta("abcd"); now = 2000;
+		assert.deepEqual(meter.finish(20, reason), { kind: "complete", tokensPerSecond: 20 });
+		assert.deepEqual(meter.interrupt(), { kind: "complete", tokensPerSecond: 20 });
+		meter.start(); meter.delta("abcd"); now = 1900; meter.delta("efgh"); now = 3000;
+		assert.deepEqual(meter.finish(20, reason), { kind: "unavailable" });
+	}
+});

package/extensions/osdy-pi/generation-meter.ts

@@ -0,0 +1,69 @@
+export type GenerationReading =
+	| { kind: "idle" | "unavailable" }
+	| { kind: "streaming"; tokensPerSecond: number | null }
+	| { kind: "complete"; tokensPerSecond: number };
+
+export interface GenerationMeter {
+	start(): GenerationReading;
+	delta(text: string): GenerationReading;
+	finish(output: number | undefined, stopReason: string | undefined): GenerationReading;
+	interrupt(): GenerationReading;
+	reset(): GenerationReading;
+}
+
+/** Volatile, per-message measurement. No partial-message references or timers.
+ * Live UTF-16 characters / 4 is a heuristic, never tokenizer/server telemetry.
+ */
+export function createGenerationMeter(now: () => number = () => performance.now()): GenerationMeter {
+	let reading: GenerationReading = { kind: "idle" };
+	let firstOutput: number | undefined;
+	let lastTime: number | undefined;
+	let invalidClock = false;
+	let characters = 0;
+	const sample = (): number => {
+		const time = now();
+		if (!Number.isFinite(time) || (lastTime !== undefined && time < lastTime)) invalidClock = true;
+		lastTime = time;
+		return time;
+	};
+	const rate = (tokens: number, time: number): number | null => {
+		const elapsed = firstOutput === undefined ? 0 : time - firstOutput;
+		// Sub-100ms observations are too short to present a useful rate.
+		if (invalidClock || elapsed < 100 || !Number.isFinite(elapsed)) return null;
+		const value = tokens / (elapsed / 1000);
+		return Number.isFinite(value) && value > 0 ? value : null;
+	};
+	const reset = (): GenerationReading => {
+		firstOutput = undefined;
+		lastTime = undefined;
+		invalidClock = false;
+		characters = 0;
+		return reading = { kind: "idle" };
+	};
+	return {
+		reset,
+		start() {
+			reset();
+			return reading = { kind: "streaming", tokensPerSecond: null };
+		},
+		delta(text) {
+			if (reading.kind !== "streaming" || !text) return reading;
+			const time = sample();
+			firstOutput ??= time;
+			characters += text.length;
+			return reading = { kind: "streaming", tokensPerSecond: rate(characters / 4, time) };
+		},
+		finish(output, stopReason) {
+			if (reading.kind !== "streaming") return reading;
+			const time = sample();
+			const completed = stopReason === "stop" || stopReason === "length" || stopReason === "toolUse";
+			const value = completed && output !== undefined && Number.isSafeInteger(output) && output > 0
+				? rate(output, time) : null;
+			return reading = value === null ? { kind: "unavailable" } : { kind: "complete", tokensPerSecond: value };
+		},
+		interrupt() {
+			if (reading.kind === "streaming") reading = { kind: "unavailable" };
+			return reading;
+		},
+	};
+}

package/extensions/osdy-pi/runtime.test.ts

@@ -50,7 +50,7 @@ registerHooks({
 type ShortcutRegistration = Parameters<ExtensionAPI["registerShortcut"]>[1];
 
 async function resetRuntimeFixture(root = mkdtempSync(join(tmpdir(), "osdy-reset-ui-runtime-")),
-	options: Pick<NonNullable<Parameters<typeof registerOsdyPi>[1]>, "fetchCodexUsage"> = {}) {
+	options: Pick<NonNullable<Parameters<typeof registerOsdyPi>[1]>, "fetchCodexUsage" | "generationClock"> = {}) {
 	const { registerOsdyPi: registerResetRuntime } = await import("./runtime.js");
 	const previousDir = process.env.PI_CODING_AGENT_DIR;
 	const previousFetch = globalThis.fetch;
@@ -69,6 +69,10 @@ async function resetRuntimeFixture(root = mkdtempSync(join(tmpdir(), "osdy-reset
 	let beforeAuth: () => Promise<void> = () => Promise.resolve();
 	let onRender: (view: string) => void = () => {};
 	let panel: Component | undefined;
+	let footer: Component | undefined;
+	let renders = 0;
+	let mounts = 0;
+	const tui = { terminal: { columns: 120, rows: 40 }, requestRender: () => { renders++; }, hasOverlay: () => false } as unknown as TUI;
 	const shortcuts = new Map<string, ShortcutRegistration>();
 	const views: string[] = [];
 	let quotaReads = 0;
@@ -99,15 +103,18 @@ async function resetRuntimeFixture(root = mkdtempSync(join(tmpdir(), "osdy-reset
 		on: (name: string, handler: (event: unknown, ctx: ExtensionContext) => Promise<void> | void) => {
 			const list = events.get(name) ?? []; list.push(handler); events.set(name, list);
 		}, registerFlag: () => {}, registerMessageRenderer: () => {}, registerEntryRenderer: () => {},
-		events: { on: () => () => {} }, exec: () => { throw new Error("external execution forbidden"); },
+		getThinkingLevel: () => "off", events: { on: () => () => {} }, exec: () => { throw new Error("external execution forbidden"); },
 	} as unknown as ExtensionAPI;
 	const ctx = { cwd: root, hasUI: true, mode: "tui", model: { provider: "openai-codex", id: "synthetic" }, isIdle: () => true,
-		sessionManager: { getSessionId: () => session }, modelRegistry: { getProviderAuth: async (provider: string) => {
+		getContextUsage: () => undefined,
+		sessionManager: { getSessionId: () => session, getEntries: () => [] }, modelRegistry: { getProviderAuth: async (provider: string) => {
 			assert.equal(provider, "openai-codex");
 			const token = `header.${Buffer.from(JSON.stringify({ "https://api.openai.com/auth": { chatgpt_account_id: account } })).toString("base64url")}.signature`;
 			await beforeAuth();
 			return { auth: { apiKey: token } };
-		} }, ui: { getEditorComponent: () => undefined, setEditorComponent: () => {}, setHeader: () => {}, setFooter: () => {},
+		} }, ui: { getEditorComponent: () => undefined, setEditorComponent: () => { mounts++; },
+			setHeader: (factory?: (tui: TUI, theme: Theme) => Component & { dispose?(): void }) => { factory?.(tui, ctx.ui.theme).dispose?.(); },
+			setFooter: (factory?: (tui: TUI, theme: Theme, data: unknown) => Component) => { footer = factory?.(tui, ctx.ui.theme, {}); },
 			setWidget: () => {}, setWorkingVisible: () => {}, notify: (text: string) => { notices.push(text); },
 			theme: { name: "dark", appearance: "dark", fg: (_color: string, text: string) => text }, getAllThemes: () => [], setTheme: () => ({ success: false }),
 			select: (title: string, options: string[]) => {
@@ -145,7 +152,11 @@ async function resetRuntimeFixture(root = mkdtempSync(join(tmpdir(), "osdy-reset
 			}) } });
 		await lifecycle("session_start");
 	} catch (error) { globalThis.fetch = previousFetch; if (previousDir === undefined) delete process.env.PI_CODING_AGENT_DIR; else process.env.PI_CODING_AGENT_DIR = previousDir; throw error; }
-	return { root, posts, dialogs, notices, views, expiry, quotaReads: () => quotaReads, overlays: () => overlays,
+	return { root, posts, dialogs, notices, views, expiry,
+		emit: async (name: string, event: unknown) => { for (const handler of events.get(name) ?? []) await handler(event, ctx); },
+		enable: () => commands.get("osdy-pi")!.handler("enable", ctx),
+		footer: () => footer?.render(120).join("\n") ?? "", renders: () => renders, mounts: () => mounts,
+		quotaReads: () => quotaReads, overlays: () => overlays,
 		open: (surface = "usage") => { nextAction = true; return commands.get(surface)!.handler("", ctx); },
 		view: (shortcut = false) => { nextAction = false; return shortcut
 			? shortcuts.get("ctrl+alt+u")!.handler(ctx) : commands.get("usage")!.handler("", ctx); },
@@ -163,6 +174,60 @@ async function resetRuntimeFixture(root = mkdtempSync(join(tmpdir(), "osdy-reset
 	};
 }
 
+void test("generation lifecycle uses delta-only estimates and final event usage without remounting", async () => {
+	let now = 0;
+	const f = await resetRuntimeFixture(undefined, { generationClock: () => now });
+	const message = { role: "assistant", usage: { output: 80, reasoning: 40 }, stopReason: "stop" };
+	const delta = (type: string, text: string) => f.emit("message_update", {
+		message, assistantMessageEvent: { type, delta: text, partial: message },
+	});
+	try {
+		await f.enable();
+		const mounts = f.mounts();
+		await f.emit("message_start", { message });
+		assert.match(f.footer(), /tok\/s …/);
+		now = 5000; await delta("thinking_delta", "abcd");
+		now = 6000; await delta("text_delta", "abcd");
+		await delta("toolcall_delta", "abcd");
+		assert.match(f.footer(), /≈3\.0 tok\/s/);
+		await delta("text_end", "not counted");
+		assert.match(f.footer(), /≈3\.0 tok\/s/);
+		now = 7000; await f.emit("message_end", { message });
+		assert.match(f.footer(), /40\.0 tok\/s/);
+		assert.doesNotMatch(f.footer(), /≈|tok ↑/);
+		await f.emit("message_start", { message: { role: "toolResult" } });
+		assert.match(f.footer(), /40\.0 tok\/s/);
+		await f.emit("agent_end", {});
+		assert.match(f.footer(), /40\.0 tok\/s/);
+		assert.equal(f.mounts(), mounts);
+		assert.ok(f.renders() > 0);
+		await f.emit("message_start", { message });
+		await delta("text_delta", "abcd"); now += 1000;
+		await f.emit("message_end", { message: { ...message, stopReason: "aborted" } });
+		assert.match(f.footer(), /tok\/s —/);
+		await f.emit("message_start", { message });
+		await delta("text_delta", "abcd"); now += 1000;
+		await delta("error", "ignored");
+		assert.match(f.footer(), /tok\/s —/);
+		await f.emit("message_end", { message });
+		assert.match(f.footer(), /tok\/s —/);
+		await f.emit("message_start", { message });
+		await delta("text_delta", "abcd"); now += 1000;
+		await f.emit("agent_end", {});
+		assert.match(f.footer(), /tok\/s —/);
+		await f.emit("message_start", { message });
+		await delta("text_delta", "abcd"); now += 1000;
+		await f.replace(); await f.enable();
+		await f.emit("message_end", { message });
+		assert.match(f.footer(), /tok\/s —/);
+		await f.emit("message_start", { message });
+		await delta("text_delta", "abcd"); now += 1000;
+		await f.shutdown();
+		await f.emit("message_end", { message });
+		assert.match(f.footer(), /tok\/s —/);
+	} finally { await f.close(); }
+});
+
 void test("registered active surfaces select and Cancel-first confirm before exactly one mocked POST", async () => {
 	for (const surface of ["usage", "osdyConfig"]) {
 		const f = await resetRuntimeFixture();

package/extensions/osdy-pi/runtime.ts

@@ -5,6 +5,7 @@ import type {
 	ExtensionContext,
 } from "@earendil-works/pi-coding-agent";
 import { homedir } from "node:os";
+import { createGenerationMeter, type GenerationReading } from "./generation-meter.js";
 import { createCodexUsageRefresh, type CodexUsageRefreshClock } from "./codex-usage-refresh.js";
 import { createControlCenterTodo } from "./control-center-todo.js";
 import { createControlCenterAgents } from "./control-center-agents.js";
@@ -1122,6 +1123,7 @@ export async function registerOsdyPi(
 		/** Tests inject a synthetic agent-data root; production uses the SDK root. */
 		agentDir?: () => string;
 		codexUsageClock?: CodexUsageRefreshClock;
+		generationClock?: () => number;
 		fetchCodexUsage?: CodexUsageFetcher;
 		accountFactory?: typeof bindControlCenterAccount;
 		editorSettingsStore?: ReturnType<typeof createEditorSettingsStore>;
@@ -1140,6 +1142,12 @@ export async function registerOsdyPi(
 		workingTreeEnabled: true,
 		workingTreePlacement: "aboveEditor",
 	};
+	const generationMeter = createGenerationMeter(dependencies.generationClock);
+	state.generation = generationMeter.reset();
+	const presentGeneration = (reading: GenerationReading): void => {
+		state.generation = reading;
+		state.tui?.requestRender();
+	};
 	const workingState: WorkingWidgetState = {
 		active: false,
 		activity: "thinking",
@@ -1306,11 +1314,29 @@ export async function registerOsdyPi(
 		audioRouter,
 	);
 
+	pi.on("message_start", (event) => {
+		if (sessionContext && event.message.role === "assistant") presentGeneration(generationMeter.start());
+	});
+	pi.on("message_update", (event) => {
+		if (!sessionContext || event.message.role !== "assistant") return;
+		const update = event.assistantMessageEvent;
+		if (update.type === "text_delta" || update.type === "thinking_delta" || update.type === "toolcall_delta") {
+			// Count only deltas, not mutable partial snapshots or authoritative block ends.
+			presentGeneration(generationMeter.delta(update.delta));
+		} else if (update.type === "error") presentGeneration(generationMeter.interrupt());
+	});
+	pi.on("message_end", (event) => {
+		if (sessionContext && event.message.role === "assistant") {
+			// message_end precedes persistence. Output already includes reasoning tokens.
+			presentGeneration(generationMeter.finish(event.message.usage?.output, event.message.stopReason));
+		}
+	});
 	pi.on("agent_start", () => {
 		controller.onAgentStart();
 		audioRouter.onAgentStart();
 	});
 	pi.on("agent_end", (_event, ctx) => {
+		presentGeneration(generationMeter.interrupt());
 		controller.onAgentEnd();
 		audioRouter.onAgentEnd(ctx);
 		if (state.enabled) clearGentleShellChangesWidget(ctx);
@@ -1346,6 +1372,7 @@ export async function registerOsdyPi(
 	});
 	pi.on("session_shutdown", () => {
 		usageSettingsReady = false;
+		presentGeneration(generationMeter.reset());
 		idleUsageRefresh.stop();
 		runtimeGeneration++;
 		for (const abort of resetAborts) abort.abort();
@@ -1363,6 +1390,7 @@ export async function registerOsdyPi(
 		sessionContext = undefined;
 	});
 	pi.on("session_start", async (_event, ctx) => {
+		presentGeneration(generationMeter.reset());
 		controller.onShutdown();
 		idleUsageRefresh.stop();
 		codexUsageAbort?.abort();

package/extensions/osdy-pi/types.ts

@@ -6,6 +6,7 @@ type EditorFactory = Exclude<
 	undefined
 >;
 import type { CodexUsageSnapshot } from "./codex-usage.js";
+import type { GenerationReading } from "./generation-meter.js";
 
 export type AnimationMode = "off" | "intro" | "continuous";
 
@@ -58,6 +59,8 @@ export type CodexUsageState =
 
 export type OsdyState = {
 	codexUsage: CodexUsageState;
+	/** Volatile response reading; never persisted as usage or settings. */
+	generation?: GenerationReading;
 	enabled: boolean;
 	/** Actual mounted editor, including while a desired change is deferred. */
 	editorEffective: boolean;

package/extensions/osdy-pi/ui.test.ts

@@ -1,4 +1,8 @@
 import assert from "node:assert/strict";
+import type { ExtensionAPI, ExtensionContext } from "@earendil-works/pi-coding-agent";
+import { KeybindingsManager } from "../../node_modules/@earendil-works/pi-coding-agent/dist/core/keybindings.js";
+import type { EditorTheme, TUI } from "@earendil-works/pi-tui";
+import type { OsdyState } from "./types.js";
 import { createHash } from "node:crypto";
 import { existsSync, readFileSync } from "node:fs";
 import { registerHooks } from "node:module";
@@ -394,6 +398,47 @@ void test("places a managed profile beside the model in simple mode and preserve
 	);
 });
 
+void test("one real editor instance and native footer read live/final speed with ANSI-safe resizing", () => {
+	const color = (text: string) => `\u001b[33m${text}\u001b[39m`;
+	const theme = { fg: (_name: string, text: string) => color(text), bold: (text: string) => text };
+	const state: OsdyState = {
+		codexUsage: { kind: "idle" }, enabled: true, editorEffective: true, editorMode: "extended",
+		fallbackEditorFactory: undefined, headerVariant: "osdy-theme", mascot: "current", smallMode: false,
+		tui: undefined, workingTreeEnabled: false, workingTreePlacement: "aboveEditor",
+		generation: { kind: "streaming", tokensPerSecond: 42.3 },
+	};
+	const ctx = { cwd: "/synthetic", ui: { theme }, model: { provider: "test", id: "test", contextWindow: 200000 },
+		getContextUsage: () => ({ percent: 60 }), sessionManager: { getEntries: () => [] },
+	} as unknown as ExtensionContext;
+	const pi = { getThinkingLevel: () => "off" } as ExtensionAPI;
+	const tui = { terminal: { rows: 40, columns: 120 }, requestRender: () => {} } as unknown as TUI;
+	const editorTheme: EditorTheme = { borderColor: color, selectList: {
+		selectedPrefix: color, selectedText: color, description: color, scrollInfo: color, noMatch: color,
+	} };
+	const editor = ui.createEditorComponent(pi, ctx, state)(tui, editorTheme, new KeybindingsManager());
+	for (const reading of [
+		{ kind: "streaming", tokensPerSecond: 42.3 }, { kind: "complete", tokensPerSecond: 50 },
+		{ kind: "streaming", tokensPerSecond: null }, { kind: "unavailable" },
+	] as const) {
+		state.generation = reading;
+		const expected = reading.kind === "complete" ? "50.0 tok/s" : reading.kind === "unavailable" ? "tok/s —"
+			: reading.tokensPerSecond === null ? "tok/s …" : "≈42.3 tok/s";
+		assert.ok(editor.render(120).join("\n").includes(expected));
+		for (const width of [4, 15, 30, 48, 80, 120]) {
+			assert.ok(editor.render(width).every(line => visibleWidth(line) <= width));
+		}
+		state.editorEffective = false;
+		const footer = ui.createFooterComponent(pi, ctx, state, {
+			getGitBranch: () => null, getExtensionStatuses: () => new Map(),
+			getAvailableProviderCount: () => 1, onBranchChange: () => () => {},
+		}, theme);
+		assert.ok(footer.render(120).join("\n").includes(expected));
+		assert.doesNotMatch(footer.render(120).join("\n"), /tok ↑/);
+		assert.ok(footer.render(30).every(line => visibleWidth(line) <= 30));
+		state.editorEffective = true;
+	}
+});
+
 void test("wires themed Codex quota bars below both native footer and extended editor", () => {
 	const source = readFileSync(new URL("./ui.ts", import.meta.url), "utf8");
 	assert.match(source, /renderCompactCodexQuotaBars/);

package/extensions/osdy-pi/ui.ts

@@ -343,7 +343,7 @@ class OsdyFooter implements Component {
 			? renderCompactCodexQuotaBars(this.theme, codexSnapshot, width)
 			: [];
 		const usageLine = truncateToWidth(
-			formatContextUsage(this.theme, contextUsageData(this.ctx), width),
+			formatContextUsage(this.theme, { ...contextUsageData(this.ctx), generation: this.state.generation }, width),
 			width,
 			ellipsis,
 		);
@@ -490,7 +490,7 @@ export function createEditorComponent(
 			const topRight = ctx.ui.theme.fg("muted", layout.topRight);
 			const bottomLeft = formatContextUsage(
 				ctx.ui.theme,
-				contextUsageData(ctx),
+				{ ...contextUsageData(ctx), generation: state.generation },
 				innerWidth,
 			);
 			lines[0] = `${borderColor("╭")}${fitBorder(topLeft, topRight, editorWidth - 2, borderColor)}${borderColor("╮")}`;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "osdy-pi",
-	"version": "1.11.14",
+	"version": "1.11.16",
 	"description": "Osdy Pi package: themes, header, and custom editor for Pi.",
 	"license": "MIT",
 	"type": "module",
@@ -83,7 +83,7 @@
 		"typescript": "^5.9.3",
 		"typescript-eslint": "^8.46.3"
 	},
-	"releaseSource": "375d9ec96ba08e538070ee492c60b0ce45bb0bc4",
+	"releaseSource": "a5c411e0d9537ce6fee513fc81e2a9a3d66b7142",
 	"repository": {
 		"type": "git",
 		"url": "git+https://github.com/OsdyOrtiz/Osdy-Pi.git"

package/themes/osdy-pi-catppuccin-frappe.json

@@ -47,10 +47,6 @@
     "searchMatchText": "text",
     "customMessageBg": "surface0",
     "customMessageText": "text",
-    "assistantMessageBg": "surface0",
-    "assistantMessageAccentBg": "blue",
-    "assistantMessageText": "text",
-    "userMessageAccentBg": "#FFFFFF",
     "userMessageBg": "#35415c",
     "userMessageText": "text",
     "customMessageLabel": "blue",

package/themes/osdy-pi-catppuccin-latte.json

@@ -47,10 +47,6 @@
     "searchMatchText": "text",
     "customMessageBg": "surface0",
     "customMessageText": "text",
-    "assistantMessageBg": "surface0",
-    "assistantMessageAccentBg": "blue",
-    "assistantMessageText": "text",
-    "userMessageAccentBg": "#FFFFFF",
     "userMessageBg": "#becddb",
     "userMessageText": "text",
     "customMessageLabel": "blue",

package/themes/osdy-pi-catppuccin-macchiato.json

@@ -47,10 +47,6 @@
     "searchMatchText": "text",
     "customMessageBg": "surface0",
     "customMessageText": "text",
-    "assistantMessageBg": "surface0",
-    "assistantMessageAccentBg": "blue",
-    "assistantMessageText": "text",
-    "userMessageAccentBg": "#FFFFFF",
     "userMessageBg": "#293851",
     "userMessageText": "text",
     "customMessageLabel": "blue",

package/themes/osdy-pi-catppuccin-mocha.json

@@ -47,10 +47,6 @@
     "searchMatchText": "text",
     "customMessageBg": "surface0",
     "customMessageText": "text",
-    "assistantMessageBg": "surface0",
-    "assistantMessageAccentBg": "blue",
-    "assistantMessageText": "text",
-    "userMessageAccentBg": "#FFFFFF",
     "userMessageBg": "#29334b",
     "userMessageText": "text",
     "customMessageLabel": "blue",

package/themes/osdy-pi-dark.json

@@ -32,10 +32,6 @@
     "selectedBg": "surface2",
     "customMessageBg": "#1C1230",
     "customMessageText": "textSoft",
-    "assistantMessageBg": "#1C1230",
-    "assistantMessageAccentBg": "pink",
-    "assistantMessageText": "textSoft",
-    "userMessageAccentBg": "#FFFFFF",
     "userMessageBg": "#292045",
     "userMessageText": "textSoft",
     "customMessageLabel": "pink",

package/themes/osdy-pi-dracula.json

@@ -36,10 +36,6 @@
     "searchMatchText": "foreground",
     "customMessageBg": "light",
     "customMessageText": "foreground",
-    "assistantMessageBg": "light",
-    "assistantMessageAccentBg": "purple",
-    "assistantMessageText": "foreground",
-    "userMessageAccentBg": "#FFFFFF",
     "userMessageBg": "#343e57",
     "userMessageText": "foreground",
     "customMessageLabel": "cyan",

package/themes/osdy-pi-kanagawa-dragon.json

@@ -44,10 +44,6 @@
     "searchMatchText": "text",
     "customMessageBg": "raised",
     "customMessageText": "text",
-    "assistantMessageBg": "raised",
-    "assistantMessageAccentBg": "blue",
-    "assistantMessageText": "text",
-    "userMessageAccentBg": "#FFFFFF",
     "userMessageBg": "#283536",
     "userMessageText": "text",
     "customMessageLabel": "cyan",

package/themes/osdy-pi-kanagawa-lotus.json

@@ -45,10 +45,6 @@
     "searchMatchText": "text",
     "customMessageBg": "raised",
     "customMessageText": "text",
-    "assistantMessageBg": "raised",
-    "assistantMessageAccentBg": "blue",
-    "assistantMessageText": "text",
-    "userMessageAccentBg": "#FFFFFF",
     "userMessageBg": "#d8ca9e",
     "userMessageText": "text",
     "customMessageLabel": "blue",

package/themes/osdy-pi-kanagawa-wave.json

@@ -44,10 +44,6 @@
     "searchMatchText": "text",
     "customMessageBg": "raised",
     "customMessageText": "text",
-    "assistantMessageBg": "raised",
-    "assistantMessageAccentBg": "blue",
-    "assistantMessageText": "text",
-    "userMessageAccentBg": "#FFFFFF",
     "userMessageBg": "#303b53",
     "userMessageText": "text",
     "customMessageLabel": "cyan",

package/themes/osdy-pi-lucent-orange.json

@@ -33,10 +33,6 @@
     "searchMatchText": "accent",
     "customMessageBg": "",
     "customMessageText": "text",
-    "assistantMessageBg": "subtle",
-    "assistantMessageAccentBg": "orange",
-    "assistantMessageText": "text",
-    "userMessageAccentBg": "#FFFFFF",
     "userMessageBg": "#33312d",
     "userMessageText": "text",
     "customMessageLabel": "secondary",

package/themes/osdy-pi-matrix.json

@@ -36,10 +36,6 @@
     "searchMatchText": "matrixInk0",
     "customMessageBg": "matrixInk2",
     "customMessageText": "rainGreenHi",
-    "assistantMessageBg": "matrixInk2",
-    "assistantMessageAccentBg": "rainGreen",
-    "assistantMessageText": "rainGreenHi",
-    "userMessageAccentBg": "#FFFFFF",
     "userMessageBg": "#193925",
     "userMessageText": "rainGreenHi",
     "customMessageLabel": "rainCyan",

package/themes/osdy-pi-new.json

@@ -44,10 +44,6 @@
     "searchMatchText": "pureWhite",
     "customMessageBg": "plasmaSurface",
     "customMessageText": "violetText",
-    "assistantMessageBg": "plasmaSurface",
-    "assistantMessageAccentBg": "cyan",
-    "assistantMessageText": "violetText",
-    "userMessageAccentBg": "#FFFFFF",
     "userMessageBg": "#18384b",
     "userMessageText": "cyanText",
     "customMessageLabel": "cyanSoft",

package/themes/osdy-pi-sexy.json

@@ -37,10 +37,6 @@
     "searchMatchText": "text",
     "customMessageBg": "elevated",
     "customMessageText": "text",
-    "assistantMessageBg": "elevated",
-    "assistantMessageAccentBg": "accentPink",
-    "assistantMessageText": "text",
-    "userMessageAccentBg": "#FFFFFF",
     "userMessageBg": "#372639",
     "userMessageText": "text",
     "customMessageLabel": "brightPink",

package/themes/osdy-pi-tokyo-night.json

@@ -36,10 +36,6 @@
     "searchMatchText": "background",
     "customMessageBg": "elevated",
     "customMessageText": "text",
-    "assistantMessageBg": "elevated",
-    "assistantMessageAccentBg": "blue",
-    "assistantMessageText": "text",
-    "userMessageAccentBg": "#FFFFFF",
     "userMessageBg": "#283b59",
     "userMessageText": "text",
     "customMessageLabel": "cyan",