gsd-pi 2.74.0 → 2.75.0-dev.fd2382b9f

package/packages/pi-coding-agent/src/core/model-registry-env-fallback.test.ts

@@ -0,0 +1,59 @@
+import assert from "node:assert/strict";
+import { describe, it } from "node:test";
+import type { AuthStorage } from "./auth-storage.js";
+import { ModelRegistry } from "./model-registry.js";
+
+function createRegistryWithCapturedResolver() {
+	let capturedResolver: ((provider: string) => string | undefined) | undefined;
+	const authStorage = {
+		setFallbackResolver: (resolver: (provider: string) => string | undefined) => {
+			capturedResolver = resolver;
+		},
+		onCredentialChange: () => {},
+		getOAuthProviders: () => [],
+		get: () => undefined,
+		hasAuth: () => false,
+		getApiKey: async () => undefined,
+	} as unknown as AuthStorage;
+
+	new ModelRegistry(authStorage, undefined);
+	assert.ok(capturedResolver, "ModelRegistry should register a fallback resolver");
+	return capturedResolver!;
+}
+
+describe("ModelRegistry env fallback resolver (#3782)", () => {
+	it("falls back to built-in provider env vars when models.json has no custom key", () => {
+		const prev = process.env.MINIMAX_API_KEY;
+		process.env.MINIMAX_API_KEY = "minimax-env-test-key";
+
+		try {
+			const resolver = createRegistryWithCapturedResolver();
+			assert.equal(
+				resolver("minimax"),
+				"minimax-env-test-key",
+				"fallback resolver should return built-in provider env keys",
+			);
+		} finally {
+			if (prev === undefined) {
+				delete process.env.MINIMAX_API_KEY;
+			} else {
+				process.env.MINIMAX_API_KEY = prev;
+			}
+		}
+	});
+
+	it("still returns undefined when no custom or built-in env key exists", () => {
+		const prev = process.env.MINIMAX_API_KEY;
+		delete process.env.MINIMAX_API_KEY;
+
+		try {
+			const resolver = createRegistryWithCapturedResolver();
+			assert.equal(resolver("minimax"), undefined);
+			assert.equal(resolver("totally-unknown-provider"), undefined);
+		} finally {
+			if (prev !== undefined) {
+				process.env.MINIMAX_API_KEY = prev;
+			}
+		}
+	});
+});

package/packages/pi-coding-agent/src/core/model-registry.ts

@@ -8,6 +8,7 @@ import {
 	type AssistantMessageEventStream,
 	type Context,
 	getApiProvider,
+	getEnvApiKey,
 	getModels,
 	getProviders,
 	type KnownProvider,
@@ -245,7 +246,7 @@ export class ModelRegistry {
 			if (keyConfig) {
 				return resolveConfigValue(keyConfig);
 			}
-			return undefined;
+			return getEnvApiKey(provider);
 		});
 
 		// Refresh models when credentials change (e.g., OAuth token refresh with new model limits)

package/packages/pi-coding-agent/src/core/sdk.ts

@@ -1,5 +1,17 @@
+import { existsSync } from "node:fs";
 import { join } from "node:path";
 
