vibecodingmachine-core 2025.12.25-25 → 2026.1.22-1441

package/src/ide-integration/applescript-utils.js

@@ -54,21 +54,21 @@ end tell`;
     try
       -- Use Cmd+L to focus AI panel (faster and more reliable)
       key code 37 using {command down} -- Cmd+L
-      delay 1.5
+      delay 2.0
 
       -- Open new chat session with Cmd+T to prevent crashes
       key code 17 using {command down} -- Cmd+T
-      delay 2.5
+      delay 3.0
 
       -- Skip clearing text to avoid selecting file content
       -- The chat input should be empty when opening new chat session
 
       -- Wait additional time for chat input field to be fully ready
-      delay 1.0
+      delay 1.5
 
       -- Type the message
       keystroke "${escapedText}"
-      delay 1.5
+      delay 2.0
 
       -- Send with Cmd+Enter (standard for chat interfaces)
       key code 36 using {command down}
@@ -86,33 +86,41 @@ end tell`;
     on error
       -- STRATEGY 2: Command Palette Approach (Fallback 1) - NO AI PANEL TOGGLE
       try
-        -- Step 1: Open Command Palette (Cmd+Shift+P)
+        -- Step 1: Press Escape first to ensure we're starting clean
+        key code 53 -- Escape
+        delay 0.5
+
+        -- Step 2: Open Command Palette (Cmd+Shift+P)
         key code 35 using {command down, shift down} -- Cmd+Shift+P
-        delay 0.8
+        delay 1.0
 
-        -- Step 2: Type "View: Focus into Secondary Side Bar" to focus AI panel
+        -- Step 3: Type "View: Focus into Secondary Side Bar" to focus AI panel
         keystroke "View: Focus into Secondary Side Bar"
-        delay 0.8
+        delay 1.0
 
-        -- Step 3: Press Enter to focus AI Panel
+        -- Step 4: Press Enter to execute the command
         key code 36 -- Enter
-        delay 2.0
+        delay 2.5
 
-        -- Step 4: Open new chat session with Cmd+T to prevent crashes
+        -- Step 5: CRITICAL - Press Escape to close command palette
+        key code 53 -- Escape
+        delay 0.5
+
+        -- Step 6: Open new chat session with Cmd+T to prevent crashes
         key code 17 using {command down} -- Cmd+T
-        delay 2.5
+        delay 3.0
 
-        -- Step 5: Skip clearing text to avoid selecting file content
+        -- Step 7: Skip clearing text to avoid selecting file content
         -- The chat input should be empty when opening new chat session
 
-        -- Step 6: Wait additional time for chat input field to be fully ready
-        delay 1.0
+        -- Step 8: Wait additional time for chat input field to be fully ready
+        delay 1.5
 
-        -- Step 7: Type the message
+        -- Step 9: Type the message
         keystroke "${escapedText}"
-        delay 1.5
+        delay 2.0
 
-        -- Step 8: Send with Cmd+Enter (standard for chat interfaces)
+        -- Step 10: Send with Cmd+Enter (standard for chat interfaces)
         key code 36 using {command down}
         delay 0.5
 

package/src/ide-integration/provider-manager.cjs

@@ -23,7 +23,7 @@ class ProviderManager {
       if (fs.existsSync(this.rateLimitFile)) {
         const data = fs.readFileSync(this.rateLimitFile, 'utf8');
         const limits = JSON.parse(data);
-        
+
         // Auto-cleanup expired rate limits
         const now = Date.now();
         let cleaned = false;
@@ -33,12 +33,12 @@ class ProviderManager {
             cleaned = true;
           }
         }
-        
+
         // Save cleaned data if any expired limits were removed
         if (cleaned) {
           this.saveRateLimitsInternal(limits);
         }
-        
+
         return limits;
       }
     } catch (err) {
@@ -46,7 +46,7 @@ class ProviderManager {
     }
     return {};
   }
-  
+
   /**
    * Internal save without reload (to prevent infinite loop during cleanup)
    */
