@sassywares/pi-extensions 0.3.21 → 0.3.23

package/README.md

@@ -151,9 +151,10 @@ Writes do not fail quietly and they are not matched by pattern. `rm`, `sed -i`,
 
 A backend is only trusted after it proves both halves of the contract: reads inside the working directory must succeed **and** a probe write there must fail. A backend that is installed but cannot enforce (for example bubblewrap on a distribution that blocks unprivileged user namespaces) is discarded, and ask mode continues without bash rather than falling back to a command allowlist. The working directory always wins over the temp allowance: if the project itself lives under the temp directory, temp writes are denied too and `/modes` reports `temp dir is read-only`.
 
-`/modes` shows the verdict, and the footer status line shows `⏸ ask · ro(sandbox-exec)`, `⏸ ask · bash off`, or `▶ work`.
+`/modes` shows the verdict. The mode badge sits on a footer line of its own, aligned to the right edge: `▶ work`, `⏸ ask · ro(sandbox-exec)`, or `⏸ ask · bash off`. To place it there without reimplementing pi's footer, the extension delegates to pi's own `FooterComponent` and appends the badge line, so directory, session name, token stats, model, and context usage stay exactly as pi renders them. If a future pi release changes what that component reads, the extension restores the native footer and falls back to a left-aligned status line.
 
 - `--ask` starts a session in ask mode; the mode persists across resume.
+- Switching mid-session applies immediately: the toolset is swapped and bash starts or stops being sandboxed. When ask mode is switched off, the model is told once that work mode is active, so it stops repeating an earlier claim that it was in ask mode. Only the newest mode notice is kept in context, and the ask prompt is refreshed on every turn, so a long session does not accumulate stale instructions.
 - `shift+tab` is not used, because pi binds it to the thinking level. To match an editor that uses it for modes, bind `app.thinking.cycle` to something else in `~/.pi/agent/keybindings.json` and add a shortcut there.
 - Ask mode is a guardrail for local changes, not a jail. Network access stays open, so a command can still change remote state if it holds a credential. Use pi's containerized setup when the boundary has to hold against a hostile model.
 - **Windows is unsupported by design.** Ask mode needs an OS-level read-only sandbox that Windows does not offer cheaply, so the extension registers nothing there. `/ask` and `/work` do not exist, and every tool behaves as before.

package/extensions/modes/footer.ts

