create-claude-workspace 1.1.79 → 1.1.81

package/dist/scripts/lib/claude-runner.mjs

@@ -249,9 +249,18 @@ export function runClaude(opts, log, runOpts = {}) {
             if (AUTH_SERVER_RE.test(msg) && /auth/i.test(msg))
                 isAuthServerError = true;
         }
+        let usageLimitKilled = false;
         function detectTextSignals(lower) {
-            if (USAGE_LIMIT_RE.test(lower))
+            if (USAGE_LIMIT_RE.test(lower)) {
                 isUsageLimit = true;
+                // Kill immediately on usage limit — Claude CLI retries internally and spams
+                // the message dozens of times. No point waiting for it to exit on its own.
+                if (!usageLimitKilled && !killed) {
+                    usageLimitKilled = true;
+                    log.warn('Usage limit detected — killing process to prevent spam.');
+                    killChild('process_timeout');
+                }
+            }
             if (RATE_LIMIT_RE.test(lower))
                 isRateLimit = true;
             if (AUTH_ERROR_RE.test(lower))
@@ -407,7 +416,8 @@ export function runClaude(opts, log, runOpts = {}) {
             }
             // Flush remaining buffer
             if (buffer.trim()) {
-                const event = parseStreamEvent(buffer.replace(/\r/g, ''));
+                const cleaned = buffer.replace(/\r/g, '');
+                const event = parseStreamEvent(cleaned);
                 if (event) {
                     if (event.session_id && !sessionId)
                         sessionId = event.session_id;
@@ -416,6 +426,14 @@ export function runClaude(opts, log, runOpts = {}) {
                         resultReceived = true;
                     }
                 }
+                else {
+                    // Non-JSON buffer (e.g. "You've hit your limit" without trailing newline)
+                    const lower = cleaned.toLowerCase();
+                    detectTextSignals(lower);
+                    if (USAGE_LIMIT_RE.test(lower) || RATE_LIMIT_RE.test(lower) || AUTH_ERROR_RE.test(lower)) {
+                        stderr += cleaned + '\n';
+                    }
+                }
             }
             // Final stderr-based detection
             detectTextSignals(stderr.toLowerCase());
@@ -431,6 +449,7 @@ export function runClaude(opts, log, runOpts = {}) {
                 timedOut: killReason === 'process_timeout',
                 activityTimedOut: killReason === 'activity_timeout',
                 hasResult: resultReceived,
+                durationMs,
             });
             if (resolved)
                 return;

package/dist/scripts/lib/errors.mjs

@@ -49,7 +49,10 @@ export function classifyError(signals) {
             return category;
     }
     // Exit code 1 with no error indicators → likely max-turns
-    if (signals.code === 1 && stderr.trim().length < 50)
+    // But only if process ran long enough (>10s). Instant exit (e.g. usage limit printed
+    // as plain text that wasn't caught) should NOT be classified as max-turns to prevent
+    // infinite restart loops with no backoff.
+    if (signals.code === 1 && stderr.trim().length < 50 && (signals.durationMs ?? 60_000) > 10_000)
         return 'max_turns';
     // Non-zero exit with content
     if (signals.code !== null && signals.code !== 0)

package/dist/scripts/lib/errors.spec.js

