feat(proxy): add universal proxy support and fix Gemini model resolution (#536)

freedomsky11 · simpleuni11 · simpleuni11 · commit 670a399c07f5 · 2026-03-28T15:54:43.000Z
Integrated undici ProxyAgent for native fetch and HttpsProxyAgent for axios/openai/anthropic. Upgraded @google/generative-ai to fix #536. Co-authored-by: uni <uni@hanwei.ink>
diff --git a/out/cli.cjs b/out/cli.cjs
diff --git a/out/github-action.cjs b/out/github-action.cjs
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -89,7 +89,7 @@
     "@azure/openai": "^1.0.0-beta.12",
     "@clack/prompts": "^0.6.1",
     "@dqbd/tiktoken": "^1.0.2",
-    "@google/generative-ai": "^0.11.4",
+    "@google/generative-ai": "^0.24.1",
     "@mistralai/mistralai": "^1.3.5",
     "@octokit/webhooks-schemas": "^6.11.0",
     "@octokit/webhooks-types": "^6.11.0",
@@ -98,6 +98,7 @@
     "cleye": "^1.3.2",
     "crypto": "^1.0.1",
     "execa": "^7.0.0",
+    "https-proxy-agent": "^8.0.0",
     "ignore": "^5.2.4",
     "ini": "^3.0.1",
     "inquirer": "^9.1.4",
diff --git a/src/cli.ts b/src/cli.ts
@@ -5,9 +5,10 @@ import { cli } from 'cleye';
 import packageJSON from '../package.json';
 import { commit } from './commands/commit';
 import { commitlintConfigCommand } from './commands/commitlint';
-import { configCommand } from './commands/config';
+import { configCommand, getConfig } from './commands/config';
 import { hookCommand, isHookCalled } from './commands/githook.js';
 import { prepareCommitMessageHook } from './commands/prepare-commit-msg-hook';
+import { setupProxy } from './utils/proxy';
 import {
   setupCommand,
   isFirstRun,
@@ -18,6 +19,9 @@ import { modelsCommand } from './commands/models';
 import { checkIsLatestVersion } from './utils/checkIsLatestVersion';
 import { runMigrations } from './migrations/_run.js';
 
+const config = getConfig();
+setupProxy(config.OCO_PROXY);
+
 const extraArgs = process.argv.slice(2);
 
 cli(
diff --git a/src/commands/config.ts b/src/commands/config.ts
@@ -25,6 +25,7 @@ export enum CONFIG_KEYS {
   OCO_ONE_LINE_COMMIT = 'OCO_ONE_LINE_COMMIT',
   OCO_TEST_MOCK_TYPE = 'OCO_TEST_MOCK_TYPE',
   OCO_API_URL = 'OCO_API_URL',
+  OCO_PROXY = 'OCO_PROXY',
   OCO_API_CUSTOM_HEADERS = 'OCO_API_CUSTOM_HEADERS',
   OCO_OMIT_SCOPE = 'OCO_OMIT_SCOPE',
   OCO_GITPUSH = 'OCO_GITPUSH', // todo: deprecate
@@ -727,6 +728,15 @@ export const configValidators = {
     return value;
   },
 
+  [CONFIG_KEYS.OCO_PROXY](value: any) {
+    validateConfig(
+      CONFIG_KEYS.OCO_PROXY,
+      typeof value === 'string',
+      `${value} is not a valid URL. It should start with 'http://' or 'https://'.`
+    );
+    return value;
+  },
+
   [CONFIG_KEYS.OCO_MODEL](value: any, config: any = {}) {
     validateConfig(
       CONFIG_KEYS.OCO_MODEL,
@@ -880,6 +890,7 @@ export type ConfigType = {
   [CONFIG_KEYS.OCO_TOKENS_MAX_INPUT]: number;
   [CONFIG_KEYS.OCO_TOKENS_MAX_OUTPUT]: number;
   [CONFIG_KEYS.OCO_API_URL]?: string;
+  [CONFIG_KEYS.OCO_PROXY]?: string;
   [CONFIG_KEYS.OCO_API_CUSTOM_HEADERS]?: string;
   [CONFIG_KEYS.OCO_DESCRIPTION]: boolean;
   [CONFIG_KEYS.OCO_EMOJI]: boolean;
@@ -964,6 +975,7 @@ const getEnvConfig = (envPath: string) => {
   return {
     OCO_MODEL: process.env.OCO_MODEL,
     OCO_API_URL: process.env.OCO_API_URL,
+    OCO_PROXY: process.env.OCO_PROXY || process.env.HTTPS_PROXY || process.env.HTTP_PROXY,
     OCO_API_KEY: process.env.OCO_API_KEY,
     OCO_API_CUSTOM_HEADERS: process.env.OCO_API_CUSTOM_HEADERS,
     OCO_AI_PROVIDER: process.env.OCO_AI_PROVIDER as OCO_AI_PROVIDER_ENUM,
@@ -1189,6 +1201,11 @@ function getConfigKeyDetails(key) {
           'Custom API URL - may be used to set proxy path to OpenAI API',
         values: ["URL string (must start with 'http://' or 'https://')"]
       };
+    case CONFIG_KEYS.OCO_PROXY:
+      return {
+        description: 'HTTP/HTTPS Proxy URL',
+        values: ["URL string (must start with 'http://' or 'https://')"]
+      };
     case CONFIG_KEYS.OCO_MESSAGE_TEMPLATE_PLACEHOLDER:
       return {
         description: 'Message template placeholder',
diff --git a/src/engine/Engine.ts b/src/engine/Engine.ts
@@ -11,6 +11,7 @@ export interface AiEngineConfig {
   maxTokensOutput: number;
   maxTokensInput: number;
   baseURL?: string;
+  proxy?: string;
   customHeaders?: Record<string, string>;
 }
 
diff --git a/src/engine/anthropic.ts b/src/engine/anthropic.ts
@@ -1,4 +1,5 @@
 import AnthropicClient from '@anthropic-ai/sdk';
+import { HttpsProxyAgent } from 'https-proxy-agent';
 import {
   MessageCreateParamsNonStreaming,
   MessageParam
@@ -18,7 +19,15 @@ export class AnthropicEngine implements AiEngine {
 
   constructor(config) {
     this.config = config;
-    this.client = new AnthropicClient({ apiKey: this.config.apiKey });
+    const clientOptions: any = { apiKey: this.config.apiKey };
+
+    const proxy =
+      config.proxy || process.env.HTTPS_PROXY || process.env.HTTP_PROXY;
+    if (proxy) {
+      clientOptions.httpAgent = new HttpsProxyAgent(proxy);
+    }
+
+    this.client = new AnthropicClient(clientOptions);
   }
 
   public generateCommitMessage = async (
diff --git a/src/engine/gemini.ts b/src/engine/gemini.ts
@@ -29,10 +29,15 @@ export class GeminiEngine implements AiEngine {
       .map((m) => m.content)
       .join('\n');
 
-    const gemini = this.client.getGenerativeModel({
-      model: this.config.model,
-      systemInstruction
-    });
+    const gemini = this.client.getGenerativeModel(
+      {
+        model: this.config.model,
+        systemInstruction
+      },
+      {
+        baseUrl: this.config.baseURL
+      }
+    );
 
     const contents = messages
       .filter((m) => m.role !== 'system')
diff --git a/src/engine/mistral.ts b/src/engine/mistral.ts
@@ -1,4 +1,5 @@
 import { OpenAI } from 'openai';
+import { HttpsProxyAgent } from 'https-proxy-agent';
 import { GenerateCommitMessageErrorEnum } from '../generateCommitMessageFromGitDiff';
 import { normalizeEngineError } from '../utils/engineErrorHandler';
 import { removeContentTags } from '../utils/removeContentTags';
diff --git a/src/engine/openAi.ts b/src/engine/openAi.ts
@@ -1,4 +1,5 @@
 import { OpenAI } from 'openai';
+import { HttpsProxyAgent } from 'https-proxy-agent';
 import { GenerateCommitMessageErrorEnum } from '../generateCommitMessageFromGitDiff';
 import { parseCustomHeaders } from '../utils/engine';
 import { normalizeEngineError } from '../utils/engineErrorHandler';
@@ -23,6 +24,12 @@ export class OpenAiEngine implements AiEngine {
       clientOptions.baseURL = config.baseURL;
     }
 
+    const proxy =
+      config.proxy || process.env.HTTPS_PROXY || process.env.HTTP_PROXY;
+    if (proxy) {
+      clientOptions.httpAgent = new HttpsProxyAgent(proxy);
+    }
+
     if (config.customHeaders) {
       const headers = parseCustomHeaders(config.customHeaders);
       if (Object.keys(headers).length > 0) {
diff --git a/src/utils/engine.ts b/src/utils/engine.ts
@@ -47,6 +47,7 @@ export function getEngine(): AiEngine {
     maxTokensOutput: config.OCO_TOKENS_MAX_OUTPUT!,
     maxTokensInput: config.OCO_TOKENS_MAX_INPUT!,
     baseURL: config.OCO_API_URL!,
+    proxy: config.OCO_PROXY!,
     apiKey: config.OCO_API_KEY!,
     customHeaders
   };
diff --git a/src/utils/proxy.ts b/src/utils/proxy.ts
@@ -0,0 +1,21 @@
+import { setGlobalDispatcher, ProxyAgent } from 'undici';
+import axios from 'axios';
+import { HttpsProxyAgent } from 'https-proxy-agent';
+
+export function setupProxy(proxyUrl?: string) {
+  const proxy = proxyUrl || process.env.HTTPS_PROXY || process.env.HTTP_PROXY;
+  if (proxy) {
+    try {
+      // Set global dispatcher for undici (affects globalThis.fetch used by Gemini and others)
+      const dispatcher = new ProxyAgent(proxy);
+      setGlobalDispatcher(dispatcher);
+
+      // Set axios global agent
+      const agent = new HttpsProxyAgent(proxy);
+      axios.defaults.httpsAgent = agent;
+      axios.defaults.proxy = false; // Disable axios built-in proxy handling to use agent
+    } catch (error) {
+      console.warn(`[Proxy Error] Failed to set proxy: ${error.message}`);
+    }
+  }
+}

Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,7 @@ export interface AiEngineConfig {`
`11`	`11`	`maxTokensOutput: number;`
`12`	`12`	`maxTokensInput: number;`
`13`	`13`	`baseURL?: string;`
	`14`	`+ proxy?: string;`
`14`	`15`	`customHeaders?: Record<string, string>;`
`15`	`16`	`}`
`16`	`17`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`import { OpenAI } from 'openai';`
	`2`	`+import { HttpsProxyAgent } from 'https-proxy-agent';`
`2`	`3`	`import { GenerateCommitMessageErrorEnum } from '../generateCommitMessageFromGitDiff';`
`3`	`4`	`import { normalizeEngineError } from '../utils/engineErrorHandler';`
`4`	`5`	`import { removeContentTags } from '../utils/removeContentTags';`