@@ -0,0 +1,88 @@
+/**
+ * Right-aligned mode badge.
+ *
+ * `ctx.ui.setStatus()` has no placement: pi appends status texts as a line of
+ * their own, left-aligned, and its sanitizer collapses runs of spaces, so a
+ * badge cannot be pushed to the right edge from there.
+ *
+ * This footer keeps pi's own rendering (it delegates to the exported
+ * `FooterComponent`) and appends one extra line with the badge aligned to the
+ * right edge. Nothing about the directory, session name, token stats, or model
+ * line is reimplemented here, so it stays correct as pi's footer evolves.
+ *
+ * If a future pi version changes what `FooterComponent` reads from its session
+ * argument, the render below throws; `onError` then tells the extension to
+ * restore the native footer and fall back to the plain status line.
+ */
+
+import type { Component } from "@earendil-works/pi-tui";
+import { truncateToWidth, visibleWidth } from "@earendil-works/pi-tui";
+import type { ExtensionContext, ReadonlyFooterDataProvider, Theme } from "@earendil-works/pi-coding-agent";
+import { FooterComponent } from "@earendil-works/pi-coding-agent";
+
+export interface ModeBadge {
+	text: string;
+	tone: "warning" | "error" | "accent";
+}
+
+export interface ModesFooterOptions {
+	/** Session auto-compaction, shown by the footer as the `(auto)` suffix. */
+	autoCompact: boolean;
+	/** Called once if pi's footer cannot be rendered through this shim. */
+	onError: () => void;
+}
+
+/**
+ * The subset of `AgentSession` that `FooterComponent` reads. Everything except
+ * a few computed values is already on the extension context.
+ */
+function sessionShim(ctx: ExtensionContext) {
+	return {
+		model: ctx.model,
+		state: { model: ctx.model, thinkingLevel: ctx.thinkingLevel },
+		routedModel: undefined,
+		getContextUsage: () => ctx.getContextUsage(),
+		modelRuntime: {
+			// Extensions cannot observe subscription backing; the provider name is
+			// the only signal available.
+			isUsingSubscription: (provider: string) => provider === "kimi-coding",
+		},
+		sessionManager: ctx.sessionManager,
+	} as unknown as ConstructorParameters<typeof FooterComponent>[0];
+}
+
+export function createModesFooter(
+	ctx: ExtensionContext,
+	theme: Theme,
+	footerData: ReadonlyFooterDataProvider,
+	badge: () => ModeBadge,
+	options: ModesFooterOptions,
+): Component & { dispose?(): void } {
+	const inner = new FooterComponent(sessionShim(ctx), footerData);
+	inner.setAutoCompactEnabled(options.autoCompact);
+	let failed = false;
+
+	function badgeLine(width: number): string {
+		const current = badge();
+		const text = current.text;
+		if (visibleWidth(text) >= width) return theme.fg(current.tone, truncateToWidth(text, width, "…"));
+		const padding = Math.max(1, width - visibleWidth(text));
+		return " ".repeat(padding) + theme.fg(current.tone, text);
+	}
+
+	return {
+		invalidate() {
+			inner.invalidate();
+		},
+		render(width: number): string[] {
+			if (failed) return [badgeLine(width)];
+			try {
+				return [...inner.render(width), badgeLine(width)];
+			} catch {
+				failed = true;
+				options.onError();
+				return [badgeLine(width)];
+			}
+		},
+	};
+}

package/extensions/modes/index.ts

@@ -14,17 +14,17 @@
  * Windows is intentionally unsupported: no modes are registered there.
  */
 
-import type { AgentMessage } from "@earendil-works/pi-agent-core";
 import type { ExtensionAPI, ExtensionContext } from "@earendil-works/pi-coding-agent";
 import { createWrappedOperations, detectBackend, type SandboxBackend } from "./backends.ts";
+import { createModesFooter, type ModeBadge } from "./footer.ts";
 
 type Mode = "work" | "ask";
 
 /** Tools that may run in ask mode. Everything else is hidden and blocked. */
 const ASK_TOOLS = ["read", "grep", "find", "ls", "bash", "web_search", "web_fetch", "questionnaire"];
 
-const CONTEXT_CUSTOM_TYPE = "modes-ask-context";
-const CONTEXT_MARKER = "[ASK MODE ACTIVE]";
+const ASK_CONTEXT_TYPE = "modes-ask-context";
+const WORK_CONTEXT_TYPE = "modes-work-context";
 const STATE_CUSTOM_TYPE = "modes";
 const SHORTCUT = "alt+m";
 
@@ -32,15 +32,25 @@ interface PersistedState {
 	mode?: Mode;
 }
 
-const ASK_PROMPT = `${CONTEXT_MARKER}
+const ASK_PROMPT = `[ASK MODE ACTIVE]
 You are in ask mode: reading, searching, and answering only.
 
 Rules:
 - Do not modify files. The edit and write tools are not available.
 - bash runs inside a read-only sandbox. Reading, searching, git history, and network access work; anything that writes fails with a permission error. Do not retry a failed write - report the limitation instead.
 - Answer from evidence: cite file paths with line numbers, and URLs for web results.
