jeopi-cli 16.6.8 → 16.6.11

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

@@ -24,6 +24,7 @@ import {
 	MarketplaceManager,
 } from "../extensibility/plugins/marketplace";
 import { resolveMemoryBackend } from "../memory-backend";
+import { loadAndCreateLiveDiscordBridge } from "../messenger/live-session";
 import { describeLoopLimitRuntime } from "../modes/loop-limit";
 import { theme } from "../modes/theme/theme";
 import type { InteractiveModeContext } from "../modes/types";
@@ -66,6 +67,13 @@ import type {
 
 export type { BuiltinSlashCommand, SubcommandDef } from "./types";
 
+interface LiveDiscordStart {
+	cancelled: boolean;
+	promise: Promise<void>;
+}
+
+const liveDiscordStarts = new WeakMap<InteractiveModeContext, LiveDiscordStart>();
+
 /** TUI-specific runtime accepted by `executeBuiltinSlashCommand`. */
 export type BuiltinSlashCommandRuntime = TuiSlashCommandRuntime;
 
@@ -650,6 +658,102 @@ const BUILTIN_SLASH_COMMAND_REGISTRY: ReadonlyArray<SlashCommandSpec> = [
 			runtime.ctx.editor.setText("");
 		},
 	},
+	{
+		name: "discord",
+		description: "Opt in to this session from an authorized Discord channel",
+		inlineHint: "[live|stop|status] [configPath] [--allow-full-control]",
+		subcommands: [
+			{ name: "live", description: "Start the live Discord bridge with a private config file" },
+			{ name: "status", description: "Show live Discord bridge status" },
+			{ name: "stop", description: "Stop the live Discord bridge" },
+		],
+		allowArgs: true,
+		getTuiAutocompleteDescription: runtime =>
+			runtime.ctx.liveDiscordBridge?.active ? "Discord live bridge: active" : "Discord live bridge: off",
+		handleTui: async (command, runtime) => {
+			const ctx = runtime.ctx;
+			ctx.editor.setText("");
+			const { verb, rest } = parseSubcommand(command.args.trim());
+			if (verb === "status") {
+				if (!ctx.liveDiscordBridge?.active) {
+					ctx.showStatus("Discord live bridge is off");
+					return;
+				}
+				const approvalMode = String(ctx.session.settings.get("tools.approvalMode"));
+				const activeTools = ctx.session.getActiveToolNames();
+				ctx.showStatus(
+					`Discord live bridge is active with full host control acknowledged. Approval mode: ${approvalMode}; active tools: ${activeTools.length > 0 ? activeTools.join(", ") : "none"}.`,
+				);
+				return;
+			}
+			if (verb === "stop") {
+				const bridge = ctx.liveDiscordBridge;
+				const start = liveDiscordStarts.get(ctx);
+				if (!bridge && start) {
+					start.cancelled = true;
+					ctx.showStatus("Discord live bridge startup cancellation requested");
+					return;
+				}
+				if (!bridge) {
+					ctx.showStatus("Discord live bridge is not active");
+					return;
+				}
+				ctx.liveDiscordBridge = undefined;
+				try {
+					await bridge.close();
+					ctx.showStatus("Discord live bridge stopped; access revoked");
+				} catch (error) {
+					ctx.showError(`Failed to stop Discord live bridge: ${errorMessage(error)}`);
+				}
+				return;
+			}
+			const acknowledgment = /^(.+?)\s+--allow-full-control$/.exec(rest);
+			if (verb !== "live" || !acknowledgment) {
+				ctx.showError("Usage: /discord live <private messenger.json> --allow-full-control");
+				return;
+			}
+			if (ctx.liveDiscordBridge?.active || liveDiscordStarts.has(ctx)) {
+				ctx.showError("Discord live bridge is already active or starting (/discord stop first)");
+				return;
+			}
+			let resolveStart!: () => void;
+			const startPromise = new Promise<void>(resolve => {
+				resolveStart = resolve;
+			});
+			const startState: LiveDiscordStart = { cancelled: false, promise: startPromise };
+			liveDiscordStarts.set(ctx, startState);
+			try {
+				const configPath = resolveToCwd(acknowledgment[1]!, ctx.sessionManager.getCwd());
+				const bridge = await loadAndCreateLiveDiscordBridge(ctx, configPath, {}, { acknowledgeFullControl: true });
+				if (startState.cancelled || ctx.shutdownRequested || ctx.isShuttingDown) {
+					await bridge.close().catch(() => {});
+					return;
+				}
+				if (ctx.liveDiscordBridge?.active) {
+					await bridge.close().catch(() => {});
+					ctx.showError("Discord live bridge is already active (/discord stop first)");
+					return;
+				}
+				ctx.liveDiscordBridge = bridge;
+				void bridge.run().catch(error => {
+					if (ctx.liveDiscordBridge !== bridge || ctx.isShuttingDown) return;
+					ctx.liveDiscordBridge = undefined;
+					ctx.showError(`Discord live bridge stopped: ${errorMessage(error)}`);
+				});
+				const approvalMode = String(ctx.session.settings.get("tools.approvalMode"));
+				const activeTools = ctx.session.getActiveToolNames();
+				ctx.showStatus(
+					`Discord live bridge active with full host control acknowledged. Approval mode: ${approvalMode}; active tools: ${activeTools.length > 0 ? activeTools.join(", ") : "none"}. /discord stop revokes access.`,
+				);
+			} catch (error) {
+				ctx.showError(`Failed to start Discord live bridge: ${errorMessage(error)}`);
+			} finally {
+				resolveStart();
+				if (liveDiscordStarts.get(ctx)?.promise === startPromise) liveDiscordStarts.delete(ctx);
+			}
+		},
+	},
+
 	{
 		name: "collab",
 		description: "Share this session live via a relay",

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,
 		});
 	}
 }