@bastani/atomic 0.9.13-alpha.1 → 0.9.13-alpha.3

package/dist/builtin/subagents/src/tui/render-result.ts

@@ -2,17 +2,11 @@ import { getMarkdownTheme, keyHintIfBound } from "@bastani/atomic";
 import type { AgentToolResult } from "@earendil-works/pi-agent-core";
 import { type Component, Container, Markdown, Spacer, Text } from "@earendil-works/pi-tui";
 import { formatDuration, formatTokens, formatUsage, shortenPath } from "../shared/formatters.ts";
-import type { AgentProgress, AsyncJobStep, Details } from "../shared/types.ts";
+import type { AgentProgress, Details } from "../shared/types.ts";
 import { getSingleResultOutput } from "../shared/utils.ts";
-import {
-	buildChainRenderEntries,
-	buildMultiProgressLabel,
-	type ChainRenderEntry,
-	resultRowLabel,
-	workflowGraphHasStatus,
-} from "./render-chain-graph.ts";
-import { modelThinkingBadge, widgetStepStatus } from "./render-event-formatting.ts";
+import { modelThinkingBadge } from "./render-event-formatting.ts";
 import { getTermWidth, type Theme, truncLine } from "./render-layout.ts";
+import { buildMultiProgressLabel, resultRowLabel } from "./render-progress.ts";
 import {
 	advanceResultPulseFrame,
 	clearResultAnimationTimer,
@@ -75,16 +69,7 @@ export function renderSubagentResult(
 	theme: Theme,
 ): Component {
 	const d = result.details;
-	if (d?.asyncId && d.results.length === 0) {
-		const contextPrefix = d.context === "fork" ? `${theme.fg("warning", "[fork]")} ` : "";
-		const container = new Container();
-		container.addChild(new Text(`${contextPrefix}${theme.fg("success", "launched")} · async run ${d.asyncId}`, 0, 0));
-		container.addChild(
-			new Text(theme.fg("dim", "completion pending; the detached result will be delivered when it finishes"), 0, 0),
-		);
-		return container;
-	}
-	const liveMultiProgress = (d?.mode === "parallel" || d?.mode === "chain") && (d?.progress?.length ?? 0) > 0;
+	const liveMultiProgress = d?.mode === "parallel" && (d?.progress?.length ?? 0) > 0;
 	if (!d?.results.length && !liveMultiProgress) {
 		const t = result.content[0];
 		const text = t?.type === "text" ? t.text : "(no output)";
@@ -118,10 +103,15 @@ export function renderSubagentResult(
 
 		const w = getTermWidth() - 4;
 		const fit = (text: string) => (expanded ? text : truncLine(text, w));
+		const modelDisplay = modelThinkingBadge(theme, r.model, r.thinking, r.fastMode);
 		const toolCallLines = getToolCallLines(r, expanded);
 		const c = new Container();
 		c.addChild(
-			new Text(fit(`${icon} ${theme.fg("toolTitle", theme.bold(r.agent))}${contextBadge}${progressInfo}`), 0, 0),
+			new Text(
+				fit(`${icon} ${theme.fg("toolTitle", theme.bold(r.agent))}${modelDisplay}${contextBadge}${progressInfo}`),
+				0,
+				0,
+			),
 		);
 		c.addChild(new Spacer(1));
 		const taskMaxLen = Math.max(20, w - 8);
@@ -184,7 +174,7 @@ export function renderSubagentResult(
 		if (r.attemptedModels && r.attemptedModels.length > 1) {
 			c.addChild(new Text(fit(theme.fg("dim", `Fallbacks: ${r.attemptedModels.join(" → ")}`)), 0, 0));
 		}
-		c.addChild(new Text(fit(theme.fg("dim", formatUsage(r.usage, r.model))), 0, 0));
+		c.addChild(new Text(fit(theme.fg("dim", formatUsage(r.usage))), 0, 0));
 		if (r.sessionFile) {
 			c.addChild(new Text(fit(theme.fg("dim", `Session: ${shortenPath(r.sessionFile)}`)), 0, 0));
 		}
@@ -199,9 +189,7 @@ export function renderSubagentResult(
 	if (!expanded) return renderMultiCompact(d, theme, options.now, options.pulseFrame);
 
 	const hasRunning =
-		d.progress?.some((p) => p.status === "running") ||
-		d.results.some((r) => r.progress?.status === "running") ||
-		workflowGraphHasStatus(d, ["running"]);
+		d.progress?.some((p) => p.status === "running") || d.results.some((r) => r.progress?.status === "running");
 	const ok = d.results.filter(
 		(r) => r.progress?.status === "completed" || (r.status === "ok" && r.progress?.status !== "running"),
 	).length;
@@ -211,19 +199,13 @@ export function renderSubagentResult(
 			r.progress?.status !== "running" &&
 			hasEmptyTextOutputWithoutOutputTarget(r.task, getSingleResultOutput(r)),
 	);
-	const hasWorkflowFailure = workflowGraphHasStatus(d, ["failed"]);
-	const hasWorkflowPause = workflowGraphHasStatus(d, ["paused", "detached"]);
 	const icon = hasRunning
 		? theme.fg("warning", "running")
 		: hasEmptyWithoutTarget
 			? theme.fg("warning", "warning")
-			: hasWorkflowFailure
-				? theme.fg("error", "failed")
-				: hasWorkflowPause
-					? theme.fg("warning", "paused")
-					: ok === d.results.length
-						? theme.fg("success", "ok")
-						: theme.fg("error", "failed");
+			: ok === d.results.length
+				? theme.fg("success", "ok")
+				: theme.fg("error", "failed");
 
 	const totalSummary =
 		d.progressSummary ||
@@ -233,8 +215,7 @@ export function renderSubagentResult(
 				if (prog) {
 					acc.toolCount += prog.toolCount;
 					acc.tokens += prog.tokens;
-					acc.durationMs =
-						d.mode === "chain" ? acc.durationMs + prog.durationMs : Math.max(acc.durationMs, prog.durationMs);
+					acc.durationMs = Math.max(acc.durationMs, prog.durationMs);
 				}
 				return acc;
 			},
@@ -250,32 +231,6 @@ export function renderSubagentResult(
 	const contextBadge = d.context === "fork" ? theme.fg("warning", " [fork]") : "";
 	const multiLabel = buildMultiProgressLabel(d, hasRunning);
 
-	const chainVis =
-		d.chainAgents?.length && !multiLabel.hasParallelInChain
-			? d.chainAgents
-					.map((agent, i) => {
-						const result = d.results[i];
-						const isFailed = result && result.status === "error" && result.progress?.status !== "running";
-						const isComplete = result && result.status === "ok" && result.progress?.status !== "running";
-						const isEmptyWithoutTarget =
-							Boolean(result) &&
-							Boolean(isComplete) &&
-							hasEmptyTextOutputWithoutOutputTarget(result.task, getSingleResultOutput(result));
-						const isCurrent = i === (d.currentStepIndex ?? d.results.length);
-						const stepIcon = isFailed
-							? theme.fg("error", "failed")
-							: isEmptyWithoutTarget
-								? theme.fg("warning", "warning")
-								: isComplete
-									? theme.fg("success", "done")
-									: isCurrent && hasRunning
-										? theme.fg("warning", "running")
-										: theme.fg("dim", "pending");
-						return `${stepIcon} ${agent}`;
-					})
-					.join(theme.fg("dim", " → "))
-			: null;
-
 	const w = getTermWidth() - 4;
 	const fit = (text: string) => (expanded ? text : truncLine(text, w));
 	const c = new Container();
@@ -288,50 +243,26 @@ export function renderSubagentResult(
 			0,
 		),
 	);
-	if (chainVis) {
-		c.addChild(new Text(fit(`  ${chainVis}`), 0, 0));
-	}
 
-	const useResultsDirectly = multiLabel.hasParallelInChain || !d.chainAgents?.length;
 	const progressSpan = d.progress?.length ? Math.max(...d.progress.map((p) => p.index + 1)) : 0;
 	const resultsSpan = Math.max(d.results.length, progressSpan, d.mode === "parallel" ? (d.totalSteps ?? 0) : 0);
 	const displayStart = multiLabel.showActiveGroupOnly ? multiLabel.groupStartIndex : 0;
-	const displayEnd = multiLabel.showActiveGroupOnly
-		? multiLabel.groupEndIndex
-		: useResultsDirectly
-			? resultsSpan
-			: d.chainAgents!.length;
-	const chainEntries = buildChainRenderEntries(d, multiLabel);
-	const renderEntries =
-		chainEntries ??
-		Array.from({ length: displayEnd - displayStart }, (_, offset): ChainRenderEntry => {
-			const i = displayStart + offset;
-			const r = d.results[i];
-			const progressAgent = d.progress?.find((p) => p.index === i)?.agent;
-			const rowNumber = multiLabel.showActiveGroupOnly ? i - multiLabel.groupStartIndex + 1 : i + 1;
-			return {
-				kind: "result",
-				resultIndex: i,
-				rowNumber,
-				agentName: useResultsDirectly
-					? r?.agent || progressAgent || `step-${rowNumber}`
-					: d.chainAgents![i] || r?.agent || progressAgent || `step-${rowNumber}`,
-			};
-		});
+	const displayEnd = multiLabel.showActiveGroupOnly ? multiLabel.groupEndIndex : resultsSpan;
+	const renderEntries = Array.from({ length: displayEnd - displayStart }, (_, offset) => {
+		const i = displayStart + offset;
+		const r = d.results[i];
+		const progressAgent = d.progress?.find((p) => p.index === i)?.agent;
+		const rowNumber = multiLabel.showActiveGroupOnly ? i - multiLabel.groupStartIndex + 1 : i + 1;
+		return {
+			resultIndex: i,
+			rowNumber,
+			agentName: r?.agent || progressAgent || `step-${rowNumber}`,
+		};
+	});
 
 	c.addChild(new Spacer(1));
 
 	for (const entry of renderEntries) {
-		if (entry.kind === "placeholder") {
-			const statusLabel = widgetStepStatus(entry.status as AsyncJobStep["status"], theme);
-			c.addChild(new Text(fit(`  ${statusLabel} ${entry.stepLabel}: ${theme.bold(entry.agentName)}`), 0, 0));
-			c.addChild(
-				new Text(theme.fg(entry.status === "failed" ? "error" : "dim", `    status: ${entry.status}`), 0, 0),
-			);
-			if (entry.error) c.addChild(new Text(theme.fg("error", `    error: ${entry.error}`), 0, 0));
-			c.addChild(new Spacer(1));
-			continue;
-		}
 		const i = entry.resultIndex;
 		const r = d.results[i];
 		const rowNumber = entry.rowNumber;
@@ -344,10 +275,16 @@ export function renderSubagentResult(
 				| undefined;
 			if (runningProg) {
 				const runningStats = ` | ${runningProg.toolCount} tools, ${formatDuration(displayProgressDurationMs(runningProg, options.now))}`;
+				const runningBadge = modelThinkingBadge(
+					theme,
+					runningProg.model,
+					runningProg.thinking,
+					runningProg.fastMode,
+				);
 				c.addChild(
 					new Text(
 						fit(
-							`${theme.fg("warning", "running")} ${rowLabel}: ${theme.bold(theme.fg("warning", agentName))}${runningStats}`,
+							`${theme.fg("warning", "running")} ${rowLabel}: ${theme.bold(theme.fg("warning", agentName))}${runningBadge}${runningStats}`,
 						),
 						0,
 						0,
@@ -389,7 +326,12 @@ export function renderSubagentResult(
 		const stats = rProg
 			? ` | ${rProg.toolCount} tools, ${formatDuration(displayProgressDurationMs(rProg, options.now))}`
 			: "";
-		const modelDisplay = modelThinkingBadge(theme, r.model, undefined, r.fastMode);
+		const modelDisplay = modelThinkingBadge(
+			theme,
+			r.model ?? rProg?.model,
+			r.thinking ?? rProg?.thinking,
+			r.fastMode ?? rProg?.fastMode,
+		);
 		const stepLabel = resultRowLabel(d, multiLabel, i, stepNumber);
 		const stepHeader = rRunning
 			? `${statusIcon} ${stepLabel}: ${theme.bold(theme.fg("warning", r.agent))}${modelDisplay}${stats}`

package/dist/builtin/subagents/src/tui/render-stable-output.ts

@@ -1,33 +1,5 @@
 import type { AgentToolResult } from "@earendil-works/pi-agent-core";
-import type { AgentProgress, AsyncJobState, Details } from "../shared/types.ts";
-
-export function widgetRenderKey(job: AsyncJobState): string {
-	return JSON.stringify({
-		asyncDir: job.asyncDir,
-		status: job.status,
-		activityState: job.activityState,
-		lastActivityAt: job.lastActivityAt,
-		currentTool: job.currentTool,
-		currentToolStartedAt: job.currentToolStartedAt,
-		currentPath: job.currentPath,
-		turnCount: job.turnCount,
-		toolCount: job.toolCount,
-		mode: job.mode,
-		agents: job.agents,
-		currentStep: job.currentStep,
-		chainStepCount: job.chainStepCount,
-		parallelGroups: job.parallelGroups,
-		steps: job.steps,
-		nestedChildren: job.nestedChildren,
-		stepsTotal: job.stepsTotal,
-		runningSteps: job.runningSteps,
-		completedSteps: job.completedSteps,
-		activeParallelGroup: job.activeParallelGroup,
-		startedAt: job.startedAt,
-		updatedAt: job.updatedAt,
-		totalTokens: job.totalTokens,
-	});
-}
+import type { AgentProgress, Details } from "../shared/types.ts";
 
 export function progressRenderKey(progress: Partial<AgentProgress> | undefined): string {
 	if (!progress) return "";
@@ -46,14 +18,6 @@ export function progressRenderKey(progress: Partial<AgentProgress> | undefined):
 	].join(":");
 }
 
-export function isRunningSubagentResult(result: AgentToolResult<Details>): boolean {
-	return (
-		result.details?.progress?.some((entry) => entry.status === "running") ||
-		result.details?.results.some((entry) => entry.progress?.status === "running") ||
-		false
-	);
-}
-
 export function subagentResultRenderKey(
 	result: AgentToolResult<Details>,
 	options: { expanded: boolean; isPartial: boolean },
@@ -79,8 +43,6 @@ export function subagentResultRenderKey(
 		options.isPartial ? "partial" : "final",
 		options.expanded ? "expanded" : "compact",
 		details.mode,
-		details.currentStepIndex ?? "",
-		details.asyncId ?? "",
 		details.totalSteps ?? "",
 		progressRenderKey(details.progressSummary),
 		progressKeys.join("|"),

package/dist/builtin/subagents/src/tui/render.ts

@@ -21,5 +21,3 @@ export {
 	clearResultAnimationTimer,
 	stopResultAnimations,
 } from "./render-result-animation.ts";
-export { widgetRenderKey } from "./render-stable-output.ts";
-export { buildWidgetLines, renderWidget, stopWidgetAnimation } from "./render-widget.ts";

package/dist/builtin/web-access/CHANGELOG.md

@@ -4,6 +4,20 @@ All notable changes to this project will be documented in this file.
 
 ## [Unreleased]
 
+## [0.9.13-alpha.2] - 2026-08-12
+
+### Changed
+
+- GitHub, credential-store, and Bun subprocesses now receive `AI_AGENT=atomic` for generic child-process attribution.
+
+### Fixed
+- Fixed background content fetch notifications that completed after an extension reload from throwing through stale runtime handles.
+- Fixed background fetch stale-context checks by consuming the host's exported predicate instead of copying its error-message marker.
+- Restored visible background content-fetch error notifications for non-stale success-path failures while keeping stale runtime errors contained and pending state alive until notification admission settles.
+
+- Routed query rewriting and summary-review model calls through Atomic's model runtime so registered custom providers and resolved request authentication apply.
+- Fixed frames and thumbnails returned by `fetch_content` bypassing the host's `images.autoResize` processing before they enter session history.
+
 ## [0.9.12] - 2026-08-04
 
 ### Fixed

package/dist/builtin/web-access/chrome-cookies.ts

@@ -3,6 +3,7 @@ import { pbkdf2Sync, createDecipheriv } from "node:crypto";
 import { copyFileSync, existsSync, mkdtempSync, rmSync } from "node:fs";
 import { tmpdir, homedir, platform } from "node:os";
 import { join } from "node:path";
+import { createChildProcessEnvironment } from "@bastani/atomic";
 
 export type CookieMap = Record<string, string>;
 
@@ -190,7 +191,7 @@ function readKeychainPassword(account: string, service: string): Promise<string
 		execFile(
 			"security",
 			["find-generic-password", "-w", "-a", account, "-s", service],
-			{ timeout: 5000 },
+			{ timeout: 5000, env: createChildProcessEnvironment() },
 			(err, stdout) => {
 				if (err) { resolve(null); return; }
 				resolve(stdout.trim() || null);
@@ -206,7 +207,7 @@ function readLinuxPassword(secretToolApp: string | undefined): Promise<string> {
 		execFile(
 			"secret-tool",
 			["lookup", "application", secretToolApp],
-			{ timeout: 5000 },
+			{ timeout: 5000, env: createChildProcessEnvironment() },
 			(err, stdout) => {
 				if (err) {
 					// KDE Wallet users fall through to peanuts intentionally.

package/dist/builtin/web-access/github-api.ts

@@ -1,4 +1,5 @@
 import { execFile } from "node:child_process";
+import { createChildProcessEnvironment } from "@bastani/atomic";
 import type { ExtractedContent } from "./extract.js";
 import { flattenTruncatedString } from "./flat-string.js";
 import type { GitHubUrlInfo } from "./github-extract.js";
@@ -13,7 +14,7 @@ export async function checkGhAvailable(): Promise<boolean> {
 	if (ghAvailable !== null) return ghAvailable;
 
 	return new Promise((resolve) => {
-		execFile("gh", ["--version"], { timeout: 5000 }, (err) => {
+		execFile("gh", ["--version"], { timeout: 5000, env: createChildProcessEnvironment() }, (err) => {
 			ghAvailable = !err;
 			resolve(ghAvailable);
 		});
@@ -31,7 +32,7 @@ export async function checkRepoSize(owner: string, repo: string): Promise<number
 	if (!(await checkGhAvailable())) return null;
 
 	return new Promise((resolve) => {
-		execFile("gh", ["api", `repos/${owner}/${repo}`, "--jq", ".size"], { timeout: 10000 }, (err, stdout) => {
+		execFile("gh", ["api", `repos/${owner}/${repo}`, "--jq", ".size"], { timeout: 10000, env: createChildProcessEnvironment() }, (err, stdout) => {
 			if (err) {
 				resolve(null);
 				return;
@@ -46,7 +47,7 @@ async function getDefaultBranch(owner: string, repo: string): Promise<string | n
 	if (!(await checkGhAvailable())) return null;
 
 	return new Promise((resolve) => {
-		execFile("gh", ["api", `repos/${owner}/${repo}`, "--jq", ".default_branch"], { timeout: 10000 }, (err, stdout) => {
+		execFile("gh", ["api", `repos/${owner}/${repo}`, "--jq", ".default_branch"], { timeout: 10000, env: createChildProcessEnvironment() }, (err, stdout) => {
 			if (err) {
 				resolve(null);
 				return;
@@ -64,7 +65,7 @@ async function fetchTreeViaApi(owner: string, repo: string, ref: string): Promis
 		execFile(
 			"gh",
 			["api", `repos/${owner}/${repo}/git/trees/${ref}?recursive=1`, "--jq", ".tree[].path"],
-			{ timeout: 15000, maxBuffer: 5 * 1024 * 1024 },
+			{ timeout: 15000, maxBuffer: 5 * 1024 * 1024, env: createChildProcessEnvironment() },
 			(err, stdout) => {
 				if (err) {
 					resolve(null);
@@ -90,7 +91,7 @@ async function fetchReadmeViaApi(owner: string, repo: string, ref: string): Prom
 		execFile(
 			"gh",
 			["api", `repos/${owner}/${repo}/readme?ref=${ref}`, "--jq", ".content"],
-			{ timeout: 10000 },
+			{ timeout: 10000, env: createChildProcessEnvironment() },
 			(err, stdout) => {
 				if (err) {
 					resolve(null);
@@ -114,7 +115,7 @@ async function fetchFileViaApi(owner: string, repo: string, path: string, ref: s
 		execFile(
 			"gh",
 			["api", `repos/${owner}/${repo}/contents/${path}?ref=${ref}`, "--jq", ".content"],
-			{ timeout: 10000, maxBuffer: 2 * 1024 * 1024 },
+			{ timeout: 10000, maxBuffer: 2 * 1024 * 1024, env: createChildProcessEnvironment() },
 			(err, stdout) => {
 				if (err) {
 					resolve(null);

package/dist/builtin/web-access/github-extract.ts

@@ -1,6 +1,7 @@
 import { existsSync, readFileSync, rmSync, statSync, readdirSync, openSync, readSync, closeSync, realpathSync } from "node:fs";
 import { execFile } from "node:child_process";
 import { extname, join, resolve as resolvePath, sep as pathSep } from "node:path";
+import { createChildProcessEnvironment } from "@bastani/atomic";
 import { activityMonitor } from "./activity.js";
 import type { ExtractedContent } from "./extract.js";
 import { flattenTruncatedString } from "./flat-string.js";
@@ -26,7 +27,7 @@ function cloneDir(config: GitHubCloneConfig, owner: string, repo: string, ref?:
 
 function execClone(args: string[], localPath: string, timeoutMs: number, signal?: AbortSignal): Promise<string | null> {
 	return new Promise((resolve) => {
-		const child = execFile(args[0], args.slice(1), { timeout: timeoutMs }, (err) => {
+		const child = execFile(args[0], args.slice(1), { timeout: timeoutMs, env: createChildProcessEnvironment() }, (err) => {
 			if (err) {
 				try {
 					rmSync(localPath, { recursive: true, force: true });

package/dist/builtin/web-access/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bastani/web-access",
-  "version": "0.9.13-alpha.1",
+  "version": "0.9.13-alpha.3",
   "private": true,
   "description": "Atomic extension for web search, URL fetching, GitHub repo cloning, PDF/video extraction. Fork of: https://github.com/nicobailon/pi-web-access",
   "contributors": [
@@ -31,7 +31,7 @@
   },
   "peerDependencies": {
     "@bastani/atomic": "*",
-    "@earendil-works/pi-tui": "^0.83.0"
+    "@earendil-works/pi-tui": "^0.84.1"
   },
   "peerDependenciesMeta": {
     "@bastani/atomic": {
@@ -44,7 +44,7 @@
   "dependencies": {
     "@mozilla/readability": "^0.6.0",
     "linkedom": "^0.18.13",
-    "p-limit": "^7.3.0",
+    "p-limit": "^7.3.1",
     "turndown": "^7.2.0",
     "unpdf": "1.7.0"
   }

package/dist/builtin/web-access/subprocess.ts

@@ -1,3 +1,5 @@
+import { createChildProcessEnvironment } from "@bastani/atomic";
+
 export interface BunSubprocessOptions {
 	timeoutMs: number;
 	maxStdoutBytes: number;
@@ -60,7 +62,7 @@ export async function runBunSubprocess(
 	try {
 		proc = Bun.spawn([command, ...args], {
 			cwd: options.cwd,
-			env: options.env ? { ...process.env, ...options.env } : process.env,
+			env: createChildProcessEnvironment(options.env),
 			stdin: "ignore",
 			stdout: "pipe",
 			stderr: "pipe",

package/dist/builtin/web-access/summary-review.ts

@@ -1,5 +1,5 @@
 import type { ProviderHeaders } from "@earendil-works/pi-ai";
-import { complete, getModel, type Message, type Model } from "@earendil-works/pi-ai/compat";
+import { getModel, type Message, type Model } from "@earendil-works/pi-ai/compat";
 import type { ExtensionContext } from "@bastani/atomic";
 import type { QueryResultData } from "./storage.js";
 
@@ -256,7 +256,7 @@ export async function generateSummaryDraft(
 		timestamp: Date.now(),
 	};
 
-	const response = await complete(model, { messages: [userMessage] }, { apiKey, headers, signal });
+	const response = await ctx.modelRegistry.complete(model, { messages: [userMessage] }, { apiKey, headers, signal });
 	if (response.stopReason === "aborted") {
 		throw new Error("Aborted");
 	}

package/dist/builtin/web-access/web-search-features.ts

@@ -1,4 +1,4 @@
-import type { ExtensionAPI, ExtensionContext } from "@bastani/atomic";
+import { isStaleExtensionContextError, type ExtensionAPI, type ExtensionContext } from "@bastani/atomic";
 import { fetchAllContent } from "./extract.js";
 import { clearCloneCache } from "./github-extract.js";
 import { registerContentTools } from "./content-tools.js";
@@ -65,7 +65,7 @@ export function registerWebSearchFeatures(pi: ExtensionAPI, initConfig: WebSearc
 		const controller = new AbortController();
 		pendingFetches.set(fetchId, controller);
 		fetchAllContent(urls, controller.signal)
-			.then((fetched) => {
+			.then(async (fetched) => {
 				if (!runtimeState.sessionActive || !pendingFetches.has(fetchId)) return;
 				const data: StoredSearchData = {
 					id: fetchId,
@@ -74,33 +74,49 @@ export function registerWebSearchFeatures(pi: ExtensionAPI, initConfig: WebSearc
 					urls: stripThumbnails(fetched),
 				};
 				storeResult(fetchId, data);
-				pi.appendEntry("web-search-results", data);
-				const ok = fetched.filter(f => !f.error).length;
-				pi.sendMessage(
-					{
-						customType: "web-search-content-ready",
-						content: `Content fetched for ${ok}/${fetched.length} URLs [${fetchId}]. Full page content now available.`,
-						display: true,
-					},
-					{ triggerTurn: true },
-				);
+				try {
+					pi.appendEntry("web-search-results", data);
+					const ok = fetched.filter(f => !f.error).length;
+					// Keep the fetch pending until notification admission settles so session
+					// changes can still clear the entry and abort its controller while admission is in flight.
+					await pi.sendMessage(
+						{
+							customType: "web-search-content-ready",
+							content: `Content fetched for ${ok}/${fetched.length} URLs [${fetchId}]. Full page content now available.`,
+							display: true,
+						},
+						{ triggerTurn: true },
+					);
+				} catch (error) {
+					if (!isStaleExtensionContextError(error)) throw error;
+				}
 			})
-			.catch((err) => {
+			.catch(async (err) => {
+				if (isStaleExtensionContextError(err)) return;
 				if (!runtimeState.sessionActive || !pendingFetches.has(fetchId)) return;
 				const message = err instanceof Error ? err.message : String(err);
 				const isAbort = (err instanceof Error && err.name === "AbortError") || message.toLowerCase().includes("abort");
 				if (!isAbort) {
-					pi.sendMessage(
-						{
-							customType: "web-search-error",
-							content: `Content fetch failed [${fetchId}]: ${message}`,
-							display: true,
-						},
-						{ triggerTurn: false },
-					);
+					try {
+						await pi.sendMessage(
+							{
+								customType: "web-search-error",
+								content: `Content fetch failed [${fetchId}]: ${message}`,
+								display: true,
+							},
+							{ triggerTurn: false },
+						);
+					} catch (error) {
+						if (!isStaleExtensionContextError(error)) throw error;
+					}
 				}
 			})
-			.finally(() => { pendingFetches.delete(fetchId); });
+			.finally(() => { pendingFetches.delete(fetchId); })
+			.catch((error) => {
+				if (!isStaleExtensionContextError(error)) {
+					console.error("Web search background fetch notification failed:", error);
+				}
+			});
 		return fetchId;
 	}
 

package/dist/builtin/web-access/web-search-summary.ts

@@ -1,4 +1,4 @@
-import { complete, getModel, type Model } from "@earendil-works/pi-ai/compat";
+import { getModel, type Model } from "@earendil-works/pi-ai/compat";
 import type { ProviderHeaders } from "@earendil-works/pi-ai";
 import type { QueryResultData } from "./storage.js";
 import {
@@ -39,7 +39,7 @@ export async function rewriteSearchQuery(
 		{ provider: "google", id: "gemini-2.5-flash" },
 		{ provider: "openai", id: "gpt-4.1-mini" },
 	]);
-	const response = await complete(
+	const response = await ctx.modelRegistry.complete(
 		model,
 		{
 			messages: [{