@bastani/atomic 0.9.16-alpha.2 → 0.9.16-alpha.3

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

@@ -1,181 +0,0 @@
-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";
-import { clearResults, generateId, restoreFromSession, storeResult, type StoredSearchData } from "./storage.js";
-import {
-	createActivityWidgetState,
-	refreshActivityForSession,
-	shutdownActivityWidget,
-	toggleActivityWidget,
-} from "./web-search-activity.js";
-import { openCuratorBrowser as openCuratorBrowserForSearch } from "./web-search-curator.js";
-import { MAX_INLINE_CONTENT, formatFullResults, stripThumbnails } from "./web-search-formatting.js";
-import { buildSearchReturn, type SearchReturnBuilder } from "./web-search-return.js";
-import { cancelPendingCurate, type PendingCurate, type WebSearchRuntimeState } from "./web-search-types.js";
-import { DEFAULT_SHORTCUTS, type WebSearchConfig } from "./web-search-config.js";
-import { registerWebSearchCommand } from "./web-search-command.js";
-import { registerWebSearchTool } from "./web-search-tool.js";
-
-const pendingFetches = new Map<string, AbortController>();
-
-const runtimeState: WebSearchRuntimeState = {
-	sessionActive: false,
-	pendingCurate: null,
-	activeCurator: null,
-	glimpseWin: null,
-};
-
-const activityState = createActivityWidgetState();
-
-function abortPendingFetches(): void {
-	for (const controller of pendingFetches.values()) {
-		controller.abort();
-	}
-	pendingFetches.clear();
-}
-
-function closeCurator(): void {
-	const win = runtimeState.glimpseWin;
-	runtimeState.glimpseWin = null;
-	try { win?.close(); } catch {}
-	cancelPendingCurate(runtimeState);
-	if (runtimeState.activeCurator) {
-		runtimeState.activeCurator.close();
-		runtimeState.activeCurator = null;
-	}
-}
-
-function handleSessionChange(ctx: ExtensionContext): void {
-	abortPendingFetches();
-	closeCurator();
-	clearCloneCache();
-	runtimeState.sessionActive = true;
-	restoreFromSession(ctx);
-	refreshActivityForSession(activityState, ctx);
-}
-
-export function registerWebSearchFeatures(pi: ExtensionAPI, initConfig: WebSearchConfig): void {
-	const curateKey = initConfig.shortcuts?.curate || DEFAULT_SHORTCUTS.curate;
-	const activityKey = initConfig.shortcuts?.activity || DEFAULT_SHORTCUTS.activity;
-
-	function startBackgroundFetch(urls: string[]): string | null {
-		if (urls.length === 0) return null;
-		const fetchId = generateId();
-		const controller = new AbortController();
-		pendingFetches.set(fetchId, controller);
-		fetchAllContent(urls, controller.signal)
-			.then(async (fetched) => {
-				if (!runtimeState.sessionActive || !pendingFetches.has(fetchId)) return;
-				const data: StoredSearchData = {
-					id: fetchId,
-					type: "fetch",
-					timestamp: Date.now(),
-					urls: stripThumbnails(fetched),
-				};
-				storeResult(fetchId, data);
-				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(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) {
-					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); })
-			.catch((error) => {
-				if (!isStaleExtensionContextError(error)) {
-					console.error("Web search background fetch notification failed:", error);
-				}
-			});
-		return fetchId;
-	}
-
-	const buildReturn: SearchReturnBuilder = (opts) => buildSearchReturn(opts, { pi, startBackgroundFetch });
-	const openCuratorBrowser = (pc: PendingCurate, searchesComplete = true) => openCuratorBrowserForSearch(
-		{ pi, state: runtimeState, buildSearchReturn: buildReturn, closeCurator },
-		pc,
-		searchesComplete,
-	);
-
-	pi.registerShortcut(curateKey, {
-		description: "Review search results",
-		handler: async (ctx) => {
-			const pc = runtimeState.pendingCurate;
-			if (!pc) return;
-
-			if (pc.phase === "searching") {
-				pc.browserPromise = openCuratorBrowser(pc, false);
-				ctx.ui.notify("Opening curator — remaining searches will stream in", "info");
-				return;
-			}
-		},
-	});
-
-	pi.registerShortcut(activityKey, {
-		description: "Toggle web search activity",
-		handler: async (ctx) => {
-			toggleActivityWidget(activityState, ctx);
-		},
-	});
-
-	pi.on("session_start", async (_event, ctx) => handleSessionChange(ctx));
-	pi.on("session_tree", async (_event, ctx) => handleSessionChange(ctx));
-
-	pi.on("session_shutdown", () => {
-		runtimeState.sessionActive = false;
-		abortPendingFetches();
-		closeCurator();
-		clearCloneCache();
-		clearResults();
-		shutdownActivityWidget(activityState);
-	});
-
-	registerWebSearchTool(pi, {
-		state: runtimeState,
-		closeCurator,
-		openCuratorBrowser,
-		buildSearchReturn: buildReturn,
-	});
-
-	registerContentTools(pi, {
-		maxInlineContent: MAX_INLINE_CONTENT,
-		stripThumbnails,
-		formatFullResults,
-	});
-
-	registerWebSearchCommand(pi, {
-		state: runtimeState,
-		closeCurator,
-		buildSearchReturn: buildReturn,
-	});
-}

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