+/**
+ * Lightweight PATH scan for the `claude` binary — no subprocess, no network.
+ * Mirrors the check in src/resources/extensions/gsd/doctor-providers.ts so the
+ * legacy Anthropic OAuth self-heal path can only trigger when the user has a
+ * working Claude Code CLI to fall back to.
+ */
+function isClaudeCodeBinaryInPath(): boolean {
+	const pathDirs = (process.env.PATH ?? "").split(":");
+	return pathDirs.some((dir) => dir && existsSync(join(dir, "claude")));
+}
+
 /**
  * Structured error thrown when all credentials for a provider are in a
  * backoff window.  Carries typed metadata so callers (e.g. the auto-loop)
@@ -438,6 +450,35 @@ export async function createAgentSession(options: CreateAgentSessionOptions = {}
 			// the retry handler and creating cascading error entries (#3429).
 			const hasAuth = modelRegistry.authStorage.hasAuth(resolvedProvider);
 			if (hasAuth) {
+				// Anthropic OAuth was removed in v2.74.0 for TOS compliance (#3952).
+				// Users who upgraded from an older version may still have OAuth
+				// credentials in auth.json that will never resolve to a valid API key.
+				if (
+					resolvedProvider === "anthropic" &&
+					modelRegistry.authStorage.hasLegacyOAuthCredential(resolvedProvider)
+				) {
+					// Self-heal: strip the stale oauth entry so hasAuth() stops lying
+					// about anthropic being configured. This preserves any api_key
+					// credentials alongside it.
+					const removed = modelRegistry.authStorage.removeLegacyOAuthCredential(resolvedProvider);
+					if (removed) {
+						console.warn(
+							`[auth] Removed unsupported Anthropic OAuth credential from auth.json (#3952).`,
+						);
+					}
+					if (isClaudeCodeBinaryInPath()) {
+						throw new Error(
+							`Removed stale Anthropic OAuth credential (OAuth support removed in v2.74.0). ` +
+								`Your current model's provider is set to "anthropic" but the local Claude Code CLI ` +
+								`is available — switch the model's provider to "claude-code" in your preferences ` +
+								`to use it, or set ANTHROPIC_API_KEY to continue with the Anthropic API directly.`,
+						);
+					}
+					throw new Error(
+						`Removed stale Anthropic OAuth credential (OAuth support removed in v2.74.0). ` +
+							`Set ANTHROPIC_API_KEY, run '/login' and paste an API key, or switch to a different provider.`,
+					);
+				}
 				const expiry = modelRegistry.authStorage.getEarliestBackoffExpiry(resolvedProvider);
 				const retryAfterMs = expiry !== undefined ? Math.max(0, expiry - Date.now()) : undefined;
 				throw new CredentialCooldownError(resolvedProvider, retryAfterMs);

package/packages/pi-coding-agent/src/core/skill-tool.test.ts

@@ -15,7 +15,7 @@ import { SettingsManager } from "./settings-manager.js";
 let testDir: string;
 
 function writeSkill(cwd: string, name: string, description: string, body = `# ${name}\n`): string {
-	const skillDir = join(cwd, ".pi", "skills", name);
+	const skillDir = join(cwd, ".agents", "skills", name);
 	mkdirSync(skillDir, { recursive: true });
 	const skillPath = join(skillDir, "SKILL.md");
 	writeFileSync(skillPath, `---\nname: ${name}\ndescription: ${description}\n---\n\n${body}`);
@@ -71,7 +71,7 @@ describe("Skill tool", () => {
 		const result = await tool.execute("call-1", { skill: "swift-testing" });
 		assert.equal(
 			result.content[0]?.type === "text" ? result.content[0].text : "",
-			`<skill name="swift-testing" location="${skillPath}">\nReferences are relative to ${join(testDir, ".pi", "skills", "swift-testing")}.\n\n# Swift Testing\nUse this skill.\n</skill>`,
+			`<skill name="swift-testing" location="${skillPath}">\nReferences are relative to ${join(testDir, ".agents", "skills", "swift-testing")}.\n\n# Swift Testing\nUse this skill.\n</skill>`,
 		);
 	});
 

package/packages/pi-coding-agent/src/modes/interactive/components/__tests__/chat-frame-compaction-tone.test.ts

@@ -0,0 +1,92 @@
+import { test, describe } from "node:test";
+import assert from "node:assert/strict";
+import stripAnsi from "strip-ansi";
+import { renderChatFrame } from "../chat-frame.js";
+import { initTheme } from "../../theme/theme.js";
+
+initTheme("dark", false);
+
+// Regression tests for the "compaction" tone added to renderChatFrame.
+// The compaction notice shares the same visual frame as user / assistant
+// messages (top rule, `• label` header, `│ ` body prefix) but uses the
+// purple `customMessageLabel` color key so it is visually distinct from
+// conversation turns.
+
+describe("renderChatFrame — compaction tone", () => {
+	test("produces a top rule, `• compaction` header row, and a │ body margin", () => {
+		const lines = renderChatFrame(
+			["Compacted from 1,224,262 tokens (ctrl+o to expand)"],
+			60,
+			{
+				label: "compaction",
+				tone: "compaction",
+				timestampFormat: "date-time-iso",
+				showTimestamp: false,
+			},
+		);
+
+		// Structure: top rule, header, body line(s)
+		assert.ok(lines.length >= 3, `expected at least 3 frame lines, got ${lines.length}`);
+
+		const plain = lines.map((line) => stripAnsi(line));
+
+		// Top rule is a solid horizontal bar
+		assert.match(plain[0], /^─+$/, "first line should be the solid top rule");
+
+		// Header row contains `• compaction`
+		assert.ok(
+			plain[1].includes("• compaction"),
+			`expected header to contain "• compaction", got ${JSON.stringify(plain[1])}`,
+		);
+
+		// Body line(s) start with `│ `
+		assert.ok(
+			plain[2].startsWith("│ "),
+			`expected body line to start with "│ ", got ${JSON.stringify(plain[2])}`,
+		);
+		assert.ok(
+			plain[2].includes("Compacted from 1,224,262 tokens"),
+			"body line should include the original content",
+		);
+	});
+
+	test("does not render a right-aligned timestamp when showTimestamp is false", () => {
+		const lines = renderChatFrame(["body"], 60, {
+			label: "compaction",
+			tone: "compaction",
+			timestamp: Date.now(),
+			timestampFormat: "date-time-iso",
+			showTimestamp: false,
+		});
+
+		const header = stripAnsi(lines[1]);
+		// No four-digit year should appear anywhere in the header row
+		assert.ok(
+			!/\b20\d{2}\b/.test(header),
+			`timestamp should be suppressed when showTimestamp=false, got ${JSON.stringify(header)}`,
+		);
+	});
+
+	test("emits ANSI color codes distinct from the assistant tone", () => {
+		const assistantFrame = renderChatFrame(["body"], 60, {
+			label: "claude",
+			tone: "assistant",
+			timestampFormat: "date-time-iso",
+			showTimestamp: false,
+		}).join("\n");
+
+		const compactionFrame = renderChatFrame(["body"], 60, {
+			label: "compaction",
+			tone: "compaction",
+			timestampFormat: "date-time-iso",
+			showTimestamp: false,
+		}).join("\n");
+
+		// Both frames carry ANSI; the compaction frame should not be identical
+		// to the assistant frame (different color mappings).
+		assert.ok(
+			assistantFrame !== compactionFrame,
+			"compaction tone must produce a different styled output than assistant tone",
+		);
+	});
+});

package/packages/pi-coding-agent/src/modes/interactive/components/__tests__/tool-execution.test.ts

@@ -48,6 +48,25 @@ function renderToolCollapsed(
 }
 
 describe("ToolExecutionComponent", () => {
+	test("renders framed header with Running status while tool is partial", () => {
+		const rendered = renderToolCollapsed("mcp__demo__do_thing", { ok: true });
+
+		assert.match(rendered, /Tool demo\u00b7do_thing/);
+		assert.match(rendered, /Running/);
+	});
+
+	test("renders framed header with Error status for failed tool result", () => {
+		const rendered = renderTool(
+			"mcp__demo__do_thing",
+			{ ok: true },
+			{ content: [{ type: "text", text: "boom" }], isError: true },
+		);
+
+		assert.match(rendered, /Tool demo\u00b7do_thing/);
+		assert.match(rendered, /Error/);
+		assert.match(rendered, /boom/);
+	});
+
 	test("renders capitalized Claude Code Bash tool names with bash output instead of generic args JSON", () => {
 		const rendered = renderTool(
 			"Bash",

package/packages/pi-coding-agent/src/modes/interactive/components/assistant-message.ts

@@ -1,7 +1,8 @@
 import type { AssistantMessage } from "@gsd/pi-ai";
 import { Container, Markdown, type MarkdownTheme, Spacer, Text } from "@gsd/pi-tui";
 import { getMarkdownTheme, theme } from "../theme/theme.js";
-import { formatTimestamp, type TimestampFormat } from "./timestamp.js";
+import { type TimestampFormat } from "./timestamp.js";
+import { renderChatFrame } from "./chat-frame.js";
 
 export interface ContentRange {
 	startIndex: number;
@@ -89,10 +90,10 @@ export class AssistantMessageComponent extends Container {
 		);
 		const hasTextContent = message.content.some((c) => c.type === "text" && c.text.trim().length > 0);
 		const hasToolContent = message.content.some((c) => c.type === "toolCall" || c.type === "serverToolUse");
-
-		if (hasVisibleContent) {
-			this.contentContainer.addChild(new Spacer(1));
-		}
+		// Claude Code often emits long reasoning blocks ahead of user-visible text/tool
+		// output in the same lifecycle. Keep chat output visible without requiring a
+		// manual thinking toggle every turn.
+		const shouldCapThinking = hasTextContent || hasToolContent || message.provider === "claude-code";
 
 		// Render content in order; non-text/thinking blocks are silently skipped
 		for (let i = 0; i < slice.length; i++) {
@@ -122,7 +123,7 @@ export class AssistantMessageComponent extends Container {
 					});
 					// Keep visible chat output readable when thinking traces are long.
 					// Tool-bearing turns can stream text in a later assistant message.
-					if (hasTextContent || hasToolContent) {
+					if (shouldCapThinking) {
 						thinkingMarkdown.maxLines = 8;
 					}
 					this.contentContainer.addChild(thinkingMarkdown);
@@ -156,10 +157,24 @@ export class AssistantMessageComponent extends Container {
 				}
 			}
 
-			if (message.stopReason && message.timestamp) {
-				const timeStr = formatTimestamp(message.timestamp, this.timestampFormat);
-				this.contentContainer.addChild(new Text(theme.fg("dim", timeStr), 1, 0));
-			}
 		}
 	}
+
+	override render(width: number): string[] {
+		const frameWidth = Math.max(20, width);
+		const contentWidth = Math.max(1, frameWidth - 4);
+		const lines = super.render(contentWidth);
+		const headerLabel = this.lastMessage?.model ? `GSD - ${this.lastMessage.model}` : "GSD";
+		const framed = renderChatFrame(lines, frameWidth, {
+			label: headerLabel,
+			tone: "assistant",
+			timestamp: this.lastMessage?.timestamp,
+			timestampFormat: this.timestampFormat,
+			showTimestamp: this.showMetadata,
+		});
+		if (framed.length === 0) {
+			return framed;
+		}
+		return ["", ...framed];
+	}
 }

package/packages/pi-coding-agent/src/modes/interactive/components/chat-frame.ts

@@ -0,0 +1,87 @@
+import { truncateToWidth, visibleWidth } from "@gsd/pi-tui";
+import { theme } from "../theme/theme.js";
+import { formatTimestamp, type TimestampFormat } from "./timestamp.js";
+
+type FrameTone = "assistant" | "user" | "compaction";
+
+function trimOuterBlankLines(lines: string[]): string[] {
+	let start = 0;
+	let end = lines.length;
+	while (start < end && lines[start].trim().length === 0) start++;
+	while (end > start && lines[end - 1].trim().length === 0) end--;
+	return lines.slice(start, end);
+}
+
+export function renderChatFrame(
+	contentLines: string[],
+	width: number,
+	opts: {
+		label: string;
+		tone: FrameTone;
+		timestamp?: number;
+		timestampFormat: TimestampFormat;
+		showTimestamp?: boolean;
+	},
+): string[] {
+	const outerWidth = Math.max(20, width);
+	const contentWidth = Math.max(1, outerWidth - 2); // "│ " + content
+	const borderColor =
+		opts.tone === "user"
+			? "border"
+			: opts.tone === "compaction"
+				? "customMessageLabel"
+				: "borderAccent";
+	const borderMuted =
+		opts.tone === "compaction" ? "customMessageLabel" : "borderMuted";
+	const border = (s: string) => theme.fg(borderColor, s);
+	const leftRaw = `• ${opts.label}`;
+	const rightRaw =
+		opts.showTimestamp === false || !opts.timestamp
+			? ""
+			: formatTimestamp(opts.timestamp, opts.timestampFormat);
+
+	const leftBudget = rightRaw
+		? Math.max(1, outerWidth - visibleWidth(rightRaw) - 1)
+		: outerWidth;
+	const left = truncateToWidth(leftRaw, leftBudget, "");
+	const labelColor =
+		opts.tone === "user"
+			? "border"
+			: opts.tone === "compaction"
+				? "customMessageLabel"
+				: "borderAccent";
+	const dashIdx = left.indexOf(" - ");
+	const leftStyled =
+		dashIdx >= 0
+			? theme.fg(labelColor, theme.bold(left.slice(0, dashIdx))) +
+				theme.fg("dim", left.slice(dashIdx))
+			: theme.fg(labelColor, theme.bold(left));
+	const rightStyled = rightRaw ? theme.fg("dim", rightRaw) : "";
+	const gap =
+		rightRaw.length > 0
+			? Math.max(
+					1,
+					outerWidth - visibleWidth(leftStyled) - visibleWidth(rightStyled),
+				)
+			: Math.max(0, outerWidth - visibleWidth(leftStyled));
+	const headerRow = `${leftStyled}${" ".repeat(gap)}${rightStyled}`;
+	const headerPad = Math.max(0, outerWidth - visibleWidth(headerRow));
+
+	const sourceLines = trimOuterBlankLines(contentLines);
+	const bodyColor =
+		opts.tone === "user"
+			? "userMessageText"
+			: opts.tone === "compaction"
+				? "customMessageText"
+				: "assistantMessageText";
+	const bodyLines = (sourceLines.length > 0 ? sourceLines : [""]).map((line) => {
+		const clipped = truncateToWidth(line, contentWidth, "");
+		return border("│ ") + theme.fg(bodyColor, clipped);
+	});
+
+	return [
+		theme.fg(borderMuted, "─".repeat(outerWidth)),
+		headerRow + " ".repeat(headerPad),
+		...bodyLines,
+	];
+}

package/packages/pi-coding-agent/src/modes/interactive/components/compaction-summary-message.ts

@@ -1,41 +1,46 @@
-import { Box, Markdown, type MarkdownTheme, Spacer, Text } from "@gsd/pi-tui";
+import { Container, Markdown, type MarkdownTheme, Text } from "@gsd/pi-tui";
 import type { CompactionSummaryMessage } from "../../../core/messages.js";
 import { getMarkdownTheme, theme } from "../theme/theme.js";
+import { renderChatFrame } from "./chat-frame.js";
 import { editorKey } from "./keybinding-hints.js";
 
 /**
- * Component that renders a compaction message with collapsed/expanded state.
- * Uses same background color as custom messages for visual consistency.
+ * Renders a compaction notice in the shared chat-frame style (top rule,
+ * `• compaction` header, `│ ` body margin) with purple border/label so it
+ * visually matches the other framed messages (user / assistant / tool
+ * execution) while standing apart from the conversation flow.
  */
