lsd-pi 1.0.0 → 1.1.0

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

@@ -1622,7 +1622,7 @@ export class DefaultPackageManager implements PackageManager {
 
 		const userDirs = {
 			extensions: join(globalBaseDir, "extensions"),
-			skills: join(globalBaseDir, "skills"),
+			skills: join(homedir(), CONFIG_DIR_NAME, "skills"),
 			prompts: join(globalBaseDir, "prompts"),
 			themes: join(globalBaseDir, "themes"),
 		};
@@ -1701,16 +1701,16 @@ export class DefaultPackageManager implements PackageManager {
 			);
 		}
 		{
-			// Ecosystem skills (~/.agents/skills/) take priority over legacy config-dir skills.
-			// Skip legacy dir entirely when migration has completed (marker file present).
+			// Preferred global skills live in ~/.lsd/skills/. Keep ~/.agents/skills/
+			// and ~/.lsd/agent/skills as compatibility fallbacks so existing installs still work.
+			const legacySkillsDir = join(homedir(), CONFIG_DIR_NAME, "agent", "skills");
 			const legacySkillsMigrated =
-				resolve(userDirs.skills) !== resolve(userAgentsSkillsDir) &&
-				existsSync(join(userDirs.skills, ".migrated-to-agents"));
+				resolve(userDirs.skills) !== resolve(legacySkillsDir) &&
+				existsSync(join(legacySkillsDir, ".migrated-to-lsd-skills"));
 			const legacyUserSkillEntries =
-				!legacySkillsMigrated && userSubdirs.has("skills")
-					? collectAutoSkillEntries(userDirs.skills)
-					: [];
+				!legacySkillsMigrated && existsSync(legacySkillsDir) ? collectAutoSkillEntries(legacySkillsDir) : [];
 			const skillEntries = [
+				...collectAutoSkillEntries(userDirs.skills),
 				...collectAutoSkillEntries(userAgentsSkillsDir),
 				...legacyUserSkillEntries,
 			];

package/packages/pi-coding-agent/src/core/resource-loader-lsd-md.test.ts

@@ -0,0 +1,67 @@
+import assert from "node:assert/strict";
+import { mkdirSync, mkdtempSync, rmSync, writeFileSync } from "node:fs";
+import { tmpdir } from "node:os";
+import { join } from "node:path";
+import test from "node:test";
+
+import { DefaultResourceLoader } from "./resource-loader.js";
+import { SettingsManager } from "./settings-manager.js";
+
+test("resource loader reads global lsd.md from the app root", async (t) => {
+	const tmp = mkdtempSync(join(tmpdir(), "resource-loader-lsd-md-"));
+	t.after(() => rmSync(tmp, { recursive: true, force: true }));
+
+	const appRoot = join(tmp, ".lsd");
+	const agentDir = join(appRoot, "agent");
+	const cwd = join(tmp, "project");
+	mkdirSync(agentDir, { recursive: true });
+	mkdirSync(cwd, { recursive: true });
+	writeFileSync(join(appRoot, "lsd.md"), "# global lsd\n", "utf-8");
+
+	const loader = new DefaultResourceLoader({
+		cwd,
+		agentDir,
+		settingsManager: SettingsManager.inMemory(),
+		noExtensions: true,
+		noSkills: true,
+		noPromptTemplates: true,
+		noThemes: true,
+	});
+	await loader.reload();
+
+	const contextFiles = loader.getAgentsFiles().agentsFiles;
+	assert.equal(contextFiles.length, 1);
+	assert.equal(contextFiles[0]?.path, join(appRoot, "lsd.md"));
+	assert.equal(contextFiles[0]?.content, "# global lsd\n");
+});
+
+test("resource loader reads ancestor .lsd/lsd.md before AGENTS.md in the same directory", async (t) => {
+	const tmp = mkdtempSync(join(tmpdir(), "resource-loader-lsd-md-"));
+	t.after(() => rmSync(tmp, { recursive: true, force: true }));
+
+	const appRoot = join(tmp, ".lsd");
+	const agentDir = join(appRoot, "agent");
+	const projectRoot = join(tmp, "project");
+	const cwd = join(projectRoot, "src", "feature");
+	mkdirSync(agentDir, { recursive: true });
+	mkdirSync(join(projectRoot, ".lsd"), { recursive: true });
+	mkdirSync(cwd, { recursive: true });
+	writeFileSync(join(projectRoot, ".lsd", "lsd.md"), "# project lsd\n", "utf-8");
+	writeFileSync(join(projectRoot, "AGENTS.md"), "# agents fallback\n", "utf-8");
+
+	const loader = new DefaultResourceLoader({
+		cwd,
+		agentDir,
+		settingsManager: SettingsManager.inMemory(),
+		noExtensions: true,
+		noSkills: true,
+		noPromptTemplates: true,
+		noThemes: true,
+	});
+	await loader.reload();
+
+	const contextFiles = loader.getAgentsFiles().agentsFiles;
+	assert.equal(contextFiles.length, 1);
+	assert.equal(contextFiles[0]?.path, join(projectRoot, ".lsd", "lsd.md"));
+	assert.equal(contextFiles[0]?.content, "# project lsd\n");
+});

package/packages/pi-coding-agent/src/core/resource-loader.ts

@@ -54,19 +54,36 @@ function resolvePromptInput(input: string | undefined, description: string): str
 	return input;
 }
 
