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

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

@@ -1,242 +0,0 @@
-import type { ExtensionAPI } from "@bastani/atomic";
-import { randomUUID } from "node:crypto";
-import { startCuratorServer, type CuratorServerHandle } from "./curator-server.js";
-import { search } from "./gemini-search.js";
-import type { QueryResultData } from "./storage.js";
-import type { SummaryGenerationContext } from "./summary-review.js";
-import { openCuratorWindow } from "./web-search-browser.js";
-import {
-	collectAllResultsAndUrls,
-	extractDomain,
-	filterByQueryIndices,
-} from "./web-search-formatting.js";
-import type { SearchReturnBuilder, SearchReturnOptions, SearchReturnPayload } from "./web-search-return.js";
-import { generateSummaryForSelectedIndices, loadSummaryModelChoices, resolveSummaryForSubmit, rewriteSearchQuery } from "./web-search-summary.js";
-import type { WebSearchRuntimeState } from "./web-search-types.js";
-import { loadCuratorBootstrap, normalizeProviderInput, normalizeQueryList, saveConfig, type CuratorBootstrap } from "./web-search-config.js";
-
-interface RegisterWebSearchCommandDeps {
-	state: WebSearchRuntimeState;
-	closeCurator(): void;
-	buildSearchReturn: SearchReturnBuilder;
-}
-
-export function registerWebSearchCommand(pi: ExtensionAPI, deps: RegisterWebSearchCommandDeps): void {
-	pi.registerCommand("websearch", {
-		description: "Open web search curator",
-		handler: async (args, ctx) => {
-			deps.closeCurator();
-			const sessionToken = randomUUID();
-
-			const raw = args.trim();
-			const queries = raw.length > 0
-				? normalizeQueryList(raw.split(","))
-				: [];
-
-			let bootstrap: CuratorBootstrap;
-			try {
-				bootstrap = await loadCuratorBootstrap(undefined);
-			} catch (err) {
-				const message = err instanceof Error ? err.message : String(err);
-				ctx.ui.notify(`Failed to load web search config: ${message}`, "error");
-				return;
-			}
-			const availableProviders = bootstrap.availableProviders;
-			const initialProvider = bootstrap.defaultProvider;
-			const curatorTimeoutSeconds = bootstrap.timeoutSeconds;
-			let currentProvider = initialProvider;
-			const summaryContext: SummaryGenerationContext = {
-				model: ctx.model,
-				modelRegistry: ctx.modelRegistry,
-			};
-			const summaryModelChoices = await loadSummaryModelChoices(summaryContext);
-
-			ctx.ui.notify("Opening web search curator...", "info");
-
-			const collected = new Map<number, QueryResultData>();
-			const searchAbort = new AbortController();
-			let aborted = false;
-			let commandHandle: CuratorServerHandle | null = null;
-
-			function sendFollowUpFromReturn(payload: SearchReturnPayload) {
-				pi.sendMessage({
-					customType: "web-search-results",
-					content: payload.content,
-					display: "tool",
-					details: payload.details,
-				}, { triggerTurn: true, deliverAs: "followUp" });
-			}
-
-			try {
-				const handle = await startCuratorServer(
-					{
-						queries,
-						sessionToken,
-						timeout: curatorTimeoutSeconds,
-						availableProviders,
-						defaultProvider: initialProvider,
-						summaryModels: summaryModelChoices.summaryModels,
-						defaultSummaryModel: summaryModelChoices.defaultSummaryModel,
-					},
-					{
-						async onSummarize(selectedQueryIndices, summarizeSignal, model, feedback) {
-							if (commandHandle && deps.state.activeCurator !== commandHandle) {
-								throw new Error("Curator session is no longer active.");
-							}
-							return generateSummaryForSelectedIndices(
-								selectedQueryIndices,
-								collected,
-								summaryContext,
-								summarizeSignal,
-								model,
-								feedback,
-							);
-						},
-						onSubmit(payload) {
-							if (commandHandle && deps.state.activeCurator !== commandHandle) return;
-							aborted = true;
-							searchAbort.abort();
-							const filtered = payload.selectedQueryIndices.length > 0
-								? filterByQueryIndices(payload.selectedQueryIndices, collected)
-								: collectAllResultsAndUrls(collected);
-							const base: SearchReturnOptions = {
-								queryList: filtered.results.map(r => r.query),
-								results: filtered.results,
-								urls: filtered.urls,
-								includeContent: false,
-								curated: true,
-								curatedFrom: collected.size,
-							};
-							if (!payload.rawResults) {
-								const resolvedSummary = resolveSummaryForSubmit(payload, collected);
-								base.workflow = "summary-review";
-								base.approvedSummary = resolvedSummary.approvedSummary;
-								base.summaryMeta = resolvedSummary.summaryMeta;
-							}
-							sendFollowUpFromReturn(deps.buildSearchReturn(base));
-							deps.closeCurator();
-						},
-						onCancel(reason) {
-							if (commandHandle && deps.state.activeCurator !== commandHandle) return;
-							aborted = true;
-							searchAbort.abort();
-							if (reason === "timeout") {
-								const all = collectAllResultsAndUrls(collected);
-								const resolvedSummary = resolveSummaryForSubmit({ selectedQueryIndices: [], summary: undefined, summaryMeta: undefined }, collected);
-								sendFollowUpFromReturn(deps.buildSearchReturn({
-									queryList: all.results.map(r => r.query),
-									results: all.results,
-									urls: all.urls,
-									includeContent: false,
-									curated: true,
-									curatedFrom: collected.size,
-									workflow: "summary-review",
-									approvedSummary: resolvedSummary.approvedSummary,
-									summaryMeta: resolvedSummary.summaryMeta,
-								}));
-							}
-							deps.closeCurator();
-						},
-						onProviderChange(provider) {
-							if (commandHandle && deps.state.activeCurator !== commandHandle) return;
-							const normalized = normalizeProviderInput(provider);
-							if (!normalized || normalized === "auto") return;
-							currentProvider = normalized;
-							try {
-								saveConfig({ provider: normalized });
-							} catch (err) {
-								const message = err instanceof Error ? err.message : String(err);
-								console.error(`Failed to persist default provider: ${message}`);
-							}
-						},
-						async onAddSearch(query, queryIndex, provider) {
-							if (commandHandle && deps.state.activeCurator !== commandHandle) {
-								throw new Error("Curator session is no longer active.");
-							}
-							const normalizedProvider = normalizeProviderInput(provider);
-							const requestedProvider = !normalizedProvider || normalizedProvider === "auto"
-								? currentProvider
-								: normalizedProvider;
-							try {
-								const { answer, results, provider: actualProvider } = await search(query, {
-									provider: requestedProvider,
-									signal: searchAbort.signal,
-								});
-								if (commandHandle && deps.state.activeCurator !== commandHandle) {
-									throw new Error("Curator session is no longer active.");
-								}
-								collected.set(queryIndex, { query, answer, results, error: null, provider: actualProvider });
-								return {
-									answer,
-									results: results.map(r => ({ title: r.title, url: r.url, domain: extractDomain(r.url) })),
-									provider: actualProvider,
-								};
-							} catch (err) {
-								const message = err instanceof Error ? err.message : String(err);
-								if (!commandHandle || deps.state.activeCurator === commandHandle) {
-									collected.set(queryIndex, { query, answer: "", results: [], error: message, provider: requestedProvider });
-								}
-								throw err;
-							}
-						},
-						async onRewriteQuery(query, rewriteSignal) {
-							if (commandHandle && deps.state.activeCurator !== commandHandle) {
-								throw new Error("Curator session is no longer active.");
-							}
-							return rewriteSearchQuery(query, summaryContext, rewriteSignal);
-						},
-					},
-				);
-
-				commandHandle = handle;
-				deps.state.activeCurator = handle;
-				await openCuratorWindow(
-					pi,
-					handle.url,
-					"Search Curator",
-					win => { deps.state.glimpseWin = win; },
-					win => {
-						if (deps.state.glimpseWin === win) {
-							deps.state.glimpseWin = null;
-							deps.closeCurator();
-						}
-					},
-				);
-
-				if (queries.length > 0) {
-					(async () => {
-						for (let qi = 0; qi < queries.length; qi++) {
-							if (aborted || deps.state.activeCurator !== handle) break;
-							const requestedProvider = currentProvider;
-							try {
-								const { answer, results, provider } = await search(queries[qi], {
-									provider: requestedProvider,
-									signal: searchAbort.signal,
-								});
-								if (aborted || deps.state.activeCurator !== handle) break;
-								handle.pushResult(qi, {
-									answer,
-									results: results.map(r => ({ title: r.title, url: r.url, domain: extractDomain(r.url) })),
-									provider,
-								});
-								collected.set(qi, { query: queries[qi], answer, results, error: null, provider });
-							} catch (err) {
-								if (aborted || deps.state.activeCurator !== handle) break;
-								const message = err instanceof Error ? err.message : String(err);
-								handle.pushError(qi, message, requestedProvider);
-								collected.set(qi, { query: queries[qi], answer: "", results: [], error: message, provider: requestedProvider });
-							}
-						}
-						if (!aborted && deps.state.activeCurator === handle) handle.searchesDone();
-					})();
-				} else {
-					if (deps.state.activeCurator === handle) handle.searchesDone();
-				}
-			} catch (err) {
-				deps.closeCurator();
-				const message = err instanceof Error ? err.message : String(err);
-				ctx.ui.notify(`Failed to open curator: ${message}`, "error");
-			}
-		},
-	});
-}

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

