@autoclawd/autoclawd 1.1.14 → 1.1.16

package/dist/index.js

@@ -1083,7 +1083,10 @@ var RATE_LIMIT_PATTERNS = [
   /\b429\b.*(?:error|too many|rate|limit|retry)/i,
   /(?:error|status|code|http)[:\s]*429\b/i,
   /(?:api|server|model)\s+(?:is\s+)?overloaded/i,
-  /over\s*capacity/i
+  /over\s*capacity/i,
+  // Claude Code subscription limit: "You've hit your limit · resets 9am (UTC)"
+  /hit your (?:usage )?limit.*resets?\s+\d+/i,
+  /you've\s+(?:reached|hit).*limit/i
 ];
 var COMPLETION_PATTERNS = [
   /\[autoclawd:done\]/i,
@@ -1096,8 +1099,30 @@ function isCompleted(output) {
   return COMPLETION_PATTERNS.some((p) => p.test(output));
 }
 function estimateResetMs(output) {
-  const match = output.match(/retry.?after[:\s]*(\d+)/i);
-  if (match) return parseInt(match[1]) * 1e3;
+  const clockMatch = output.match(/resets?\s+(\d{1,2})(?::(\d{2}))?\s*(am|pm)\s*\(?utc\)?/i);
+  if (clockMatch) {
+    let targetHour = parseInt(clockMatch[1]);
+    const targetMin = clockMatch[2] ? parseInt(clockMatch[2]) : 0;
+    const ampm = clockMatch[3].toLowerCase();
+    if (ampm === "pm" && targetHour !== 12) targetHour += 12;
+    if (ampm === "am" && targetHour === 12) targetHour = 0;
+    const now = /* @__PURE__ */ new Date();
+    const target = new Date(Date.UTC(
+      now.getUTCFullYear(),
+      now.getUTCMonth(),
+      now.getUTCDate(),
+      targetHour,
+      targetMin,
+      0,
+      0
+    ));
+    if (target.getTime() <= now.getTime()) {
+      target.setUTCDate(target.getUTCDate() + 1);
+    }
+    return target.getTime() - now.getTime() + 6e4;
+  }
+  const retryAfter = output.match(/retry.?after[:\s]*(\d+)/i);
+  if (retryAfter) return parseInt(retryAfter[1]) * 1e3;
   return 6e4;
 }
 var MAX_RATE_LIMIT_RETRIES = 10;
@@ -1158,12 +1183,17 @@ async function runAgentLoop(opts) {
       return { iterations: i, success: true, lastOutput };
     }
     if (rateLimited) {
+      const waitMs = estimateResetMs(combined);
+      if (waitMs > 5 * 60 * 1e3) {
+        const pauseUntil = Date.now() + waitMs;
+        log.ticket(ticketId, `Rate limited with long reset (${Math.round(waitMs / 1e3)}s) \u2014 pausing watcher globally`);
+        return { iterations: i, success: false, lastOutput, pauseUntil };
+      }
       rateLimitRetries++;
       if (rateLimitRetries > MAX_RATE_LIMIT_RETRIES) {
         log.ticket(ticketId, `Rate limited ${rateLimitRetries} times, giving up`);
         return { iterations: i, success: false, lastOutput };
       }
-      const waitMs = estimateResetMs(combined);
       log.ticket(ticketId, `Rate limited (${rateLimitRetries}/${MAX_RATE_LIMIT_RETRIES}) \u2014 pausing ${Math.round(waitMs / 1e3)}s`);
       await sleep2(waitMs);
       i--;
@@ -1706,6 +1736,14 @@ async function executeTicket(opts) {
       prompt: agentPrompt,
       ticketId: ticket.identifier
     });
+    if (agentResult.pauseUntil) {
+      return {
+        ticketId: ticket.identifier,
+        success: false,
+        error: `REQUEUE_PAUSE:${agentResult.pauseUntil}`,
+        iterations: agentResult.iterations
+      };
+    }
     const gitResult = await commitAndPush(container, {
       branchName,
       ticketId: ticket.identifier,
@@ -1984,6 +2022,7 @@ var WebhookServer = class {
   server;
   // Track in-memory active set for concurrency counting (fast path)
   activeInMemory = /* @__PURE__ */ new Set();
+  pausedUntil = 0;
   start() {
     getDb();
     this.resumeQueue();
@@ -2140,7 +2179,15 @@ var WebhookServer = class {
       octokit: this.octokit
     }).then(
       (result) => {
-        if (result.error?.startsWith("REQUEUE:")) {
+        if (result.error?.startsWith("REQUEUE_PAUSE:")) {
+          const until = parseInt(result.error.slice("REQUEUE_PAUSE:".length), 10);
+          this.pausedUntil = Math.max(this.pausedUntil, until);
+          const waitSec = Math.round((until - Date.now()) / 1e3);
+          log.ticket(ticket.identifier, `Rate limit hit \u2014 pausing webhook dispatch for ${waitSec}s`);
+          finishRun(ticket.id, "failed", result.error);
+          removeFromProcessed(ticket.id);
+          enqueue(ticket);
+        } else if (result.error?.startsWith("REQUEUE:")) {
           log.ticket(ticket.identifier, "Re-queued (waiting for dependency branch)");
           finishRun(ticket.id, "failed", result.error);
           removeFromProcessed(ticket.id);
@@ -2160,6 +2207,7 @@ var WebhookServer = class {
     });
   }
   drainQueue() {
+    if (this.pausedUntil > Date.now()) return;
     while (this.activeInMemory.size < this.config.maxConcurrent) {
       const next = dequeue();
       if (!next) break;
@@ -2233,6 +2281,7 @@ var Watcher = class {
   stopped = false;
   pollCount = 0;
   rebaseRunning = false;
+  pausedUntil = 0;
   async start(intervalSeconds, once) {
     getDb();
     this.resumeQueue();
@@ -2278,6 +2327,15 @@ var Watcher = class {
     }
   }
   async poll() {
+    if (this.pausedUntil > Date.now()) {
+      const remainingSec = Math.round((this.pausedUntil - Date.now()) / 1e3);
+      log.info(`Paused (rate limit) \u2014 ${remainingSec}s remaining until retry`);
+      return;
+    }
+    if (this.pausedUntil > 0) {
+      log.info("Rate limit pause ended, resuming polls");
+      this.pausedUntil = 0;
+    }
     this.recentlyRequeued.clear();
     try {
       const tickets = await pollTickets(this.linearClient, this.config);
@@ -2351,7 +2409,15 @@ var Watcher = class {
       octokit: this.octokit
     }).then(
       (result) => {
-        if (result.error?.startsWith("REQUEUE:")) {
+        if (result.error?.startsWith("REQUEUE_PAUSE:")) {
+          const until = parseInt(result.error.slice("REQUEUE_PAUSE:".length), 10);
+          this.pausedUntil = Math.max(this.pausedUntil, until);
+          const waitSec = Math.round((until - Date.now()) / 1e3);
+          log.ticket(ticket.identifier, `Rate limit hit \u2014 pausing watcher for ${waitSec}s`);
+          finishRun(ticket.id, "failed", result.error);
+          removeFromProcessed(ticket.id);
+          enqueue(ticket);
+        } else if (result.error?.startsWith("REQUEUE:")) {
           log.ticket(ticket.identifier, "Re-queued (waiting for dependency branch)");
           finishRun(ticket.id, "failed", result.error);
           removeFromProcessed(ticket.id);
@@ -2372,6 +2438,7 @@ var Watcher = class {
     });
   }
   drainQueue() {
+    if (this.pausedUntil > Date.now()) return;
     const queued = [];
     let next;
     while (next = dequeue()) {