@vanillagreen/pi-qol 2.1.1 → 2.2.0

package/README.md

@@ -14,11 +14,11 @@ A Pi extension for session controls, prompt editing and notifications. Users can
 source = "kendex"
 ```
 
-Restart Pi after installation. Use `kendex update-pi --check` to preview the installation.
+Requires Pi 0.86.0 or newer. Restart Pi after installation. Use `kendex update-pi --check` to preview the installation.
 
 ## Features
 
-- Show repository, model and context information beside the editor.
+- Show repository, model and context information beside the editor, with the working spinner before the project name.
 - Name and search sessions.
 - Schedule prompts and prepare handoff drafts.
 - Ask before configured shell commands run.
@@ -36,7 +36,7 @@ The settings editor writes project values to `.pi/settings.json`. The default us
 Open `/extensions:settings`; settings appear under the **QOL** tab. Project settings in `.pi/settings.json` apply only after Pi marks the workspace trusted. `glyphStyle` picks `unicode` or `ascii` symbols, and `@vanillagreen/pi-tool-renderer`'s `globalGlyphStyleOverride` wins when set.
 
 - `enabled`: package toggle for everything below.
-- Statusline and editor: `statusline.enabled`, `statusline.showAccount`, `replaceFooter`, `compactPrompt`, `showSessionNameTitle`, `showSessionNameWindow`, `inputBottomPaddingLines`, `gitRefreshTimeoutMs`, `showDirtyMarker`, `newlineOnShiftEnter`, `newlineFallbackKey`, `pendingQueue.asciiGreen`, `showImageChips`, `showAttachmentCountInStatus`.
+- Statusline and editor: `statusline.enabled`, `statusline.showProvider`, `statusline.showAccount`, `replaceFooter`, `compactPrompt`, `showSessionNameTitle`, `showSessionNameWindow`, `inputBottomPaddingLines`, `gitRefreshTimeoutMs`, `showDirtyMarker`, `newlineOnShiftEnter`, `newlineFallbackKey`, `pendingQueue.asciiGreen`, `showImageChips`, `showAttachmentCountInStatus`.
 - Commands: `enableSessionNameCommand`, `enableHandoffCommand`, `enableScheduleCommand`, `enableContextCommand`, `handoffReviewPrompt`.
 - Session naming: `sessionAutoRename.*` (model, fallback model, deterministic fallback, prefix, prompt, limits, notify, debug).
 - Session search: `sessionSearch.*` (shortcut, result and row limits, snippets, overlay width, cache TTL, summary model and limits).
@@ -47,4 +47,6 @@ Open `/extensions:settings`; settings appear under the **QOL** tab. Project sett
   - Pi's own `compaction.enabled` (the top-level `compaction` object in the same settings files, not a QOL key) turns off every automatic compaction: when it is `false`, neither the budget guard nor the idle trigger starts one, and `/qol` reports both as disabled by that key. A manual `/compact` still runs. While it is `true` or absent, both keep the defaults and thresholds above: the budget guard on at `compaction.budgetPercent` 85, the idle trigger off until `compaction.idleEnabled` is set.
 - Thinking: `thinkingLabel.text`, `thinkingTimer.enabled`, `workingIndicator.mode` (`static` if the animated indicator flashes).
 
+**Show model provider** displays a readable provider name before the model, such as `Copilot / GPT 6 Astra`. It is on by default; changes apply on the next render without reloading. Disabling the QOL statusline leaves Pi's standalone working indicator in place.
+
 Maintainer notes are in [DEVELOPMENT.md](DEVELOPMENT.md).

package/extensions/qol/editor.ts

@@ -101,7 +101,25 @@ function syncQolEditorStatus(
 	}
 }
 
-export class QolEditor extends CustomEditor {
+type WorkingStatusIndicator = Parameters<CustomEditor["setWorkingStatusIndicator"]>[0];
+
+// Pi owns the indicator's animation and lifetime. Opt into its embedded-status
+// delivery, but draw in the statusline widget rather than the editor border.
+class QolStatusEditor extends CustomEditor {
+	private statuslineIndicator: WorkingStatusIndicator;
+
+	override setWorkingStatusIndicator(indicator: WorkingStatusIndicator): void {
+		this.statuslineIndicator = indicator;
+	}
+
+	renderWorkingStatus(width: number): string {
+		const indicator = this.statuslineIndicator;
+		if (!indicator || !this.embedWorkingStatus) return "";
+		return indicator.kind === "working" ? indicator.renderSpinnerInBorder(width) : indicator.renderInBorder(width);
+	}
+}
+
+export class QolEditor extends QolStatusEditor {
 	private readonly statusCache: { last?: string } = {};
 	private readonly ctx: ExtensionContext;
 
@@ -111,7 +129,7 @@ export class QolEditor extends CustomEditor {
 		keybindings: KeybindingsManager,
 		ctx: ExtensionContext,
 	) {
-		super(tui, editorTheme, keybindings);
+		super(tui, editorTheme, keybindings, { embedWorkingStatus: settingBoolean("statusline.enabled", true, ctx.cwd) });
 		this.ctx = ctx;
 	}
 
@@ -130,7 +148,7 @@ function isEditorBorderLine(line: string): boolean {
 	return visible.length > 0 && /^[─━╭╮╰╯┌┐└┘]+$/.test(visible);
 }
 
-export class QolCompactPromptEditor extends CustomEditor {
+export class QolCompactPromptEditor extends QolStatusEditor {
 	private readonly statusCache: { last?: string } = {};
 	private readonly inputBottomPaddingLines: number;
 	private readonly ctx: ExtensionContext;
@@ -142,7 +160,7 @@ export class QolCompactPromptEditor extends CustomEditor {
 		inputBottomPaddingLines: number,
 		ctx: ExtensionContext,
 	) {
-		super(tui, editorTheme, keybindings, { paddingX: 0 });
+		super(tui, editorTheme, keybindings, { paddingX: 0, embedWorkingStatus: settingBoolean("statusline.enabled", true, ctx.cwd) });
 		this.inputBottomPaddingLines = inputBottomPaddingLines;
 		this.ctx = ctx;
 	}

package/extensions/qol/statusline.ts

@@ -39,6 +39,34 @@ function formatModelName(ctx: ExtensionContext): string {
 	return name;
 }
 
+const PROVIDER_NAMES: Record<string, string> = {
+	"github-copilot": "Copilot",
+	"openai": "OpenAI",
+	"openai-codex": "Codex",
+	"anthropic": "Anthropic",
+	"pi-claude": "Claude",
+	"google": "Google",
+	"google-gemini-cli": "Gemini CLI",
+	"google-antigravity": "Antigravity",
+	"google-vertex": "Vertex AI",
+	"amazon-bedrock": "Bedrock",
+	"azure-openai-responses": "Azure OpenAI",
+	"openrouter": "OpenRouter",
+	"vercel-ai-gateway": "Vercel AI Gateway",
+	"xai": "xAI",
+	"groq": "Groq",
+	"cerebras": "Cerebras",
+	"mistral": "Mistral",
+	"deepseek": "DeepSeek",
+	"zai": "Z.AI",
+	"ollama": "Ollama",
+};
+
+function formatProviderName(provider: string): string {
+	const name = stripAnsi(provider).replace(/[\x00-\x1f\x7f]/g, " ").trim();
+	return Object.hasOwn(PROVIDER_NAMES, name) ? PROVIDER_NAMES[name] : name.replace(/[-_]+/g, " ").replace(/\b\w/g, (letter) => letter.toUpperCase()).replace(/\s+/g, " ").trim();
+}
+
 type ThinkingLevel = "off" | "minimal" | "low" | "medium" | "high" | "xhigh" | "max";
 type ThinkingThemeToken = "thinkingOff" | "thinkingMinimal" | "thinkingLow" | "thinkingMedium" | "thinkingHigh" | "thinkingXhigh" | "thinkingMax";
 const THINKING_TOKEN: Record<ThinkingLevel, ThinkingThemeToken> = {
@@ -204,24 +232,23 @@ function cavemanIconTone(mode: string, active: boolean): "muted" | "text" | "suc
 	}
 }
 
-export function renderStatusLine(width: number, ctx: ExtensionContext, git: GitState, pi: ExtensionAPI, theme: Pick<Theme, "fg">): string {
+export function renderStatusLine(width: number, ctx: ExtensionContext, git: GitState, pi: ExtensionAPI, theme: Pick<Theme, "fg">, workingIndicator = ""): string {
 	const { label: contextLabel, percent } = statuslineContextInfo(ctx);
-	const projectChunk = `${git.projectName}${gitBadge(git, settingBoolean("showDirtyMarker", true, ctx.cwd))} ${formatModelName(ctx)}`;
+	const provider = settingBoolean("statusline.showProvider", true, ctx.cwd) && ctx.model ? formatProviderName(ctx.model.provider) : "";
+	const projectChunk = `${git.projectName}${gitBadge(git, settingBoolean("showDirtyMarker", true, ctx.cwd))} ${provider ? `${provider} / ` : ""}${formatModelName(ctx)}`;
+	const workingPrefix = workingIndicator ? `${workingIndicator} ` : "";
 	const statusSeparator = " / ";
 	const thinkingLevel = normalizeThinkingLevel(pi.getThinkingLevel());
 	const thinkingChunk = thinkingLevel;
 	const contextChunk = ` ${contextLabel}`;
 	const account = accountLabel(ctx);
-	const accountSegment = account ? `${statusSeparator}${account}` : "";
 	const cavemanBridge = readCavemanBridge();
 	const cavemanVisible = !!cavemanBridge && (cavemanBridge.isStatusBadgeEnabled?.(ctx.cwd) ?? true);
 	const caveman = cavemanVisible ? cavemanBridge : undefined;
 	const cavemanActive = caveman?.isActive() ?? false;
 	const cavemanGlyph = caveman ? (cavemanActive ? CAVEMAN_ICON_ACTIVE : CAVEMAN_ICON_INACTIVE) : "";
 	const cavemanTone = cavemanIconTone(caveman?.getMode() ?? "off", cavemanActive);
-	const cavemanSegment = caveman ? `${statusSeparator}${cavemanGlyph}` : "";
 	const contextSeparator = caveman ? ` ${statusSeparator}` : "";
-	const leftPlain = `${projectChunk}${statusSeparator}${thinkingChunk}${cavemanSegment}${contextSeparator}${contextChunk.trimStart()}${accountSegment}`;
 	const percentPlain = percent === null ? `${glyphs(ctx.cwd).ellipsis}%` : `${percent}%`;
 	const subagentMarker = subagentStatuslineMarker(ctx.cwd);
 	const rightPlain = subagentMarker ? `${percentPlain} ${subagentMarker.plain}` : percentPlain;
@@ -234,9 +261,9 @@ export function renderStatusLine(width: number, ctx: ExtensionContext, git: GitS
 		: `${theme.fg("accent", projectChunk)}${separatorColored}${theme.fg(thinkingToken, thinkingChunk)}${theme.fg("accent", contextChunk)}${accountColored}`;
 	const right = subagentMarker ? `${theme.fg(percentColor, percentPlain)} ${subagentMarker.styled}` : theme.fg(percentColor, percentPlain);
 	const minimumGap = 1;
-	const gapWidth = Math.max(minimumGap, width - visibleWidth(leftPlain) - visibleWidth(rightPlain) - 2);
+	const gapWidth = Math.max(minimumGap, width - visibleWidth(workingPrefix + leftColored) - visibleWidth(rightPlain) - 2);
 	const filled = percent === null ? 0 : Math.round(gapWidth * (percent / 100));
 	const empty = Math.max(0, gapWidth - filled);
 	const bar = " ".repeat(empty) + theme.fg("warning", glyphs(ctx.cwd).line.repeat(filled));
-	return truncateToWidth(`${leftColored} ${bar} ${right}`, width, "");
+	return truncateToWidth(`${workingPrefix}${leftColored} ${bar} ${right}`, width, "");
 }

package/extensions/qol.ts

@@ -121,6 +121,7 @@ export default function qol(pi: ExtensionAPI): void {
 	let autoRenameInProgress = false;
 	let autoRenameGeneration = 0;
 	let latestSystemPromptOptions: unknown;
+	let statusEditor: QolEditor | QolCompactPromptEditor | undefined;
 
 	const resetAutoRename = () => {
 		autoRenameAttempted = false;
@@ -217,15 +218,9 @@ export default function qol(pi: ExtensionAPI): void {
 		thinkingTimerStore.enabled = !!ctx?.hasUI && settingBoolean("thinkingTimer.enabled", true, ctx?.cwd);
 	};
 
-	// Working indicator mode.
-	// The built-in pi-tui Loader ticks every 80ms during streaming. Each tick
-	// mutates a line in statusContainer; once total rendered content exceeds the
-	// terminal viewport (overlay content like /tree, or chat overflow), every tick
-	// trips pi-tui's firstChanged < prevViewportTop branch and triggers a full
-	// screen + scrollback clear (visible flash). This setting lets the user trade
-	// the spinner animation away for a stable display in overflow scenarios.
-	// Implementation note: Loader.restartAnimation() bails out when frames.length
-	// is <= 1, so a single-frame indicator does NOT start the setInterval at all.
+	// Pi's Loader starts no animation timer for a single-frame indicator.
+	// Keep static mode available for terminals where frequent redraws flash,
+	// whether the indicator is embedded in QOL or in Pi's standalone row.
 	const applyWorkingIndicatorMode = (ctx: ExtensionContext): void => {
 		if (!ctx.hasUI) return;
 		const mode = settingString("workingIndicator.mode", "animated", ctx.cwd);
@@ -547,6 +542,7 @@ export default function qol(pi: ExtensionAPI): void {
 		ctx.ui.setHeader(undefined);
 		ctx.ui.setFooter(undefined);
 		activeTui = undefined;
+		statusEditor = undefined;
 	};
 
 	const maybeNotifyTaskCompletion = (_ctx: ExtensionContext, state: any) => {
@@ -615,9 +611,10 @@ export default function qol(pi: ExtensionAPI): void {
 			installSessionTitleSync(ctx);
 			ctx.ui.setEditorComponent((tui, theme, keybindings) => {
 				activeTui = tui;
-				return settingBoolean("compactPrompt", true, ctx.cwd)
+				statusEditor = settingBoolean("compactPrompt", true, ctx.cwd)
 					? new QolCompactPromptEditor(tui, theme, keybindings, Math.max(0, Math.floor(settingNumber("inputBottomPaddingLines", DEFAULT_INPUT_BOTTOM_PADDING_LINES, ctx.cwd))), ctx)
 					: new QolEditor(tui, theme, keybindings, ctx);
+				return statusEditor;
 			});
 			if (showStatusline || scheduleEnabled || rateLimitAutoResumeEnabled) {
 				const statusWidgetTimer = setTimeout(() => {
@@ -629,7 +626,7 @@ export default function qol(pi: ExtensionAPI): void {
 								const lines = rateLimitAutoResumeController.enabled(ctx) ? rateLimitAutoResumeController.renderPreviewLines(width) : [];
 								if (scheduleEnabled) lines.push(...scheduleController.renderPreviewLines(width));
 								if (budgetGuardStatus) lines.push(truncateToWidth(ansiGreen(`┃ ${budgetGuardStatus}`), width, ""));
-								if (showStatusline) lines.push(renderStatusLine(width, ctx, gitState ?? makeFallbackGitState(ctx.cwd), pi, theme));
+								if (showStatusline) lines.push(renderStatusLine(width, ctx, gitState ?? makeFallbackGitState(ctx.cwd), pi, theme, statusEditor?.renderWorkingStatus(width)));
 								return lines;
 							},
 						};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vanillagreen/pi-qol",
-  "version": "2.1.1",
+  "version": "2.2.0",
   "description": "Pi quality-of-life extension: compact statusline/π prompt, reliable multiline input, styled pasted-image chips, session naming/search/context import, scheduled prompts, handoff, permission prompts, notifications, custom compaction, and a collapsed-thinking timer.",
   "license": "MIT",
   "keywords": [
@@ -56,6 +56,15 @@
           "apply": "reload",
           "requiresReload": true
         },
+        {
+          "key": "statusline.showProvider",
+          "label": "Show model provider",
+          "description": "Show a readable provider name before the model, for example Copilot / GPT 6 Astra.",
+          "type": "boolean",
+          "default": true,
+          "category": "Statusline",
+          "apply": "live"
+        },
         {
           "key": "statusline.showAccount",
           "label": "Show account email",
@@ -957,7 +966,7 @@
         {
           "key": "workingIndicator.mode",
           "label": "Working indicator mode",
-          "description": "Control Pi's built-in streaming spinner. The default animated spinner ticks every 80ms; in terminals where rendered content overflows the viewport (chat scrolled past the top, /tree open, etc.) each tick can trigger a pi-tui full-screen redraw and visible flash. Use 'static' for a single non-animating dot that keeps the working row visible without the 80ms timer.",
+          "description": "Control Pi's built-in streaming spinner. The default animated spinner ticks every 80ms; in terminals where rendered content overflows the viewport (chat scrolled past the top, /tree open, etc.) each tick can trigger a pi-tui full-screen redraw and visible flash. Use 'static' for a single non-animating dot that keeps the working indicator visible without the 80ms timer. It appears before the project name when the QOL statusline is enabled, or in Pi's working row otherwise.",
           "type": "enum",
           "enumValues": [
             "animated",
@@ -974,7 +983,7 @@
   "peerDependencies": {
     "@earendil-works/pi-agent-core": "*",
     "@earendil-works/pi-ai": "*",
-    "@earendil-works/pi-coding-agent": ">=0.80.4",
+    "@earendil-works/pi-coding-agent": ">=0.86.0",
     "@earendil-works/pi-tui": "*"
   },
   "files": [