@@ -56,8 +56,11 @@ describe('classifyError', () => {
     it('detects context exhaustion from stderr', () => {
         expect(classifyError({ ...base, code: 1, stderr: 'context_length_exceeded' })).toBe('context_exhausted');
     });
-    it('classifies exit code 1 with minimal stderr as max_turns', () => {
-        expect(classifyError({ ...base, code: 1, stderr: '' })).toBe('max_turns');
+    it('classifies exit code 1 with minimal stderr as max_turns when process ran >10s', () => {
+        expect(classifyError({ ...base, code: 1, stderr: '', durationMs: 60_000 })).toBe('max_turns');
+    });
+    it('classifies instant exit (code 1, <10s, no stderr) as cli_crash not max_turns', () => {
+        expect(classifyError({ ...base, code: 1, stderr: '', durationMs: 1_000 })).toBe('cli_crash');
     });
     it('classifies exit code 1 with content as cli_crash', () => {
         expect(classifyError({ ...base, code: 1, stderr: 'Some unexpected internal error happened during execution blah blah' })).toBe('cli_crash');

package/dist/scripts/lib/loop-integration.spec.js

@@ -674,9 +674,12 @@ describe('Loop integration: classifyError → getErrorAction → checkpoint', ()
             expect(classifyError({ ...base, code: 1, stderr: 'ENOTFOUND' })).toBe('network_error');
             expect(classifyError({ ...base, code: 1, stderr: 'context_length_exceeded' })).toBe('context_exhausted');
         });
-        it('exit 1 with minimal stderr → max_turns', () => {
-            expect(classifyError({ ...base, code: 1, stderr: '' })).toBe('max_turns');
-            expect(classifyError({ ...base, code: 1, stderr: 'short' })).toBe('max_turns');
+        it('exit 1 with minimal stderr and long duration → max_turns', () => {
+            expect(classifyError({ ...base, code: 1, stderr: '', durationMs: 60_000 })).toBe('max_turns');
+            expect(classifyError({ ...base, code: 1, stderr: 'short', durationMs: 60_000 })).toBe('max_turns');
+        });
+        it('exit 1 with minimal stderr and instant exit → cli_crash (not max_turns)', () => {
+            expect(classifyError({ ...base, code: 1, stderr: '', durationMs: 2_000 })).toBe('cli_crash');
         });
         it('exit 1 with long stderr → cli_crash', () => {
             expect(classifyError({ ...base, code: 1, stderr: 'a'.repeat(60) })).toBe('cli_crash');

package/dist/scripts/lib/utils.mjs

@@ -7,17 +7,18 @@ import { createInterface } from 'node:readline';
 // Node.js runtime accepts `true` for shell but @types expects string
 const SHELL = process.platform === 'win32' ? 'cmd.exe' : '/bin/sh';
 // ─── Usage limit reset time parser ───
-/** Parse "resets Xpm (UTC)" / "resets X:XX AM" / "resets 3am" from stderr text.
+/** Parse "resets Xpm (UTC)" / "resets 12pm (Europe/Prague)" / "resets 3am" from stderr text.
  *  Returns milliseconds to wait, or null if unparseable.
- *  Accepts with or without (UTC) — assumes UTC when timezone not specified. */
+ *  Supports IANA timezones, UTC, and bare times (assumes UTC). */
 export function parseUsageLimitResetMs(text) {
-    // Match patterns: "resets 6pm (UTC)", "resets 6:30pm", "resets 18:00 (UTC)", "resets 6 PM", "resets 3am"
-    const match = text.match(/resets\s+(\d{1,2})(?::(\d{2}))?\s*(am|pm)?(?:\s*\(UTC\))?/i);
+    // Match: "resets 6pm (UTC)", "resets 12pm (Europe/Prague)", "resets 6:30pm", "resets 18:00 (UTC)", "resets 3am"
+    const match = text.match(/resets\s+(\d{1,2})(?::(\d{2}))?\s*(am|pm)?(?:\s*\(([^)]+)\))?/i);
     if (!match)
         return null;
     let hours = parseInt(match[1], 10);
     const minutes = match[2] ? parseInt(match[2], 10) : 0;
     const ampm = match[3]?.toLowerCase();
+    const tz = match[4]?.trim() || 'UTC';
     if (ampm === 'pm' && hours < 12)
         hours += 12;
     if (ampm === 'am' && hours === 12)
@@ -25,14 +26,48 @@ export function parseUsageLimitResetMs(text) {
     if (hours > 23 || minutes > 59)
         return null;
     const now = new Date();
-    const reset = new Date(Date.UTC(now.getUTCFullYear(), now.getUTCMonth(), now.getUTCDate(), hours, minutes, 0, 0));
-    // If reset time is in the past, it's tomorrow
-    if (reset.getTime() <= now.getTime()) {
-        reset.setUTCDate(reset.getUTCDate() + 1);
+    let resetMs;
+    try {
+        // Resolve timezone offset using Intl (works for UTC, IANA like "Europe/Prague", etc.)
+        // Strategy: find the UTC offset for the given timezone at "now", then compute reset time
+        const tzName = tz === 'UTC' ? 'UTC' : tz;
+        // Get current time in target timezone to determine today's date there
+        const dtf = new Intl.DateTimeFormat('en-CA', {
+            timeZone: tzName, year: 'numeric', month: '2-digit', day: '2-digit',
+            hour: '2-digit', minute: '2-digit', hour12: false,
+        });
+        const parts = dtf.formatToParts(now);
+        const pv = (t) => parts.find(p => p.type === t).value;
+        const tzDate = `${pv('year')}-${pv('month')}-${pv('day')}`;
+        // Construct the reset datetime as if it were UTC, then find the real offset
+        const timeStr = `${String(hours).padStart(2, '0')}:${String(minutes).padStart(2, '0')}:00`;
+        const resetAsUtc = new Date(`${tzDate}T${timeStr}Z`);
+        // Find what hour resetAsUtc maps to in the target TZ
+        const inTz = new Intl.DateTimeFormat('en-CA', {
+            timeZone: tzName, hour: '2-digit', minute: '2-digit', hour12: false,
+        }).format(resetAsUtc);
+        const [tzH, tzM] = inTz.split(':').map(Number);
+        const offsetMin = (tzH * 60 + tzM) - (resetAsUtc.getUTCHours() * 60 + resetAsUtc.getUTCMinutes());
+        // Handle day wrap (e.g. tzH=23 but utcH=1 → offset should be negative, not +1320)
+        const correctedOffset = offsetMin > 720 ? offsetMin - 1440 : offsetMin < -720 ? offsetMin + 1440 : offsetMin;
+        // Reset time in UTC = local time - offset
+        const resetUtc = new Date(resetAsUtc.getTime() - correctedOffset * 60_000);
+        if (resetUtc.getTime() <= now.getTime()) {
+            resetUtc.setUTCDate(resetUtc.getUTCDate() + 1);
+        }
+        resetMs = resetUtc.getTime();
+    }
+    catch {
+        // Invalid timezone — fall back to treating as UTC
+        const reset = new Date(Date.UTC(now.getUTCFullYear(), now.getUTCMonth(), now.getUTCDate(), hours, minutes, 0, 0));
+        if (reset.getTime() <= now.getTime()) {
+            reset.setUTCDate(reset.getUTCDate() + 1);
+        }
+        resetMs = reset.getTime();
     }
-    const waitMs = reset.getTime() - now.getTime();
-    // Sanity: max 24 hours
-    if (waitMs > 24 * 60 * 60_000)
+    const waitMs = resetMs - now.getTime();
+    // Sanity: max 24 hours, min 0
+    if (waitMs > 24 * 60 * 60_000 || waitMs < 0)
         return null;
     return waitMs;
 }

package/dist/scripts/lib/utils.spec.js

@@ -139,6 +139,22 @@ describe('parseUsageLimitResetMs', () => {
         expect(ms).toBeTypeOf('number');
         expect(ms).toBeGreaterThan(0);
     });
+    it('parses "resets 12pm (Europe/Prague)" IANA timezone', () => {
+        const ms = parseUsageLimitResetMs("You've hit your limit · resets 12pm (Europe/Prague)");
+        expect(ms).toBeTypeOf('number');
+        expect(ms).toBeGreaterThan(0);
+        expect(ms).toBeLessThanOrEqual(24 * 60 * 60_000);
+    });
+    it('parses "resets 3am (America/New_York)" IANA timezone', () => {
+        const ms = parseUsageLimitResetMs("resets 3am (America/New_York)");
+        expect(ms).toBeTypeOf('number');
+        expect(ms).toBeGreaterThan(0);
+    });
+    it('falls back to UTC for invalid timezone', () => {
+        const ms = parseUsageLimitResetMs("resets 6pm (Invalid/Zone)");
+        expect(ms).toBeTypeOf('number');
+        expect(ms).toBeGreaterThan(0);
+    });
     it('result is always positive (wraps to next day if time passed)', () => {
         // Use a time that's definitely in the past today (1am UTC if test runs after 1am)
         const ms = parseUsageLimitResetMs('resets 1am (UTC)');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-claude-workspace",
-  "version": "1.1.79",
+  "version": "1.1.81",
   "description": "Scaffold a project with Claude Code agents for autonomous AI-driven development",
   "type": "module",
   "bin": {