@@ -1,117 +0,0 @@
-import type { ExtractedContent } from "./extract.js";
-import type { SearchResult } from "./perplexity.js";
-import type { QueryResultData } from "./storage.js";
-import type { SummaryMeta } from "./summary-review.js";
-
-export const MAX_INLINE_CONTENT = 30000;
-
-export function stripThumbnails(results: ExtractedContent[]): ExtractedContent[] {
-	return results.map(({ thumbnail, frames, ...rest }) => rest);
-}
-
-export function formatSearchSummary(results: SearchResult[], answer: string): string {
-	let output = answer ? `${answer}\n\n---\n\n**Sources:**\n` : "";
-	output += results.map((r, i) => `${i + 1}. ${r.title}\n   ${r.url}`).join("\n\n");
-	return output;
-}
-
-export function duplicateQuerySet(results: QueryResultData[]): Set<string> {
-	const counts = new Map<string, number>();
-	for (const result of results) {
-		counts.set(result.query, (counts.get(result.query) ?? 0) + 1);
-	}
-	const duplicates = new Set<string>();
-	for (const [query, count] of counts) {
-		if (count > 1) duplicates.add(query);
-	}
-	return duplicates;
-}
-
-export function formatQueryHeader(query: string, provider: string | undefined, duplicateQueries: Set<string>): string {
-	const suffix = duplicateQueries.has(query) && provider ? ` (${provider})` : "";
-	return `## Query: "${query}"${suffix}\n\n`;
-}
-
-export function hasFullInlineCoverage(urls: string[], inlineContent: ExtractedContent[] | undefined): boolean {
-	if (!inlineContent || inlineContent.length === 0) return false;
-	const coveredUrls = new Set(inlineContent.map(c => c.url));
-	return urls.every(url => coveredUrls.has(url));
-}
-
-export function formatFullResults(queryData: QueryResultData): string {
-	let output = `## Results for: "${queryData.query}"\n\n`;
-	if (queryData.answer) {
-		output += `${queryData.answer}\n\n---\n\n`;
-	}
-	for (const r of queryData.results) {
-		output += `### ${r.title}\n${r.url}\n\n`;
-	}
-	return output;
-}
-
-export function normalizeSummaryMeta(meta: SummaryMeta | undefined, summaryText: string): SummaryMeta {
-	const normalizedText = summaryText.trim();
-	if (!meta) {
-		return {
-			model: null,
-			durationMs: 0,
-			tokenEstimate: normalizedText.length > 0 ? Math.max(1, Math.ceil(normalizedText.length / 4)) : 0,
-			fallbackUsed: false,
-			edited: false,
-		};
-	}
-
-	return {
-		model: meta.model,
-		durationMs: Number.isFinite(meta.durationMs) && meta.durationMs >= 0 ? meta.durationMs : 0,
-		tokenEstimate: Number.isFinite(meta.tokenEstimate) && meta.tokenEstimate >= 0
-			? meta.tokenEstimate
-			: (normalizedText.length > 0 ? Math.max(1, Math.ceil(normalizedText.length / 4)) : 0),
-		fallbackUsed: meta.fallbackUsed === true,
-		fallbackReason: meta.fallbackReason,
-		edited: meta.edited === true,
-	};
-}
-
-export function buildCurationCancelledReturn(reason: "user" | "stale") {
-	const message = `Search curation cancelled (${reason}).`;
-	return {
-		content: [{ type: "text", text: message }],
-		details: {
-			error: message,
-			cancelled: true,
-			cancelReason: reason,
-		},
-	};
-}
-
-export function filterByQueryIndices(selectedQueryIndices: number[], results: Map<number, QueryResultData>) {
-	const filteredResults: QueryResultData[] = [];
-	const filteredUrls: string[] = [];
-	for (const qi of selectedQueryIndices) {
-		const r = results.get(qi);
-		if (r) {
-			filteredResults.push(r);
-			for (const res of r.results) {
-				if (!filteredUrls.includes(res.url)) filteredUrls.push(res.url);
-			}
-		}
-	}
-	return { results: filteredResults, urls: filteredUrls };
-}
-
-export function collectAllResultsAndUrls(resultsByIndex: Map<number, QueryResultData>) {
-	const results = [...resultsByIndex.values()];
-	const urls: string[] = [];
-	for (const result of results) {
-		for (const source of result.results) {
-			if (!urls.includes(source.url)) urls.push(source.url);
-		}
-	}
-	return { results, urls };
-}
-
-export function extractDomain(url: string): string {
-	try { return new URL(url).hostname; }
-	catch { return url; }
-}

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

