From 997b00034435440d412f955e05e53f09bae83f9e Mon Sep 17 00:00:00 2001 From: Adam Malczewski Date: Sat, 23 May 2026 19:07:21 +0900 Subject: feat: google gemini provider, adaptive thinking for opus 4.7, model search filter - Added Google (Gemini) as a provider: add-key UI, env var resolution via resolveApiKey, usage tracking via native models endpoint + gemini.google.com cookie scraping - @ai-sdk/anthropic upgraded to v3 (adaptive thinking support) with LanguageModelV1 cast for ai v4 compat - Claude Opus 4.7 uses adaptive thinking (type: adaptive); all other models keep explicit budget tokens - Model selector modal: search filter with space matching dash/underscore - Copy button: all tool results truncated at 300 chars - Sidebar layout fix: Claude Reset panel removed from flex-1 fill to prevent overlap --- packages/api/src/agent-manager.ts | 2 +- packages/api/src/routes/models.ts | 32 +++- packages/core/package.json | 2 +- packages/core/src/agent/agent.ts | 44 +++-- packages/core/src/credentials/api-keys.ts | 10 +- packages/core/src/credentials/google.ts | 178 +++++++++++++++++++++ packages/core/src/credentials/index.ts | 4 + packages/frontend/src/App.svelte | 2 +- .../frontend/src/lib/components/KeyUsage.svelte | 53 ++++++ .../src/lib/components/ModelSelector.svelte | 46 ++++-- packages/frontend/src/lib/types.ts | 21 ++- 11 files changed, 355 insertions(+), 39 deletions(-) create mode 100644 packages/core/src/credentials/google.ts (limited to 'packages') diff --git a/packages/api/src/agent-manager.ts b/packages/api/src/agent-manager.ts index 5b19eb3..1a28371 100644 --- a/packages/api/src/agent-manager.ts +++ b/packages/api/src/agent-manager.ts @@ -548,7 +548,7 @@ export class AgentManager { } } else { // Standard key: resolve from env var - const envKey = resolveApiKey(key.id); + const envKey = resolveApiKey(key.id, key.env); if (envKey) { apiKey = envKey; baseURL = key.base_url; diff --git a/packages/api/src/routes/models.ts b/packages/api/src/routes/models.ts index b250263..1a54abb 100644 --- a/packages/api/src/routes/models.ts +++ b/packages/api/src/routes/models.ts @@ -6,6 +6,7 @@ import { type ClaudeAccount, fetchAnthropicModels, fetchCopilotUsage, + fetchGoogleUsage, fetchOpencodeUsage, getAccountUsage, getAnthropicHeaders, @@ -112,7 +113,7 @@ modelsRoutes.get("/available", async (c) => { }); } - const apiKeyValue = resolveApiKey(keyId); + const apiKeyValue = resolveApiKey(keyId, key.definition.env); if (!apiKeyValue) { return c.json({ error: `no API key found for ${keyId}` }, 500); } @@ -148,7 +149,7 @@ modelsRoutes.get("/available", async (c) => { return c.json({ error: "failed to parse provider response", details: String(err) }, 502); } - const models = data.data.map((m) => m.id); + const models = data.data.map((m) => m.id.replace(/^models\//, "")); return c.json({ models }); }); @@ -291,7 +292,7 @@ modelsRoutes.get("/key-usage", async (c) => { }, }); } else if (provider === "github-copilot") { - const token = resolveApiKey(keyId); + const token = resolveApiKey(keyId, key.definition.env); if (!token) { return c.json({ error: `no API key found for ${keyId}` }, 502); } @@ -307,6 +308,21 @@ modelsRoutes.get("/key-usage", async (c) => { resetAt: report.resetAt, plan: report.plan, }); + } else if (provider === "google") { + const token = resolveApiKey(keyId, key.definition.env); + if (!token) { + return c.json({ error: `no API key found for ${keyId}. Set GOOGLE_API_KEY env var.` }, 502); + } + const report = await fetchGoogleUsage(token, key.definition.base_url); + if (!report) { + return c.json({ error: "failed to fetch Google usage data" }, 502); + } + return c.json({ + provider: "google", + models: report.models, + currentUsage: report.currentUsage, + weeklyUsage: report.weeklyUsage, + }); } else { return c.json({ error: "usage tracking not supported for this provider" }, 400); } @@ -400,13 +416,13 @@ modelsRoutes.get("/credentials-status", (c) => { // ─── Add key to dispatch.toml ───────────────────────────────── -const VALID_PROVIDERS = ["anthropic", "opencode-go", "github-copilot"] as const; +const VALID_PROVIDERS = ["anthropic", "opencode-go", "google"] as const; type SupportedProvider = (typeof VALID_PROVIDERS)[number]; const PROVIDER_BASE_URLS: Record = { anthropic: "https://api.anthropic.com/v1", "opencode-go": "https://opencode.ai/zen/go/v1", - "github-copilot": "https://api.githubcopilot.com", + google: "https://generativelanguage.googleapis.com/v1beta/openai", }; modelsRoutes.post("/add-key", async (c) => { @@ -445,6 +461,12 @@ modelsRoutes.post("/add-key", async (c) => { if (provider === "anthropic") { const credPath = `${homedir()}/.claude/.credentials-${id}.json`; newBlock += `\ncredentials_file = "${credPath}"`; + } else { + const envVar = + provider === "google" + ? "GOOGLE_API_KEY" + : `DISPATCH_${id.toUpperCase().replace(/-/g, "_")}_KEY`; + newBlock += `\nenv = "${envVar}"`; } newBlock += "\n"; diff --git a/packages/core/package.json b/packages/core/package.json index a9bf6e9..6f88398 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -11,7 +11,7 @@ "typecheck": "tsc --noEmit" }, "dependencies": { - "@ai-sdk/anthropic": "1.2.12", + "@ai-sdk/anthropic": "^3.0.0", "@ai-sdk/openai-compatible": "^0.2.0", "ai": "^4.0.0", "chokidar": "^5.0.0", diff --git a/packages/core/src/agent/agent.ts b/packages/core/src/agent/agent.ts index bf9b22f..24de59d 100644 --- a/packages/core/src/agent/agent.ts +++ b/packages/core/src/agent/agent.ts @@ -1,6 +1,6 @@ import { realpathSync } from "node:fs"; import { dirname, isAbsolute, relative, resolve } from "node:path"; -import type { CoreMessage } from "ai"; +import type { CoreMessage, LanguageModelV1 } from "ai"; import { streamText } from "ai"; import { buildBillingHeaderValue, SYSTEM_IDENTITY } from "../credentials/claude.js"; import { createProvider, prefixToolName, unprefixToolName } from "../llm/provider.js"; @@ -260,28 +260,40 @@ export class Agent { const effort = options?.reasoningEffort ?? this.config.reasoningEffort ?? "max"; // Build stream text options + const rawModel = providerFactory(this.config.model); + const model = rawModel as unknown as LanguageModelV1; const streamOptions: Parameters[0] = { - model: providerFactory(this.config.model), + model, system: systemPrompt, messages: toCoreMessages(stepMessages, isAnthropic), tools, }; if (isAnthropic && effort !== "none") { - const budgetTokens = - effort === "max" - ? 16000 - : effort === "high" - ? 10000 - : effort === "medium" - ? 5000 - : effort === "low" - ? 2000 - : 0; - streamOptions.providerOptions = { - anthropic: { thinking: { type: "enabled" as const, budgetTokens } }, - }; - streamOptions.maxTokens = budgetTokens + 8000; + const modelId = this.config.model; + const isOpus47 = modelId === "claude-opus-4-7"; + + if (isOpus47) { + // Opus 4.7 only supports adaptive thinking + streamOptions.providerOptions = { + anthropic: { thinking: { type: "adaptive" as const } }, + }; + } else { + const budgetTokens = + effort === "max" + ? 16000 + : effort === "high" + ? 10000 + : effort === "medium" + ? 5000 + : effort === "low" + ? 2000 + : 0; + streamOptions.providerOptions = { + anthropic: { thinking: { type: "enabled" as const, budgetTokens } }, + }; + streamOptions.maxTokens = budgetTokens + 8000; + } } else if (!isAnthropic && effort !== "none") { streamOptions.providerOptions = { openaiCompatible: { reasoningEffort: effort } }; } diff --git a/packages/core/src/credentials/api-keys.ts b/packages/core/src/credentials/api-keys.ts index af5aa0e..ef30400 100644 --- a/packages/core/src/credentials/api-keys.ts +++ b/packages/core/src/credentials/api-keys.ts @@ -40,10 +40,14 @@ export function getApiKey(keyId: string): string | null { } /** - * Resolve an API key from the database. Returns null if not found. + * Resolve an API key from the database, with env var fallback. + * Pass the env var name (e.g. "GOOGLE_API_KEY") to check process.env as well. */ -export function resolveApiKey(keyId: string): string | null { - return getApiKey(keyId); +export function resolveApiKey(keyId: string, envVar?: string): string | null { + const dbKey = getApiKey(keyId); + if (dbKey) return dbKey; + if (envVar) return process.env[envVar] ?? null; + return null; } /** diff --git a/packages/core/src/credentials/google.ts b/packages/core/src/credentials/google.ts new file mode 100644 index 0000000..17bc930 --- /dev/null +++ b/packages/core/src/credentials/google.ts @@ -0,0 +1,178 @@ +// ─── Google Gemini Usage Tracking ─────────────────────────── +// Two modes: +// 1. API key → queries native Gemini models endpoint for rate limits +// 2. Cookie → scrapes gemini.google.com for current usage % (like OpenCode) +// +// Set GEMINI_COOKIE env var with the value of your __Secure-1PSID cookie +// from gemini.google.com to see current usage percentages. + +export interface GoogleUsageBucket { + percentUsed: number; // 0-100 + resetsAt?: string; // e.g. "22:40" or "30 May at 17:40" +} + +export interface GoogleUsageReport { + // Mode 1: API key rate limits + models?: Array<{ + name: string; + inputTokenLimit: number; + outputTokenLimit: number; + rpm: number; + requestsPerDay: number; + }>; + // Mode 2: Cookie-scraped usage from gemini.google.com + currentUsage?: GoogleUsageBucket; + weeklyUsage?: GoogleUsageBucket; +} + +// Helpers to extract HTML text between markers +function extractBetween(html: string, after: string, before: string): string | null { + const start = html.indexOf(after); + if (start === -1) return null; + const s = start + after.length; + const end = html.indexOf(before, s); + if (end === -1) return null; + return html.slice(s, end).trim(); +} + +function extractPercent(html: string, afterMarker: string): number | null { + const chunk = extractBetween(html, afterMarker, "%"); + if (!chunk) return null; + const digits = chunk.replace(/\D/g, ""); + const n = parseInt(digits, 10); + return Number.isNaN(n) ? null : n; +} + +function extractResetTime(html: string, afterMarker: string): string | null { + // Look for "Resets at HH:MM" or "Resets on DD Mon at HH:MM" + const start = html.indexOf(afterMarker); + if (start === -1) return null; + const chunk = html.slice(start + afterMarker.length); + // Match time patterns + const m = chunk.match(/Resets?\s+(at|on)\s+([^<]+)/i); + if (!m?.[1] || !m[2]) return null; + return `${m[1]} ${m[2].trim()}`; +} + +async function scrapeGeminiWeb(cookie: string): Promise<{ + currentUsage?: GoogleUsageBucket; + weeklyUsage?: GoogleUsageBucket; +} | null> { + try { + const response = await fetch("https://gemini.google.com/app", { + headers: { + cookie: `__Secure-1PSID=${cookie}`, + "accept-language": "en-US,en;q=0.9", + }, + redirect: "follow", + }); + + if (!response.ok) return null; + + const html = await response.text(); + + // Detect auth redirect + if (html.includes("ServiceLogin") || html.includes("sign in")) { + return null; + } + + // Look for usage data in the page + // Pattern: "Current usage" followed by a percentage and reset time + const currentPct = extractPercent(html, "Current usage"); + const currentReset = extractResetTime(html, "Current usage"); + + // Weekly limit section + const weeklyPct = extractPercent(html, "Weekly limit"); + const weeklyReset = extractResetTime(html, "Weekly limit"); + + const result: { + currentUsage?: GoogleUsageBucket; + weeklyUsage?: GoogleUsageBucket; + } = {}; + + if (currentPct !== null) { + result.currentUsage = { + percentUsed: currentPct, + resetsAt: currentReset ?? undefined, + }; + } + + if (weeklyPct !== null) { + result.weeklyUsage = { + percentUsed: weeklyPct, + resetsAt: weeklyReset ?? undefined, + }; + } + + if (result.currentUsage || result.weeklyUsage) return result; + return null; + } catch { + return null; + } +} + +async function fetchModelsViaApiKey(apiKey: string): Promise | null> { + const url = `https://generativelanguage.googleapis.com/v1beta/models?key=${encodeURIComponent(apiKey)}`; + + try { + const response = await fetch(url); + if (!response.ok) return null; + + const data = (await response.json()) as { + models?: Array<{ + name: string; + inputTokenLimit?: number; + outputTokenLimit?: number; + rateLimit?: { requestsPerMinute?: number }; + limits?: { requestsPerDay?: number }; + }>; + }; + + return (data.models ?? []) + .filter((m) => { + const name = m.name?.replace(/^models\//, "") ?? ""; + return name.startsWith("gemini-"); + }) + .map((m) => ({ + name: m.name?.replace(/^models\//, "") ?? "", + inputTokenLimit: m.inputTokenLimit ?? 0, + outputTokenLimit: m.outputTokenLimit ?? 0, + rpm: m.rateLimit?.requestsPerMinute ?? 0, + requestsPerDay: m.limits?.requestsPerDay ?? 0, + })); + } catch { + return null; + } +} + +export async function fetchGoogleUsage( + apiKey: string, + _baseUrl: string, +): Promise { + const results: GoogleUsageReport = {}; + + // Try API key mode: get model rate limits + const models = await fetchModelsViaApiKey(apiKey); + if (models) { + results.models = models; + } + + // Try cookie mode: scrape gemini.google.com usage + const cookie = process.env.GEMINI_COOKIE; + if (cookie) { + const scraped = await scrapeGeminiWeb(cookie); + if (scraped) { + if (scraped.currentUsage) results.currentUsage = scraped.currentUsage; + if (scraped.weeklyUsage) results.weeklyUsage = scraped.weeklyUsage; + } + } + + if (results.models || results.currentUsage || results.weeklyUsage) return results; + return null; +} diff --git a/packages/core/src/credentials/index.ts b/packages/core/src/credentials/index.ts index e7f8a12..ff7392b 100644 --- a/packages/core/src/credentials/index.ts +++ b/packages/core/src/credentials/index.ts @@ -29,6 +29,10 @@ export { type CopilotUsageReport, fetchCopilotUsage, } from "./copilot.js"; +export { + fetchGoogleUsage, + type GoogleUsageReport, +} from "./google.js"; export { fetchOpencodeUsage, type OpencodeUsageBucket, diff --git a/packages/frontend/src/App.svelte b/packages/frontend/src/App.svelte index a2f7327..591266c 100644 --- a/packages/frontend/src/App.svelte +++ b/packages/frontend/src/App.svelte @@ -190,7 +190,7 @@ onMount(() => {
diff --git a/packages/frontend/src/lib/components/KeyUsage.svelte b/packages/frontend/src/lib/components/KeyUsage.svelte index 49c3cf6..96a4b08 100644 --- a/packages/frontend/src/lib/components/KeyUsage.svelte +++ b/packages/frontend/src/lib/components/KeyUsage.svelte @@ -404,6 +404,59 @@ function hasBucketData(bucket: UsageBucket | undefined): boolean { Resets: {formatDate(entry.data.resetAt)} {/if}
+ {:else if entry.data.provider === "google"} +
+ + {#if entry.data.currentUsage} + {@const u = entry.data.currentUsage} +
+
+ Current + {u.percentUsed}% +
+ + {#if u.resetsAt} + Resets: {u.resetsAt} + {/if} +
+ {/if} + {#if entry.data.weeklyUsage} + {@const w = entry.data.weeklyUsage} +
+
+ Weekly + {w.percentUsed}% +
+ + {#if w.resetsAt} + Resets: {w.resetsAt} + {/if} +
+ {/if} + + {#if !entry.data.currentUsage && entry.data.models && entry.data.models.length > 0} + {@const m = entry.data.models[0]} +
+ Models + {entry.data.models.length} available +
+ {#if m.rpm > 0} +
+ RPM + {m.rpm} +
+ {/if} + {#if m.requestsPerDay > 0} +
+ RPD + {m.requestsPerDay.toLocaleString()} +
+ {/if} + {#if !entry.data.currentUsage} +

Set GEMINI_COOKIE (__Secure-1PSID) for usage %

+ {/if} + {/if} +
{/if} {/if} diff --git a/packages/frontend/src/lib/components/ModelSelector.svelte b/packages/frontend/src/lib/components/ModelSelector.svelte index bbbf036..235cf3b 100644 --- a/packages/frontend/src/lib/components/ModelSelector.svelte +++ b/packages/frontend/src/lib/components/ModelSelector.svelte @@ -62,6 +62,7 @@ const modelCache = new Map(); let loadingModels = $state(false); let modelError = $state(null); let sliderDragging = $state(null); + let modelSearch = $state(""); let cwdExists = $state(null); let cwdCheckTimer: ReturnType | null = null; @@ -126,6 +127,7 @@ const modelCache = new Map(); if (!keyId) return; showModelModal = true; modelError = null; + modelSearch = ""; // Check session cache if (modelCache.has(keyId)) { @@ -393,17 +395,39 @@ const modelCache = new Map(); {modelError} {:else} -
- {#each availableModels as model} - - {/each} + {@const search = modelSearch.toLowerCase().trim()} + {@const searchRegex = search + ? new RegExp( + search.replace(/[.*+?^${}()|[\]\\]/g, "\\$&").replace(/ /g, "[ _-]"), + ) + : null} + {@const filteredModels = searchRegex + ? availableModels.filter((m) => searchRegex.test(m.toLowerCase())) + : availableModels} +
+ +
+ {#each filteredModels as model} + + {/each} + {#if filteredModels.length === 0} +

+ {search ? 'No models match your search.' : 'No models available.'} +

+ {/if} +
{/if}
diff --git a/packages/frontend/src/lib/types.ts b/packages/frontend/src/lib/types.ts index 532c948..2e6b219 100644 --- a/packages/frontend/src/lib/types.ts +++ b/packages/frontend/src/lib/types.ts @@ -163,4 +163,23 @@ export interface CopilotUsageData { plan?: string; } -export type KeyUsageData = ClaudeUsageData | OpencodeUsageData | CopilotUsageData; +export interface GoogleUsageData { + provider: "google"; + models?: Array<{ + name: string; + inputTokenLimit: number; + outputTokenLimit: number; + rpm: number; + requestsPerDay: number; + }>; + currentUsage?: { + percentUsed: number; + resetsAt?: string; + }; + weeklyUsage?: { + percentUsed: number; + resetsAt?: string; + }; +} + +export type KeyUsageData = ClaudeUsageData | OpencodeUsageData | CopilotUsageData | GoogleUsageData; -- cgit v1.2.3