-export class CompactionSummaryMessageComponent extends Box {
+export class CompactionSummaryMessageComponent extends Container {
 	private expanded = false;
 	private message: CompactionSummaryMessage;
 	private markdownTheme: MarkdownTheme;
 
-	constructor(message: CompactionSummaryMessage, markdownTheme: MarkdownTheme = getMarkdownTheme()) {
-		super(1, 1, (t) => theme.bg("customMessageBg", t));
+	constructor(
+		message: CompactionSummaryMessage,
+		markdownTheme: MarkdownTheme = getMarkdownTheme(),
+	) {
+		super();
 		this.message = message;
 		this.markdownTheme = markdownTheme;
-		this.updateDisplay();
+		this.rebuild();
 	}
 
 	setExpanded(expanded: boolean): void {
-		this.expanded = expanded;
-		this.updateDisplay();
+		if (this.expanded !== expanded) {
+			this.expanded = expanded;
+			this.rebuild();
+		}
 	}
 
 	override invalidate(): void {
 		super.invalidate();
-		this.updateDisplay();
+		this.rebuild();
 	}
 
-	private updateDisplay(): void {
+	private rebuild(): void {
 		this.clear();
 
 		const tokenStr = this.message.tokensBefore.toLocaleString();
-		const label = theme.fg("customMessageLabel", theme.bold("[compaction]"));
-		this.addChild(new Text(label, 0, 0));
-		this.addChild(new Spacer(1));
 
 		if (this.expanded) {
 			const header = `**Compacted from ${tokenStr} tokens**\n\n`;
@@ -47,7 +52,10 @@ export class CompactionSummaryMessageComponent extends Box {
 		} else {
 			this.addChild(
 				new Text(
-					theme.fg("customMessageText", `Compacted from ${tokenStr} tokens (`) +
+					theme.fg(
+						"customMessageText",
+						`Compacted from ${tokenStr} tokens (`,
+					) +
 						theme.fg("dim", editorKey("expandTools")) +
 						theme.fg("customMessageText", " to expand)"),
 					0,
@@ -56,4 +64,17 @@ export class CompactionSummaryMessageComponent extends Box {
 			);
 		}
 	}
+
+	override render(width: number): string[] {
+		const frameWidth = Math.max(20, width);
+		const contentWidth = Math.max(1, frameWidth - 4);
+		const lines = super.render(contentWidth);
+		const framed = renderChatFrame(lines, frameWidth, {
+			label: "compaction",
+			tone: "compaction",
+			timestampFormat: "date-time-iso",
+			showTimestamp: false,
+		});
+		return framed.length > 0 ? ["", ...framed] : framed;
+	}
 }

package/packages/pi-coding-agent/src/modes/interactive/components/footer.ts

@@ -114,15 +114,20 @@ export class FooterComponent implements Component {
 		// Build stats line as separate groups joined by a dim middle-dot separator
 		const sep = ` ${theme.fg("dim", "\u00B7")} `;
 
-		// Group 1: token I/O
+		// Group 1: total tokens.
 		const tokenGroup: string[] = [];
-		if (totalInput) tokenGroup.push(`↑${formatTokens(totalInput)}`);
-		if (totalOutput) tokenGroup.push(`↓${formatTokens(totalOutput)}`);
+		const totalTokens = totalInput + totalOutput + totalCacheRead + totalCacheWrite;
+		if (totalTokens > 0) tokenGroup.push(formatTokens(totalTokens));
 
-		// Group 2: cache metrics
+		// Group 2: cache efficiency — cacheRead / all input-side tokens.
+		// Collapses the old cr/cw pair into a single "how much was served
+		// from cache" signal. cr/cw breakdown moved to `/stats`.
 		const cacheGroup: string[] = [];
-		if (totalCacheRead) cacheGroup.push(`cr:${formatTokens(totalCacheRead)}`);
-		if (totalCacheWrite) cacheGroup.push(`cw:${formatTokens(totalCacheWrite)}`);
+		const inputSide = totalInput + totalCacheRead + totalCacheWrite;
+		if (totalCacheRead > 0 && inputSide > 0) {
+			const cachedPct = Math.round((totalCacheRead / inputSide) * 100);
+			cacheGroup.push(`${cachedPct}% cached`);
+		}
 
 		// Group 3: cost
 		const costGroup: string[] = [];
@@ -140,20 +145,27 @@ export class FooterComponent implements Component {
 			}
 		}
 
-		// Group 4: context percentage (colorized)
-		let contextPercentStr: string;
+		// Group 4: context bar + percentage (mirrors /gsd auto dashboard style).
+		// Bar colors track the same thresholds as the percent text.
 		const autoIndicator = this.autoCompactEnabled ? " (auto)" : "";
-		const contextPercentDisplay =
-			contextPercent === "?"
-				? `?/${formatTokens(contextWindow)}${autoIndicator}`
-				: `${contextPercent}%/${formatTokens(contextWindow)}${autoIndicator}`;
-		if (contextPercentValue > 90) {
-			contextPercentStr = theme.fg("error", contextPercentDisplay);
-		} else if (contextPercentValue > 70) {
-			contextPercentStr = theme.fg("warning", contextPercentDisplay);
-		} else {
-			contextPercentStr = contextPercentDisplay;
-		}
+		const barColor: "error" | "warning" | "success" =
+			contextPercentValue > 90 ? "error" : contextPercentValue > 70 ? "warning" : "success";
+		const BAR_WIDTH = 8;
+		const filled = contextUsage?.percent !== null
+			? Math.max(0, Math.min(BAR_WIDTH, Math.round((contextPercentValue / 100) * BAR_WIDTH)))
+			: 0;
+		const bar =
+			theme.fg(barColor, "━".repeat(filled)) +
+			theme.fg("dim", "─".repeat(Math.max(0, BAR_WIDTH - filled)));
+		const pctText = contextPercent === "?" ? "?" : `${contextPercent}%`;
+		const suffix = `/${formatTokens(contextWindow)}${autoIndicator}`;
+		const colorizedPct =
+			contextPercentValue > 90
+				? theme.fg("error", pctText)
+				: contextPercentValue > 70
+					? theme.fg("warning", pctText)
+					: pctText;
+		const contextPercentStr = `${bar} ${colorizedPct}${suffix}`;
 
 		// Assemble groups: items within a group are space-separated,
 		// groups are separated by a dim middle-dot
@@ -226,21 +238,31 @@ export class FooterComponent implements Component {
 		const remainder = statsLine.slice(statsLeft.length); // padding + rightSide
 		const dimRemainder = theme.fg("dim", remainder);
 
-		const pwdLine = truncateToWidth(theme.fg("dim", pwd), width, theme.fg("dim", "..."));
-		const lines = [pwdLine, dimStatsLeft + dimRemainder];
-
-		// Add extension statuses on a single line, sorted by key alphabetically
+		// Extension statuses right-aligned on the pwd line (sorted by key).
+		// Keeps the footer compact by avoiding a dedicated row when the content
+		// fits alongside pwd. Falls back to pwd-only if the combined line would
+		// exceed width.
 		const extensionStatuses = this.footerData.getExtensionStatuses();
-		if (extensionStatuses.size > 0) {
-			const sortedStatuses = Array.from(extensionStatuses.entries())
-				.sort(([a], [b]) => a.localeCompare(b))
-				.map(([, text]) => sanitizeStatusText(text));
-			const statusLine = sortedStatuses.join(" ");
-			// Match the rest of the footer styling: extension statuses should render
-			// in the same dim color as pwd/stats, with a dim ellipsis on truncation.
-			lines.push(truncateToWidth(theme.fg("dim", statusLine), width, theme.fg("dim", "...")));
+		const extStatusText =
+			extensionStatuses.size > 0
+				? Array.from(extensionStatuses.entries())
+						.sort(([a], [b]) => a.localeCompare(b))
+						.map(([, text]) => sanitizeStatusText(text))
+						.join(" ")
+				: "";
+
+		const pwdWidth = visibleWidth(pwd);
+		const extWidth = visibleWidth(extStatusText);
+		let pwdLine: string;
+		if (extStatusText && pwdWidth + 2 + extWidth <= width) {
+			const padding = " ".repeat(width - pwdWidth - extWidth);
+			pwdLine = theme.fg("dim", pwd + padding + extStatusText);
+		} else {
+			pwdLine = truncateToWidth(theme.fg("dim", pwd), width, theme.fg("dim", "..."));
 		}
 
+		const lines = [pwdLine, dimStatsLeft + dimRemainder];
+
 		return lines;
 	}
 }