@gajae-code/coding-agent 0.17.4 → 0.17.6

package/src/session/agent-session.ts

@@ -5941,8 +5941,13 @@ export class AgentSession {
 		if (next && MCPManager.instance() === undefined) MCPManager.setInstance(next);
 	}
 
-	/** Swap named custom/project tools after a cwd rescope. */
-	async replaceNamedCustomTools(previousNames: readonly string[], nextTools: CustomTool[]): Promise<void> {
+	/** Swap named custom tools and their optional mandatory MCP selection. */
+	async replaceNamedCustomTools(
+		previousNames: readonly string[],
+		nextTools: readonly CustomTool[],
+		options?: { mandatoryMCPToolNames?: readonly string[]; activateNewTools?: boolean },
+	): Promise<void> {
+		const previousSelectedMCPToolNames = this.getSelectedMCPToolNames();
 		const previous = new Set(previousNames);
 		const previousActive = this.getActiveToolNames();
 		for (const name of previous) this.#toolRegistry.delete(name);
@@ -5956,11 +5961,21 @@ export class AgentSession {
 			this.#toolRegistry.set(finalTool.name, finalTool);
 			added.push(finalTool.name);
 		}
-		this.#invalidateDiscoveryCaches();
-		await this.#applyActiveToolsByName([
-			...previousActive.filter(name => !previous.has(name)),
-			...added.filter(name => !previous.has(name) || previousActive.includes(name)),
-		]);
+		if (options?.mandatoryMCPToolNames) {
+			this.#mandatoryMCPToolNames = new Set(
+				options.mandatoryMCPToolNames.map(name => name.toLowerCase()).filter(name => this.#toolRegistry.has(name)),
+			);
+		}
+		this.#setDiscoverableMCPTools(this.#collectDiscoverableMCPToolsFromRegistry());
+		await this.#applyActiveToolsByName(
+			[
+				...previousActive.filter(name => !previous.has(name)),
+				...added.filter(
+					name => previousActive.includes(name) || (options?.activateNewTools !== false && !previous.has(name)),
+				),
+			],
+			{ previousSelectedMCPToolNames },
+		);
 	}
 
 	/** Best-effort accessor for the active skill's `current_phase` field from
@@ -11884,6 +11899,7 @@ export class AgentSession {
 		options: {
 			selectedMCPToolNames?: string[];
 			activeMCPToolNames?: string[];
+			mandatoryMCPToolNames?: string[];
 			persistMCPSelection?: boolean;
 		} = {},
 	): Promise<void> {
@@ -11918,6 +11934,11 @@ export class AgentSession {
 		}
 
 		this.#setDiscoverableMCPTools(this.#collectDiscoverableMCPToolsFromRegistry());
+		if (options.mandatoryMCPToolNames !== undefined) {
+			this.#mandatoryMCPToolNames = new Set(
+				options.mandatoryMCPToolNames.map(name => name.toLowerCase()).filter(name => this.#toolRegistry.has(name)),
+			);
+		}
 		this.#pruneSelectedMCPToolNames();
 		const hasPersistedMCPToolSelection = this.buildDisplaySessionContext().hasPersistedMCPToolSelection;
 		if (options.selectedMCPToolNames) {
@@ -16752,6 +16773,16 @@ export class AgentSession {
 					...(registeredScope ? { terminalScope: registeredScope } : {}),
 				};
 			}
+			const retainedProof = await this.agent.resourceLedger.waitForSettlement(handle, { graceMs: 0 });
+			if (
+				retainedProof.status === "settled" ||
+				(retainedProof.status === "unfenced" && retainedProof.reason !== "unknown_run")
+			) {
+				return {
+					...retainedProof,
+					...(registeredScope ? { terminalScope: registeredScope } : {}),
+				};
+			}
 			return {
 				status: "unfenced",
 				reason: "unknown_run",
@@ -16761,9 +16792,17 @@ export class AgentSession {
 		}
 		if (handle === this.agent.activeResourceRunId) this.agent.abort();
 		const proof = await this.agent.resourceLedger.waitForSettlement(handle, { graceMs: options.graceMs });
-		if (proof.status === "unfenced") this.agent.resourceLedger.quarantine(handle);
+		if (proof.status === "unfenced" && proof.reason !== "resources_pending") {
+			this.agent.resourceLedger.quarantine(handle);
+		}
 		// The run's agent_end (if any) consumed the disposition; a settled or
-		// already-ended run must not leave it for an unrelated later exit.
+		// already-ended run must not leave it for an unrelated later exit. A
+		// `resources_pending` proof is different: the run is already sealed, and
+		// the ledger still owns exact promises for the outstanding resources.
+		// Keep that sealed accounting live so a later resolution of those exact
+		// tracked promises can remove its entries; this ledger proof does not
+		// establish that an OS process or remote tool stopped. Quarantining here
+		// would freeze a stale tombstone even after every tracked promise completed.
 		this.#disownedSteeringDisposition = undefined;
 		// Rearm surviving owned-completion follow-ups once the abort has
 		// settled: the aborted loop exits before polling the follow-up queue,
@@ -18209,6 +18248,7 @@ export class AgentSession {
 			reason?: TemporaryModelReason;
 			providerSessionScope?: TemporaryProviderSessionScope;
 			signal?: AbortSignal;
+			onMutationStarted?: () => void;
 		},
 		// biome-ignore lint/suspicious/noConfusingVoidType: Existing session adapters return Promise<void>; a scope is optional.
 	): Promise<TemporaryProviderSessionScope | void> {
@@ -18226,6 +18266,7 @@ export class AgentSession {
 			throw new Error(`No API key for ${model.provider}/${model.id}`);
 		}
 		if (suppliedScope && this.#temporaryProviderSessionScopes.at(-1)?.token !== suppliedScope) return;
+		options?.onMutationStarted?.();
 
 		const isTemporaryOperation = options?.cause === undefined || options.cause === "temporary-operation";
 		const autoCreateScope = isTemporaryOperation && !suppliedScope;
@@ -18277,13 +18318,18 @@ export class AgentSession {
 		model: Model | undefined,
 		thinkingLevel: ThinkingLevel | undefined,
 	): Promise<void> {
+		const previousEditMode = this.#resolveActiveEditMode();
 		if (model) {
-			await this.setModelTemporary(model, thinkingLevel, { cause: "rollback", reason: "other" });
-			return;
+			// Restoring a captured live model is compensation, not a new selection:
+			// the old credential may have disappeared after the forward mutation.
+			this.#setModelAuthoritatively(model, "rollback");
+			this.sessionManager.appendModelChange(`${model.provider}/${model.id}`, "temporary");
+			this.settings.getStorage()?.recordModelUsage(`${model.provider}/${model.id}`);
+		} else {
+			this.#clearActiveRetryFallback();
+			this.#setModelWithProviderSessionReset(undefined);
+			this.#syncAppendOnlyContext(undefined);
 		}
-		const previousEditMode = this.#resolveActiveEditMode();
-		this.#clearActiveRetryFallback();
-		this.#setModelWithProviderSessionReset(undefined);
 		this.setThinkingLevel(thinkingLevel);
 		await this.#syncEditToolModeAfterModelChange(previousEditMode);
 	}

package/src/session/internal/managed-session-scope.ts

@@ -1852,6 +1852,16 @@ function receiptMatches(
 				tree?: unknown;
 			};
 		};
+		// A receipt is keyed by its source and names exactly one destination. The
+		// resume listing probes every (legacy source, v2 destination) pair, so reject
+		// on these cheap receipt fields before hashing both transcripts and walking
+		// the artifact manifest; the full conjunction below would be false anyway.
+		if (
+			record.destination?.path !== destination.path ||
+			record.source?.path !== source.path ||
+			record.source?.sha256 !== source.identity.sha256
+		)
+			return false;
 		const exact = (
 			recorded: { dev?: unknown; ino?: unknown; size?: unknown; mtimeNs?: unknown } | undefined,
 			candidate: ManagedCandidate,

package/src/session/internal/managed-session-storage.ts

@@ -1178,11 +1178,40 @@ export function retainManagedDirectoryAuthority(
 		)
 			throw new Error("Managed root authority changed");
 		const relative = path.relative(root.canonicalPath, resolved).split(path.sep).join("/");
-		return rootAuthority.retainManagedDirectory(
+		const rootRecovery = rootAuthority.recoveryReaperMetrics();
+		const rootRecoveryUnhealthy = !rootRecovery.ok || Boolean(rootRecovery.code);
+		if (rootRecoveryUnhealthy)
+			logger.warn("Managed recovery sidecar reaping", {
+				ok: rootRecovery.ok,
+				code: rootRecovery.code,
+				reapedCount: rootRecovery.totalReapedFiles,
+				reapedBytes: rootRecovery.totalReapedBytes,
+				failureCount: rootRecovery.totalFailures,
+				scanLimited: rootRecovery.scanLimited,
+			});
+		const authority = rootAuthority.retainManagedDirectory(
 			relative,
 			canonicalFileId(named.dev).toString(),
 			canonicalFileId(named.ino).toString(),
 		);
+		const recovery = authority.recoveryReaperMetrics();
+		if (
+			!rootRecoveryUnhealthy &&
+			(!recovery.ok ||
+				recovery.code ||
+				recovery.totalReapedFiles !== "0" ||
+				recovery.totalFailures !== "0" ||
+				recovery.scanLimited)
+		)
+			logger.warn("Managed recovery sidecar reaping", {
+				ok: recovery.ok,
+				code: recovery.code,
+				reapedCount: recovery.totalReapedFiles,
+				reapedBytes: recovery.totalReapedBytes,
+				failureCount: recovery.totalFailures,
+				scanLimited: recovery.scanLimited,
+			});
+		return authority;
 	} finally {
 		rootAuthority.close();
 	}

package/src/setup/provider-presets.json

@@ -6,5 +6,6 @@
   {"id":"cline-pass","aliases":["clinepass","cline"],"name":"ClinePass","description":"ClinePass subscription models discovered from Cline's upstream models.dev catalog","compatibility":"openai","api":"openai-completions","providerId":"cline-pass","baseUrl":"https://api.cline.bot/api/v1","apiKeyEnv":"CLINE_API_KEY","discovery":{"type":"models-dev","modelsDevProvider":"cline-pass"},"compat":{"supportsStore":false,"supportsDeveloperRole":false,"supportsReasoningEffort":false,"reasoningContentField":"reasoning"}},
   {"id":"commandcode-goat","aliases":["commandcode","command-code","goat"],"name":"Command Code GOAT","description":"Command Code GOAT coding-plan models discovered from its OpenAI-compatible Provider API","compatibility":"openai","api":"openai-completions","providerId":"commandcode-goat","baseUrl":"https://api.commandcode.ai/provider/v1","apiKeyEnv":"CMD_API_KEY","discovery":{"type":"openai-models-list","apiByModelPrefix":{"claude":"anthropic-messages","anthropic/claude":"anthropic-messages"}},"compat":{"supportsStore":false,"supportsDeveloperRole":false,"supportsReasoningEffort":false,"maxTokensField":"max_tokens","reasoningContentField":"reasoning_content"}},
   {"id":"litellm","aliases":["litellm-proxy"],"name":"LiteLLM Proxy","description":"OpenAI-compatible LiteLLM proxy endpoint (user-supplied base URL) with live model discovery","compatibility":"openai","api":"openai-completions","providerId":"litellm","parameterized":true,"apiKeyEnv":"LITELLM_API_KEY","discovery":{"type":"openai-models-list"}},
-  {"id":"openai-compatible-proxy","aliases":["openai-proxy","compatible-proxy","custom-proxy"],"name":"OpenAI-Compatible Proxy","description":"Generic OpenAI-compatible gateway (OpenRouter, OpenCode Go, custom) with live model discovery","compatibility":"openai","api":"openai-completions","providerId":"openai-compatible-proxy","parameterized":true,"apiKeyEnv":"OPENAI_COMPATIBLE_API_KEY","discovery":{"type":"openai-models-list"}}
+  {"id":"openai-compatible-proxy","aliases":["openai-proxy","compatible-proxy","custom-proxy"],"name":"OpenAI-Compatible Proxy","description":"Generic OpenAI-compatible gateway (OpenRouter, OpenCode Go, custom) with live model discovery","compatibility":"openai","api":"openai-completions","providerId":"openai-compatible-proxy","parameterized":true,"apiKeyEnv":"OPENAI_COMPATIBLE_API_KEY","discovery":{"type":"openai-models-list"}},
+  {"id":"ionet","aliases":["io-net","io-intelligence"],"name":"IO Intelligence (io.net)","description":"OpenAI-compatible IO Intelligence endpoint by io.net with live model discovery","compatibility":"openai","api":"openai-completions","providerId":"ionet","baseUrl":"https://api.intelligence.io.solutions/api/v1","apiKeyEnv":"IONET_API_KEY","discovery":{"type":"openai-models-list"},"compat":{"supportsStore":false,"supportsDeveloperRole":false,"supportsReasoningEffort":false,"supportsUsageInStreaming":false,"maxTokensField":"max_tokens","reasoningContentField":"reasoning_content","extraBody":{"tool_choice":"auto"}}}
 ]

package/src/slash-commands/builtin-registry.ts

@@ -286,7 +286,7 @@ function providerSetupUsage(): string {
 	return [
 		"Provider onboarding",
 		"Presets: /provider add --preset <id> [--force]",
-		"Aliases include minimax, zai, alibaba, cline, command-code, and goat.",
+		"Aliases include minimax, zai, alibaba, cline, command-code, goat, and ionet.",
 		`API providers: ${MODEL_ONBOARDING_API_PROVIDER_COMMAND} [--force]`,
 		`Available presets:\n${formatProviderPresetList()}`,
 		"OAuth/subscription providers: /provider login [provider-id] or /login [provider-id]",

package/src/task/executor.ts

@@ -37,6 +37,7 @@ import { ModelRegistry } from "../config/model-registry";
 import {
 	formatModelString,
 	isExplicitProviderModelOverride,
+	refreshMissingQualifiedModelProviders,
 	resolveModelOverrideWithAuthFallback,
 } from "../config/model-resolver";
 import type { PromptTemplate } from "../config/prompt-templates";
@@ -1418,6 +1419,7 @@ export async function runSubprocessOnce(options: ExecutorOptions): Promise<Singl
 		forwardSubagentEvent(event);
 
 		const now = Date.now();
+		progress.lastActivityMs = now;
 		let flushProgress = false;
 		// A retry is recovered at the first assistant provider event, before the
 		// session emits auto_retry_end after message completion.
@@ -1719,19 +1721,20 @@ export async function runSubprocessOnce(options: ExecutorOptions): Promise<Singl
 			checkAbort();
 			// Pin authStorage to modelRegistry.authStorage — mirrors the createAgentSession invariant.
 			const registryFromParent = options.modelRegistry !== undefined;
+			const effectiveAgentDir = options.agentDir ?? settings.getAgentDir();
 			const registryAuthStorage =
 				options.authStorage ??
 				options.modelRegistry?.authStorage ??
-				(await awaitAbortable(discoverAuthStorage(settings.getAgentDir())));
+				(await awaitAbortable(discoverAuthStorage(effectiveAgentDir)));
 			if (options.modelRegistry === undefined && options.authStorage === undefined)
 				ownedAuthStorage = registryAuthStorage;
 			ownedModelRegistry = options.modelRegistry
 				? undefined
-				: new ModelRegistry(registryAuthStorage, path.join(settings.getAgentDir(), "models.yml"), settings, {
-						agentDir: settings.getAgentDir(),
+				: new ModelRegistry(registryAuthStorage, path.join(effectiveAgentDir, "models.yml"), settings, {
+						agentDir: effectiveAgentDir,
 						automaticRefresh: false,
 					});
-			const modelRegistry = options.modelRegistry ?? ownedModelRegistry!;
+			let modelRegistry = options.modelRegistry ?? ownedModelRegistry!;
 			const authStorage = modelRegistry.authStorage;
 			if (options.authStorage && options.authStorage !== authStorage) {
 				throw new Error(
@@ -1754,17 +1757,7 @@ export async function runSubprocessOnce(options: ExecutorOptions): Promise<Singl
 			const canonicalChildScope = getSubagentCanonicalScope(options.parentSessionId, options.subagentId ?? id);
 
 			if (options.preflightProbe || options.preflightDurable) preflightOperation = "auth_resolve";
-			const {
-				model,
-				thinkingLevel: resolvedThinkingLevel,
-				explicitThinkingLevel,
-				authFallbackUsed: resolvedAuthFallbackUsed,
-				requestedModel,
-				fallbackReason,
-				activeIndex,
-				parentFallbackSelector,
-				skips,
-			} = await awaitAbortable(
+			const resolveConfiguredModel = () =>
 				resolveModelOverrideWithAuthFallback(
 					modelPatterns,
 					options.preflightProbe || options.preflightDurable ? undefined : options.parentActiveModelPattern,
@@ -1776,8 +1769,44 @@ export async function runSubprocessOnce(options: ExecutorOptions): Promise<Singl
 						...(options.parentActiveModelProfile ? { aliasIntent: "preset-equivalent" } : {}),
 					},
 					canonicalChildScope,
-				),
-			);
+				);
+			let resolution = await awaitAbortable(resolveConfiguredModel());
+			if (
+				!resolution.model &&
+				registryFromParent &&
+				isExplicitProviderModelOverride(modelPatterns) &&
+				resolution.skips.some(skip => skip.reason === "unknown_model")
+			) {
+				ownedModelRegistry = new ModelRegistry(
+					registryAuthStorage,
+					path.join(effectiveAgentDir, "models.yml"),
+					settings,
+					{
+						agentDir: effectiveAgentDir,
+						automaticRefresh: false,
+					},
+				);
+				await awaitAbortable(
+					refreshMissingQualifiedModelProviders(
+						modelPatterns,
+						ownedModelRegistry,
+						options.parentCredentialSessionId ?? options.parentSessionId,
+					),
+				);
+				modelRegistry = ownedModelRegistry;
+				resolution = await awaitAbortable(resolveConfiguredModel());
+			}
+			const {
+				model,
+				thinkingLevel: resolvedThinkingLevel,
+				explicitThinkingLevel,
+				authFallbackUsed: resolvedAuthFallbackUsed,
+				requestedModel,
+				fallbackReason,
+				activeIndex,
+				parentFallbackSelector,
+				skips,
+			} = resolution;
 			if (!model && isExplicitProviderModelOverride(modelPatterns)) {
 				const skipReasons = [...new Set(skips.map(skip => skip.reason))];
 				if ((options.preflightProbe || options.preflightDurable) && skipReasons.includes("unauthenticated")) {

package/src/task/types.ts

@@ -285,6 +285,8 @@ export interface AgentProgress {
 	recentTools: Array<{ tool: string; args: string; endMs: number }>;
 	recentOutput: string[];
 	toolCount: number;
+	/** Epoch ms of the latest event observed from this subagent (any agent event). */
+	lastActivityMs?: number;
 	/** Cumulative input + output + cacheWrite tokens across all turns. Excludes cacheRead (re-reads cached context every turn, making cumulative sum misleading). */
 	tokens: number;
 	/**

package/src/tools/bash-interactive.ts

@@ -331,6 +331,7 @@ export async function runInteractiveBashPty(
 		timeoutMs: number;
 		signal?: AbortSignal;
 		env?: Record<string, string>;
+		unsetEnv?: string[];
 		artifactPath?: string;
 		artifactId?: string;
 		artifactPublisher?: TerminalArtifactPublisher;
@@ -422,6 +423,7 @@ export async function runInteractiveBashPty(
 				cwd: options.cwd,
 				timeoutMs: options.timeoutMs,
 				env: { ...NON_INTERACTIVE_ENV, ...options.env },
+				unsetEnv: options.unsetEnv,
 				signal: processAbortController.signal,
 				cols: initialPtySize.cols,
 				rows: initialPtySize.rows,

package/src/tools/bash.ts

@@ -94,6 +94,15 @@ const ARTIFACT_SAVE_DIAGNOSTIC_MAX_BYTES = 256;
 const BASH_ENV_NAME_PATTERN = /^[A-Za-z_][A-Za-z0-9_]*$/;
 const MASTER_CAPABILITY_ENV = "GJC_MASTER_CAPABILITY";
 const MASTER_OWNER_SESSION_ENV = "GJC_MASTER_OWNER_SESSION_ID";
+const COORDINATOR_ONLY_BASH_ENV = [
+	"GJC_COORDINATOR_SESSION_STATE_FILE",
+	"GJC_COORDINATOR_SESSION_ID",
+	"GJC_COORDINATOR_SESSION_BRANCH",
+	"GJC_COORDINATOR_SESSION_LAUNCH_ID",
+	"GJC_COORDINATOR_SESSION_READINESS_FILE",
+	"GJC_COORDINATOR_SIDECAR_SIGNATURE_REQUIRED",
+	"GJC_COORDINATOR_SIDECAR_KEY_ID",
+] as const;
 const DEFAULT_AUTO_BACKGROUND_THRESHOLD_MS = 60_000;
 const ACP_RELEASE_TIMEOUT_MS = 1_000;
 const READ_ONLY_BASH_ENV: Record<string, string> = {
@@ -1051,6 +1060,7 @@ export class BashTool implements AgentTool<BashToolSchema, BashToolDetails> {
 		notices?: readonly string[];
 
 		resolvedEnv?: Record<string, string>;
+		unsetEnv: string[];
 		directMasterSpawn: boolean;
 		onUpdate?: AgentToolUpdateCallback<BashToolDetails>;
 		startBackgrounded: boolean;
@@ -1108,6 +1118,7 @@ export class BashTool implements AgentTool<BashToolSchema, BashToolDetails> {
 								timeout: options.timeoutMs,
 								signal: runSignal,
 								env: options.resolvedEnv,
+								unsetEnv: options.unsetEnv,
 								artifactPath,
 								artifactId,
 								artifactPublisher,
@@ -1290,6 +1301,7 @@ export class BashTool implements AgentTool<BashToolSchema, BashToolDetails> {
 		command: string;
 		commandCwd: string;
 		resolvedEnv: Record<string, string>;
+		unsetEnv: string[];
 		directMasterSpawn: boolean;
 		requestedTimeoutSec: number;
 		timeoutSec: number;
@@ -1462,6 +1474,7 @@ export class BashTool implements AgentTool<BashToolSchema, BashToolDetails> {
 			...(this.session.bashRestrictionProfile === "read-only" ? READ_ONLY_BASH_ENV : {}),
 			...(allowedPrefixes && allowedPrefixes.length > 0 ? { [GJC_RESTRICTED_ROLE_AGENT_BASH_ENV]: "1" } : {}),
 		};
+		const unsetEnv = COORDINATOR_ONLY_BASH_ENV.filter(name => !Object.hasOwn(expandedEnv ?? {}, name));
 
 		if (cwd?.includes("://") || cwd?.includes("local:/")) {
 			cwd = await expandInternalUrls(cwd, { ...internalUrlOptions, noEscape: true });
@@ -1494,6 +1507,7 @@ export class BashTool implements AgentTool<BashToolSchema, BashToolDetails> {
 			command,
 			commandCwd,
 			resolvedEnv,
+			unsetEnv,
 			directMasterSpawn,
 			requestedTimeoutSec,
 			timeoutSec,
@@ -1657,6 +1671,7 @@ export class BashTool implements AgentTool<BashToolSchema, BashToolDetails> {
 						timeout: monitorTimeoutMs,
 						signal,
 						env: prepared.resolvedEnv,
+						unsetEnv: prepared.unsetEnv,
 						artifactPath,
 						artifactId,
 						artifactPublisher,
@@ -1743,6 +1758,7 @@ export class BashTool implements AgentTool<BashToolSchema, BashToolDetails> {
 			command,
 			commandCwd,
 			resolvedEnv,
+			unsetEnv,
 			directMasterSpawn,
 			requestedTimeoutSec,
 			timeoutSec,
@@ -1782,6 +1798,7 @@ export class BashTool implements AgentTool<BashToolSchema, BashToolDetails> {
 				notices: pendingNotices,
 
 				resolvedEnv,
+				unsetEnv,
 				directMasterSpawn,
 				onUpdate,
 				startBackgrounded: true,
@@ -1834,6 +1851,7 @@ export class BashTool implements AgentTool<BashToolSchema, BashToolDetails> {
 				notices: pendingNotices,
 
 				resolvedEnv,
+				unsetEnv,
 				directMasterSpawn,
 				onUpdate,
 				startBackgrounded,
@@ -2606,6 +2624,7 @@ export class BashTool implements AgentTool<BashToolSchema, BashToolDetails> {
 					timeoutMs,
 					signal,
 					env: resolvedEnv,
+					unsetEnv,
 					artifactPath,
 					artifactId,
 					artifactPublisher,
@@ -2774,6 +2793,7 @@ export class BashTool implements AgentTool<BashToolSchema, BashToolDetails> {
 					timeout: timeoutMs,
 					signal,
 					env: resolvedEnv,
+					unsetEnv,
 					artifactPath,
 					artifactId,
 					artifactPublisher,

package/src/tools/fetch.ts

@@ -11,15 +11,20 @@ import { type Theme, theme } from "../modes/theme/theme";
 import type { ToolSession } from "../sdk";
 import type { AgentStorage } from "../session/agent-storage";
 import { DEFAULT_MAX_BYTES, type TruncationDirection, truncateContent } from "../session/streaming-output";
-import { renderStatusLine } from "../tui";
 import { CachedOutputBlock } from "../tui/output-block";
+import { renderStatusLine } from "../tui/status-line";
 import { formatDimensionNote, resizeImage } from "../utils/image-resize";
 import { parseHtmlLazy } from "../utils/linkedom";
 import { INSANE_NOTES } from "../web/insane/bridge";
 import { validatePublicHttpUrl } from "../web/insane/url-guard";
-import { specialHandlers } from "../web/scrapers";
-import type { RenderResult } from "../web/scrapers/types";
-import { finalizeOutput, loadPage, looksLikeHtml, MAX_OUTPUT_CHARS } from "../web/scrapers/types";
+import {
+	finalizeOutput,
+	loadPage,
+	looksLikeHtml,
+	MAX_OUTPUT_CHARS,
+	type RenderResult,
+	type SpecialHandler,
+} from "../web/scrapers/types";
 import { convertWithMarkit, fetchBinary } from "../web/scrapers/utils";
 import { applyListLimit } from "./list-limit";
 import { formatStyledArtifactReference, type OutputMeta } from "./output-meta";
@@ -30,6 +35,12 @@ import { clampTimeout } from "./tool-timeouts";
 
 type NativeHtmlBindings = { htmlToMarkdown: typeof htmlToMarkdownFn };
 let nativeHtmlBindings: NativeHtmlBindings | undefined;
+let specialHandlersCache: SpecialHandler[] | undefined;
+
+function getSpecialHandlers(): SpecialHandler[] {
+	specialHandlersCache ??= (require("../web/scrapers") as { specialHandlers: SpecialHandler[] }).specialHandlers;
+	return specialHandlersCache;
+}
 
 /**
  * Lazy native access for HTML conversion. The module is cached, never the
@@ -659,7 +670,7 @@ async function handleSpecialUrls(
 	signal: AbortSignal | undefined,
 	storage: AgentStorage | null,
 ): Promise<FetchRenderResult | null> {
-	for (const handler of specialHandlers) {
+	for (const handler of getSpecialHandlers()) {
 		if (signal?.aborted) {
 			throw new ToolAbortError();
 		}
@@ -669,6 +680,11 @@ async function handleSpecialUrls(
 	return null;
 }
 
+/** Test-only seam for verifying lazy special-handler loading and dispatch. */
+export const fetchSpecialHandlerTestHooks = {
+	dispatch: handleSpecialUrls,
+};
+
 // =============================================================================
 // Main Render Function
 // =============================================================================