@@ -1,143 +0,0 @@
-import type { ExtensionAPI } from "@bastani/atomic";
-import type { ExtractedContent } from "./extract.js";
-import {
-	duplicateQuerySet,
-	formatQueryHeader,
-	formatSearchSummary,
-	hasFullInlineCoverage,
-} from "./web-search-formatting.js";
-import { generateId, storeResult, type QueryResultData, type StoredSearchData } from "./storage.js";
-import type { SummaryMeta } from "./summary-review.js";
-import type { CuratorWorkflow } from "./web-search-config.js";
-
-export interface SearchReturnOptions {
-	queryList: string[];
-	results: QueryResultData[];
-	urls: string[];
-	includeContent: boolean;
-	inlineContent?: ExtractedContent[];
-	curated?: boolean;
-	curatedFrom?: number;
-	workflow?: CuratorWorkflow;
-	approvedSummary?: string;
-	summaryMeta?: SummaryMeta;
-}
-
-export interface SearchReturnPayload {
-	content: Array<{ type: string; text: string }>;
-	details: Record<string, unknown>;
-}
-
-export type SearchReturnBuilder = (opts: SearchReturnOptions) => SearchReturnPayload;
-
-interface BuildSearchReturnDeps {
-	pi: ExtensionAPI;
-	startBackgroundFetch(urls: string[]): string | null;
-}
-
-function storeAndPublishSearch(pi: ExtensionAPI, results: QueryResultData[]): string {
-	const id = generateId();
-	const data: StoredSearchData = {
-		id, type: "search", timestamp: Date.now(), queries: results,
-	};
-	storeResult(id, data);
-	pi.appendEntry("web-search-results", data);
-	return id;
-}
-
-export function buildSearchReturn(opts: SearchReturnOptions, deps: BuildSearchReturnDeps): SearchReturnPayload {
-	const sc = opts.results.filter(r => !r.error).length;
-	const tr = opts.results.reduce((sum, r) => sum + r.results.length, 0);
-	const allFailed = opts.results.length > 0 && sc === 0;
-
-	const hasApprovedSummary = typeof opts.approvedSummary === "string" && opts.approvedSummary.trim().length > 0;
-	let output = "";
-	if (hasApprovedSummary) {
-		output = opts.approvedSummary!.trim();
-	} else {
-		if (opts.curated) {
-			output += "[These results were manually curated by the user in the browser. Use them as-is — do not re-search or discard.]\n\n";
-		}
-		const duplicateQueries = opts.curated ? duplicateQuerySet(opts.results) : new Set<string>();
-		for (const { query, answer, results, error, provider } of opts.results) {
-			if (opts.queryList.length > 1) {
-				output += opts.curated
-					? formatQueryHeader(query, provider, duplicateQueries)
-					: `## Query: "${query}"\n\n`;
-			}
-			if (error) output += `Error: ${error}\n\n`;
-			else if (results.length === 0) output += "No results found.\n\n";
-			else output += formatSearchSummary(results, answer) + "\n\n";
-		}
-	}
-
-	const hasInlineReady = hasFullInlineCoverage(opts.urls, opts.inlineContent);
-	let fetchId: string | null = null;
-	if (hasInlineReady && opts.inlineContent) {
-		fetchId = generateId();
-		const data: StoredSearchData = {
-			id: fetchId,
-			type: "fetch",
-			timestamp: Date.now(),
-			urls: opts.inlineContent,
-		};
-		storeResult(fetchId, data);
-		deps.pi.appendEntry("web-search-results", data);
-		if (!hasApprovedSummary) {
-			output += `---\nFull content for ${opts.inlineContent.length} sources available [${fetchId}].`;
-		}
-	} else if (opts.includeContent) {
-		fetchId = deps.startBackgroundFetch(opts.urls);
-		if (fetchId && !hasApprovedSummary) {
-			output += `---\nContent fetching in background [${fetchId}]. Will notify when ready.`;
-		}
-	}
-
-	const searchId = storeAndPublishSearch(deps.pi, opts.results);
-	const isBackgroundFetch = fetchId !== null && !hasInlineReady;
-
-	return {
-		content: [{ type: "text", text: output.trim() }],
-		details: {
-			...(allFailed ? {
-				outcome: "all_failed",
-				stage: "provider_execution",
-				failedQueries: opts.results.length,
-				error: `All ${opts.results.length} search provider request(s) failed`,
-			} : {}),
-			queries: opts.queryList,
-			queryCount: opts.queryList.length,
-			successfulQueries: sc,
-			totalResults: tr,
-			includeContent: opts.includeContent,
-			fetchId,
-			fetchUrls: isBackgroundFetch ? opts.urls : undefined,
-			searchId,
-			...(opts.curated ? {
-				curated: true,
-				curatedFrom: opts.curatedFrom,
-				curatedQueries: opts.results.map(r => ({
-					query: r.query,
-					provider: r.provider || null,
-					answer: r.answer || null,
-					sources: r.results.map(s => ({ title: s.title, url: s.url })),
-					error: r.error,
-				})),
-			} : {}),
-			...((opts.workflow && hasApprovedSummary)
-				? {
-					summary: {
-						text: opts.approvedSummary!.trim(),
-						workflow: opts.workflow,
-						model: opts.summaryMeta?.model ?? null,
-						durationMs: opts.summaryMeta?.durationMs ?? 0,
-						tokenEstimate: opts.summaryMeta?.tokenEstimate ?? 0,
-						fallbackUsed: opts.summaryMeta?.fallbackUsed === true,
-						fallbackReason: opts.summaryMeta?.fallbackReason,
-						edited: opts.summaryMeta?.edited === true,
-					},
-				}
-				: {}),
-		},
-	};
-}

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

