jeopi-cli 16.6.6 → 16.6.9

package/src/session/session-loader.ts

@@ -1,5 +1,5 @@
 import type { AgentMessage } from "jeopi-agent-core";
-import { getBlobsDir, isEnoent, parseJsonlLenient } from "jeopi-utils";
+import { getBlobsDir, isEnoent, parseJsonlLenient, readLines } from "jeopi-utils";
 import { BlobStore, isBlobRef, resolveImageData, resolveImageDataUrl } from "./blob-store";
 import { buildSessionContext } from "./session-context";
 import {
@@ -109,66 +109,24 @@ export async function loadEntriesFromFileStream(filePath: string): Promise<{
 	const entries: FileEntry[] = [];
 	let titleSlot: SessionTitleUpdate | undefined;
 	let sawFirstLine = false;
-	// Byte buffer (NOT a decoded string): multibyte UTF-8 sequences that straddle
-	// a stream-chunk boundary stay intact, and Bun.JSONL.parseChunk accepts typed
-	// arrays directly. Only the unconsumed remainder is held (≤ one record + a
-	// chunk), so the ≥8MiB memory guard is preserved (the file is never fully
-	// loaded into memory).
-	let buffer: Uint8Array = new Uint8Array();
+	// readLines grows its byte buffer geometrically and yields complete records.
+	// Parse each record once: retrying an incomplete multi-MB summary for every
+	// stream chunk repeatedly copies and parses the same growing payload.
 	const decoder = new TextDecoder();
 
-	const drain = () => {
-		while (buffer.length > 0) {
-			const { values, error, read, done } = Bun.JSONL.parseChunk(buffer);
-			if (values.length > 0) {
-				for (const value of values) entries.push(value as FileEntry);
-			}
-			if (error) {
-				// Malformed record: skip past the next newline and continue.
-				const nextNewline = buffer.indexOf(0x0a, read);
-				if (nextNewline === -1) break; // rest of the bad line not yet received
-				buffer = buffer.subarray(nextNewline + 1);
-				continue;
-			}
-			if (read === 0) break; // incomplete record awaiting more data
-			buffer = buffer.subarray(read);
-			if (done) {
-				buffer = new Uint8Array();
-				break;
-			}
-		}
-	};
-
 	try {
-		for await (const chunk of Bun.file(filePath).stream()) {
-			buffer = buffer.length === 0 ? chunk : Buffer.concat([buffer, chunk]);
-			// The optional fixed-width title slot is a physical first line that is
-			// NOT JSON; peel it before the parser would (correctly) reject it. The
-			// first line ends at a '\n' byte, so it is a complete UTF-8 sequence and
-			// safe to decode. A non-slot first line is a real entry and is left for
-			// the parser; a blank first line is left for the parser to skip.
+		for await (const bytes of readLines(Bun.file(filePath).stream())) {
+			const line = decoder.decode(bytes);
 			if (!sawFirstLine) {
-				const newline = buffer.indexOf(0x0a);
-				if (newline !== -1) {
-					sawFirstLine = true;
-					const firstLine = decoder.decode(buffer.subarray(0, newline)).trim();
-					if (firstLine) {
-						const slot = parseTitleSlotLine(firstLine);
-						if (slot) {
-							titleSlot = titleUpdateFromSlot(slot);
-							buffer = buffer.subarray(newline + 1);
-						}
-					}
+				sawFirstLine = true;
+				const slot = parseTitleSlotLine(line.trim());
+				if (slot) {
+					titleSlot = titleUpdateFromSlot(slot);
+					continue;
 				}
 			}
-			drain();
-		}
-		// A trailing record without a final newline: terminate it so the parser
-		// can complete it (readline yielded it; parseChunk needs the delimiter).
-		if (buffer.length > 0 && buffer[buffer.length - 1] !== 0x0a) {
-			buffer = Buffer.concat([buffer, new Uint8Array([0x0a])]);
+			for (const entry of parseJsonlLenient<RawFileEntry>(line)) entries.push(entry as FileEntry);
 		}
-		drain();
 	} catch (err) {
 		if (isEnoent(err)) return { entries: [], titleSlot: undefined };
 		throw err;

package/src/web/search/index.ts

@@ -7,7 +7,7 @@
 
 import { type } from "arktype";
 import type { AgentTool, AgentToolContext, AgentToolResult, AgentToolUpdateCallback } from "jeopi-agent-core";
-import type { AuthStorage } from "jeopi-ai";
+import type { Api, AuthStorage, Model } from "jeopi-ai";
 import { prompt } from "jeopi-utils";
 import { settings } from "../../config/settings";
 import type { CustomTool, CustomToolContext, RenderResultOptions } from "../../extensibility/custom-tools/types";
@@ -117,6 +117,7 @@ function hasRenderableSearchContent(response: SearchResponse): boolean {
 
 interface ExecuteSearchOptions {
 	authStorage: AuthStorage;
+	model?: Model<Api>;
 	sessionId?: string;
 	signal?: AbortSignal;
 }
@@ -127,7 +128,7 @@ async function executeSearch(
 	params: SearchQueryParams,
 	options: ExecuteSearchOptions,
 ): Promise<{ content: Array<{ type: "text"; text: string }>; details: SearchRenderDetails }> {
-	const { authStorage, sessionId, signal } = options;
+	const { authStorage, model, sessionId, signal } = options;
 	const explicitProvider = params.provider;
 	let providers: SearchProvider[];
 	if (explicitProvider && explicitProvider !== "auto") {
@@ -174,6 +175,7 @@ async function executeSearch(
 				numSearchResults: params.num_search_results,
 				temperature: params.temperature,
 				signal,
+				model,
 				authStorage,
 				sessionId,
 				antigravityEndpointMode,
@@ -222,7 +224,7 @@ async function executeSearch(
  */
 export async function runSearchQuery(
 	params: SearchQueryParams,
-	options: { authStorage?: AuthStorage; sessionId?: string; signal?: AbortSignal } = {},
+	options: { authStorage?: AuthStorage; model?: Model<Api>; sessionId?: string; signal?: AbortSignal } = {},
 ): Promise<{ content: Array<{ type: "text"; text: string }>; details: SearchRenderDetails }> {
 	const createdAuthStorage = options.authStorage ? undefined : await discoverAuthStorage();
 	const authStorage = options.authStorage ?? createdAuthStorage;
@@ -232,6 +234,7 @@ export async function runSearchQuery(
 	try {
 		return await executeSearch("cli-web-search", params, {
 			authStorage,
+			model: options.model,
 			sessionId: options.sessionId,
 			signal: options.signal,
 		});
@@ -271,7 +274,12 @@ export class WebSearchTool implements AgentTool<typeof webSearchSchema, SearchRe
 	): Promise<AgentToolResult<SearchRenderDetails>> {
 		const authStorage = this.#session.authStorage ?? (await discoverAuthStorage());
 		const sessionId = this.#session.getSessionId?.() ?? undefined;
-		return executeSearch(_toolCallId, params, { authStorage, sessionId, signal });
+		return executeSearch(_toolCallId, params, {
+			authStorage,
+			model: this.#session.getActiveModel?.(),
+			sessionId,
+			signal,
+		});
 	}
 }
 
@@ -292,7 +300,7 @@ export const webSearchCustomTool: CustomTool<typeof webSearchSchema, SearchRende
 	) {
 		const authStorage = ctx.modelRegistry?.authStorage ?? (await discoverAuthStorage());
 		const sessionId = ctx.sessionManager.getSessionId();
-		return executeSearch(toolCallId, params, { authStorage, sessionId, signal });
+		return executeSearch(toolCallId, params, { authStorage, model: ctx.model, sessionId, signal });
 	},
 
 	renderCall(args: SearchToolParams, options: RenderResultOptions, theme: Theme) {

package/src/web/search/providers/base.ts

@@ -1,6 +1,17 @@
-import type { AuthStorage, FetchImpl } from "jeopi-ai";
+import type { Api, AuthStorage, FetchImpl, Model } from "jeopi-ai";
 import type { SearchProviderId, SearchResponse } from "../types";
 
+export type GeminiOAuthProvider = "google-gemini-cli" | "google-antigravity";
+
+/** Return the OAuth provider owned by a matching Gemini model, if any. */
+export function resolveGeminiOAuthProvider(model?: Model<Api>): GeminiOAuthProvider | undefined {
+	if (!model?.id.startsWith("gemini-")) return undefined;
+	if (model.provider === "google-antigravity" || model.provider === "google-gemini-cli") {
+		return model.provider;
+	}
+	return undefined;
+}
+
 /**
  * Shared web search parameters passed to providers.
  *
@@ -51,6 +62,8 @@ export interface SearchParams {
 	 * caller's agent session when available; otherwise omit.
 	 */
 	sessionId?: string;
+	/** Active session model, when the caller has one. Providers may use it only when it matches their protocol. */
+	model?: Model<Api>;
 	antigravityEndpointMode?: "auto" | "production" | "sandbox";
 }
 

package/src/web/search/providers/gemini.ts

@@ -8,7 +8,7 @@
  * sibling SQLite store and never POSTs the broker sentinel to a Google token
  * endpoint.
  */
-import { type AuthStorage, type FetchImpl, type OAuthAccess, withOAuthAccess } from "jeopi-ai";
+import { type Api, type AuthStorage, type FetchImpl, type Model, type OAuthAccess, withOAuthAccess } from "jeopi-ai";
 import {
 	ANTIGRAVITY_SYSTEM_INSTRUCTION,
 	getAntigravityUserAgent,
@@ -18,8 +18,8 @@ import { fetchWithRetry } from "jeopi-utils";
 
 import type { SearchCitation, SearchResponse, SearchSource } from "../../../web/search/types";
 import { SearchProviderError } from "../../../web/search/types";
-import type { SearchParams } from "./base";
-import { SearchProvider } from "./base";
+import type { GeminiOAuthProvider, SearchParams } from "./base";
+import { resolveGeminiOAuthProvider, SearchProvider } from "./base";
 import { classifyProviderHttpError, withHardTimeout } from "./utils";
 
 const DEFAULT_ENDPOINT = "https://cloudcode-pa.googleapis.com";
@@ -52,6 +52,7 @@ export interface GeminiSearchParams extends GeminiToolParams {
 	temperature?: number;
 	signal?: AbortSignal;
 	authStorage: AuthStorage;
+	model?: Model<Api>;
 	sessionId?: string;
 	fetch?: FetchImpl;
 	antigravityEndpointMode?: "auto" | "production" | "sandbox";
@@ -102,8 +103,10 @@ export async function findGeminiAuth(
 	authStorage: AuthStorage,
 	sessionId: string | undefined,
 	signal: AbortSignal | undefined,
+	preferredProvider?: GeminiOAuthProvider,
 ): Promise<GeminiAuthSeed | null> {
-	for (const provider of GEMINI_PROVIDERS) {
+	const providers = preferredProvider ? [preferredProvider] : GEMINI_PROVIDERS;
+	for (const provider of providers) {
 		const access = await authStorage.getOAuthAccess(provider, sessionId, { signal });
 		if (!access?.accessToken || !access.projectId) continue;
 		return { provider, access, projectId: access.projectId };
@@ -160,13 +163,16 @@ interface CloudCodeResponseChunk {
 	response?: GeminiModelResponse;
 }
 
-async function parseGeminiSearchStream(body: ReadableStream<Uint8Array>): Promise<GeminiSearchResult> {
+async function parseGeminiSearchStream(
+	body: ReadableStream<Uint8Array>,
+	fallbackModel: string = DEFAULT_MODEL,
+): Promise<GeminiSearchResult> {
 	const answerParts: string[] = [];
 	const sources: SearchSource[] = [];
 	const citations: SearchCitation[] = [];
 	const searchQueries: string[] = [];
 	const seenUrls = new Set<string>();
-	let model = DEFAULT_MODEL;
+	let model = fallbackModel;
 	let usage: { inputTokens: number; outputTokens: number; totalTokens: number } | undefined;
 
 	const reader = body.getReader();
@@ -287,6 +293,7 @@ async function parseGeminiSearchStream(body: ReadableStream<Uint8Array>): Promis
  */
 async function callGeminiSearch(
 	auth: GeminiAuth,
+	modelId: string,
 	query: string,
 	systemPrompt: string | undefined,
 	maxOutputTokens: number | undefined,
@@ -330,7 +337,7 @@ async function callGeminiSearch(
 
 	const requestBody: Record<string, unknown> = {
 		project: auth.projectId,
-		model: DEFAULT_MODEL,
+		model: modelId,
 		request: {
 			contents: [
 				{
@@ -414,7 +421,7 @@ async function callGeminiSearch(
 		throw new SearchProviderError("gemini", "Gemini API returned no response body", 500);
 	}
 
-	return parseGeminiSearchStream(response.body);
+	return parseGeminiSearchStream(response.body, modelId);
 }
 
 async function callGeminiDeveloperSearch(
@@ -494,7 +501,10 @@ async function callGeminiDeveloperSearch(
  * Executes a web search using Google Gemini with Google Search grounding.
  */
 export async function searchGemini(params: GeminiSearchParams): Promise<SearchResponse> {
-	const seed = await findGeminiAuth(params.authStorage, params.sessionId, params.signal);
+	const selectedProvider = resolveGeminiOAuthProvider(params.model);
+	const selectedModelId =
+		selectedProvider && params.model ? (params.model.requestModelId ?? params.model.id) : DEFAULT_MODEL;
+	const seed = await findGeminiAuth(params.authStorage, params.sessionId, params.signal, selectedProvider);
 	let result: GeminiSearchResult;
 
 	if (seed) {
@@ -513,6 +523,7 @@ export async function searchGemini(params: GeminiSearchParams): Promise<SearchRe
 						projectId: access.projectId ?? seed.projectId,
 						isAntigravity,
 					},
+					selectedModelId,
 					params.query,
 					params.system_prompt,
 					params.max_output_tokens,
@@ -528,6 +539,12 @@ export async function searchGemini(params: GeminiSearchParams): Promise<SearchRe
 				),
 			{ sessionId: params.sessionId, signal: params.signal, seed: seed.access },
 		);
+	} else if (selectedProvider) {
+		throw new SearchProviderError(
+			"gemini",
+			`No OAuth credentials found for selected Gemini provider "${selectedProvider}".`,
+			401,
+		);
 	} else {
 		const apiKey = await params.authStorage.getApiKey(DEVELOPER_API_PROVIDER, params.sessionId, {
 			signal: params.signal,
@@ -594,8 +611,10 @@ export class GeminiProvider extends SearchProvider {
 			url_context: params.urlContext,
 			signal: params.signal,
 			authStorage: params.authStorage,
+			model: params.model,
 			sessionId: params.sessionId,
 			fetch: params.fetch,
+			antigravityEndpointMode: params.antigravityEndpointMode,
 		});
 	}
 }