@@ -1,157 +0,0 @@
-import { CONFIG_DIR_NAME, getUserConfigPaths } from "@bastani/atomic";
-import { existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
-import { homedir } from "node:os";
-import { join } from "node:path";
-import { findReadableConfigPath } from "./config-paths.ts";
-import { isExaAvailable } from "./exa.js";
-import { isGeminiApiAvailable } from "./gemini-api.js";
-import { isGeminiWebAvailable } from "./gemini-web.js";
-import { isPerplexityAvailable } from "./perplexity.js";
-import type { SearchProvider, ResolvedSearchProvider } from "./gemini-search.js";
-
-const WEB_SEARCH_CONFIG_PATH = getUserConfigPaths("web-search.json")[0] ?? join(homedir(), CONFIG_DIR_NAME, "web-search.json");
-const WEB_SEARCH_CONFIG_READ_PATH = findReadableConfigPath();
-const MAX_CURATOR_TIMEOUT_SECONDS = 600;
-const DEFAULT_CURATOR_TIMEOUT_SECONDS = 20;
-
-export const DEFAULT_SHORTCUTS = { curate: "ctrl+shift+s", activity: "ctrl+shift+w" };
-
-export interface WebSearchConfig {
-	provider?: string;
-	workflow?: string;
-	curatorTimeoutSeconds?: unknown;
-	summaryModel?: string;
-	shortcuts?: {
-		curate?: string;
-		activity?: string;
-	};
-}
-
-export interface ProviderAvailability {
-	perplexity: boolean;
-	exa: boolean;
-	gemini: boolean;
-}
-
-export type { CuratorWorkflow, WebSearchWorkflow } from "./web-search-workflow.js";
-export { resolveWorkflow } from "./web-search-workflow.js";
-
-export interface CuratorBootstrap {
-	availableProviders: ProviderAvailability;
-	defaultProvider: ResolvedSearchProvider;
-	timeoutSeconds: number;
-}
-
-export function loadConfig(): WebSearchConfig {
-	if (!existsSync(WEB_SEARCH_CONFIG_READ_PATH)) return {};
-	const raw = readFileSync(WEB_SEARCH_CONFIG_READ_PATH, "utf-8");
-	try {
-		return JSON.parse(raw) as WebSearchConfig;
-	} catch (err) {
-		const message = err instanceof Error ? err.message : String(err);
-		throw new Error(`Failed to parse ${WEB_SEARCH_CONFIG_READ_PATH}: ${message}`);
-	}
-}
-
-export function saveConfig(updates: Partial<WebSearchConfig>): void {
-	let config: Record<string, unknown> = {};
-	const existingConfigPath = findReadableConfigPath();
-	if (existsSync(existingConfigPath)) {
-		const raw = readFileSync(existingConfigPath, "utf-8");
-		try {
-			config = JSON.parse(raw) as Record<string, unknown>;
-		} catch (err) {
-			const message = err instanceof Error ? err.message : String(err);
-			throw new Error(`Failed to parse ${existingConfigPath}: ${message}`);
-		}
-	}
-
-	Object.assign(config, updates);
-	const dir = join(homedir(), CONFIG_DIR_NAME);
-	if (!existsSync(dir)) mkdirSync(dir, { recursive: true });
-	writeFileSync(WEB_SEARCH_CONFIG_PATH, JSON.stringify(config, null, 2) + "\n");
-}
-
-export function loadConfigForExtensionInit(): WebSearchConfig {
-	try {
-		return loadConfig();
-	} catch (err) {
-		const message = err instanceof Error ? err.message : String(err);
-		console.error(`[pi-web-access] ${message}`);
-		return {};
-	}
-}
-
-export function normalizeProviderInput(value: unknown): SearchProvider | undefined {
-	if (value === undefined) return undefined;
-	if (typeof value !== "string") return "auto";
-	const normalized = value.trim().toLowerCase();
-	if (normalized === "auto" || normalized === "exa" || normalized === "perplexity" || normalized === "gemini") {
-		return normalized;
-	}
-	return "auto";
-}
-
-function normalizeCuratorTimeoutSeconds(value: unknown): number | undefined {
-	if (typeof value !== "number" || !Number.isFinite(value)) return undefined;
-	const normalized = Math.floor(value);
-	if (normalized < 1) return undefined;
-	return Math.min(normalized, MAX_CURATOR_TIMEOUT_SECONDS);
-}
-
-export function normalizeQueryList(queryList: unknown[]): string[] {
-	const normalized: string[] = [];
-	for (const query of queryList) {
-		if (typeof query !== "string") continue;
-		const trimmed = query.trim();
-		if (trimmed.length > 0) normalized.push(trimmed);
-	}
-	return normalized;
-}
-
-function getCuratorTimeoutSeconds(): number {
-	const source = loadConfig();
-	return normalizeCuratorTimeoutSeconds(source.curatorTimeoutSeconds) ?? DEFAULT_CURATOR_TIMEOUT_SECONDS;
-}
-
-async function getProviderAvailability(): Promise<ProviderAvailability> {
-	const geminiWebAvail = await isGeminiWebAvailable();
-	return {
-		perplexity: isPerplexityAvailable(),
-		exa: isExaAvailable(),
-		gemini: isGeminiApiAvailable() || !!geminiWebAvail,
-	};
-}
-
-export async function loadCuratorBootstrap(requestedProvider: unknown): Promise<CuratorBootstrap> {
-	const availableProviders = await getProviderAvailability();
-	return {
-		availableProviders,
-		defaultProvider: resolveProvider(requestedProvider, availableProviders),
-		timeoutSeconds: getCuratorTimeoutSeconds(),
-	};
-}
-
-function resolveProvider(requested: unknown, available: ProviderAvailability): ResolvedSearchProvider {
-	const provider = normalizeProviderInput(requested ?? loadConfig().provider ?? "auto") ?? "auto";
-
-	if (provider === "auto") {
-		if (available.exa) return "exa";
-		if (available.perplexity) return "perplexity";
-		if (available.gemini) return "gemini";
-		return "exa";
-	}
-	if (provider === "exa" && !available.exa) {
-		if (available.perplexity) return "perplexity";
-		return available.gemini ? "gemini" : "exa";
-	}
-	if (provider === "perplexity" && !available.perplexity) {
-		if (available.exa) return "exa";
-		return available.gemini ? "gemini" : "perplexity";
-	}
-	if (provider === "gemini" && !available.gemini) {
-		if (available.exa) return "exa";
-		return available.perplexity ? "perplexity" : "gemini";
-	}
-	return provider;
-}

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

@@ -1,214 +0,0 @@
-import type { ExtensionAPI } from "@bastani/atomic";
-import { randomUUID } from "node:crypto";
-import { startCuratorServer, type CuratorServerHandle } from "./curator-server.js";
-import { search } from "./gemini-search.js";
-import {
-	buildCurationCancelledReturn,
-	collectAllResultsAndUrls,
-	extractDomain,
-	filterByQueryIndices,
-} from "./web-search-formatting.js";
-import type { SearchReturnBuilder, SearchReturnOptions } from "./web-search-return.js";
-import { generateSummaryForSelectedIndices, resolveSummaryForSubmit, rewriteSearchQuery } from "./web-search-summary.js";
-import { openCuratorWindow } from "./web-search-browser.js";
-import type { PendingCurate, WebSearchRuntimeState } from "./web-search-types.js";
-import { normalizeProviderInput, saveConfig } from "./web-search-config.js";
-
-interface OpenCuratorBrowserDeps {
-	pi: ExtensionAPI;
-	state: WebSearchRuntimeState;
-	buildSearchReturn: SearchReturnBuilder;
-	closeCurator(): void;
-}
-
-export async function openCuratorBrowser(
-	deps: OpenCuratorBrowserDeps,
-	pc: PendingCurate,
-	searchesComplete = true,
-): Promise<void> {
-	let handle: CuratorServerHandle | null = null;
-	try {
-		pc.phase = "curating";
-
-		const searchAbort = new AbortController();
-		const addSearchSignal = pc.signal
-			? AbortSignal.any([pc.signal, searchAbort.signal])
-			: searchAbort.signal;
-
-		const sessionToken = randomUUID();
-		handle = await startCuratorServer(
-			{
-				queries: pc.queryList,
-				sessionToken,
-				timeout: pc.timeoutSeconds,
-				availableProviders: pc.availableProviders,
-				defaultProvider: pc.defaultProvider,
-				summaryModels: pc.summaryModels,
-				defaultSummaryModel: pc.defaultSummaryModel,
-			},
-			{
-				async onSummarize(selectedQueryIndices, summarizeSignal, model, feedback) {
-					if (deps.state.pendingCurate !== pc) throw new Error("Curator session is no longer active.");
-					pc.onUpdate?.({
-						content: [{ type: "text", text: "Generating summary draft..." }],
-						details: { phase: "generating-summary", progress: 0.9 },
-					});
-					const draft = await generateSummaryForSelectedIndices(
-						selectedQueryIndices,
-						pc.searchResults,
-						pc.summaryContext,
-						summarizeSignal,
-						model,
-						feedback,
-					);
-					if (deps.state.pendingCurate !== pc) throw new Error("Curator session is no longer active.");
-					pc.onUpdate?.({
-						content: [{ type: "text", text: "Summary draft ready — waiting for approval..." }],
-						details: { phase: "waiting-for-approval", progress: 1 },
-					});
-					return draft;
-				},
-				onSubmit(payload) {
-					if (deps.state.pendingCurate !== pc) return;
-					searchAbort.abort();
-					const filtered = payload.selectedQueryIndices.length > 0
-						? filterByQueryIndices(payload.selectedQueryIndices, pc.searchResults)
-						: collectAllResultsAndUrls(pc.searchResults);
-					const filteredInline = pc.allInlineContent.filter(c => filtered.urls.includes(c.url));
-					const base: SearchReturnOptions = {
-						queryList: filtered.results.map(r => r.query),
-						results: filtered.results,
-						urls: filtered.urls,
-						includeContent: pc.includeContent,
-						inlineContent: filteredInline.length > 0 ? filteredInline : undefined,
-						curated: true,
-						curatedFrom: pc.searchResults.size,
-					};
-					if (!payload.rawResults) {
-						const resolvedSummary = resolveSummaryForSubmit(payload, pc.searchResults);
-						base.workflow = pc.workflow;
-						base.approvedSummary = resolvedSummary.approvedSummary;
-						base.summaryMeta = resolvedSummary.summaryMeta;
-					}
-					pc.finish(deps.buildSearchReturn(base));
-					deps.closeCurator();
-				},
-				onCancel(reason) {
-					if (deps.state.pendingCurate !== pc) return;
-					searchAbort.abort();
-					if (reason === "timeout") {
-						const resolvedSummary = resolveSummaryForSubmit({ selectedQueryIndices: [], summary: undefined, summaryMeta: undefined }, pc.searchResults);
-						const all = collectAllResultsAndUrls(pc.searchResults);
-						const filteredInline = pc.allInlineContent.filter(c => all.urls.includes(c.url));
-						pc.finish(deps.buildSearchReturn({
-							queryList: all.results.map(r => r.query),
-							results: all.results,
-							urls: all.urls,
-							includeContent: pc.includeContent,
-							inlineContent: filteredInline.length > 0 ? filteredInline : undefined,
-							curated: true,
-							curatedFrom: pc.searchResults.size,
-							workflow: pc.workflow,
-							approvedSummary: resolvedSummary.approvedSummary,
-							summaryMeta: resolvedSummary.summaryMeta,
-						}));
-					} else {
-						pc.finish(buildCurationCancelledReturn(reason));
-					}
-					deps.closeCurator();
-				},
-				onProviderChange(provider) {
-					if (deps.state.pendingCurate !== pc) return;
-					const normalized = normalizeProviderInput(provider);
-					if (!normalized || normalized === "auto") return;
-					pc.defaultProvider = normalized;
-					try {
-						saveConfig({ provider: normalized });
-					} catch (err) {
-						const message = err instanceof Error ? err.message : String(err);
-						console.error(`Failed to persist default provider: ${message}`);
-					}
-				},
-				async onAddSearch(query, queryIndex, provider) {
-					if (deps.state.pendingCurate !== pc) throw new Error("Curator session is no longer active.");
-					const normalizedProvider = normalizeProviderInput(provider);
-					const requestedProvider = !normalizedProvider || normalizedProvider === "auto"
-						? pc.defaultProvider
-						: normalizedProvider;
-					try {
-						const { answer, results, inlineContent, provider: actualProvider } = await search(query, {
-							provider: requestedProvider,
-							numResults: pc.numResults,
-							recencyFilter: pc.recencyFilter,
-							domainFilter: pc.domainFilter,
-							includeContent: pc.includeContent,
-							signal: addSearchSignal,
-						});
-						if (deps.state.pendingCurate !== pc) throw new Error("Curator session is no longer active.");
-						pc.searchResults.set(queryIndex, { query, answer, results, error: null, provider: actualProvider });
-						if (inlineContent) pc.allInlineContent.push(...inlineContent);
-						return {
-							answer,
-							results: results.map(r => ({ title: r.title, url: r.url, domain: extractDomain(r.url) })),
-							provider: actualProvider,
-						};
-					} catch (err) {
-						const message = err instanceof Error ? err.message : String(err);
-						if (deps.state.pendingCurate === pc) {
-							pc.searchResults.set(queryIndex, { query, answer: "", results: [], error: message, provider: requestedProvider });
-						}
-						throw err;
-					}
-				},
-				async onRewriteQuery(query, rewriteSignal) {
-					if (deps.state.pendingCurate !== pc) throw new Error("Curator session is no longer active.");
-					return rewriteSearchQuery(query, pc.summaryContext, rewriteSignal);
-				},
-			},
-		);
-
-		if (deps.state.pendingCurate !== pc) {
-			handle.close();
-			return;
-		}
-
-		deps.state.activeCurator = handle;
-
-		for (const [qi, data] of pc.searchResults) {
-			if (data.error) {
-				handle.pushError(qi, data.error, data.provider);
-			} else {
-				handle.pushResult(qi, {
-					answer: data.answer,
-					results: data.results.map(r => ({ title: r.title, url: r.url, domain: extractDomain(r.url) })),
-					provider: data.provider || pc.defaultProvider,
-				});
-			}
-		}
-		if (searchesComplete) handle.searchesDone();
-
-		pc.onUpdate?.({
-			content: [{ type: "text", text: searchesComplete ? "Waiting for summary approval in browser..." : "Searches streaming to browser..." }],
-			details: { phase: "curating", progress: searchesComplete ? 1 : 0.5 },
-		});
-
-		await openCuratorWindow(
-			deps.pi,
-			handle.url,
-			"Search Curator",
-			win => { deps.state.glimpseWin = win; },
-			win => {
-				if (deps.state.glimpseWin === win) {
-					deps.state.glimpseWin = null;
-					deps.closeCurator();
-				}
-			},
-		);
-	} catch (err) {
-		const message = err instanceof Error ? err.message : String(err);
-		console.error(`Failed to open curator UI: ${message}`);
-		if (deps.state.pendingCurate === pc || (handle && deps.state.activeCurator === handle)) {
-			deps.closeCurator();
-		}
-	}
-}