package/src/tools/subagent-render.ts

@@ -9,6 +9,7 @@
  */
 import type { Component } from "@gajae-code/tui";
 import { Text } from "@gajae-code/tui";
+import { formatNumber } from "@gajae-code/utils";
 import type { RenderResultOptions } from "../extensibility/custom-tools/types";
 import type { Theme } from "../modes/theme/theme";
 import { providerRetryPhaseLabel } from "../task/provider-retry-status";
@@ -22,6 +23,7 @@ import {
 	truncateToWidth,
 } from "./render-utils";
 import {
+	SUBAGENT_ACTIVITY_BUCKET_MS,
 	type SubagentLiveProgress,
 	type SubagentSnapshot,
 	type SubagentToolDetails,
@@ -186,7 +188,28 @@ function renderSubagentStatusLine(snapshot: SubagentSnapshot, theme: Theme, spin
 			)
 		: theme.fg("dim", snapshot.status);
 	const duration = theme.fg("dim", formatDuration(snapshot.durationMs));
-	return `${icon} ${id} ${status} ${duration}`;
+	const live = snapshot.liveProgressAvailable !== false ? snapshot.progress : undefined;
+	return `${icon} ${id} ${status} ${duration}${live ? formatLiveStats(live, theme, Date.now()) : ""}`;
+}
+
+// Live stats ride the cheap status line (rebuilt every render), never the cached
+// body. Quantize age to the producer cadence so incidental renders do not churn it.
+function formatLiveStats(progress: SubagentLiveProgress, theme: Theme, nowMs: number): string {
+	const parts: string[] = [];
+	if (progress.toolCount) parts.push(`${progress.toolCount} ${progress.toolCount === 1 ? "tool" : "tools"}`);
+	if (progress.contextTokens) {
+		parts.push(
+			progress.contextWindow
+				? `${formatNumber(progress.contextTokens)}/${formatNumber(progress.contextWindow)} ctx`
+				: `${formatNumber(progress.contextTokens)} ctx`,
+		);
+	}
+	if (progress.lastActivityMs !== undefined && progress.status === "running") {
+		const ageMs = Math.max(0, nowMs - progress.lastActivityMs);
+		const ageBucketMs = Math.floor(ageMs / SUBAGENT_ACTIVITY_BUCKET_MS) * SUBAGENT_ACTIVITY_BUCKET_MS;
+		parts.push(`last activity ${formatDuration(ageBucketMs)} ago`);
+	}
+	return parts.map(part => `${theme.sep.dot}${theme.fg("dim", part)}`).join("");
 }
 
 function renderSubagentLiveProgress(

package/src/tools/subagent.ts

@@ -120,6 +120,10 @@ export interface SubagentLiveProgress {
 	currentTool?: string;
 	recentTool?: string;
 	recentOutputSummary?: { lineCount: number };
+	toolCount?: number;
+	contextTokens?: number;
+	contextWindow?: number;
+	lastActivityMs?: number;
 	fastMode?: boolean;
 	retryState?: {
 		attempt: number;
@@ -145,6 +149,14 @@ function toSubagentLiveProgress(progress: AgentProgress): SubagentLiveProgress {
 		...(progress.recentOutput.length > 0
 			? { recentOutputSummary: { lineCount: Math.min(progress.recentOutput.length, 6) } }
 			: {}),
+		...(progress.toolCount > 0 ? { toolCount: progress.toolCount } : {}),
+		...(progress.contextTokens !== undefined && progress.contextTokens > 0
+			? { contextTokens: progress.contextTokens }
+			: {}),
+		...(progress.contextWindow !== undefined && progress.contextWindow > 0
+			? { contextWindow: progress.contextWindow }
+			: {}),
+		...(progress.lastActivityMs !== undefined ? { lastActivityMs: progress.lastActivityMs } : {}),
 		...(progress.fastMode ? { fastMode: true } : {}),
 		...(progress.retryState
 			? {
@@ -1104,11 +1116,15 @@ function previewJobOutput(
  * unsafe.
  *
  * Time-derived fields are intentionally excluded so the panel does not churn while
- * idle: raw durations (`durationMs`), current-tool elapsed (`currentToolStartMs`),
+ * idle (the child's last-event timestamp is included; it moves only on real
+ * activity): raw durations (`durationMs`), current-tool elapsed (`currentToolStartMs`),
  * and retry countdowns (`retryState.startedAtMs`) are omitted. Idle duration and
  * countdown ticking is sacrificed by design; every real transition still changes
  * the signature.
  */
+/** Shared cadence for await progress refreshes and rendered last-activity age. */
+export const SUBAGENT_ACTIVITY_BUCKET_MS = 5_000;
+
 export function subagentAwaitRenderedStateSignature(
 	subagents: readonly SubagentSnapshot[],
 	receipt?: Pick<SubagentToolDetails, "awaitOutcome" | "interrupted">,
@@ -1156,6 +1172,16 @@ function canonicalizeProgressForSignature(progress: SubagentLiveProgress): unkno
 		currentTool: progress.currentTool ?? null,
 		recentTool: progress.recentTool ?? null,
 		recentOutputSummary: progress.recentOutputSummary ?? null,
+		toolCount: progress.toolCount ?? 0,
+		contextTokens: progress.contextTokens ?? null,
+		contextWindow: progress.contextWindow ?? null,
+		// Event timestamp, bucketed: it only moves when the child actually does
+		// something (idle gating holds), and the bucket keeps a streaming child from
+		// re-emitting on every delta. The status-line age is quantized to this cadence.
+		lastActivityBucket:
+			progress.lastActivityMs === undefined
+				? null
+				: Math.floor(progress.lastActivityMs / SUBAGENT_ACTIVITY_BUCKET_MS),
 		fastMode: progress.fastMode ?? false,
 		retryFailure: progress.retryFailure ?? null,
 		retryState: progress.retryState

package/src/utils/mupdf.ts

@@ -122,8 +122,15 @@ function formatMuPdfCauseChain(error: unknown): string {
 // internal inspection and operational debug logging. Conservatively redact the
 // rest of a path-bearing field so spaces in install paths cannot leak suffixes.
 export function sanitizeMuPdfDiagnostic(message: string): string {
-	return util
-		.stripVTControlCharacters(message)
-		.replace(/[\u0000-\u001f\u007f-\u009f\u2028\u2029\u202a-\u202e\u2066-\u2069]/g, "")
-		.replace(/[^\s"'`]*(?:[/\\]|%2f|%5c)[^"'`]*(?=["'`]|$)/gi, "[path redacted]");
+	return (
+		util
+			.stripVTControlCharacters(message)
+			.replace(/[\u0000-\u001f\u007f-\u009f\u2028\u2029\u202a-\u202e\u2066-\u2069]/g, "")
+			// The prefix run is boundary anchored. Unbounded, `[^\s"'`]*` is re-tried at
+			// every offset of a long slash-free run before failing to find a separator,
+			// which is quadratic in the message length: 100 KB cost about 13s. A MuPDF
+			// diagnostic is derived from the document being converted, and
+			// `normalizeError` runs this once per link in the cause chain.
+			.replace(/(?<![^\s"'`])[^\s"'`]*(?:[/\\]|%2f|%5c)[^"'`]*(?=["'`]|$)/gi, "[path redacted]")
+	);
 }