gentle-pi 4.1.0 → 4.3.0

package/extensions/gentle-herdr-activity.ts

@@ -1,6 +1,6 @@
 import { statSync } from "node:fs";
 import type { ExtensionAPI, ExtensionContext } from "@earendil-works/pi-coding-agent";
-import { activitySummary, ActivityPublisher, createActivityColumns, metadataTransport } from "../lib/herdr-activity.ts";
+import { activitySummary, ActivityPublisher, createActivityColumns, herdrDetected, metadataTransport } from "../lib/herdr-activity.ts";
 import { replayTodo, type TodoState } from "../lib/shell-todo.ts";
 
 interface ActivityOptions {
@@ -15,8 +15,7 @@ interface ActivityOptions {
 export function createHerdrActivityExtension(options: ActivityOptions = {}) {
 	return (pi: ExtensionAPI): void => {
 		const env = options.env ?? process.env;
-		if (env.GENTLE_PI_AGENTS_CHILD === "1" || env.HERDR_ENV !== "1" ||
-			!env.HERDR_PANE_ID?.trim() || !env.HERDR_SOCKET_PATH?.trim()) return;
+		if (env.GENTLE_PI_AGENTS_CHILD === "1" || !herdrDetected(env)) return;
 		const isSocket = options.isSocket ?? ((path: string) => {
 			try { return statSync(path).isSocket(); } catch { return false; }
 		});

package/extensions/gentle-shell.ts

@@ -6,13 +6,13 @@ import { existsSync, realpathSync, statSync } from "node:fs";
 import { lstat, readFile } from "node:fs/promises";
 import { fileURLToPath } from "node:url";
 import { profilesFilePath, profileRoleEntries, readProfilesFileResult } from "../lib/agent-profiles.ts";
-import { readSessionProfileBinding } from "../lib/session-profile-binding.ts";
-import { resolveProfilePin } from "../lib/agent-profile-pin.ts";
+import { resolveSessionProfile, sessionProfileLabel, sessionProfileModelProfiles } from "../lib/session-profile-freeze.ts";
 import * as os from "node:os";
 import { dirname, join, resolve } from "node:path";
 import { buildShellHeaderModel, renderShellBar, renderShellBelowInputFloat, renderShellBottomOnlyBar, renderShellHeaderChrome, renderShellSidebarBar, keepNativeWorkingRow, shellEnabled, shellHeaderUsageHit, shellJobsCount, type ShellBarModel, type ShellBarTheme } from "../lib/shell-bar.ts";
 import { CHANGE_STATUS, DIFF_MAX_BYTES, DIFF_MAX_LINES, DIFF_TOO_LARGE, WorktreeChangesTracker, renderChangesWidget, type ChangedFile, type ChangesModel, type FileRevision, type GitRunner, type LineCounter, type WorktreeChanges } from "../lib/shell-changes.ts";
 import { WorktreeChangesView } from "../lib/shell-changes-view.ts";
+import { createNativeFullscreenInteraction } from "../lib/native-fullscreen-interaction.ts";
 import { SessionWorktreeRegistry, resolveSessionWorktree, worktreeGitEnvironment, type WorktreeResolver, type WorktreeIdentity } from "../lib/session-worktree-registry.ts";
 import { CARD_STYLE, CARD_TONE, cardStyle, renderCard, setCardStyle, type Card, type CardTheme } from "../lib/shell-card.ts";
 import { resolveCardStyle, writeCardStyle } from "../lib/card-style-policy.ts";
@@ -22,6 +22,8 @@ import { buildCommandPaletteGroups } from "../lib/command-palette-catalog.ts";
 import { discoverYoloUiAdapter, YOLO_DISPLAY, type YoloDisplay, type YoloUiAdapter } from "../lib/yolo-session-policy.ts";
 import { VisualCustomizeView, type CustomizeCategory, type CustomizeRow, type ProfileActions } from "../lib/visual-customize-view.ts";
 import { deleteVisualProfile, getVisualProfile, listVisualProfiles, resetVisualProfiles, saveVisualProfile } from "../lib/visual-profiles.ts";
+import { gaugePaintFor } from "../lib/gauge-theme.ts";
+import type { GaugePaint } from "../lib/shell-gauge.ts";
 import { sourcePalettePreview } from "../lib/theme-customization.ts";
 import { DEFAULT_VISUAL_SETTINGS, DENSITY, HEADER_PLACEMENT, STATUS_PLACEMENT, VISUAL_SECTION_KEYS, resolveVisualSettings, writeVisualSettings } from "../lib/visual-customization-policy.ts";
 import { BANNER_COLORS, DEFAULT_BANNER_CONFIG, readBannerConfig, readBannerConfigForEdit, writeBannerConfig } from "./startup-banner.ts";
@@ -32,7 +34,6 @@ import { oddPhaseRegistry } from "../lib/odd-phase.ts";
 import { inferOddPhase } from "../lib/odd-phase-inference.ts";
 import { isInteractiveMode } from "../lib/rpc-host.ts";
 import { gentlePiConfigHome } from "../lib/agent-home.ts";
-import { bundledGentlePiConfigHome } from "../lib/gentle-shell-bundled.ts";
 import { isNanAdaptiveReasoningModel } from "../lib/nan-provider.ts";
 import { resolveAnimationPolicy, writeAnimationPolicy, type AnimationPolicy } from "../lib/animation-policy.ts";
 import { resolveVimPolicy, writeVimPolicy, type VimPolicy } from "../lib/vim-policy.ts";
@@ -181,7 +182,7 @@ export type ActiveProfileReader = (() => string | undefined) & {
 // Unbound reads retain the global file-identity cache, including atomic replacements.
 // Bound reads are snapshots: no filesystem or Git work is done during a frame.
 export function createActiveProfileReader(env: NodeJS.ProcessEnv = process.env): ActiveProfileReader {
-	const path = profilesFilePath(bundledGentlePiConfigHome(env) ?? env.GENTLE_PI_CONFIG_HOME ?? join(os.homedir(), ".pi", "gentle-ai"));
+	const path = profilesFilePath(gentlePiConfigHome(env));
 	let fingerprint: string | undefined;
 	let name: string | undefined;
 	let bound = false;
@@ -208,23 +209,18 @@ export function createActiveProfileReader(env: NodeJS.ProcessEnv = process.env):
 	const reader = (() => bound ? effective : global()) as ActiveProfileReader;
 	reader.refresh = () => {
 		if (!bound) return false;
-		// gentle-shell#1064 slice 1: a parent-session profile binding outranks
-		// both the pin layers and the global active profile, with the same
-		// "name (scope)" spelling the pin uses. The shared precedence rule lives
-		// in one place: session → p (local pin) → P (repo declaration) → global.
-		const session = sessionId === undefined ? undefined : readSessionProfileBinding(sessionId);
-		if (session !== undefined) {
-			const next = `${session.name} (session)`;
-			const changed = next !== effective;
-			effective = next;
-			return changed;
-		}
-		const pin = identity && cwd ? resolveProfilePin({
+		// gentle-shell#1064: the status shows the profile launches use, through
+		// the same single rule (explicit Enter binding → profile frozen at
+		// startup → live p → P → G only in follow mode), with the existing
+		// spelling: "name (session)", "name (local)", "name (repo)", or the bare
+		// global name.
+		const next = cwd === undefined ? global() : sessionProfileLabel(resolveSessionProfile({
+			sessionId,
 			cwd,
-			configHome: bundledGentlePiConfigHome(env) ?? env.GENTLE_PI_CONFIG_HOME ?? join(os.homedir(), ".pi", "gentle-ai"),
-			resolveWorktree: () => identity!,
-		}) : undefined;
-		const next = pin ? `${pin.profile} (${pin.source})` : global();
+			configHome: gentlePiConfigHome(env),
+			resolveWorktree: () => identity,
+			env,
+		}));
 		const changed = next !== effective;
 		effective = next;
 		return changed;
@@ -340,6 +336,16 @@ export function buildShellBarModel(
 	};
 }
 
+// Gauge-specific theme roles (issue #2222): resolved from the installed theme
+// source and memoized by gauge-theme.ts, so the render hot path only stats the
+// theme file. Undefined — and therefore today's shared roles — whenever the theme
+// source is unavailable.
+function gaugePaint(ctx: ExtensionContext): GaugePaint | undefined {
+	const themeName = ctx.ui.theme.name;
+	const source = ctx.ui.theme.sourcePath ?? ctx.ui.getAllThemes?.().find((item) => item?.name === themeName)?.path;
+	return gaugePaintFor(typeof source === "string" ? source : undefined);
+}
+
 export function createShellBarComponent(
 	pi: ExtensionAPI,
 	ctx: ExtensionContext,
@@ -356,7 +362,7 @@ export function createShellBarComponent(
 	});
 	return {
 		render(width: number) {
-			return renderShellBar(buildShellBarModel(pi, ctx, footerData, { dirty: dirty(), usage: usage() }), theme, width, presentation?.());
+			return renderShellBar(buildShellBarModel(pi, ctx, footerData, { dirty: dirty(), usage: usage() }), theme, width, presentation?.(), gaugePaint(ctx));
 		},
 		invalidate() {},
 		dispose() {
@@ -1229,8 +1235,6 @@ const CHANGES_SHORTCUT_DEFAULT = "alt+g";
 const CHANGES_POLL_DEFAULT_MS = 2000;
 const GIT_TIMEOUT_MS = 5000;
 const COMMANDS_COMMAND_NAME = "gentle:commands";
-const OVERLAY_HEIGHT_RATIO = 0.8;
-const OVERLAY_MIN_ROWS = 8;
 
 export function shellGitRunner(cwd: string, env: NodeJS.ProcessEnv = process.env, run: typeof execFile = execFile, maxBuffer = Infinity): GitRunner {
 	// Pi exec cannot replace the inherited environment. Use argv directly and
@@ -1335,6 +1339,8 @@ interface OverlayDeps {
 }
 
 // The overlay polls each root's Git state while it is open; diffs load lazily.
+// Like Gentle Agents it takes the whole terminal, and the native fullscreen
+// wrapper keeps mouse dispatch on the view while it owns the keyboard.
 async function showChangesOverlay(ctx: ExtensionContext, deps: OverlayDeps): Promise<void> {
 	let host: ExternalEditorHost | undefined;
 	let view: WorktreeChangesView | undefined;
@@ -1352,16 +1358,18 @@ async function showChangesOverlay(ctx: ExtensionContext, deps: OverlayDeps): Pro
 				host = tui;
 				view = new WorktreeChangesView(deps.worktrees(), {
 					theme,
-					rows: () => Math.max(OVERLAY_MIN_ROWS, Math.floor(tui.terminal.rows * OVERLAY_HEIGHT_RATIO)),
+					rows: () => Math.max(0, tui.terminal.rows),
 					loadDiff: deps.loadDiff,
 					onOpen: (root, file) => close({ root, file }),
 					onRefresh: () => void refresh().catch(() => {}),
 					onClose: () => close(null),
 					requestRender: () => tui.requestRender(),
 				});
-				return view;
+				const interaction = createNativeFullscreenInteraction({ keyboardTarget: view, requestRender: () => tui.requestRender() });
+				interaction.addChild(view);
+				return interaction;
 			},
-			{ overlay: true, overlayOptions: { width: "92%", anchor: "center" } },
+			{ overlay: true, overlayOptions: { width: "100%", maxHeight: "100%", margin: 0, anchor: "center" } },
 		);
 		if (!chosen || !host) return;
 		if (!openInExternalEditor(host, chosen.file.path, process.env, spawnSync, chosen.root)) ctx.ui.notify("No editor configured. Set $VISUAL or $EDITOR.", "warning");
@@ -1578,19 +1586,20 @@ export default function gentleShell(pi: ExtensionAPI, env: NodeJS.ProcessEnv = p
 	// store and the profile reader cannot drift onto two different stores.
 	const usageConfigHome = gentlePiConfigHome(env);
 	const usageFetchTimeout = usageFetchTimeoutMs(env);
-	// The subagent routing in force for this session: a session binding first
-	// (gentle-shell#1064 slice 1), then a repository pin, then the global active
-	// profile. Only the profile's own role entries count; the reserved
-	// orchestrator key is not a route.
+	// The subagent routing in force for this session, through the same single
+	// rule launches use (gentle-shell#1064): explicit Enter binding, then the
+	// profile frozen at startup, then the live p → P → G only in follow mode.
+	// Only the profile's own role entries count; the reserved orchestrator key
+	// is not a route.
 	const activeRoutingModels = (ctx: ExtensionContext): Array<string | undefined> => {
-		const session = readSessionProfileBinding(ctx.sessionManager?.getSessionId?.())?.modelProfiles;
-		if (session) return [...profileRoleEntries(session).map(([, entry]) => entry.model)];
-		const pin = resolveProfilePin({ cwd: ctx.cwd, configHome: usageConfigHome, resolveWorktree: deps.resolveWorktree });
-		const config = pin ? pin.modelProfiles : undefined;
-		if (config) return [...profileRoleEntries(config).map(([, entry]) => entry.model)];
-		const store = readProfilesFileResult(profilesFilePath(usageConfigHome));
-		const active = store.status === "valid" && store.file.active !== undefined ? store.file.profiles[store.file.active] : undefined;
-		return active ? profileRoleEntries(active).map(([, entry]) => entry.model) : [];
+		const config = sessionProfileModelProfiles(resolveSessionProfile({
+			sessionId: ctx.sessionManager?.getSessionId?.(),
+			cwd: ctx.cwd,
+			configHome: usageConfigHome,
+			resolveWorktree: deps.resolveWorktree,
+			env,
+		}));
+		return config ? profileRoleEntries(config).map(([, entry]) => entry.model) : [];
 	};
 	// A bare model id names a provider only when exactly one provider in the
 	// registry carries that id; anything else stays untargeted rather than guessed.
@@ -1743,6 +1752,7 @@ export default function gentleShell(pi: ExtensionAPI, env: NodeJS.ProcessEnv = p
 					onClose: () => withOverlayRepaint(tui, done)(null),
 					requestRender: () => tui.requestRender(),
 					scope: () => ({ providers: usageScope, failed: new Set(usageFailures) }),
+					gauge: () => gaugePaint(ctx),
 				});
 				// Open promptly: the panel draws whatever the store already holds
 				// while the forced refresh runs underneath it, and repaints when
@@ -1929,7 +1939,7 @@ export default function gentleShell(pi: ExtensionAPI, env: NodeJS.ProcessEnv = p
 			const statusOwner = () => narrowStatusOwner({ mode: (tui as TUI & { mode?: string }).mode, columns: tui.terminal?.columns ?? 0, statusPlacement: visualSettings.statusPlacement, headerPlacement: visualSettings.headerPlacement });
 			const statusCardVisible = () => Boolean(tui.terminal && tui.terminal.columns >= SIDEBAR_BREAKPOINT && sidebarState(tui).ownsHost?.() && visualSettings.statusPlacement !== "hidden");
 			const belowFloat = (width: number, statuses: boolean) => (tui as TUI & { mode?: string }).mode === "fullscreen"
-				? renderShellBelowInputFloat({ ...footerModel(), ...(statuses ? {} : { statuses: [] }), ...(statusCardVisible() ? { jobs: undefined } : {}) }, theme, width, usageShortcutKey, visualSettings, tracker.model)
+				? renderShellBelowInputFloat({ ...footerModel(), ...(statuses ? {} : { statuses: [] }), ...(statusCardVisible() ? { jobs: undefined } : {}) }, theme, width, usageShortcutKey, visualSettings, tracker.model, gaugePaint(ctx))
 				: undefined;
 			// Match sidebarPart's live paint ownership, including an unavailable rail.
 			const footerSuppressed = () => {
@@ -1940,7 +1950,7 @@ export default function gentleShell(pi: ExtensionAPI, env: NodeJS.ProcessEnv = p
 			groupedChangesOwner = (width) => belowFloat(width, !footerSuppressed()) !== undefined;
 			const bottomBar = {
 				...bottom,
-				render: (width: number) => belowFloat(width, true)?.rows ?? (statusOwner() === STATUS_OWNER.BOTTOM ? renderShellBottomOnlyBar(footerModel(), theme, width, usageShortcutKey, visualSettings) : bottom.render(width)),
+				render: (width: number) => belowFloat(width, true)?.rows ?? (statusOwner() === STATUS_OWNER.BOTTOM ? renderShellBottomOnlyBar(footerModel(), theme, width, usageShortcutKey, visualSettings, undefined, gaugePaint(ctx)) : bottom.render(width)),
 				handleMouse(event: Parameters<NonNullable<SidebarRail["handleMouse"]>>[0]) {
 					if (footerSuppressed() || event.type !== "click" || event.button !== "left") return undefined;
 					const chrome = belowFloat(event.width, true);
@@ -1957,7 +1967,7 @@ export default function gentleShell(pi: ExtensionAPI, env: NodeJS.ProcessEnv = p
 			// The header row carries everything that ticks every frame (model,
 			// effort, context, cost, usage) plus session identity and the jobs count
 			// when Status is absent. Opaque statuses and working state stay excluded.
-			const headerBar = (width: number) => renderShellHeaderChrome(buildShellHeaderModel(footerModel(), !statusCardVisible() && (statusOwner() === STATUS_OWNER.HEADER || visualSettings.statusPlacement === "hidden")), theme, width, usageShortcutKey, visualSettings);
+			const headerBar = (width: number) => renderShellHeaderChrome(buildShellHeaderModel(footerModel(), !statusCardVisible() && (statusOwner() === STATUS_OWNER.HEADER || visualSettings.statusPlacement === "hidden")), theme, width, usageShortcutKey, visualSettings, gaugePaint(ctx));
 			const disposeHeader = sidebarHeader(tui, {
 				digest: () => JSON.stringify([footerModel(), tracker.model, visualSettings, cardStyle()]),
 				render: (width) => headerBar(width).rows,
@@ -2261,7 +2271,7 @@ export default function gentleShell(pi: ExtensionAPI, env: NodeJS.ProcessEnv = p
 			});
 			for (const mode of ["normal", "auto", "yolo"] as const) rows.push({
 				category,
-				label: () => `Session permissions: ${mode.toUpperCase()}${permissionDisplay === mode ? " (current)" : ""}`,
+				label: () => `Session permissions: ${mode.toUpperCase()}${mode === "auto" ? " (beta)" : ""}${permissionDisplay === mode ? " (current)" : ""}`,
 				preview: () => ({ title: "Permissions · current session", sample: mode === "auto"
 					? "independent session-model action checks · extra inference cost · hard safety and native consent remain"
 					: mode === "yolo" ? "ordinary scoped delivery permission · destructive confirmations remain" : "normal checks · overrides an elevated global default" }),
@@ -2273,7 +2283,7 @@ export default function gentleShell(pi: ExtensionAPI, env: NodeJS.ProcessEnv = p
 			});
 			for (const mode of ["normal", "auto", "yolo"] as const) rows.push({
 				category,
-				label: () => `Default permissions: ${mode.toUpperCase()}${permissionDefault === mode ? " (saved)" : ""}`,
+				label: () => `Default permissions: ${mode.toUpperCase()}${mode === "auto" ? " (beta)" : ""}${permissionDefault === mode ? " (saved)" : ""}`,
 				preview: () => ({ title: "Permissions · user-global default", sample: `New primary sessions start in ${mode.toUpperCase()}; current session stays unchanged. ${mode === "auto" ? "Additional classifier inference uses the session model; usage is separate." : "Independent safety and consent remain."}` }),
 				action: async () => {
 					if (closed) return;

package/extensions/gentle-todo.ts

@@ -13,9 +13,13 @@ import {
 	staleTurns,
 	TODO_DETAILS_KEY,
 	TODO_GLYPH,
+	TODO_PROGRESS_EVENT,
 	TODO_TOOL_NAME,
 	todoCardTone,
+	TODO_CLOSED_STATE,
+	todoProgress,
 	todoPromptBlock,
+	todoStateMessage,
 	todoSummary,
 	type TodoParams,
 	type TodoState,
@@ -24,10 +28,13 @@ import {
 // Gentle Todo: the task list the model keeps while it works, drawn as a
 // Gentle Shell card above the editor. Three things keep it current that a
 // static tool description cannot: `write` replaces the whole list in one
-// call, each run's system prompt carries the open tasks and the rules, and
-// a list that goes untouched while tasks stay open is marked stale for both
-// the human and the model. Long runs also receive one request-local reminder
-// after several tool-use turns, without waking the agent or changing tasks.
+// call, each run's system prompt carries a byte-stable rules block while the
+// open tasks reach the model as a hidden transcript message appended when the
+// list changes (so list changes never invalidate the cached prompt prefix and
+// requests stay append-only, gentle-shell#1662, #2195), and
+// a list that goes untouched while tasks stay open is marked stale for the
+// human. Long runs also receive one request-local reminder after several
+// tool-use turns, without waking the agent or changing tasks.
 
 const WIDGET_KEY = "gentle-todo";
 const STATUS_ENUM = ["pending", "in_progress", "blocked", "done", "dropped"];
@@ -84,6 +91,10 @@ interface TodoSession {
 	collapsed: boolean;
 	/** A finished list stays on screen for the turn it finished in, then clears. */
 	clearOnNextTurn: boolean;
+	/** The last state snapshot sent to the transcript. */
+	lastSent: string | undefined;
+	/** A snapshot queued during the current turn; Pi appends it at turn_end. */
+	pending: string | undefined;
 	ui: ExtensionContext["ui"] | undefined;
 	host: { requestRender(): void } | undefined;
 	tui: TUI | undefined;
@@ -104,12 +115,21 @@ export default function gentleTodo(pi: ExtensionAPI, env: NodeJS.ProcessEnv = pr
 		const key = sessionKey(ctx);
 		let current = sessions.get(key);
 		if (!current) {
-			current = { state: emptyTodo(), turn: 0, toolTurnsSinceWrite: 0, reminded: false, wroteThisTurn: false, collapsed: false, clearOnNextTurn: false, ui: undefined, host: undefined, tui: undefined };
+			current = { state: emptyTodo(), turn: 0, toolTurnsSinceWrite: 0, reminded: false, wroteThisTurn: false, collapsed: false, clearOnNextTurn: false, lastSent: undefined, pending: undefined, ui: undefined, host: undefined, tui: undefined };
 			sessions.set(key, current);
 		}
 		return current;
 	};
 
+	// While the agent streams, Pi appends this hidden message at turn_end, after
+	// the tool results and before the next model request; it never starts a turn.
+	const persistState = (current: TodoSession, state: string) => {
+		if (!pi.sendMessage) return;
+		pi.sendMessage({ customType: "gentle-todo-state", content: state, display: false }, { triggerTurn: false });
+		current.lastSent = state;
+		current.pending = state;
+	};
+
 	const toggle = (current: TodoSession) => {
 		current.collapsed = !current.collapsed;
 		if (current.tui) invalidateSidebar(current.tui);
@@ -262,6 +282,11 @@ export default function gentleTodo(pi: ExtensionAPI, env: NodeJS.ProcessEnv = pr
 					current.toolTurnsSinceWrite = 0;
 					current.reminded = false;
 					current.wroteThisTurn = true;
+					// A closed list persists the closing marker, so the last open
+					// snapshot in the transcript never reads as current work.
+					const state = todoStateMessage(current.state) ?? (current.lastSent === undefined ? undefined : TODO_CLOSED_STATE);
+					if (state !== undefined && state !== current.lastSent) persistState(current, state);
+					pi.events?.emit(TODO_PROGRESS_EVENT, todoProgress(current.state, ctx.sessionManager.getSessionId()));
 				}
 				if (current.tui) invalidateSidebar(current.tui);
 			}
@@ -281,7 +306,9 @@ export default function gentleTodo(pi: ExtensionAPI, env: NodeJS.ProcessEnv = pr
 		});
 	}
 
-	for (const [key, lines] of [["ctrl+shift+up", -3], ["ctrl+shift+down", 3]] as const) {
+	// Pi binds ctrl+shift+up/down to prompt navigation (tui.altScreen.*Prompt) and
+	// alt+up/down to dequeue and model reordering; alt+shift+up/down are free.
+	for (const [key, lines] of [["alt+shift+up", -3], ["alt+shift+down", 3]] as const) {
 		pi.registerShortcut(key, {
 			description: `Scroll the Todo list ${lines < 0 ? "up" : "down"}`,
 			handler: async (ctx) => session(ctx).scrollTodo?.(lines),
@@ -298,6 +325,8 @@ export default function gentleTodo(pi: ExtensionAPI, env: NodeJS.ProcessEnv = pr
 		current.toolTurnsSinceWrite = 0;
 		current.reminded = false;
 		current.wroteThisTurn = false;
+		current.lastSent = undefined;
+		current.pending = undefined;
 		current.ui = ctx.hasUI ? ctx.ui : undefined;
 		show(current);
 	});
@@ -315,11 +344,10 @@ export default function gentleTodo(pi: ExtensionAPI, env: NodeJS.ProcessEnv = pr
 			current.clearOnNextTurn = false;
 			show(current);
 		}
-		const block = todoPromptBlock(current.state, staleTurns(current.state, current.turn));
-		if (!block) return undefined;
 		// gentle-shell#1485: pi-claude-bridge drops a handler-returned
-		// systemPrompt, so the open-tasks block goes through appendSystemPrompt.
-		appendSystemPromptOnce(event.systemPromptOptions, block);
+		// systemPrompt, so the rules block goes through appendSystemPrompt. It is
+		// the same bytes on every turn, list or no list (gentle-shell#1662).
+		appendSystemPromptOnce(event.systemPromptOptions, todoPromptBlock());
 		return undefined;
 	});
 
@@ -331,18 +359,34 @@ export default function gentleTodo(pi: ExtensionAPI, env: NodeJS.ProcessEnv = pr
 			current.toolTurnsSinceWrite += 1;
 		}
 		current.wroteThisTurn = false;
+		// Pi flushes the queued snapshot right after this event.
+		current.pending = undefined;
 	});
 
 	pi.on("context", (event, ctx) => {
 		const current = session(ctx);
-		if (current.reminded || current.toolTurnsSinceWrite < REMIND_AFTER_TOOL_TURNS) return undefined;
-		if (!current.state.tasks.some((task) => task.status === "pending" || task.status === "in_progress")) return undefined;
-		current.reminded = true;
-		// Context transforms are request-local: no transcript entry, UI
-		// notification, continuation or provider-specific wake is needed.
-		return {
-			messages: [...event.messages, { role: "custom" as const, customType: "gentle-todo-reminder", content: TODO_REMINDER, display: false, timestamp: Date.now() }],
-		};
+		// gentle-shell#1662, #2195: providers cache the request prefix up to the
+		// last message (Anthropic) or send only the delta after the previous input
+		// (openai-codex), so a trailing message that the next request drops breaks
+		// both. The list is persisted when it changes; this transform only covers a
+		// transcript that lacks the current snapshot (compaction, branch navigation,
+		// sessions recorded earlier): it trails this one request and persists the
+		// snapshot once, so the following requests are append-only again.
+		const trailing: Array<{ role: "custom"; customType: string; content: string; display: false; timestamp: number }> = [];
+		const last = [...event.messages].reverse().find((message) => (message as { customType?: string }).customType === "gentle-todo-state") as { content?: unknown } | undefined;
+		const seen = typeof last?.content === "string" ? last.content : undefined;
+		const state = todoStateMessage(current.state) ?? (seen === undefined || seen === TODO_CLOSED_STATE ? undefined : TODO_CLOSED_STATE);
+		if (state !== undefined && seen !== state) {
+			trailing.push({ role: "custom", customType: "gentle-todo-state", content: state, display: false, timestamp: Date.now() });
+			if (current.pending !== state) persistState(current, state);
+		}
+		const actionable = current.state.tasks.some((task) => task.status === "pending" || task.status === "in_progress");
+		if (!current.reminded && current.toolTurnsSinceWrite >= REMIND_AFTER_TOOL_TURNS && actionable) {
+			current.reminded = true;
+			trailing.push({ role: "custom", customType: "gentle-todo-reminder", content: TODO_REMINDER, display: false, timestamp: Date.now() });
+		}
+		if (trailing.length === 0) return undefined;
+		return { messages: [...event.messages, ...trailing] };
 	});
 
 	pi.on("tool_execution_end", (event, ctx) => {

package/extensions/quiet-tools.ts

@@ -795,7 +795,7 @@ export function createQuietToolRenderer(
 					safeResult,
 					options,
 					theme,
-					sanitizedRenderContext(renderContext) as any,
+					{ ...sanitizedRenderContext(renderContext), lastComponent: undefined } as any,
 				), false);
 			}
 			let output = formatToolResultOutput(toolName, safeResult, {