@@ -86,33 +86,107 @@ class ProviderManager {
    *   "Session limit reached ∙ resets 12pm" -> ms until 12pm today/tomorrow
    */
   parseRateLimitDuration(errorMessage) {
+    // Gemini / Google AI style: "You can resume using this model at 1/12/2026, 4:07:27 PM"
+    // Also seen as: "resume using this model at <date>, <time>"
+    const resumeAtMatch = errorMessage.match(/resume\s+(?:using\s+this\s+model\s+)?at\s+(\d{1,2}\/\d{1,2}\/\d{4})\s*,?\s*(\d{1,2}:\d{2}(?::\d{2})?)\s*(am|pm)/i);
+    if (resumeAtMatch) {
+      try {
+        const datePart = resumeAtMatch[1];
+        const timePart = resumeAtMatch[2];
+        const meridiem = resumeAtMatch[3];
+        const parsed = new Date(`${datePart}, ${timePart} ${meridiem.toUpperCase()}`);
+        if (!Number.isNaN(parsed.getTime())) {
+          const ms = parsed.getTime() - Date.now();
+          return ms > 0 ? ms : 0;
+        }
+      } catch (_) { }
+    }
+
+    // Check for "resets [Month] [Day] at [Time]" format (e.g. "Spending cap reached resets Jan 17 at 12pm")
+    const dateMatch = errorMessage.match(/resets\s+([a-zA-Z]+)\s+(\d{1,2})\s+at\s+(\d{1,2}(?::\d{2})?)\s*(am|pm)?/i);
+    if (dateMatch) {
+      try {
+        const monthStr = dateMatch[1]; // Jan, February, etc.
+        const day = parseInt(dateMatch[2]);
+        const timeStr = dateMatch[3];
+        const meridiem = dateMatch[4] ? dateMatch[4].toLowerCase() : null;
+
+        // Parse time
+        let [hours, minutes] = timeStr.split(':').map(n => parseInt(n));
+        if (!minutes || Number.isNaN(minutes)) minutes = 0;
+
+        if (meridiem === 'pm' && hours !== 12) hours += 12;
+        if (meridiem === 'am' && hours === 12) hours = 0;
+
+        // Parse month
+        const months = {
+          jan: 0, january: 0,
+          feb: 1, february: 1,
+          mar: 2, march: 2,
+          apr: 3, april: 3,
+          may: 4,
+          jun: 5, june: 5,
+          jul: 6, july: 6,
+          aug: 7, august: 7,
+          sep: 8, sept: 8, september: 8,
+          oct: 9, october: 9,
+          nov: 10, november: 10,
+          dec: 11, december: 11
+        };
+
+        const monthIndex = months[monthStr.toLowerCase().substring(0, 3)] ?? months[monthStr.toLowerCase()];
+
+        if (monthIndex !== undefined) {
+          const currentYear = new Date().getFullYear();
+          let parsed = new Date(currentYear, monthIndex, day, hours, minutes);
+          const now = Date.now();
+
+          // Logic to handle year crossing (reset in Jan, currently Dec)
+          if (parsed.getTime() < now) {
+            if (!Number.isNaN(parsed.getTime())) {
+              if (parsed.getTime() < now) {
+                const nextYearDate = new Date(parsed);
+                nextYearDate.setFullYear(nextYearDate.getFullYear() + 1);
+                if (nextYearDate.getTime() > now) {
+                  parsed = nextYearDate;
+                }
+              }
+            }
+          }
+
+          const ms = parsed.getTime() - now;
+          return ms > 0 ? ms : 0;
+        }
+      } catch (_) { }
+    }
+
     // Check for Claude Code session limit format: "Session limit reached ∙ resets 12pm"
     const sessionMatch = errorMessage.match(/resets?\s+(\d{1,2})(?::(\d{2}))?\s*(am|pm)?/i);
     if (sessionMatch) {
       let hour = parseInt(sessionMatch[1]);
       const minute = sessionMatch[2] ? parseInt(sessionMatch[2]) : 0;
       const meridiem = sessionMatch[3] ? sessionMatch[3].toLowerCase() : null;
-      
+
       // Convert to 24-hour format
       if (meridiem === 'pm' && hour !== 12) {
         hour += 12;
       } else if (meridiem === 'am' && hour === 12) {
         hour = 0;
       }
-      
+
       // Calculate reset time
       const now = new Date();
       const resetTime = new Date(now);
       resetTime.setHours(hour, minute, 0, 0);
-      
+
       // If reset time is in the past, it's tomorrow
       if (resetTime <= now) {
         resetTime.setDate(resetTime.getDate() + 1);
       }
-      
+
       return resetTime.getTime() - now.getTime();
     }
-    
+
     // Match patterns like "15m5.472s" or "1h30m" or "45s"
     const timeMatch = errorMessage.match(/try again in ([\d.]+h)?\s?([\d.]+m)?\s?([\d.]+s)?/i);
     if (!timeMatch) return null;
@@ -147,8 +221,11 @@ class ProviderManager {
    * @param {string} errorMessage - Full error message containing duration
    */
   markRateLimited(provider, model, errorMessage) {
+    // Normalize model: if model is missing/undefined, assume it's the provider name.
+    model = model || provider;
+
     let duration = this.parseRateLimitDuration(errorMessage);
-    if (!duration) {
+    if (duration === null || duration === undefined) {
       console.warn(`Could not parse rate limit duration from: ${errorMessage}`);
       // Default to 15 minutes if we can't parse
       duration = 15 * 60 * 1000;
@@ -162,6 +239,7 @@ class ProviderManager {
       model,
       resetTime,
       resetDate: new Date(resetTime).toISOString(),
+      reason: errorMessage,
       markedAt: new Date().toISOString()
     };
 
@@ -196,17 +274,28 @@ class ProviderManager {
     const key = `${provider}:${model}`;
     const limit = this.rateLimits[key];
 
-    if (!limit) return false;
+    if (limit) {
+      // Check if rate limit has expired
+      if (Date.now() >= limit.resetTime) {
+        // Clean up expired rate limit
+        delete this.rateLimits[key];
+        this.saveRateLimits();
+        return false;
+      }
 
-    // Check if rate limit has expired
-    if (Date.now() >= limit.resetTime) {
-      // Clean up expired rate limit
-      delete this.rateLimits[key];
-      this.saveRateLimits();
-      return false;
+      return true;
     }
 
-    return true;
+    // Fall back to any provider-level entries (handles older or model-agnostic keys)
+    const providerPrefix = `${provider}:`;
+    for (const k in this.rateLimits) {
+      if (k.startsWith(providerPrefix)) {
+        const l = this.rateLimits[k];
+        if (l && Date.now() < l.resetTime) return true;
+      }
+    }
+
+    return false;
   }
 
   /**
@@ -252,6 +341,31 @@ class ProviderManager {
           reason: limit.reason
         };
       }
+
+      // Fallback: check other keys for this provider and return earliest reset
+      const providerPrefix = `${provider}:`;
+      let earliestReset = null;
+      let reason = null;
+
+      for (const k in this.rateLimits) {
+        if (k.startsWith(providerPrefix)) {
+          const l = this.rateLimits[k];
+          if (l && Date.now() < l.resetTime) {
+            if (!earliestReset || l.resetTime < earliestReset) {
+              earliestReset = l.resetTime;
+              reason = l.reason;
+            }
+          }
+        }
+      }
+
+      if (earliestReset) {
+        return {
+          isRateLimited: true,
+          resetTime: earliestReset,
+          reason
+        };
+      }
     }
 
     return {
@@ -285,9 +399,25 @@ class ProviderManager {
     const key = `${provider}:${model}`;
     const limit = this.rateLimits[key];
 
-    if (!limit) return null;
+    if (limit && Date.now() < limit.resetTime) {
+      const remaining = limit.resetTime - Date.now();
+      return remaining > 0 ? remaining : null;
+    }
 
-    const remaining = limit.resetTime - Date.now();
+    // Fallback: check other keys for this provider (handles legacy or model-agnostic entries)
+    const providerPrefix = `${provider}:`;
+    let earliest = null;
+    for (const k in this.rateLimits) {
+      if (k.startsWith(providerPrefix)) {
+        const l = this.rateLimits[k];
+        if (l && Date.now() < l.resetTime) {
+          if (!earliest || l.resetTime < earliest) earliest = l.resetTime;
+        }
+      }
+    }
+
+    if (!earliest) return null;
+    const remaining = earliest - Date.now();
     return remaining > 0 ? remaining : null;
   }
 
@@ -356,7 +486,7 @@ class ProviderManager {
    */
   recordPerformance(provider, model, durationMs) {
     const key = `${provider}:${model}`;
-    
+
     if (!this.performance[key]) {
       this.performance[key] = {
         provider,
@@ -365,19 +495,19 @@ class ProviderManager {
         avgSpeed: 0
       };
     }
-    
+
     const perf = this.performance[key];
     perf.samples.push(durationMs);
-    
+
     // Keep only last 10 samples
     if (perf.samples.length > 10) {
       perf.samples.shift();
     }
-    
+
     // Calculate average
     perf.avgSpeed = perf.samples.reduce((a, b) => a + b, 0) / perf.samples.length;
     perf.lastUsed = Date.now();
-    
+
     this.savePerformance();
   }
 
@@ -388,10 +518,10 @@ class ProviderManager {
    */
   getFastestAvailable(providers) {
     const available = providers.filter(p => !this.isRateLimited(p.provider, p.model));
-    
+
     if (available.length === 0) return null;
     if (available.length === 1) return available[0];
-    
+
     // Sort by average speed (fastest first)
     available.sort((a, b) => {
       const aKey = `${a.provider}:${a.model}`;
@@ -402,7 +532,7 @@ class ProviderManager {
       const bSpeed = (bAvg ?? b.estimatedSpeed ?? Infinity);
       return aSpeed - bSpeed;
     });
-    
+
     return available[0];
   }