+function tryReadContextFile(filePath: string): { path: string; content: string } | null {
+	if (!existsSync(filePath)) {
+		return null;
+	}
+	try {
+		return {
+			path: filePath,
+			content: readFileSync(filePath, "utf-8"),
+		};
+	} catch (error) {
+		console.error(chalk.yellow(`Warning: Could not read ${filePath}: ${error}`));
+		return null;
+	}
+}
+
 function loadContextFileFromDir(dir: string): { path: string; content: string } | null {
-	const candidates = ["AGENTS.md", "CLAUDE.md"];
-	for (const filename of candidates) {
-		const filePath = join(dir, filename);
-		if (existsSync(filePath)) {
-			try {
-				return {
-					path: filePath,
-					content: readFileSync(filePath, "utf-8"),
-				};
-			} catch (error) {
-				console.error(chalk.yellow(`Warning: Could not read ${filePath}: ${error}`));
-			}
+	const candidates = [
+		join(dir, "lsd.md"),
+		join(dir, ".lsd", "lsd.md"),
+		join(dir, CONFIG_DIR_NAME, "lsd.md"),
+		join(dir, "LSD.md"),
+		join(dir, ".lsd", "LSD.md"),
+		join(dir, CONFIG_DIR_NAME, "LSD.md"),
+		join(dir, "AGENTS.md"),
+		join(dir, "CLAUDE.md"),
+	];
+	for (const filePath of new Set(candidates)) {
+		const loaded = tryReadContextFile(filePath);
+		if (loaded) {
+			return loaded;
 		}
 	}
 	return null;
@@ -81,7 +98,8 @@ function loadProjectContextFiles(
 	const contextFiles: Array<{ path: string; content: string }> = [];
 	const seenPaths = new Set<string>();
 
-	const globalContext = loadContextFileFromDir(resolvedAgentDir);
+	const appRootDir = resolve(resolvedAgentDir, "..");
+	const globalContext = loadContextFileFromDir(appRootDir) ?? loadContextFileFromDir(resolvedAgentDir);
 	if (globalContext) {
 		contextFiles.push(globalContext);
 		seenPaths.add(globalContext.path);
@@ -777,6 +795,7 @@ export class DefaultResourceLoader implements ResourceLoader {
 		}
 
 		const agentRoots = [
+			join(homedir(), CONFIG_DIR_NAME, "skills"),
 			join(this.agentDir, "skills"),
 			join(this.agentDir, "prompts"),
 			join(this.agentDir, "themes"),

package/packages/pi-coding-agent/src/core/settings-manager.ts

@@ -13,7 +13,8 @@ import type { BashInterceptorRule } from "./tools/bash-interceptor.js";
 
 export interface CompactionSettings {
 	enabled?: boolean; // default: true
-	reserveTokens?: number; // default: 16384
+	thresholdPercent?: number; // default: 85
+	reserveTokens?: number; // default: 16384 (used for compaction summary generation budget)
 	keepRecentTokens?: number; // default: 20000
 }
 
@@ -113,7 +114,8 @@ export interface Settings {
 	lastChangelogVersion?: string;
 	defaultProvider?: string;
 	defaultModel?: string;
-	permissionMode?: "danger-full-access" | "accept-on-edit" | "auto";
+	budgetSubagentModel?: string;
+	permissionMode?: "danger-full-access" | "accept-on-edit" | "auto" | "plan";
 	classifierModel?: string;
 	defaultThinkingLevel?: "off" | "minimal" | "low" | "medium" | "high" | "xhigh";
 	transport?: TransportSetting; // default: "sse"
@@ -154,6 +156,7 @@ export interface Settings {
 	modelDiscovery?: ModelDiscoverySettings;
 	editMode?: "standard" | "hashline"; // Edit tool mode: "standard" (text match) or "hashline" (LINE#ID anchors). Default: "standard"
 	timestampFormat?: "date-time-iso" | "date-time-us"; // Timestamp display format for messages. Default: "date-time-iso"
+	toolOutputMode?: "minimal" | "normal"; // Collapsed tool rendering mode. "minimal" hides previews until expanded.
 }
 
 /** Deep merge settings: project/overrides take precedence, nested objects merge recursively */
@@ -658,7 +661,11 @@ export class SettingsManager {
 		return this.settings.defaultModel;
 	}
 
-	getPermissionMode(): "danger-full-access" | "accept-on-edit" | "auto" {
+	getBudgetSubagentModel(): string | undefined {
+		return this.settings.budgetSubagentModel;
+	}
+
+	getPermissionMode(): "danger-full-access" | "accept-on-edit" | "auto" | "plan" {
 		return this.settings.permissionMode ?? "accept-on-edit";
 	}
 
@@ -674,7 +681,17 @@ export class SettingsManager {
 		this.setScopedSetting("defaultModel", modelId);
 	}
 
-	setPermissionMode(mode: "danger-full-access" | "accept-on-edit" | "auto"): void {
+	setBudgetSubagentModel(modelRef: string | undefined): void {
+		if (modelRef === undefined) {
+			delete this.globalSettings.budgetSubagentModel;
+			this.markModified("budgetSubagentModel");
+			this.save();
+			return;
+		}
+		this.setGlobalSetting("budgetSubagentModel", modelRef);
+	}
+
+	setPermissionMode(mode: "danger-full-access" | "accept-on-edit" | "auto" | "plan"): void {
 		this.setGlobalSetting("permissionMode", mode);
 	}
 
@@ -752,6 +769,14 @@ export class SettingsManager {
 		this.setNestedGlobalSetting("compaction", "enabled", enabled);
 	}
 
+	setCompactionThresholdPercent(percent: number): void {
+		this.setNestedGlobalSetting("compaction", "thresholdPercent", percent);
+	}
+
+	getCompactionThresholdPercent(): number {
+		return this.settings.compaction?.thresholdPercent ?? 85;
+	}
+
 	getCompactionReserveTokens(): number {
 		return this.settings.compaction?.reserveTokens ?? COMPACTION_RESERVE_TOKENS;
 	}
@@ -760,11 +785,12 @@ export class SettingsManager {
 		return this.settings.compaction?.keepRecentTokens ?? COMPACTION_KEEP_RECENT_TOKENS;
 	}
 
-	getCompactionSettings(): { enabled: boolean; reserveTokens: number; keepRecentTokens: number } {
+	getCompactionSettings(): { enabled: boolean; reserveTokens: number; keepRecentTokens: number; thresholdPercent: number } {
 		return {
 			enabled: this.getCompactionEnabled(),
 			reserveTokens: this.getCompactionReserveTokens(),
 			keepRecentTokens: this.getCompactionKeepRecentTokens(),
+			thresholdPercent: this.getCompactionThresholdPercent(),
 		};
 	}
 
@@ -836,6 +862,14 @@ export class SettingsManager {
 		this.setGlobalSetting("collapseChangelog", collapse);
 	}
 
+	getToolOutputMode(): "minimal" | "normal" {
+		return this.settings.toolOutputMode === "minimal" ? "minimal" : "normal";
+	}
+
+	setToolOutputMode(mode: "minimal" | "normal"): void {
+		this.setGlobalSetting("toolOutputMode", mode);
+	}
+
 	getPackages(): PackageSource[] {
 		return [...(this.settings.packages ?? [])];
 	}

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

@@ -8,19 +8,22 @@ import type { ResourceDiagnostic } from "./diagnostics.js";
 import { CONFIG_DIR_NAME } from "../config.js";
 
 /**
- * The standard ecosystem skills directory used by skills.sh and the
- * Agent Skills standard.  All agents share this location for globally
- * installed skills.
+ * Preferred global skills directory for LSD.
  */
-export const ECOSYSTEM_SKILLS_DIR = join(homedir(), ".agents", "skills");
+export const ECOSYSTEM_SKILLS_DIR = join(homedir(), CONFIG_DIR_NAME, "skills");
 
 /**
- * The standard project-level skills directory (`.agents/skills/` relative to cwd).
+ * Preferred project-level skills directory (`.lsd/skills/` relative to cwd).
  */
-export const ECOSYSTEM_PROJECT_SKILLS_DIR = ".agents";
+export const ECOSYSTEM_PROJECT_SKILLS_DIR = CONFIG_DIR_NAME;
 
 /**
- * Legacy skills directory (~/.gsd/agent/skills/ or ~/.pi/agent/skills/).
+ * Compatibility fallback: shared Agent Skills ecosystem directory.
+ */
+const COMPAT_ECOSYSTEM_SKILLS_DIR = join(homedir(), ".agents", "skills");
+
+/**
+ * Legacy skills directory (~/.lsd/agent/skills/ or ~/.pi/agent/skills/).
  * Read as a fallback so existing installs don't lose skills before migration runs.
  */
 const LEGACY_SKILLS_DIR = join(homedir(), CONFIG_DIR_NAME, "agent", "skills");
@@ -349,7 +352,7 @@ function escapeXml(str: string): string {
 export interface LoadSkillsOptions {
 	/** Working directory for project-local skills. Default: process.cwd() */
 	cwd?: string;
-	/** @deprecated Skills now use ~/.agents/skills/ exclusively. This option is ignored. */
+	/** @deprecated Retained for compatibility. Default skill discovery no longer depends on agentDir. */
 	agentDir?: string;
 	/** Explicit skill paths (files or directories) */
 	skillPaths?: string[];
@@ -419,15 +422,18 @@ export function loadSkills(options: LoadSkillsOptions = {}): LoadSkillsResult {
 	}
 
 	if (includeDefaults) {
-		// Primary: ~/.agents/skills/ — the industry-standard skills.sh location
+		// Primary global location for LSD.
 		addSkills(loadSkillsFromDirInternal(ECOSYSTEM_SKILLS_DIR, "user", true));
-		// Primary project: .agents/skills/ — standard project-level location
+		// Preferred project-local location for LSD repos.
 		addSkills(loadSkillsFromDirInternal(resolve(cwd, ECOSYSTEM_PROJECT_SKILLS_DIR, "skills"), "project", true));
+		// Compatibility fallback: shared Agent Skills ecosystem directory.
+		if (COMPAT_ECOSYSTEM_SKILLS_DIR !== ECOSYSTEM_SKILLS_DIR) {
+			addSkills(loadSkillsFromDirInternal(COMPAT_ECOSYSTEM_SKILLS_DIR, "user", true));
+		}
 
-		// Legacy fallback: read skills from ~/.gsd/agent/skills/ so existing
-		// installs keep working until the one-time migration in resource-loader
-		// copies them to ~/.agents/skills/. Skip if migration has completed.
-		const legacyMigrated = existsSync(join(LEGACY_SKILLS_DIR, ".migrated-to-agents"));
+		// Legacy fallback: read skills from ~/.lsd/agent/skills/ so existing
+		// installs keep working until migration moves them to ~/.lsd/skills/.
+		const legacyMigrated = existsSync(join(LEGACY_SKILLS_DIR, ".migrated-to-lsd-skills"));
 		if (LEGACY_SKILLS_DIR !== ECOSYSTEM_SKILLS_DIR && existsSync(LEGACY_SKILLS_DIR) && !legacyMigrated) {
 			addSkills(loadSkillsFromDirInternal(LEGACY_SKILLS_DIR, "user", true));
 		}

package/packages/pi-coding-agent/src/core/slash-commands.ts

@@ -31,7 +31,7 @@ export const BUILTIN_SLASH_COMMANDS: ReadonlyArray<BuiltinSlashCommand> = [
 	{ name: "provider", description: "Manage provider configuration" },
 	{ name: "config", description: "Re-run the setup wizard" },
 	{ name: "setup", description: "Re-run the setup wizard" },
-	{ name: "permission", description: "Cycle permission mode (danger-full-access/accept-on-edit/auto)" },
+	{ name: "permission", description: "Cycle permission mode (danger-full-access/accept-on-edit/auto/plan)" },
 	{ name: "login", description: "Login with OAuth provider" },
 	{ name: "logout", description: "Logout from OAuth provider" },
 	{ name: "new", description: "Start a new session" },

package/packages/pi-coding-agent/src/core/tool-approval.js

@@ -0,0 +1,111 @@
+export const READ_ONLY_TOOLS = new Set(["read", "grep", "find", "ls", "lsp", "hashline_read"]);
+export const MUTATING_TOOLS = new Set(["bash", "edit", "write", "hashline_edit"]);
+let fileChangeApprovalHandler = null;
+let classifierHandler = null;
+let subagentApprovalRouter = null;
+let subagentClassifierRouter = null;
+export function setSubagentApprovalRouter(router) {
+    subagentApprovalRouter = router;
+}
+export function setSubagentClassifierRouter(router) {
+    subagentClassifierRouter = router;
+}
+const pendingApprovals = new Map();
+const pendingClassifications = new Map();
+let approvalIdCounter = 0;
+let classifierIdCounter = 0;
+let permissionModeOverride = null;
+export function setPermissionMode(mode) {
+    permissionModeOverride = mode;
+}
+export function getPermissionMode() {
+    if (permissionModeOverride !== null)
+        return permissionModeOverride;
+    const mode = process.env.LUCENT_CODE_PERMISSION_MODE;
+    if (mode === "accept-on-edit")
+        return "accept-on-edit";
+    if (mode === "auto")
+        return "auto";
+    if (mode === "plan")
+        return "plan";
+    if (mode === "danger-full-access")
+        return "danger-full-access";
+    return "accept-on-edit";
+}
+export function setFileChangeApprovalHandler(handler) {
+    fileChangeApprovalHandler = handler;
+}
+export function setClassifierHandler(handler) {
+    classifierHandler = handler;
+}
+export function registerStdioApprovalHandler() {
+    setFileChangeApprovalHandler(async (request) => {
+        const id = `apr_${++approvalIdCounter}_${Date.now()}`;
+        return new Promise((resolve) => {
+            pendingApprovals.set(id, { resolve });
+            const msg = JSON.stringify({
+                type: "approval_request",
+                id,
+                action: request.action,
+                path: request.path,
+                message: request.message,
+            });
+            process.stdout.write(msg + "\n");
+        });
+    });
+}
+export function registerStdioClassifierHandler() {
+    setClassifierHandler(async (request) => {
+        const id = `cls_${++classifierIdCounter}_${Date.now()}`;
+        return new Promise((resolve) => {
+            pendingClassifications.set(id, { resolve });
+            const msg = JSON.stringify({
+                type: "classifier_request",
+                id,
+                toolName: request.toolName,
+                toolCallId: request.toolCallId,
+                args: request.args,
+            });
+            process.stdout.write(msg + "\n");
+        });
+    });
+}
+export function resolveApprovalResponse(id, approved) {
+    if (subagentApprovalRouter && subagentApprovalRouter(id, approved))
+        return;
+    const pending = pendingApprovals.get(id);
+    if (pending) {
+        pendingApprovals.delete(id);
+        pending.resolve(approved);
+    }
+}
+export function resolveClassifierResponse(id, approved) {
+    if (subagentClassifierRouter && subagentClassifierRouter(id, approved))
+        return;
+    const pending = pendingClassifications.get(id);
+    if (pending) {
+        pendingClassifications.delete(id);
+        pending.resolve(approved);
+    }
+}
+export async function requestFileChangeApproval(request) {
+    if (getPermissionMode() !== "accept-on-edit") {
+        return;
+    }
+    if (!fileChangeApprovalHandler) {
+        throw new Error(`Approval required before ${request.action} on ${request.path}, but no approval handler is configured.`);
+    }
+    const approved = await fileChangeApprovalHandler(request);
+    if (!approved) {
+        throw new Error(`User declined ${request.action} for ${request.path}.`);
+    }
+}
+export async function requestClassifierDecision(request) {
+    if (getPermissionMode() !== "auto") {
+        return true;
+    }
+    if (!classifierHandler) {
+        return false;
+    }
+    return await classifierHandler(request);
+}

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

@@ -1,4 +1,4 @@
-export type PermissionMode = "danger-full-access" | "accept-on-edit" | "auto";
+export type PermissionMode = "danger-full-access" | "accept-on-edit" | "auto" | "plan";
 
 export const READ_ONLY_TOOLS = new Set(["read", "grep", "find", "ls", "lsp", "hashline_read"]);
 export const MUTATING_TOOLS = new Set(["bash", "edit", "write", "hashline_edit"]);
@@ -49,6 +49,7 @@ export function getPermissionMode(): PermissionMode {
 	const mode = process.env.LUCENT_CODE_PERMISSION_MODE;
 	if (mode === "accept-on-edit") return "accept-on-edit";
 	if (mode === "auto") return "auto";
+	if (mode === "plan") return "plan";
 	if (mode === "danger-full-access") return "danger-full-access";
 	return "accept-on-edit";
 }

package/packages/pi-coding-agent/src/index.ts

@@ -338,7 +338,9 @@ export {
 	resolveApprovalResponse,
 	resolveClassifierResponse,
 	requestFileChangeApproval,
+	requestClassifierDecision,
 	setFileChangeApprovalHandler,
+	setPermissionMode,
 	setSubagentApprovalRouter,
 	setSubagentClassifierRouter,
 } from "./core/tool-approval.js";

package/packages/pi-coding-agent/src/main.ts

@@ -424,7 +424,7 @@ export async function main(args: string[]) {
 		noThemes: firstPass.noThemes || firstPass.bare,
 		systemPrompt: firstPass.systemPrompt,
 		appendSystemPrompt: firstPass.appendSystemPrompt,
-		// --bare: suppress CLAUDE.md/AGENTS.md ancestor walk
+		// --bare: suppress lsd.md/CLAUDE.md/AGENTS.md ancestor walk
 		...(firstPass.bare ? { agentsFilesOverride: () => ({ agentsFiles: [] }) } : {}),
 	});
 	await resourceLoader.reload();

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

@@ -18,6 +18,8 @@ import { truncateToVisualLines } from "./visual-truncate.js";
 // Preview line limit when not expanded (matches tool execution behavior)
 const PREVIEW_LINES = 20;
 
+type ToolOutputMode = "minimal" | "normal";
+
 export class BashExecutionComponent extends Container {
 	private command: string;
 	private outputLines: string[] = [];
@@ -27,13 +29,15 @@ export class BashExecutionComponent extends Container {
 	private truncationResult?: TruncationResult;
 	private fullOutputPath?: string;
 	private expanded = false;
+	private renderMode: ToolOutputMode;
 	private contentContainer: Container;
 	private ui: TUI;
 
-	constructor(command: string, ui: TUI, excludeFromContext = false) {
+	constructor(command: string, ui: TUI, excludeFromContext = false, renderMode: ToolOutputMode = "normal") {
 		super();
 		this.command = command;
 		this.ui = ui;
+		this.renderMode = renderMode;
 
 		// Use dim border for excluded-from-context commands (!! prefix)
 		const colorKey = excludeFromContext ? "dim" : "bashMode";
@@ -74,6 +78,13 @@ export class BashExecutionComponent extends Container {
 		this.updateDisplay();
 	}
 
+	setRenderMode(mode: ToolOutputMode): void {
+		if (this.renderMode !== mode) {
+			this.renderMode = mode;
+			this.updateDisplay();
+		}
+	}
+
 	override invalidate(): void {
 		super.invalidate();
 		this.updateDisplay();
@@ -146,6 +157,8 @@ export class BashExecutionComponent extends Container {
 				// Show all lines
 				const displayText = availableLines.map((line) => theme.fg("muted", line)).join("\n");
 				this.contentContainer.addChild(new Text(`\n${displayText}`, 1, 0));
+			} else if (this.renderMode === "minimal") {
+				this.contentContainer.addChild(new Text(`\n${theme.fg("muted", `(${keyHint("expandTools", "to expand")})`)}`, 1, 0));
 			} else {
 				// Use shared visual truncation utility
 				const styledOutput = previewLogicalLines.map((line) => theme.fg("muted", line)).join("\n");

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

@@ -1,7 +1,7 @@
 import { type Component, truncateToWidth, visibleWidth } from "@gsd/pi-tui";
 import type { AgentSession } from "../../../core/agent-session.js";
 import type { ReadonlyFooterDataProvider } from "../../../core/footer-data-provider.js";
-import type { PermissionMode } from "../../../core/tool-approval.js";
+import { getPermissionMode, type PermissionMode } from "../../../core/tool-approval.js";
 import { theme } from "../theme/theme.js";
 
 /**
@@ -93,6 +93,7 @@ export class FooterComponent implements Component {
 		// Calculate context usage from session (handles compaction correctly).
 		// After compaction, tokens are unknown until the next LLM response.
 		const contextUsage = this.session.getContextUsage();
+		const contextTokens = contextUsage?.tokens ?? null;
 		const contextWindow = contextUsage?.contextWindow ?? displayModel?.contextWindow ?? 0;
 		const contextPercentValue = contextUsage?.percent ?? 0;
 		const contextPercent = contextUsage?.percent !== null ? contextPercentValue.toFixed(1) : "?";
@@ -144,7 +145,9 @@ export class FooterComponent implements Component {
 		const contextPercentDisplay =
 			contextPercent === "?"
 				? `?/${formatTokens(contextWindow)}${autoIndicator}`
-				: `${contextPercent}%/${formatTokens(contextWindow)}${autoIndicator}`;
+				: contextTokens !== null
+					? `${formatTokens(contextTokens)} ${contextPercent}%/${formatTokens(contextWindow)}${autoIndicator}`
+					: `${contextPercent}%/${formatTokens(contextWindow)}${autoIndicator}`;
 		if (contextPercentValue > 90) {
 			contextPercentStr = theme.fg("error", contextPercentDisplay);
 		} else if (contextPercentValue > 70) {
@@ -154,12 +157,15 @@ export class FooterComponent implements Component {
 		}
 		statsParts.push(contextPercentStr);
 
+		const currentPermissionMode = getPermissionMode();
 		const permissionModeLabel =
-			this.permissionMode === "danger-full-access"
+			currentPermissionMode === "danger-full-access"
 				? "⚡ full-access"
-				: this.permissionMode === "accept-on-edit"
+				: currentPermissionMode === "accept-on-edit"
 					? "✓ accept-edit"
-					: "🤖 auto";
+					: currentPermissionMode === "auto"
+						? "🤖 auto"
+						: "📝 plan";
 		statsParts.push(permissionModeLabel);
 
 		let statsLeft = statsParts.join(" ");