hedgequantx 2.6.120 → 2.6.122

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hedgequantx",
-  "version": "2.6.120",
+  "version": "2.6.122",
   "description": "HedgeQuantX - Prop Futures Trading CLI",
   "main": "src/app.js",
   "bin": {

package/src/services/ai/proxy-manager.js

@@ -495,44 +495,6 @@ const getAuthUrl = async (provider) => {
 };
 
 /**
- * Poll for OAuth authentication status
- * @param {string} state - OAuth state from getAuthUrl
- * @returns {Promise<{status: string, error?: string}>}
- */
-const pollAuthStatus = async (state) => {
-  const response = await managementRequest('GET', `/v0/management/get-auth-status?state=${state}`);
-  return response;
-};
-
-/**
- * Wait for OAuth authentication to complete
- * @param {string} state - OAuth state
- * @param {number} timeoutMs - Timeout in milliseconds
- * @param {Function} onStatus - Status callback
- * @returns {Promise<boolean>}
- */
-const waitForAuth = async (state, timeoutMs = 300000, onStatus = () => {}) => {
-  const startTime = Date.now();
-  
-  while (Date.now() - startTime < timeoutMs) {
-    const status = await pollAuthStatus(state);
-    
-    if (status.status === 'ok') {
-      return true;
-    } else if (status.status === 'error') {
-      throw new Error(status.error || 'Authentication failed');
-    }
-    
-    onStatus('Waiting for authorization...');
-    await new Promise(resolve => setTimeout(resolve, 2000));
-  }
-  
-  throw new Error('Authentication timeout');
-};
-
-/**
- * Submit OAuth callback URL manually (for remote/VPS use)
- * Extracts code and state from callback URL and submits to proxy via main port
  * @param {string} callbackUrl - Full callback URL (http://localhost:54545/callback?code=xxx&state=yyy)
  * @param {string} provider - Provider ID (anthropic, openai, gemini, qwen, iflow)
  * @returns {Promise<boolean>}
@@ -553,24 +515,25 @@ const submitCallback = async (callbackUrl, provider = 'anthropic') => {
     throw new Error('Missing code or state in callback URL');
   }
   
-  // Map provider to callback endpoint
-  const callbackEndpoints = {
-    anthropic: '/anthropic/callback',
-    openai: '/codex/callback',
-    gemini: '/gemini/callback',
-    qwen: '/qwen/callback',
-    iflow: '/iflow/callback'
+  // Each provider has its own OAuth callback port and path in CLIProxyAPI
+  // We need to submit the callback to the correct port
+  const providerConfig = {
+    anthropic: { port: 54545, path: '/callback' },
+    openai: { port: 16168, path: '/callback' },
+    gemini: { port: 8085, path: '/oauth2callback' },
+    qwen: { port: 8087, path: '/oauth2callback' },
+    iflow: { port: 8088, path: '/callback' }
   };
   
-  const endpoint = callbackEndpoints[provider] || '/anthropic/callback';
+  const config = providerConfig[provider] || providerConfig.anthropic;
   
-  // Submit to proxy via main port (8317)
+  // Submit to the provider's OAuth callback port directly
   return new Promise((resolve, reject) => {
-    const callbackPath = `${endpoint}?code=${encodeURIComponent(code)}&state=${encodeURIComponent(state)}`;
+    const callbackPath = `${config.path}?code=${encodeURIComponent(code)}&state=${encodeURIComponent(state)}`;
     
     const req = http.request({
       hostname: '127.0.0.1',
-      port: PROXY_PORT,
+      port: config.port,
       path: callbackPath,
       method: 'GET',
       timeout: 30000
@@ -600,6 +563,42 @@ const submitCallback = async (callbackUrl, provider = 'anthropic') => {
   });
 };
 
+/**
+ * Poll OAuth authentication status
+ * @param {string} state - OAuth state
+ * @returns {Promise<{status: string, error?: string}>}
+ */
+const pollAuthStatus = async (state) => {
+  const response = await managementRequest('GET', `/v0/management/get-auth-status?state=${state}`);
+  return response;
+};
+
+/**
+ * Wait for OAuth authentication to complete
+ * @param {string} state - OAuth state
+ * @param {number} timeoutMs - Timeout in milliseconds
+ * @param {Function} onStatus - Status callback
+ * @returns {Promise<boolean>}
+ */
+const waitForAuth = async (state, timeoutMs = 300000, onStatus = () => {}) => {
+  const startTime = Date.now();
+  
+  while (Date.now() - startTime < timeoutMs) {
+    const status = await pollAuthStatus(state);
+    
+    if (status.status === 'ok') {
+      return true;
+    } else if (status.status === 'error') {
+      throw new Error(status.error || 'Authentication failed');
+    }
+    
+    onStatus('Waiting for authorization...');
+    await new Promise(resolve => setTimeout(resolve, 2000));
+  }
+  
+  throw new Error('Authentication timeout');
+};
+
 /**
  * Get available models from the proxy
  * @returns {Promise<Array<string>>}