+- This instruction overrides earlier turns. If the conversation shows file edits, write tools, or unrestricted bash, that happened before ask mode was enabled and says nothing about the current turn.
 - If a change is needed, describe it precisely and tell the user to switch to work mode (/work or alt+m).`;
 
+/**
+ * Sent once on the first turn after ask mode is switched off. Without it the
+ * model keeps answering from its own earlier "I am in ask mode" reply, because
+ * the ask instructions are gone and nothing replaces them.
+ */
+const WORK_PROMPT = `[WORK MODE ACTIVE]
+Ask mode was switched off for this session. You can edit files, write new files, and run any bash command again.
+Ignore any earlier statement that you were in ask mode: it no longer applies.`;
+
 export default function modesExtension(pi: ExtensionAPI): void {
 	// Ask mode depends on an OS-level sandbox that Windows does not provide.
 	// Rather than ship a weaker guardrail, the extension does nothing there.
@@ -51,6 +61,9 @@ export default function modesExtension(pi: ExtensionAPI): void {
 	let backendReason = "not detected yet";
 	let backendChecked = false;
 	let workTools: string[] | undefined;
+	let announceWork = false;
+	let footerStatus: "none" | "custom" | "fallback" = "none";
+	let footerTui: { requestRender(): void } | undefined;
 	const wrappedCalls = new Set<string>();
 
 	function configuredAskTools(): string[] {
@@ -71,13 +84,55 @@ export default function modesExtension(pi: ExtensionAPI): void {
 		pi.appendEntry(STATE_CUSTOM_TYPE, { mode } satisfies PersistedState);
 	}
 
+	function badgeSpec(): ModeBadge {
+		if (mode === "work") return { text: "▶ work", tone: "accent" };
+		if (backend) return { text: `⏸ ask · ro(${backend.id})`, tone: "warning" };
+		return { text: "⏸ ask · bash off", tone: "error" };
+	}
+
 	function updateStatus(ctx: ExtensionContext): void {
-		if (mode === "work") {
-			ctx.ui.setStatus("modes", ctx.ui.theme.fg("accent", "▶ work"));
+		// The custom footer draws the badge itself, right-aligned.
+		if (footerStatus === "custom") {
+			ctx.ui.setStatus("modes", undefined);
+			footerTui?.requestRender();
 			return;
 		}
-		const text = backend ? `⏸ ask · ro(${backend.id})` : "⏸ ask · bash off";
-		ctx.ui.setStatus("modes", ctx.ui.theme.fg(backend ? "warning" : "error", text));
+		const badge = badgeSpec();
+		ctx.ui.setStatus("modes", ctx.ui.theme.fg(badge.tone, badge.text));
+	}
+
+	/**
+	 * Install a footer that keeps pi's rendering and appends the badge aligned to
+	 * the right edge. Falls back to the native footer plus a status line if pi's
+	 * footer cannot be driven from here.
+	 */
+	function installFooter(ctx: ExtensionContext): void {
+		if (ctx.mode !== "tui" || footerStatus === "custom") return;
+		const autoCompact = pi.getSettings().compaction?.enabled !== false;
+
+		ctx.ui.setFooter((tui, theme, footerData) => {
+			footerTui = tui;
+			const unsubscribe = footerData.onBranchChange(() => tui.requestRender());
+			return {
+				...createModesFooter(ctx, theme, footerData, badgeSpec, {
+					autoCompact,
+					onError: () => {
+						footerStatus = "fallback";
+						footerTui = undefined;
+						queueMicrotask(() => {
+							ctx.ui.setFooter(undefined);
+							updateStatus(ctx);
+						});
+					},
+				}),
+				dispose() {
+					unsubscribe();
+					footerTui = undefined;
+				},
+			};
+		});
+		footerStatus = "custom";
+		ctx.ui.setStatus("modes", undefined);
 	}
 
 	function describe(): string {
@@ -111,6 +166,7 @@ export default function modesExtension(pi: ExtensionAPI): void {
 		if (next === "ask") {
 			await ensureBackend(ctx.cwd);
 			mode = "ask";
+			announceWork = false;
 			workTools = pi.getActiveTools();
 			pi.setActiveTools(askToolset());
 			updateStatus(ctx);
@@ -124,6 +180,7 @@ export default function modesExtension(pi: ExtensionAPI): void {
 		}
 
 		mode = "work";
+		announceWork = true;
 		pi.setActiveTools(workTools ?? pi.getActiveTools());
 		workTools = undefined;
 		updateStatus(ctx);
@@ -205,21 +262,48 @@ export default function modesExtension(pi: ExtensionAPI): void {
 	});
 
 	pi.on("before_agent_start", async (event) => {
-		if (mode !== "ask") return undefined;
 		if (event.messageType !== "user") return undefined;
+
+		if (mode === "ask") {
+			return {
+				message: {
+					customType: ASK_CONTEXT_TYPE,
+					content: ASK_PROMPT,
+					display: false,
+				},
+			};
+		}
+
+		// Announce the switch to work once, so the model stops repeating its own
+		// earlier claim that it was in ask mode.
+		if (!announceWork) return undefined;
+		announceWork = false;
 		return {
 			message: {
-				customType: CONTEXT_CUSTOM_TYPE,
-				content: ASK_PROMPT,
+				customType: WORK_CONTEXT_TYPE,
+				content: WORK_PROMPT,
 				display: false,
 			},
 		};
 	});
 
-	// Drop ask-mode context once the session leaves ask mode.
+	// Keep only the newest mode notice, and only if it matches the current mode.
+	// This drops stale ask instructions after a switch and stops the per-turn ask
+	// prompt from accumulating for the length of a session.
 	pi.on("context", async (event) => {
-		if (mode === "ask") return undefined;
-		return { messages: event.messages.filter((message) => !isAskContext(message)) };
+		const wanted = mode === "ask" ? ASK_CONTEXT_TYPE : WORK_CONTEXT_TYPE;
+		let keep = -1;
+		event.messages.forEach((message, index) => {
+			if ((message as { customType?: string }).customType === wanted) keep = index;
+		});
+
+		return {
+			messages: event.messages.filter((message, index) => {
+				const customType = (message as { customType?: string }).customType;
+				if (customType !== ASK_CONTEXT_TYPE && customType !== WORK_CONTEXT_TYPE) return true;
+				return index === keep;
+			}),
+		};
 	});
 
 	pi.on("session_start", async (_event, ctx) => {
@@ -233,6 +317,7 @@ export default function modesExtension(pi: ExtensionAPI): void {
 
 		mode = state?.data?.mode ?? "work";
 		if (pi.getFlag("ask") === true) mode = "ask";
+		announceWork = false;
 
 		workTools = undefined;
 		if (mode === "ask") {
@@ -240,24 +325,7 @@ export default function modesExtension(pi: ExtensionAPI): void {
 			workTools = pi.getActiveTools();
 			pi.setActiveTools(askToolset());
 		}
+		installFooter(ctx);
 		updateStatus(ctx);
 	});
 }
-
-/** True for the hidden ask-mode prompt and for user messages that carry it. */
-function isAskContext(message: AgentMessage): boolean {
-	const candidate = message as AgentMessage & { customType?: string };
-	if (candidate.customType === CONTEXT_CUSTOM_TYPE) return true;
-	if (candidate.role === "assistant") return false;
-	const content = (candidate as { content?: unknown }).content;
-	if (typeof content === "string") return content.includes(CONTEXT_MARKER);
-	if (!Array.isArray(content)) return false;
-	return content.some(
-		(part) =>
-			!!part &&
-			typeof part === "object" &&
-			(part as { type?: unknown }).type === "text" &&
-			typeof (part as { text?: unknown }).text === "string" &&
-			(part as { text: string }).text.includes(CONTEXT_MARKER),
-	);
-}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sassywares/pi-extensions",
-  "version": "0.3.21",
+  "version": "0.3.23",
   "description": "A zesty power pack for pi: auto-titled sessions, real web access, clean handoffs, isolated subagents, and ask/work modes.",
   "type": "module",
   "license": "MIT",
@@ -36,6 +36,7 @@
   },
   "peerDependencies": {
     "@earendil-works/pi-coding-agent": "*",
+    "@earendil-works/pi-tui": "*",
     "typebox": "*"
   },
   "pi": {