hedgequantx 2.5.8 → 2.5.10

package/package.json

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

package/src/menus/ai-agent.js

@@ -174,9 +174,17 @@ const showExistingTokens = async () => {
   const spinner = ora({ text: 'VALIDATING TOKEN...', color: 'cyan' }).start();
   
   try {
-    // Validate the token
-    const credentials = { apiKey: selectedToken.token };
-    const validation = await aiService.validateConnection(selectedToken.provider, 'api_key', credentials);
+    // Validate the token - include metadata from scanner
+    const credentials = { 
+      apiKey: selectedToken.token,
+      sessionKey: selectedToken.token,
+      accessToken: selectedToken.token,
+      fromKeychain: selectedToken.sourceId === 'secureStorage' || selectedToken.sourceId === 'keychain',
+      subscriptionType: selectedToken.subscriptionType,
+      refreshToken: selectedToken.refreshToken,
+      expiresAt: selectedToken.expiresAt
+    };
+    const validation = await aiService.validateConnection(selectedToken.provider, selectedToken.type, credentials);
     
     if (!validation.valid) {
       spinner.fail(`TOKEN INVALID OR EXPIRED: ${validation.error}`);

package/src/menus/dashboard.js

@@ -80,7 +80,7 @@ const dashboardMenu = async (service) => {
   
   console.log(chalk.cyan('╠' + '═'.repeat(W) + '╣'));
   
-  // Menu in 3 columns
+  // Menu in 3 columns - centered
   const colWidth = Math.floor(W / 3);
   
   const menuRow3 = (col1, col2, col3) => {
@@ -88,11 +88,22 @@ const dashboardMenu = async (service) => {
     const c2Plain = col2.replace(/\x1b\[[0-9;]*m/g, '');
     const c3Plain = col3.replace(/\x1b\[[0-9;]*m/g, '');
     
-    const c1Padded = '  ' + col1 + ' '.repeat(Math.max(0, colWidth - c1Plain.length - 2));
-    const c2Padded = col2 + ' '.repeat(Math.max(0, colWidth - c2Plain.length));
-    const c3Padded = col3 + ' '.repeat(Math.max(0, W - colWidth * 2 - c3Plain.length));
+    // Center each column within its space
+    const c1LeftPad = Math.floor((colWidth - c1Plain.length) / 2);
+    const c1RightPad = colWidth - c1Plain.length - c1LeftPad;
     
-    console.log(chalk.cyan('║') + c1Padded + c2Padded + c3Padded + chalk.cyan('║'));
+    const c2LeftPad = Math.floor((colWidth - c2Plain.length) / 2);
+    const c2RightPad = colWidth - c2Plain.length - c2LeftPad;
+    
+    const c3Width = W - colWidth * 2;
+    const c3LeftPad = Math.floor((c3Width - c3Plain.length) / 2);
+    const c3RightPad = c3Width - c3Plain.length - c3LeftPad;
+    
+    console.log(chalk.cyan('║') + 
+      ' '.repeat(Math.max(0, c1LeftPad)) + col1 + ' '.repeat(Math.max(0, c1RightPad)) +
+      ' '.repeat(Math.max(0, c2LeftPad)) + col2 + ' '.repeat(Math.max(0, c2RightPad)) +
+      ' '.repeat(Math.max(0, c3LeftPad)) + col3 + ' '.repeat(Math.max(0, c3RightPad)) +
+      chalk.cyan('║'));
   };
   
   const centerLine = (content) => {

package/src/services/ai/index.js

@@ -150,11 +150,54 @@ const validateConnection = async (providerId, optionId, credentials) => {
 // Validation functions for each provider
 const validateAnthropic = async (credentials) => {
   try {
+    const token = credentials.apiKey || credentials.sessionKey || credentials.accessToken;
+    
+    // Check if it's an OAuth token (sk-ant-oat...) vs API key (sk-ant-api...)
+    const isOAuthToken = token && token.startsWith('sk-ant-oat');
+    
+    if (isOAuthToken) {
+      // OAuth tokens use Bearer auth and claude.ai endpoint
+      const response = await fetch('https://api.claude.ai/api/organizations', {
+        method: 'GET',
+        headers: {
+          'Authorization': `Bearer ${token}`,
+          'Content-Type': 'application/json',
+          'User-Agent': 'HQX-CLI/1.0'
+        }
+      });
+      
+      if (response.ok) {
+        return { valid: true, tokenType: 'oauth', subscriptionType: credentials.subscriptionType || 'max' };
+      }
+      
+      // Try alternate endpoint
+      const altResponse = await fetch('https://claude.ai/api/auth/session', {
+        method: 'GET',
+        headers: {
+          'Authorization': `Bearer ${token}`,
+          'Cookie': `sessionKey=${token}`
+        }
+      });
+      
+      if (altResponse.ok) {
+        return { valid: true, tokenType: 'oauth', subscriptionType: credentials.subscriptionType || 'max' };
+      }
+      
+      // For OAuth tokens from Keychain, trust them without validation
+      // since the Keychain already verified the user
+      if (credentials.fromKeychain) {
+        return { valid: true, tokenType: 'oauth', subscriptionType: credentials.subscriptionType || 'max', trusted: true };
+      }
+      
+      return { valid: false, error: 'OAuth token expired or invalid' };
+    }
+    
+    // Standard API key validation
     const response = await fetch('https://api.anthropic.com/v1/messages', {
       method: 'POST',
       headers: {
         'Content-Type': 'application/json',
-        'x-api-key': credentials.apiKey || credentials.sessionKey,
+        'x-api-key': token,
         'anthropic-version': '2023-06-01'
       },
       body: JSON.stringify({
@@ -165,7 +208,7 @@ const validateAnthropic = async (credentials) => {
     });
     
     if (response.ok) {
-      return { valid: true };
+      return { valid: true, tokenType: 'api_key' };
     }
     
     const error = await response.json();