@gajae-code/coding-agent 0.16.0 → 0.16.1

package/src/main.ts

@@ -453,6 +453,7 @@ type StartupModelProfileArgs = {
 	startupModel?: CreateAgentSessionOptions["model"];
 	startupThinkingLevel?: CreateAgentSessionOptions["thinkingLevel"];
 	preferCachedModels?: boolean;
+	preferCachedDefaultProfile?: boolean;
 };
 
 async function applyStartupModelProfilesWithPolicy(
@@ -484,7 +485,9 @@ async function applyStartupModelProfilesWithPolicy(
 	// deferred `--model <pattern>` path resolved inside createAgentSession.
 	const explicitModel = args.parsedArgs.model ? (args.startupModel ?? args.session.model) : undefined;
 	const defaultProfile = args.settings.get("modelProfile.default");
-	const preferCachedProfiles = args.preferCachedModels === true && args.parsedArgs.mpreset !== undefined;
+	const preferCachedProfiles =
+		(args.preferCachedModels === true && args.parsedArgs.mpreset !== undefined) ||
+		(args.preferCachedDefaultProfile === true && defaultProfile !== undefined);
 	const applyConfiguredProfiles = async (): Promise<boolean> => {
 		let applied = true;
 		if (defaultProfile) {

package/src/modes/acp/acp-agent.ts

@@ -715,11 +715,11 @@ const ACP_CONFIG_OPTIONS = [
 		],
 	},
 	{
-		id: "interruptMode",
-		name: "Interrupt mode",
+		id: "toolInterruptPolicy",
+		name: "Tool interrupt policy",
 		options: [
-			{ value: "immediate", name: "Immediate" },
-			{ value: "wait", name: "Wait" },
+			{ value: "abort_tools", name: "Abort running tools" },
+			{ value: "finish_tools", name: "Finish running tools" },
 		],
 	},
 ] as const;
@@ -727,7 +727,7 @@ const ACP_CONFIG_OPTIONS = [
 const ACP_CONFIG_CONTROL_OPERATIONS: Record<string, string> = {
 	steeringMode: "queue.steering_mode.set",
 	followUpMode: "queue.follow_up_mode.set",
-	interruptMode: "queue.interrupt_mode.set",
+	toolInterruptPolicy: "queue.tool_interrupt_policy.set",
 };
 
 function configValues(query: unknown): Map<string, string> {

package/src/modes/components/model-selector.ts

@@ -22,6 +22,7 @@ import {
 	normalizeTierMap,
 	validateAutoroutingSetup,
 } from "../../config/autorouting-contract";
+import type { BillingPath } from "../../config/billing-path";
 import {
 	getProxyRoutableProviders,
 	inspectProxyProviderId,
@@ -30,7 +31,6 @@ import {
 	rewriteSelectorForProxy,
 	tryResolveProxyProviderId,
 } from "../../config/model-profile-activation";
-
 import { isModelProfileProviderAvailable } from "../../config/model-profile-contract";
 import {
 	deriveModelProfileMappedProviders,
@@ -429,6 +429,9 @@ export class ModelSelectorComponent extends Container {
 	#imageRoleFilter: boolean = false;
 	#smartRoutingPanel?: SmartRoutingPanelComponent;
 	#smartRoutingPreviewBuilder?: (draft: AutoroutingSetup) => SmartRoutingPreview;
+	#isBillingDismissed?: (key: string) => boolean;
+	#markBillingDismissed?: (key: string) => void;
+	#pendingBillingNoticeKey?: string;
 
 	// Tab state
 	#providers: ProviderTabState[] = STATIC_PROVIDER_TABS;
@@ -455,6 +458,10 @@ export class ModelSelectorComponent extends Container {
 			smartRoutingPreview?: (draft: AutoroutingSetup) => SmartRoutingPreview;
 			/** Open the smart-routing panel directly instead of the preset landing. */
 			smartRoutingOnly?: boolean;
+			/** Test seam: synchronous persisted-dismissal check to avoid async render churn. */
+			isBillingDismissed?: (key: string) => boolean;
+			/** Test seam: record that a billing notice was shown/dismissed. */
+			markBillingDismissed?: (key: string) => void;
 		},
 	) {
 		super();
@@ -468,6 +475,8 @@ export class ModelSelectorComponent extends Container {
 		this.#temporaryOnly = options?.temporaryOnly ?? false;
 		this.#authSessionId = options?.sessionId;
 		this.#smartRoutingPreviewBuilder = options?.smartRoutingPreview;
+		this.#isBillingDismissed = (options as any)?.isBillingDismissed;
+		this.#markBillingDismissed = (options as any)?.markBillingDismissed;
 		this.#currentModel = _currentModel;
 		this.#currentThinkingLevel = options?.currentThinkingLevel;
 		this.#activeModelProfile = options?.activeModelProfile;
@@ -1497,6 +1506,25 @@ export class ModelSelectorComponent extends Container {
 		const availableModels = this.#getProfileAvailableModels();
 		const resolutionRegistry = this.#createProfileResolutionRegistry(availableModels);
 		const providers = new Set<string>();
+		// Preset groups share selectors heavily (role assignments repeat across
+		// profiles), and each `resolveModelRoleValue` call scans the candidate set
+		// while validating lookup contexts and resolving aliases. Resolve identical
+		// selectors once per refresh; the inputs are shared and only the provider is
+		// needed here. This map is deliberately local to the synchronous, pre-await
+		// snapshot below: catalog/config changes and credential-generation changes
+		// start a new refresh with a new map.
+		const resolvedProviderBySelector = new Map<string, string | undefined>();
+		const resolveSelectorProvider = (selector: string): string | undefined => {
+			if (resolvedProviderBySelector.has(selector)) return resolvedProviderBySelector.get(selector);
+			const provider = resolveModelRoleValue(selector, availableModels, {
+				settings: this.#settings,
+				modelRegistry: this.#modelRegistry,
+				aliasIntent: "preset-equivalent",
+				credentialSessionId: this.#authSessionId,
+			}).model?.provider;
+			resolvedProviderBySelector.set(selector, provider);
+			return provider;
+		};
 		for (const profiles of this.#getPresetGroups().values()) {
 			for (const profile of profiles) {
 				for (const provider of profileRequiredProviders(profile)) providers.add(provider);
@@ -1516,13 +1544,8 @@ export class ModelSelectorComponent extends Container {
 				];
 				for (const value of values) {
 					for (const selector of normalizeModelSelectorValue(value)) {
-						const resolved = resolveModelRoleValue(selector, availableModels, {
-							settings: this.#settings,
-							modelRegistry: this.#modelRegistry,
-							aliasIntent: "preset-equivalent",
-							credentialSessionId: this.#authSessionId,
-						}).model;
-						if (resolved) providers.add(resolved.provider);
+						const resolvedProvider = resolveSelectorProvider(selector);
+						if (resolvedProvider !== undefined) providers.add(resolvedProvider);
 					}
 				}
 			}
@@ -1705,12 +1728,24 @@ export class ModelSelectorComponent extends Container {
 		return lines;
 	}
 
+	#billingPathForModel(model: Model): BillingPath | undefined {
+		try {
+			const fn = (
+				this.#modelRegistry as unknown as { getBillingPath?: (m: Model, s?: string) => BillingPath | undefined }
+			).getBillingPath;
+			if (typeof fn === "function") return fn.call(this.#modelRegistry, model, this.#authSessionId);
+		} catch {}
+		return undefined;
+	}
+
 	#formatAssignedModelLabel(model: Model, thinkingLevel: ThinkingLevel | undefined): string {
 		const modelLabel = sanitizeText(`${model.provider}/${model.id}`).replace(/\s+/g, " ").trim();
 		let label = modelLabel;
 		if (thinkingLevel && thinkingLevel !== ThinkingLevel.Inherit) {
 			label += ` (${getThinkingLevelMetadata(thinkingLevel).label})`;
 		}
+		const billing = this.#billingPathForModel(model)?.label;
+		if (billing) label += ` [${billing}]`;
 		return truncateToWidth(label, ROLE_BINDING_MAX_WIDTH);
 	}
 
@@ -1914,6 +1949,27 @@ export class ModelSelectorComponent extends Container {
 			this.#listContainer.addChild(new Spacer(1));
 			this.#listContainer.addChild(new Text(theme.fg("warning", `  ${this.#presetLoginHint}`), 0, 0));
 		}
+		// One-time metered billing notice for the currently selected model (first bind per credential source)
+		try {
+			const sel = this.#getSelectedItem?.() as any;
+			const m = sel?.model as any;
+			if (m && this.#viewMode === "models") {
+				const bp = this.#billingPathForModel(m);
+				if (bp && !(this.#isBillingDismissed?.(bp.dismissKey) ?? false)) {
+					this.#listContainer.addChild(new Spacer(1));
+					this.#listContainer.addChild(
+						new Text(
+							theme.fg("warning", `  Billing: ${bp.label} — charges may apply. Press d to dismiss.`),
+							0,
+							0,
+						),
+					);
+					this.#pendingBillingNoticeKey = bp.dismissKey;
+				} else {
+					this.#pendingBillingNoticeKey = undefined;
+				}
+			}
+		} catch {}
 		const previewProfile = this.#getProfileByName(this.#previewProfileName);
 		if (previewProfile) this.#renderPresetPreview(previewProfile);
 	}
@@ -2075,6 +2131,8 @@ export class ModelSelectorComponent extends Container {
 			) {
 				roleBadgeTokens.push(theme.icon.fast);
 			}
+			const billingLabel = this.#billingPathForModel(item.model)?.label;
+			if (billingLabel) roleBadgeTokens.push(theme.fg("warning", `[${billingLabel}]`));
 			const badgeText = roleBadgeTokens.length > 0 ? ` ${roleBadgeTokens.join(" ")}` : "";
 
 			let line = "";
@@ -2307,6 +2365,16 @@ export class ModelSelectorComponent extends Container {
 			return;
 		}
 
+		if (keyData === "d" || keyData === "D") {
+			if (this.#pendingBillingNoticeKey) {
+				try {
+					this.#markBillingDismissed?.(this.#pendingBillingNoticeKey);
+				} catch {}
+				this.#pendingBillingNoticeKey = undefined;
+				this.#updateList();
+				return;
+			}
+		}
 		// Pass everything else to search input
 		this.#searchInput.handleInput(keyData);
 		this.#filterModels(this.#searchInput.getValue());

package/src/modes/components/session-selector.ts

@@ -14,7 +14,12 @@ import {
 import { formatBytes } from "@gajae-code/utils";
 import { theme } from "../../modes/theme/theme";
 import { matchesAppInterrupt } from "../../modes/utils/keybinding-matchers";
-import type { ResumeSessionIdentity, ResumeTailInspection, SessionInfo } from "../../session/session-manager";
+import {
+	prioritizeStarredSessions,
+	type ResumeSessionIdentity,
+	type ResumeTailInspection,
+	type SessionInfo,
+} from "../../session/session-manager";
 import { DynamicBorder } from "./dynamic-border";
 import { HookSelectorComponent } from "./hook-selector";
 
@@ -71,17 +76,19 @@ class SessionList implements Component {
 	}
 
 	#filterSessions(query: string): void {
-		this.#filteredSessions = fuzzyFilter(this.allSessions, query, session =>
-			[
-				session.id,
-				session.title ?? "",
-				session.cwd ?? "",
-				session.firstMessage ?? "",
-				session.allMessagesText,
-				session.path,
-			]
-				.filter(Boolean)
-				.join(" "),
+		this.#filteredSessions = prioritizeStarredSessions(
+			fuzzyFilter(this.allSessions, query, session =>
+				[
+					session.id,
+					session.title ?? "",
+					session.cwd ?? "",
+					session.firstMessage ?? "",
+					session.allMessagesText,
+					session.path,
+				]
+					.filter(Boolean)
+					.join(" "),
+			),
 		);
 		this.#clampSelectedIndex();
 	}
@@ -131,8 +138,9 @@ class SessionList implements Component {
 			const cursorWidth = visibleWidth(cursor);
 			const prefix = selected ? theme.fg("accent", cursor) : padding(cursorWidth);
 			const message = session.firstMessage.replace(/\n/g, " ").trim();
-			const title = truncateToWidth(session.title ?? message, width - cursorWidth);
-			lines.push(prefix + (selected ? theme.bold(title) : title));
+			const star = session.starred ? theme.fg("warning", `${theme.icon.star} `) : "";
+			const title = truncateToWidth(session.title ?? message, width - cursorWidth - visibleWidth(star));
+			lines.push(prefix + star + (selected ? theme.bold(title) : title));
 			if (session.title) lines.push(`  ${theme.fg("dim", truncateToWidth(message, width - cursorWidth))}`);
 			lines.push(
 				theme.fg(
@@ -211,7 +219,7 @@ export class SessionSelectorComponent extends Container {
 		this.addChild(new DynamicBorder());
 		this.addChild(new Spacer(1));
 		this.addChild(this.#messageContainer);
-		this.#sessionList = new SessionList(sessions);
+		this.#sessionList = new SessionList(prioritizeStarredSessions(sessions));
 		this.#sessionList.onSelect = session => {
 			if (this.inspector) void this.#inspect(session);
 			else this.#dispatchSelect(session.path);

package/src/modes/components/sessions-dashboard.ts

@@ -1,6 +1,6 @@
 import * as fs from "node:fs";
-import { type Component, Container, matchesKey, truncateToWidth } from "@gajae-code/tui";
-import type { SessionInfo } from "../../session/session-manager";
+import { type Component, Container, matchesKey, truncateToWidth, visibleWidth } from "@gajae-code/tui";
+import { prioritizeStarredSessions, type SessionInfo } from "../../session/session-manager";
 import { theme } from "../theme/theme";
 
 const PRESENCE_MAX_BYTES = 4096;
@@ -41,6 +41,7 @@ export interface DashboardSession {
 	id: string;
 	cwd: string;
 	title: string;
+	starred: boolean;
 	modified: Date;
 	messageCount: number;
 	messageCountIsEstimate?: boolean;
@@ -78,10 +79,11 @@ export function dashboardSessions(
 	sessions: readonly SessionInfo[],
 	options: { readFile?: (filePath: string) => string; now?: number } = {},
 ): DashboardSession[] {
-	return sessions.map(session => ({
+	return prioritizeStarredSessions(sessions).map(session => ({
 		id: session.id,
 		cwd: session.cwd,
 		title: session.title ?? session.firstMessage,
+		starred: session.starred,
 		modified: session.modified,
 		messageCountIsEstimate: session.messageCountIsEstimate,
 		messageCount: session.messageCount,
@@ -169,10 +171,11 @@ class SessionDashboardRow implements Component {
 		const fullMetadata = `· ${count} · ${modified}`;
 		const compactMetadata = `· ${this.session.messageCountIsEstimate ? `~${this.session.messageCount}` : this.session.messageCount} msgs`;
 		const metadata = width >= 48 ? fullMetadata : width >= 24 ? compactMetadata : "";
-		const titleWidth = Math.max(0, width - 2 - metadata.length - (metadata ? 1 : 0));
+		const star = this.session.starred ? theme.fg("warning", `${theme.icon.star} `) : "";
+		const titleWidth = Math.max(0, width - 2 - visibleWidth(star) - metadata.length - (metadata ? 1 : 0));
 		return [
 			fit(
-				` ${status} ${truncateToWidth(title, titleWidth)}${metadata ? ` ${theme.fg("dim", metadata)}` : ""}`,
+				` ${status} ${star}${truncateToWidth(title, titleWidth)}${metadata ? ` ${theme.fg("dim", metadata)}` : ""}`,
 				width,
 			),
 			fit(`   ${theme.fg("dim", cwd)}`, width),

package/src/modes/controllers/command-controller.ts

@@ -1161,7 +1161,7 @@ export class CommandController {
 		}
 
 		try {
-			await this.ctx.sessionManager.runExclusiveCwdTransition(async () => {
+			await this.ctx.sessionManager.runExclusiveCwdMoveTransition(async () => {
 				await this.ctx.sessionManager.flush();
 				await this.ctx.sessionManager.moveTo(resolvedPath);
 				setProjectDir(resolvedPath);

package/src/modes/controllers/event-controller.ts

@@ -57,6 +57,17 @@ export const __eventControllerPerfCounters = {
 };
 
 const COMPLETION_NOTIFY_COMMAND_TIMEOUT_MS = 10_000;
+const TEXTLESS_LENGTH_WARNING =
+	'Response ended with stopReason "length" before producing visible text or a tool call. Check the model\'s output and context token limits (maxTokens in models.yml) or lower the reasoning level (/reasoning), then retry.';
+
+function isTextlessLengthStop(message: AssistantMessage | undefined): boolean {
+	return (
+		message?.stopReason === "length" &&
+		!message.content.some(
+			block => (block.type === "text" && block.text.trim().length > 0) || block.type === "toolCall",
+		)
+	);
+}
 
 interface CompletionNotifyPayload {
 	type: "agent-turn-complete";
@@ -904,7 +915,7 @@ export class EventController {
 		}
 	}
 
-	async #handleAgentEnd(_event: Extract<AgentSessionEvent, { type: "agent_end" }>): Promise<void> {
+	async #handleAgentEnd(event: Extract<AgentSessionEvent, { type: "agent_end" }>): Promise<void> {
 		this.ctx.setWorkingMessage(undefined);
 		stopInteractiveActivityIndicator(this.ctx, { foregroundSettled: true });
 		if (this.ctx.streamingComponent) {
@@ -929,6 +940,14 @@ export class EventController {
 		this.ctx.ui.requestRender();
 		this.#scheduleIdleCompaction();
 		emitHostStatus("finished");
+		const lastAssistant = this.ctx.session.getLastAssistantMessage();
+		if (
+			event.stopReason !== "cancelled" &&
+			event.stopReason !== "maintenance" &&
+			isTextlessLengthStop(lastAssistant)
+		) {
+			this.ctx.showWarning(TEXTLESS_LENGTH_WARNING);
+		}
 		this.sendCompletionNotification();
 		this.ctx.promptSuggestion?.onAgentEnd();
 	}
@@ -1204,13 +1223,20 @@ export class EventController {
 		// errored — those are not "Task complete" events. Mirrors the gate
 		// already used by #currentContextTokens, #handleMessageEnd, and the
 		// retry / TTSR / compaction skip paths across agent-session.ts.
-		const last = this.ctx.session.getLastAssistantMessage?.();
+		const last = this.ctx.session.getLastAssistantMessage();
 		if (last?.stopReason === "aborted" || last?.stopReason === "error") return;
 
 		const sessionName = this.ctx.sessionManager.getSessionName();
-		const title = sessionName ? `${sessionName}: Complete` : "Complete";
+		const textlessLengthStop = isTextlessLengthStop(last);
+		const title = textlessLengthStop
+			? sessionName
+				? `${sessionName}: Output limit reached`
+				: "Output limit reached"
+			: sessionName
+				? `${sessionName}: Complete`
+				: "Complete";
 		const summary = summaryFromMessage(last, 1000);
-		const body = summary ?? "Complete";
+		const body = textlessLengthStop ? TEXTLESS_LENGTH_WARNING : (summary ?? "Complete");
 		const sessionManager = this.ctx.sessionManager as { getCwd?: () => string; getSessionId?: () => string };
 		const payload: CompletionNotifyPayload = {
 			type: "agent-turn-complete",

package/src/modes/controllers/extension-ui-controller.ts

@@ -39,6 +39,7 @@ import {
 	SYNTHETIC_PROVIDER_ID,
 	syntheticNamespaceCollision,
 } from "../../sdk/model-profile-model";
+import { bashBackgroundControlError } from "../../session/fold-coordinator";
 import { createReadonlySessionManager } from "../../session/session-manager";
 import { parseThinkingLevel } from "../../thinking";
 import type { TodoPhase } from "../../tools/todo-write";
@@ -311,12 +312,11 @@ export class ExtensionUiController {
 					throw Object.assign(new Error("No retry backoff is pending."), { code: "retry_not_pending" });
 				session.retryNow();
 				return { retried: true, immediate: true };
-			case "bash.background":
-				if (!(await session.requestForegroundBashBackground()))
-					throw Object.assign(new Error("The active bash command cannot be moved to a managed background job."), {
-						code: "not_foldable",
-					});
-				return { backgrounded: true };
+			case "bash.background": {
+				const outcome = await session.requestForegroundBashBackgroundOutcome("sdk_control");
+				if (outcome.status !== "folded") throw bashBackgroundControlError(outcome);
+				return { backgrounded: true, jobId: outcome.jobId };
+			}
 			case "compaction.auto.set":
 				session.setAutoCompactionEnabled(input.on === true);
 				return { changed: true };
@@ -591,8 +591,8 @@ export class ExtensionUiController {
 					this.ctx.session.setFollowUpMode(mode);
 					return true;
 				}
-				if (kind === "interrupt" && (mode === "immediate" || mode === "wait")) {
-					this.ctx.session.setInterruptMode(mode);
+				if (kind === "tool_interrupt" && (mode === "abort_tools" || mode === "finish_tools")) {
+					this.ctx.session.setToolInterruptPolicy(mode);
 					return true;
 				}
 				return false;
@@ -821,8 +821,8 @@ export class ExtensionUiController {
 					this.ctx.session.setFollowUpMode(mode);
 					return true;
 				}
-				if (kind === "interrupt" && (mode === "immediate" || mode === "wait")) {
-					this.ctx.session.setInterruptMode(mode);
+				if (kind === "tool_interrupt" && (mode === "abort_tools" || mode === "finish_tools")) {
+					this.ctx.session.setToolInterruptPolicy(mode);
 					return true;
 				}
 				return false;
@@ -962,8 +962,8 @@ export class ExtensionUiController {
 								this.ctx.session.setFollowUpMode(mode);
 								return true;
 							}
-							if (kind === "interrupt" && (mode === "immediate" || mode === "wait")) {
-								this.ctx.session.setInterruptMode(mode);
+							if (kind === "tool_interrupt" && (mode === "abort_tools" || mode === "finish_tools")) {
+								this.ctx.session.setToolInterruptPolicy(mode);
 								return true;
 							}
 							return false;
@@ -973,7 +973,7 @@ export class ExtensionUiController {
 						getConfigItems: () => ({
 							steeringMode: this.ctx.session.steeringMode,
 							followUpMode: this.ctx.session.followUpMode,
-							interruptMode: this.ctx.session.interruptMode,
+							toolInterruptPolicy: this.ctx.session.toolInterruptPolicy,
 						}),
 						getBranchCandidates: () => this.ctx.sessionManager.getTree(),
 						getExtensions: () => this.ctx.session.extensionRunner?.getExtensionPaths() ?? [],

package/src/modes/controllers/input-controller.ts

@@ -1170,7 +1170,7 @@ export class InputController {
 			const promptOptions =
 				streamingBehavior === "followUp"
 					? { streamingBehavior, images, followUpQueuePolicy: "sequential" as const }
-					: { streamingBehavior, images };
+					: { streamingBehavior, images, steerQueuePolicy: "sequential" as const };
 			await this.ctx.withLocalSubmission(text, () => this.ctx.session.prompt(text, promptOptions), {
 				imageCount: images?.length ?? 0,
 			});
@@ -1683,7 +1683,7 @@ export class InputController {
 					},
 					streamingBehavior === "followUp"
 						? { streamingBehavior, followUpQueuePolicy: "sequential" }
-						: { streamingBehavior },
+						: { streamingBehavior, steerQueuePolicy: "sequential" },
 				);
 			}
 			if (this.ctx.session.isStreaming) {

package/src/modes/controllers/selector-controller.ts

@@ -7,6 +7,7 @@ import {
 	isSqliteCorruptionError,
 	isSqliteError,
 	type Model,
+	OAuthCredentialSelectorError,
 	resolveOAuthStorageProvider,
 } from "@gajae-code/ai/core";
 import { getOAuthProviders } from "@gajae-code/ai/utils/oauth";
@@ -2243,8 +2244,8 @@ export class SelectorController {
 			case "followUpMode":
 				this.ctx.session.setFollowUpMode(value as "all" | "one-at-a-time");
 				break;
-			case "interruptMode":
-				this.ctx.session.setInterruptMode(value as "immediate" | "wait");
+			case "toolInterruptPolicy":
+				this.ctx.session.setToolInterruptPolicy(value as "abort_tools" | "finish_tools");
 				break;
 			case "thinkingLevel":
 			case "defaultThinkingLevel":
@@ -3706,7 +3707,13 @@ export class SelectorController {
 							{
 								accountProviderId: selectedProviderId,
 								onAccountSelect: async (selectorValue: AuthCredentialSelector) => {
-									await this.ctx.session.setCredentialPin(selectedProviderId, selectorValue);
+									try {
+										await this.ctx.session.setCredentialPin(selectedProviderId, selectorValue);
+									} catch (error: unknown) {
+										if (!(error instanceof OAuthCredentialSelectorError)) throw error;
+										this.ctx.showError(error.message);
+										return;
+									}
 									selector.stopValidation();
 									done();
 									this.ctx.showStatus(`Pinned OAuth account for ${selectedProviderId} to this session.`);

package/src/modes/interactive-mode.ts

@@ -45,7 +45,7 @@ import {
 	starReminderLaunchGate,
 } from "../reminders/star-reminder";
 import type { NotificationSessionReconcileResult, NotificationSessionStatus } from "../sdk/bus/session-control";
-import type { AgentSession, AgentSessionEvent } from "../session/agent-session";
+import type { AgentSession, AgentSessionEvent, AsyncJobSnapshotItem } from "../session/agent-session";
 import type { HistoryStorage } from "../session/history-storage";
 import type { SessionContext, SessionManager } from "../session/session-manager";
 import { getRecentSessions, getSessionMessageEntryId } from "../session/session-manager";
@@ -186,18 +186,42 @@ export function getComposerPlaceholder(
 	return buildComposerPlaceholder(keybindings, context, options);
 }
 
+/** Running background work split into the three kinds the activity indicator names. */
+export interface BackgroundActivityTally {
+	subagents: number;
+	backgroundBash: number;
+	monitors: number;
+}
+
+/**
+ * Classify running jobs for the activity indicator using the three locked
+ * predicates: subagents are `task` jobs carrying subagent metadata, monitors
+ * are flagged by `metadata.monitor`, and background bash is a `bash` job that
+ * is not a monitor. A running job matching none of them (a task job without
+ * subagent metadata) is outside this indicator and is not counted.
+ */
+export function tallyBackgroundActivity(running: readonly AsyncJobSnapshotItem[]): BackgroundActivityTally {
+	const tally: BackgroundActivityTally = { subagents: 0, backgroundBash: 0, monitors: 0 };
+	for (const item of running) {
+		if (item.type === "task" && item.metadata?.subagent !== undefined) tally.subagents += 1;
+		else if (item.metadata?.monitor === true) tally.monitors += 1;
+		else if (item.type === "bash" && item.metadata?.backgrounded === true) tally.backgroundBash += 1;
+	}
+	return tally;
+}
+
 export function resolveActivityIndicatorMessage(
 	foregroundActive: boolean,
-	activeBackgroundTasks: number,
+	activity: BackgroundActivityTally,
 	foregroundMessage: string,
 ): string | undefined {
-	const backgroundCount = Math.max(0, Math.trunc(activeBackgroundTasks));
-	if (foregroundActive) {
-		if (backgroundCount === 0) return foregroundMessage;
-		return `${foregroundMessage} · ${backgroundCount} background task${backgroundCount === 1 ? "" : "s"}`;
-	}
-	if (backgroundCount === 0) return undefined;
-	return `Background: ${backgroundCount} task${backgroundCount === 1 ? "" : "s"}…`;
+	const parts: string[] = [];
+	if (activity.subagents > 0) parts.push(`${activity.subagents} subagent${activity.subagents === 1 ? "" : "s"}`);
+	if (activity.backgroundBash > 0) parts.push(`${activity.backgroundBash} background bash`);
+	if (activity.monitors > 0) parts.push(`${activity.monitors} monitor${activity.monitors === 1 ? "" : "s"}`);
+
+	if (foregroundActive) return parts.length === 0 ? foregroundMessage : `${foregroundMessage} · ${parts.join(", ")}`;
+	return parts.length === 0 ? undefined : `Background: ${parts.join(", ")}…`;
 }
 const WELCOME_RESERVED_CONTAINER_CHILD_LIMIT = 8;
 const COMPOSER_RIGHT_GUTTER_WIDTH = 1;
@@ -1926,8 +1950,8 @@ export class InteractiveMode implements InteractiveModeContext {
 		return main && dim ? { main, dim } : undefined;
 	}
 
-	#activeBackgroundTaskCount(): number {
-		return this.session.getAsyncJobSnapshot()?.running.length ?? 0;
+	#activeBackgroundActivity(): BackgroundActivityTally {
+		return tallyBackgroundActivity(this.session.getAsyncJobSnapshot()?.running ?? []);
 	}
 
 	#stopLoadingAnimation(): void {
@@ -1946,7 +1970,7 @@ export class InteractiveMode implements InteractiveModeContext {
 		}
 		const message = resolveActivityIndicatorMessage(
 			foregroundActive,
-			this.#activeBackgroundTaskCount(),
+			this.#activeBackgroundActivity(),
 			this.#pendingWorkingMessage ?? this.#defaultWorkingMessage,
 		);
 		if (!message) {