@prestyj/ai 4.3.201 → 4.3.207

package/dist/index.d.cts

@@ -1,6 +1,6 @@
 import { z } from 'zod';
 
-type Provider = "anthropic" | "xiaomi" | "openai" | "glm" | "moonshot" | "minimax" | "deepseek" | "openrouter" | "palsu";
+type Provider = "anthropic" | "xiaomi" | "openai" | "gemini" | "glm" | "moonshot" | "minimax" | "deepseek" | "openrouter" | "palsu";
 type ThinkingLevel = "low" | "medium" | "high" | "xhigh";
 type CacheRetention = "none" | "short" | "long";
 interface TextContent {
@@ -157,12 +157,14 @@ interface StreamOptions {
     signal?: AbortSignal;
     /** Prompt cache retention preference. Providers map this to their supported values. Default: "short". */
     cacheRetention?: CacheRetention;
-    /** Stable per-session cache routing key for providers that support it (OpenAI, Moonshot). */
+    /** Stable per-session cache routing key for providers that support it (OpenAI, Moonshot, Gemini Code Assist). */
     promptCacheKey?: string;
     /** OpenAI service tier for latency-sensitive requests. Only sent to first-party OpenAI API calls. */
     serviceTier?: "auto" | "default" | "flex" | "priority";
     /** OpenAI ChatGPT account ID (from OAuth JWT) for codex endpoint */
     accountId?: string;
+    /** Google Cloud/Code Assist project ID used by Gemini OAuth transport. */
+    projectId?: string;
     /** Enable provider-native web search. Each provider uses its own format:
      *  - Anthropic: server tool `web_search_20250305`
      *  - Moonshot: `builtin_function` `$web_search`

package/dist/index.d.ts

@@ -1,6 +1,6 @@
 import { z } from 'zod';
 
-type Provider = "anthropic" | "xiaomi" | "openai" | "glm" | "moonshot" | "minimax" | "deepseek" | "openrouter" | "palsu";
+type Provider = "anthropic" | "xiaomi" | "openai" | "gemini" | "glm" | "moonshot" | "minimax" | "deepseek" | "openrouter" | "palsu";
 type ThinkingLevel = "low" | "medium" | "high" | "xhigh";
 type CacheRetention = "none" | "short" | "long";
 interface TextContent {
@@ -157,12 +157,14 @@ interface StreamOptions {
     signal?: AbortSignal;
     /** Prompt cache retention preference. Providers map this to their supported values. Default: "short". */
     cacheRetention?: CacheRetention;
-    /** Stable per-session cache routing key for providers that support it (OpenAI, Moonshot). */
+    /** Stable per-session cache routing key for providers that support it (OpenAI, Moonshot, Gemini Code Assist). */
     promptCacheKey?: string;
     /** OpenAI service tier for latency-sensitive requests. Only sent to first-party OpenAI API calls. */
     serviceTier?: "auto" | "default" | "flex" | "priority";
     /** OpenAI ChatGPT account ID (from OAuth JWT) for codex endpoint */
     accountId?: string;
+    /** Google Cloud/Code Assist project ID used by Gemini OAuth transport. */
+    projectId?: string;
     /** Enable provider-native web search. Each provider uses its own format:
      *  - Anthropic: server tool `web_search_20250305`
      *  - Moonshot: `builtin_function` `$web_search`

package/dist/index.js

@@ -29,6 +29,7 @@ var ProviderError = class extends EZCoderAIError {
 var PROVIDER_DISPLAY = {
   openai: "OpenAI",
   anthropic: "Anthropic",
+  gemini: "Gemini",
   glm: "Z.AI (GLM)",
   moonshot: "Moonshot",
   deepseek: "DeepSeek",
@@ -721,20 +722,6 @@ function normalizeOpenAIStopReason(reason) {
 function isJsonObject(value) {
   return value != null && typeof value === "object" && !Array.isArray(value);
 }
-function uniqueToolsByName(tools) {
-  const seen = /* @__PURE__ */ new Set();
-  const unique = [];
-  for (const tool of tools) {
-    if (!tool.name) {
-      unique.push(tool);
-      continue;
-    }
-    if (seen.has(tool.name)) continue;
-    seen.add(tool.name);
-    unique.push(tool);
-  }
-  return unique;
-}
 function createClient(options) {
   const isOAuth = options.apiKey?.startsWith("sk-ant-oat");
   return new Anthropic({
@@ -803,18 +790,18 @@ async function* runStream(options) {
         if (name) reservedServerNames.add(name);
       }
       const clientTools = options.tools?.length ? toAnthropicTools(
-        uniqueToolsByName(options.tools.filter((t) => !reservedServerNames.has(t.name))),
+        options.tools.filter((t) => !reservedServerNames.has(t.name)),
         {
           ...supportsFirstPartyToolExtras && cacheControl ? { cacheControl } : {},
           ...supportsFirstPartyToolExtras ? { enableFineGrainedToolStreaming: true } : {}
         }
       ) : [];
       return {
-        tools: uniqueToolsByName([
+        tools: [
           ...clientTools,
           ...options.serverTools ?? [],
           ...options.webSearch ? [{ type: "web_search_20250305", name: "web_search" }] : []
-        ])
+        ]
       };
     })() : {},
     ...options.toolChoice && options.tools?.length ? { tool_choice: toAnthropicToolChoice(options.toolChoice) } : {},
@@ -1940,6 +1927,502 @@ function parseCodexErrorBody(text) {
   }
 }
 
+// src/providers/gemini.ts
+var DEFAULT_CODE_ASSIST_BASE_URL = "https://cloudcode-pa.googleapis.com";
+var CODE_ASSIST_API_VERSION = "v1internal";
+var GEMINI_CLI_USER_AGENT = "google-gemini-cli";
+var GEMINI_CLI_API_CLIENT = "gemini-cli/0.0.0";
+var CODE_ASSIST_NON_STREAMING_RETRIES = 3;
+var CODE_ASSIST_NON_STREAMING_RETRY_DELAY_MS = 1e3;
+var SYNTHETIC_THOUGHT_SIGNATURE = "skip_thought_signature_validator";
+var CODE_ASSIST_SUPPORTED_MODELS = /* @__PURE__ */ new Set([
+  "gemini-3-pro-preview",
+  "gemini-3.1-pro-preview",
+  "gemini-3.1-pro-preview-customtools",
+  "gemini-3-flash-preview",
+  "gemini-3.1-flash-lite-preview",
+  "gemini-2.5-pro",
+  "gemini-2.5-flash",
+  "gemini-2.5-flash-lite",
+  "gemma-4-31b-it",
+  "gemma-4-26b-a4b-it"
+]);
+function isJsonObject4(value) {
+  return value != null && typeof value === "object" && !Array.isArray(value);
+}
+function getEnvironment() {
+  return globalThis.process?.env;
+}
+function getGoogleProject(options) {
+  const env = getEnvironment();
+  return options.projectId ?? env?.GOOGLE_CLOUD_PROJECT ?? env?.GOOGLE_CLOUD_PROJECT_ID;
+}
+function getCodeAssistEndpoint(method) {
+  const env = getEnvironment();
+  const endpoint = env?.CODE_ASSIST_ENDPOINT ?? DEFAULT_CODE_ASSIST_BASE_URL;
+  const version = env?.CODE_ASSIST_API_VERSION || CODE_ASSIST_API_VERSION;
+  return new URL(`${endpoint}/${version}:${method}`);
+}
+function formatUnsupportedModelMessage(model) {
+  return `Gemini OAuth is configured to use the Gemini Code Assist subscription endpoint only. That endpoint does not currently expose model "${model}".`;
+}
+function formatErrorMessage(status, body, model) {
+  if (status === 404 && !CODE_ASSIST_SUPPORTED_MODELS.has(model)) {
+    return `Gemini API error (404): ${body}
+
+${formatUnsupportedModelMessage(model)}`;
+  }
+  return `Gemini API error (${status}): ${body}`;
+}
+function toSystemAndContents(messages) {
+  let systemText = "";
+  const contents = [];
+  const toolNamesById = /* @__PURE__ */ new Map();
+  for (const msg of messages) {
+    if (msg.role === "system") {
+      systemText = systemText ? `${systemText}
+
+${msg.content}` : msg.content;
+      continue;
+    }
+    if (msg.role === "user") {
+      contents.push({
+        role: "user",
+        parts: typeof msg.content === "string" ? [{ text: msg.content }] : msg.content.map((part) => {
+          if (part.type === "text") return { text: part.text };
+          return { inlineData: { mimeType: part.mediaType, data: part.data } };
+        })
+      });
+      continue;
+    }
+    if (msg.role === "assistant") {
+      const parts = [];
+      const source = msg.content;
+      if (typeof source === "string") {
+        if (source) parts.push({ text: source });
+      } else {
+        for (const part of source) {
+          if (part.type === "text" && part.text) {
+            parts.push({ text: part.text });
+          } else if (part.type === "thinking" && part.text) {
+            parts.push({ text: part.text });
+          } else if (part.type === "tool_call") {
+            toolNamesById.set(part.id, part.name);
+            parts.push({
+              functionCall: { id: part.id, name: part.name, args: part.args },
+              thoughtSignature: SYNTHETIC_THOUGHT_SIGNATURE
+            });
+          }
+        }
+      }
+      if (parts.length > 0) contents.push({ role: "model", parts });
+      continue;
+    }
+    if (msg.role === "tool") {
+      const parts = [];
+      for (const result of msg.content) {
+        const name = toolNamesById.get(result.toolCallId) ?? result.toolCallId;
+        const content = typeof result.content === "string" ? result.content : stringifyToolContent(result.content);
+        parts.push({
+          functionResponse: {
+            id: result.toolCallId,
+            name,
+            response: {
+              content,
+              ...result.isError ? { isError: true } : {}
+            }
+          }
+        });
+      }
+      if (parts.length > 0) contents.push({ role: "user", parts });
+    }
+  }
+  return {
+    ...systemText ? { systemInstruction: { parts: [{ text: systemText }] } } : {},
+    contents
+  };
+}
+function stringifyToolContent(content) {
+  return content.map((part) => part.type === "text" ? part.text : `[image ${part.mediaType}]`).join("\n");
+}
+function toGeminiTools(tools) {
+  if (!tools?.length) return void 0;
+  return [
+    {
+      functionDeclarations: tools.map((tool) => ({
+        name: tool.name,
+        description: tool.description,
+        parameters: sanitizeSchema(tool.rawInputSchema ?? zodToJsonSchema(tool.parameters))
+      }))
+    }
+  ];
+}
+function sanitizeSchema(schema) {
+  const clone = JSON.parse(JSON.stringify(schema));
+  stripUnsupportedSchemaFields(clone);
+  return clone;
+}
+function stripUnsupportedSchemaFields(value) {
+  if (!isJsonObject4(value)) {
+    if (Array.isArray(value)) {
+      for (const item of value) stripUnsupportedSchemaFields(item);
+    }
+    return;
+  }
+  delete value.$schema;
+  delete value.additionalProperties;
+  for (const item of Object.values(value)) {
+    if (isJsonObject4(item) || Array.isArray(item)) {
+      stripUnsupportedSchemaFields(item);
+    }
+  }
+}
+function toGeminiToolConfig(choice, tools) {
+  if (!choice || !tools?.length) return void 0;
+  if (choice === "auto") return { functionCallingConfig: { mode: "AUTO" } };
+  if (choice === "none") return { functionCallingConfig: { mode: "NONE" } };
+  if (choice === "required") return { functionCallingConfig: { mode: "ANY" } };
+  return { functionCallingConfig: { mode: "ANY", allowedFunctionNames: [choice.name] } };
+}
+function isGemini3Model(model) {
+  return /^gemini-3(?:\.|-|$)/.test(model);
+}
+function toGemini3ThinkingLevel(level) {
+  switch (level) {
+    case "low":
+      return "LOW";
+    case "medium":
+      return "MEDIUM";
+    case "high":
+    case "xhigh":
+      return "HIGH";
+  }
+}
+function toThinkingBudget(level) {
+  switch (level) {
+    case "low":
+      return 1024;
+    case "medium":
+      return 8192;
+    case "high":
+    case "xhigh":
+      return 8192;
+  }
+}
+function toThinkingConfig(model, level) {
+  if (!level) return void 0;
+  if (isGemini3Model(model)) {
+    return {
+      includeThoughts: true,
+      thinkingLevel: toGemini3ThinkingLevel(level)
+    };
+  }
+  return {
+    includeThoughts: true,
+    thinkingBudget: toThinkingBudget(level)
+  };
+}
+function buildGenerateRequest(options) {
+  const downgradedMessages = downgradeUnsupportedImages(options.messages, options.supportsImages);
+  const { systemInstruction, contents } = toSystemAndContents(downgradedMessages);
+  const tools = toGeminiTools(options.tools);
+  const toolConfig = toGeminiToolConfig(options.toolChoice, options.tools);
+  const thinkingConfig = toThinkingConfig(options.model, options.thinking);
+  const generationConfig = {
+    ...options.maxTokens ? { maxOutputTokens: options.maxTokens } : {},
+    ...options.temperature != null && !options.thinking ? { temperature: options.temperature } : {},
+    ...options.topP != null ? { topP: options.topP } : {},
+    ...options.stop ? { stopSequences: options.stop } : {},
+    ...thinkingConfig ? { thinkingConfig } : {}
+  };
+  return {
+    contents,
+    ...systemInstruction ? { systemInstruction } : {},
+    ...tools ? { tools } : {},
+    ...toolConfig ? { toolConfig } : {},
+    ...Object.keys(generationConfig).length > 0 ? { generationConfig } : {},
+    ...options.promptCacheKey ? { session_id: options.promptCacheKey } : {}
+  };
+}
+function buildCodeAssistRequest(options, request, projectId) {
+  return {
+    model: options.model,
+    ...projectId ? { project: projectId } : {},
+    user_prompt_id: crypto.randomUUID(),
+    request
+  };
+}
+function buildRequestPlan(options, method) {
+  if (!CODE_ASSIST_SUPPORTED_MODELS.has(options.model)) {
+    throw new ProviderError("gemini", formatUnsupportedModelMessage(options.model));
+  }
+  const projectId = getGoogleProject(options);
+  const request = buildGenerateRequest(options);
+  return {
+    url: getCodeAssistEndpoint(method),
+    headers: {
+      Authorization: `Bearer ${options.apiKey}`,
+      "Content-Type": "application/json",
+      "User-Agent": GEMINI_CLI_USER_AGENT,
+      "X-Goog-Api-Client": GEMINI_CLI_API_CLIENT
+    },
+    body: buildCodeAssistRequest(options, request, projectId)
+  };
+}
+function normalizeGeminiStopReason(reason) {
+  switch (reason) {
+    case "MAX_TOKENS":
+      return "max_tokens";
+    case "STOP":
+      return "stop_sequence";
+    case "SAFETY":
+    case "RECITATION":
+    case "BLOCKLIST":
+    case "PROHIBITED_CONTENT":
+    case "SPII":
+      return "refusal";
+    default:
+      return "end_turn";
+  }
+}
+function parseSseEvents(buffer) {
+  const events = [];
+  let cursor = 0;
+  while (true) {
+    const next = buffer.indexOf("\n\n", cursor);
+    if (next === -1) break;
+    const raw = buffer.slice(cursor, next);
+    cursor = next + 2;
+    let eventName;
+    const dataLines = [];
+    for (const line of raw.split("\n")) {
+      if (line.startsWith("event:")) {
+        eventName = line.slice("event:".length).trim();
+      } else if (line.startsWith("data:")) {
+        dataLines.push(line.slice("data:".length).trimStart());
+      }
+    }
+    if (dataLines.length > 0) {
+      events.push({ event: eventName, data: dataLines.join("\n") });
+    }
+  }
+  return { events, remaining: buffer.slice(cursor) };
+}
+async function* streamSse(response) {
+  if (!response.body) return;
+  const reader = response.body.getReader();
+  const decoder = new TextDecoder();
+  let buffer = "";
+  try {
+    while (true) {
+      const { done, value } = await reader.read();
+      if (done) break;
+      buffer += decoder.decode(value, { stream: true }).replace(/\r\n/g, "\n");
+      const parsed2 = parseSseEvents(buffer);
+      buffer = parsed2.remaining;
+      for (const event of parsed2.events) {
+        if (event.data === "[DONE]") continue;
+        yield JSON.parse(event.data);
+      }
+    }
+    buffer += decoder.decode().replace(/\r\n/g, "\n");
+    const parsed = parseSseEvents(buffer + "\n\n");
+    for (const event of parsed.events) {
+      if (event.data === "[DONE]") continue;
+      yield JSON.parse(event.data);
+    }
+  } finally {
+    reader.releaseLock();
+  }
+}
+function candidatesFromResponse(response) {
+  return response.response?.candidates ?? response.candidates;
+}
+function usageFromResponse(response) {
+  return response.response?.usageMetadata ?? response.usageMetadata;
+}
+function partsFromResponse(response) {
+  return candidatesFromResponse(response)?.[0]?.content?.parts ?? [];
+}
+function finishReasonFromResponse(response) {
+  return candidatesFromResponse(response)?.[0]?.finishReason;
+}
+function readTextPart(part) {
+  return "text" in part ? { text: part.text, thought: part.thought === true } : void 0;
+}
+function readFunctionCallPart(part) {
+  if (!("functionCall" in part)) return void 0;
+  return {
+    ...part.functionCall.id ? { id: part.functionCall.id } : {},
+    name: part.functionCall.name,
+    args: isJsonObject4(part.functionCall.args) ? part.functionCall.args : {}
+  };
+}
+function makeToolCallId(index, providerId) {
+  return providerId ?? `gemini_call_${index}_${crypto.randomUUID().replace(/-/g, "")}`;
+}
+function shouldRetryCodeAssistStatus(status) {
+  return status === 429 || status === 499 || status >= 500 && status <= 599;
+}
+function isAbortError(err) {
+  return err instanceof Error && err.name === "AbortError";
+}
+async function sleep(ms, signal) {
+  if (ms <= 0) return;
+  await new Promise((resolve, reject) => {
+    const cleanup = () => signal?.removeEventListener("abort", onAbort);
+    const timer = setTimeout(() => {
+      cleanup();
+      resolve();
+    }, ms);
+    const onAbort = () => {
+      clearTimeout(timer);
+      cleanup();
+      reject(new DOMException("The operation was aborted.", "AbortError"));
+    };
+    signal?.addEventListener("abort", onAbort, { once: true });
+    if (signal?.aborted) onAbort();
+  });
+}
+async function fetchCodeAssist(plan, options) {
+  try {
+    const response = await fetch(plan.url, {
+      method: "POST",
+      headers: plan.headers,
+      body: JSON.stringify(plan.body),
+      signal: options.signal
+    });
+    if (!response.ok) {
+      const text = await response.text().catch(() => "");
+      throw new ProviderError("gemini", formatErrorMessage(response.status, text, options.model), {
+        statusCode: response.status
+      });
+    }
+    return response;
+  } catch (err) {
+    throw toError3(err);
+  }
+}
+async function fetchCodeAssistWithRetry(plan, options) {
+  let lastError;
+  for (let attempt = 0; attempt <= CODE_ASSIST_NON_STREAMING_RETRIES; attempt++) {
+    try {
+      return await fetchCodeAssist(plan, options);
+    } catch (err) {
+      const error = toError3(err);
+      const statusCode = error instanceof ProviderError ? error.statusCode : void 0;
+      if (options.signal?.aborted || isAbortError(error) || attempt === CODE_ASSIST_NON_STREAMING_RETRIES || statusCode != null && !shouldRetryCodeAssistStatus(statusCode)) {
+        throw error;
+      }
+      lastError = error;
+    }
+    try {
+      await sleep(CODE_ASSIST_NON_STREAMING_RETRY_DELAY_MS, options.signal);
+    } catch (err) {
+      throw toError3(err);
+    }
+  }
+  throw lastError ?? new ProviderError("gemini", "Gemini Code Assist request failed.");
+}
+function streamGemini(options) {
+  return new StreamResult(runStream4(options));
+}
+async function* runStream4(options) {
+  const useStreaming = options.streaming !== false;
+  const method = useStreaming ? "streamGenerateContent" : "generateContent";
+  const plan = buildRequestPlan(options, method);
+  if (useStreaming) plan.url.searchParams.set("alt", "sse");
+  const response = useStreaming ? await fetchCodeAssist(plan, options) : await fetchCodeAssistWithRetry(plan, options);
+  const contentParts = [];
+  const pendingToolCalls = [];
+  let textAccum = "";
+  let thinkingAccum = "";
+  let stopReason = "end_turn";
+  let inputTokens = 0;
+  let outputTokens = 0;
+  let cacheRead = 0;
+  let toolIndex = 0;
+  const handleResponse = function* (chunk) {
+    const usage = usageFromResponse(chunk);
+    if (usage) {
+      inputTokens = usage.promptTokenCount ?? inputTokens;
+      outputTokens = usage.candidatesTokenCount ?? outputTokens;
+      cacheRead = usage.cachedContentTokenCount ?? cacheRead;
+    }
+    const reason = finishReasonFromResponse(chunk);
+    if (reason) stopReason = normalizeGeminiStopReason(reason);
+    for (const part of partsFromResponse(chunk)) {
+      const textPart = readTextPart(part);
+      if (textPart) {
+        if (textPart.thought) {
+          thinkingAccum += textPart.text;
+          yield { type: "thinking_delta", text: textPart.text };
+        } else {
+          textAccum += textPart.text;
+          yield { type: "text_delta", text: textPart.text };
+        }
+        continue;
+      }
+      const functionCall = readFunctionCallPart(part);
+      if (functionCall) {
+        const id = makeToolCallId(toolIndex++, functionCall.id);
+        const argsJson = JSON.stringify(functionCall.args);
+        pendingToolCalls.push({
+          type: "tool_call",
+          id,
+          name: functionCall.name,
+          args: functionCall.args
+        });
+        yield { type: "toolcall_delta", id, name: functionCall.name, argsJson };
+      }
+    }
+  };
+  try {
+    if (useStreaming) {
+      for await (const chunk of streamSse(response)) {
+        yield* handleResponse(chunk);
+      }
+    } else {
+      const chunk = await response.json();
+      yield* handleResponse(chunk);
+    }
+  } catch (err) {
+    throw toError3(err);
+  }
+  if (thinkingAccum) contentParts.push({ type: "thinking", text: thinkingAccum });
+  if (textAccum) contentParts.push({ type: "text", text: textAccum });
+  for (const toolCall of pendingToolCalls) {
+    contentParts.push(toolCall);
+    yield {
+      type: "toolcall_done",
+      id: toolCall.id,
+      name: toolCall.name,
+      args: toolCall.args
+    };
+  }
+  if (pendingToolCalls.length > 0) stopReason = "tool_use";
+  const adjustedInputTokens = Math.max(0, inputTokens - cacheRead);
+  const streamResponse = {
+    message: {
+      role: "assistant",
+      content: contentParts.length > 0 ? contentParts : textAccum
+    },
+    stopReason,
+    usage: {
+      inputTokens: adjustedInputTokens,
+      outputTokens,
+      ...cacheRead > 0 ? { cacheRead } : {}
+    }
+  };
+  yield { type: "done", stopReason };
+  return streamResponse;
+}
+function toError3(err) {
+  if (err instanceof ProviderError) return err;
+  if (err instanceof Error) return new ProviderError("gemini", err.message, { cause: err });
+  return new ProviderError("gemini", String(err));
+}
+
 // src/provider-registry.ts
 var ProviderRegistryImpl = class {
   providers = /* @__PURE__ */ new Map();
@@ -1996,6 +2479,9 @@ providerRegistry.register("openai", {
     return streamOpenAI(options);
   }
 });
+providerRegistry.register("gemini", {
+  stream: (options) => streamGemini(options)
+});
 providerRegistry.register("glm", {
   stream: (options) => streamOpenAI({
     ...options,