pi-cockpit 0.1.0 → 0.1.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-cockpit",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "description": "Agent cockpit for Pi: a list-mode status stack (live teammates + todo plan) pinned above the editor, plus a Starship-style footer. Renders only via public extension APIs (setWidget/setFooter).",
   "type": "module",
   "keywords": [

package/src/footer.ts

@@ -27,9 +27,10 @@ export interface FooterParts {
 	ctxTokens: number;
 	ctxWindow: number;
 	totals: UsageTotals;
-	git?: string;
-	agentSummary?: string;
-	workflowStatus?: string;
+	git?: string;
+	agentSummary?: string;
+	bashBgStatus?: string;
+	workflowStatus?: string;
 	extensionStatuses?: readonly ExtensionStatusSegment[];
 	width: number;
 	glyphs: IconGlyphs;
@@ -322,11 +323,14 @@ export function renderFooter(p: FooterParts): string[] {
 	}
 	if (!selected) fittedLeft = fitLeftBeside("");
 
-	const line1 = alignRight(fittedLeft.join(identitySeparator), right1, width, utils.measure);
-	const lines = [utils.clip(line1, width, ell)];
-	if (p.workflowStatus) {
-		lines.push(utils.clip(theme.fg("muted", p.workflowStatus), width, ell));
-	}
+	const line1 = alignRight(fittedLeft.join(identitySeparator), right1, width, utils.measure);
+	const lines = [utils.clip(line1, width, ell)];
+	if (p.bashBgStatus) {
+		lines.push(utils.clip(p.bashBgStatus, width, ell));
+	}
+	if (p.workflowStatus) {
+		lines.push(utils.clip(theme.fg("muted", p.workflowStatus), width, ell));
+	}
 	const statuses = visibleStatuses.filter((status) => !controlStatuses.includes(status));
 	if (statuses.length > 0) {
 		const statusSeparator = ` ${sep} `;

package/src/index.ts

@@ -2,16 +2,17 @@ import { isAbsolute, relative, resolve, sep } from "node:path";
 import type { ExtensionAPI, ExtensionCommandContext, ExtensionContext, Theme } from "@earendil-works/pi-coding-agent";
 import type { TUI } from "@earendil-works/pi-tui";
 import { Key, matchesKey, truncateToWidth, visibleWidth } from "@earendil-works/pi-tui";
-import { AgentsStore, type CompletePayload, type MessagePayload, type StartedPayload } from "./agents-store.ts";
-import { statusText, titleFor, workingMessage, type AmbientState } from "./ambient.ts";
-import { BashBgStore } from "./bash-bg-store.ts";
-import { BashBgOverlay } from "./bash-bg-overlay.ts";
-import { TodoStore } from "./todo-store.ts";
+import { AgentsStore, type CompletePayload, type MessagePayload, type StartedPayload } from "./agents-store.ts";
+import { statusText, titleFor, workingMessage, type AmbientState } from "./ambient.ts";
+import { BashBgStore } from "./bash-bg-store.ts";
+import { BashBgOverlay } from "./bash-bg-overlay.ts";
+import { renderBashBgSummary } from "./bash-bg-widget.ts";
+import { TodoStore } from "./todo-store.ts";
 import { makeTodoWidget, makeAgentWidget, terminalRows } from "./stack-widget.ts";
 import { activeThemeName, ThemePicker } from "./theme-picker.ts";
 import { getUsageTotals, invalidateUsageCache, renderFooter, type PaintTheme, type WidthUtils } from "./footer.ts";
 import { collectExtensionStatuses } from "./extension-status.ts";
-import { ANIMATION_PERIOD_MS, resolveGlyphs } from "./icons.ts";
+import { ANIMATION_PERIOD_MS, resolveGlyphs, spinFrame } from "./icons.ts";
 import { ensureConfigExists, loadConfig, saveConfig } from "./config.ts";
 import { applyRow, buildRows, rowKeyForAccel, type SaveState } from "./settings-view.ts";
 import {
@@ -180,13 +181,12 @@ export default function (pi: ExtensionAPI): void {
 		ctx.ui.setWidget(
 			AGENT_WIDGET_KEY,
 			(tui, theme) => {
-				capturedTui = tui;
-				return makeAgentWidget({
-					getAgents: () => agents.snapshot(),
-					getBashBgJobs: () => bashBg.snapshot(),
-					getConfig: () => config,
-					isRunning: () => running,
-					isAnimating,
+				capturedTui = tui;
+				return makeAgentWidget({
+					getAgents: () => agents.snapshot(),
+					getConfig: () => config,
+					isRunning: () => running,
+					isAnimating,
 				})(tui, theme);
 			},
 			{ placement: "belowEditor" },
@@ -210,10 +210,23 @@ export default function (pi: ExtensionAPI): void {
 			const component = {
 				render(width: number): string[] {
 					if (Number.isFinite(width) && width > 0) observedWidth = width;
-					const cu = ctx.getContextUsage();
-					const branch = footerData.getGitBranch();
-					const extensionStatuses = collectExtensionStatuses(footerData.getExtensionStatuses());
-					return renderFooter({
+					const cu = ctx.getContextUsage();
+					const branch = footerData.getGitBranch();
+					const extensionStatuses = collectExtensionStatuses(footerData.getExtensionStatuses());
+					const glyphs = resolveGlyphs(config.icons.mode);
+					const now = Date.now();
+					const bashBgStatus = renderBashBgSummary(
+						bashBg.snapshot(),
+						width,
+						theme,
+						FOOTER_UTILS,
+						{
+							glyphs,
+							spin: spinFrame(glyphs, now, isAnimating()),
+							now,
+						},
+					)[0];
+					return renderFooter({
 						width,
 						model: ctx.model?.id ?? "no-model",
 						provider: ctx.model?.provider,
@@ -221,15 +234,13 @@ export default function (pi: ExtensionAPI): void {
 						cwd: formatCwd(ctx.sessionManager.getCwd()),
 						ctxPct: cu?.percent ?? 0,
 						ctxTokens: cu?.tokens ?? 0,
-						ctxWindow: cu?.contextWindow ?? ctx.model?.contextWindow ?? 0,
-						totals: getUsageTotals(ctx.sessionManager.getEntries()),
-						git: branch ?? undefined,
-						// The Agents header one line above already states the roster and
-						// the failure count. Repeating it here spent a footer segment to
-						// say nothing new, and the two could disagree mid-update.
-						workflowStatus: extensionStatuses.find((status) => status.key === WORKFLOW_STATUS_KEY)?.text,
-						extensionStatuses: extensionStatuses.filter((status) => status.key !== WORKFLOW_STATUS_KEY),
-						glyphs: resolveGlyphs(config.icons.mode),
+						ctxWindow: cu?.contextWindow ?? ctx.model?.contextWindow ?? 0,
+						totals: getUsageTotals(ctx.sessionManager.getEntries()),
+						git: branch ?? undefined,
+						bashBgStatus,
+						workflowStatus: extensionStatuses.find((status) => status.key === WORKFLOW_STATUS_KEY)?.text,
+						extensionStatuses: extensionStatuses.filter((status) => status.key !== WORKFLOW_STATUS_KEY),
+						glyphs,
 						theme,
 						utils: FOOTER_UTILS,
 					});

package/src/stack-widget.ts

@@ -2,11 +2,10 @@ import type { Theme } from "@earendil-works/pi-coding-agent";
 import type { TUI } from "@earendil-works/pi-tui";
 import { truncateToWidth, visibleWidth } from "@earendil-works/pi-tui";
 import { renderAgents, renderTodos, type PaintTheme, type WidthUtils } from "./render.ts";
-import { renderBashBgSummary } from "./bash-bg-widget.ts";
 import { fitLineByPriority, type PrioritizedSegment } from "./layout.ts";
 import { resolveGlyphs, spinFrame } from "./icons.ts";
 import { panelRows } from "./viewport.ts";
-import type { AgentRow, BashBgJob, CockpitConfig, TodoItem } from "./types.ts";
+import type { AgentRow, CockpitConfig, TodoItem } from "./types.ts";
 
 export interface TodoWidgetDeps {
 	getTodos: () => TodoItem[];
@@ -17,7 +16,6 @@ export interface TodoWidgetDeps {
 
 export interface AgentWidgetDeps {
 	getAgents: () => AgentRow[];
-	getBashBgJobs: () => BashBgJob[];
 	getConfig: () => CockpitConfig;
 	isRunning: () => boolean;
 	isAnimating?: () => boolean;
@@ -71,24 +69,17 @@ export function makeAgentWidget(deps: AgentWidgetDeps) {
 			render(width: number): string[] {
 				const cfg = deps.getConfig();
 				const agents = deps.getAgents();
-				const bashBgJobs = deps.getBashBgJobs();
+				if (agents.length === 0) return [];
 				const g = resolveGlyphs(cfg.icons.mode);
 				const now = Date.now();
 				const animating = deps.isAnimating?.() ?? true;
 				const spin = spinFrame(g, now, animating);
-				const bashBgLines = renderBashBgSummary(bashBgJobs, width, paint, UTILS, {
-					glyphs: g,
-					spin,
-					now,
-				});
-				if (agents.length === 0) return bashBgLines;
 				const running = deps.isRunning();
-				// The panel budget covers everything this widget prints, so the header
-				// and the background strip are charged to it before the roster is.
+				// The panel budget covers the roster header and its rows.
 				const panel = panelRows(terminalRows(tui));
 				const rosterRows = panel === undefined
 					? undefined
-					: Math.max(1, panel - 1 - bashBgLines.length);
+					: Math.max(1, panel - 1);
 				const opts = { glyphs: g, spin, now, maxRows: rosterRows };
 				const dot = theme.fg(running ? "success" : "muted", running ? g.dotRunning : g.dotIdle);
 				const failedCount = agents.filter((a) => a.status === "failed").length;
@@ -111,7 +102,6 @@ export function makeAgentWidget(deps: AgentWidgetDeps) {
 				// Was the one line in the package pushed without any width clipping.
 				lines.push(fitLineByPriority(headerSegs, width, UTILS, theme.fg("dim", g.separator), g.ellipsis));
 				lines.push(...renderAgents(agents, cfg.agentsMode, width, paint, UTILS, { ...opts, withHead: false }));
-				lines.push(...bashBgLines);
 				return lines;
 			},
 			invalidate(): void {},