@@ -1,177 +0,0 @@
-import { getModel, type Model } from "@bastani/pi-ai/compat";
-import type { ProviderHeaders } from "@bastani/pi-ai";
-import type { QueryResultData } from "./storage.js";
-import {
-	buildDeterministicSummary,
-	generateSummaryDraft,
-	type SummaryGenerationContext,
-	type SummaryMeta,
-} from "./summary-review.js";
-import { loadConfig } from "./web-search-config.js";
-import { filterByQueryIndices, normalizeSummaryMeta } from "./web-search-formatting.js";
-
-async function resolveFirstAvailableModel(
-	ctx: SummaryGenerationContext,
-	candidates: Array<{ provider: string; id: string }>,
-): Promise<{ model: Model; apiKey: string; headers?: ProviderHeaders }> {
-	for (const { provider, id } of candidates) {
-		const model = getModel(provider, id);
-		if (!model) continue;
-		const auth = await ctx.modelRegistry.getApiKeyAndHeaders(model);
-		if (auth.ok && auth.apiKey) {
-			return {
-				model: auth.baseUrl === undefined ? model : { ...model, baseUrl: auth.baseUrl },
-				apiKey: auth.apiKey,
-				headers: auth.headers,
-			};
-		}
-	}
-	throw new Error(`No model available: ${candidates.map(c => `${c.provider}/${c.id}`).join(", ")}`);
-}
-
-export async function rewriteSearchQuery(
-	query: string,
-	ctx: SummaryGenerationContext,
-	signal: AbortSignal,
-): Promise<string> {
-	const { model, apiKey, headers } = await resolveFirstAvailableModel(ctx, [
-		{ provider: "anthropic", id: "claude-haiku-4-5" },
-		{ provider: "google", id: "gemini-2.5-flash" },
-		{ provider: "openai", id: "gpt-4.1-mini" },
-	]);
-	const response = await ctx.modelRegistry.complete(
-		model,
-		{
-			messages: [{
-				role: "user",
-				content: [{ type: "text", text: `Rewrite this web search query to get better, more specific results. Add relevant year qualifiers, precise technical terms, and specificity. Return ONLY the improved query text, nothing else.\n\nQuery: ${query}` }],
-				timestamp: Date.now(),
-			}],
-		},
-		{ apiKey, headers, signal },
-	);
-	if (response.stopReason === "aborted") throw new Error("Aborted");
-	const contentParts = Array.isArray(response.content) ? response.content : [];
-	const text = contentParts
-		.map(p => {
-			if (!p || typeof p !== "object") return "";
-			const part = p as Record<string, unknown>;
-			return typeof part.text === "string" ? part.text : "";
-		})
-		.join("")
-		.trim();
-	if (!text) throw new Error("Rewrite returned empty response");
-	return text;
-}
-
-export async function generateSummaryForSelectedIndices(
-	selectedQueryIndices: number[],
-	resultsByIndex: Map<number, QueryResultData>,
-	summaryContext: SummaryGenerationContext,
-	signal?: AbortSignal,
-	modelOverride?: string,
-	feedback?: string,
-): Promise<{ summary: string; meta: SummaryMeta }> {
-	const selectedResults: QueryResultData[] = [];
-	for (const qi of selectedQueryIndices) {
-		const result = resultsByIndex.get(qi);
-		if (result) selectedResults.push(result);
-	}
-	if (selectedResults.length === 0) {
-		throw new Error("No selected results available for summary generation");
-	}
-	try {
-		return await generateSummaryDraft(selectedResults, summaryContext, signal, modelOverride, feedback);
-	} catch (err) {
-		const isEmptyResponse = err instanceof Error && err.message.includes("Summary model returned empty response");
-		if (!isEmptyResponse) throw err;
-		const deterministic = buildDeterministicSummary(selectedResults);
-		return {
-			summary: deterministic.summary,
-			meta: {
-				...deterministic.meta,
-				fallbackReason: "summary-model-empty-response",
-			},
-		};
-	}
-}
-
-export async function loadSummaryModelChoices(
-	summaryContext: SummaryGenerationContext,
-): Promise<{ summaryModels: Array<{ value: string; label: string }>; defaultSummaryModel: string | null }> {
-	const summaryModels: Array<{ value: string; label: string }> = [];
-	const seen = new Set<string>();
-	const availableValues = new Set<string>();
-
-	const addModel = (provider: string, id: string) => {
-		const value = `${provider}/${id}`;
-		if (seen.has(value)) return;
-		seen.add(value);
-		summaryModels.push({ value, label: value });
-	};
-
-	try {
-		const availableModels = summaryContext.modelRegistry.getAvailable();
-		for (const model of availableModels) {
-			const value = `${model.provider}/${model.id}`;
-			availableValues.add(value);
-			addModel(model.provider, model.id);
-		}
-	} catch (err) {
-		const message = err instanceof Error ? err.message : String(err);
-		console.error(`Failed to load summary models: ${message}`);
-	}
-
-	const currentModelValue = summaryContext.model
-		? `${summaryContext.model.provider}/${summaryContext.model.id}`
-		: null;
-	if (summaryContext.model && currentModelValue && !seen.has(currentModelValue)) {
-		addModel(summaryContext.model.provider, summaryContext.model.id);
-	}
-
-	const config = loadConfig();
-	const configuredSummaryModel = typeof config.summaryModel === "string" ? config.summaryModel.trim() : "";
-	const preferredDefaults = [
-		"anthropic/claude-haiku-4-5",
-		"openai-codex/gpt-5.3-codex-spark",
-	];
-
-	let defaultSummaryModel: string | null = null;
-	if (configuredSummaryModel.length > 0 && availableValues.has(configuredSummaryModel)) {
-		defaultSummaryModel = configuredSummaryModel;
-	}
-	if (!defaultSummaryModel) {
-		for (const preferred of preferredDefaults) {
-			if (availableValues.has(preferred)) {
-				defaultSummaryModel = preferred;
-				break;
-			}
-		}
-	}
-	if (!defaultSummaryModel && summaryModels.length > 0) {
-		defaultSummaryModel = summaryModels[0].value;
-	}
-
-	return { summaryModels, defaultSummaryModel };
-}
-
-export function resolveSummaryForSubmit(
-	payload: { selectedQueryIndices: number[]; summary?: string; summaryMeta?: SummaryMeta },
-	resultsByIndex: Map<number, QueryResultData>,
-): { approvedSummary: string; summaryMeta: SummaryMeta } {
-	const submittedSummary = typeof payload.summary === "string" ? payload.summary.trim() : "";
-	if (submittedSummary.length > 0) {
-		return {
-			approvedSummary: submittedSummary,
-			summaryMeta: normalizeSummaryMeta(payload.summaryMeta, submittedSummary),
-		};
-	}
-
-	const selected = filterByQueryIndices(payload.selectedQueryIndices, resultsByIndex).results;
-	const fallbackResults = selected.length > 0 ? selected : [...resultsByIndex.values()];
-	const deterministic = buildDeterministicSummary(fallbackResults);
-	return {
-		approvedSummary: deterministic.summary,
-		summaryMeta: deterministic.meta,
-	};
-}