agent-dealer 1.3.2 → 1.3.3

package/bundle/server/dist/runners/usage-cap.test.js

@@ -9,7 +9,7 @@ process.env.USAGE_CAP_FALLBACK_COOLDOWN_MS = "1800000";
 const fixtureDir = path.dirname(fileURLToPath(import.meta.url));
 const claudeFixture = fs.readFileSync(path.join(fixtureDir, "fixtures/claude-rate-limit-rejected.ndjson"), "utf8");
 const { migrate } = await import("../db/index.js");
-const { recordUsageCapFromEvents, detectUsageCapFromNdjson, detectUsageCapFromRawLog, detectUsageCapFromLog, extractUsageCapFromEvents, recordMuseUsageCap, } = await import("./usage-cap.js");
+const { recordUsageCapFromEvents, recordUsageCapFromLog, detectUsageCapFromNdjson, detectUsageCapFromRawLog, detectUsageCapFromLog, extractUsageCapFromEvents, extractUsageCapReset, recordMuseUsageCap, } = await import("./usage-cap.js");
 const { parseNdjson } = await import("./stream-json.js");
 const { runtimeAvailability, clearAllRuntimeAvailability, } = await import("../repository/runtime-availability.js");
 before(() => migrate());
@@ -104,7 +104,101 @@ test("NOT-117: successful Codex turn.completed skips text fallback even when std
     ].join("\n");
     assert.ok(detectUsageCapFromRawLog(failed, "codex_local"));
 });
-// NOT-181: Muse's cap comes from the parsed failure kind, with the fallback cooldown (no reset time).
+// ---------------------------------------------------------------------------
+// NOT-439: every hard-cap path preserves the provider's future reset instead
+// of the 30-minute fallback. Incident fixture: `2026-10-12T18:59:01Z` must
+// persist exactly as `2026-10-12T18:59:01.000Z` on every path.
+// ---------------------------------------------------------------------------
+const NOT439_NOW = Date.parse("2026-10-12T18:16:20.154Z");
+const NOT439_RESET = "2026-10-12T18:59:01.000Z";
+test("NOT-439: Claude/Cursor result error text with a provider reset persists the exact boundary", () => {
+    const raw = '{"type":"result","is_error":true,"result":"Rate limit exceeded for this account. Your usage window resets at 2026-10-12T18:59:01Z."}';
+    const cap = recordUsageCapFromEvents(parseNdjson(raw), "claude_code", NOT439_NOW);
+    assert.ok(cap);
+    assert.equal(cap.unavailableUntil, NOT439_RESET);
+    const avail = runtimeAvailability("claude_code", NOT439_NOW);
+    assert.equal(avail.available, false);
+    if (!avail.available)
+        assert.equal(avail.until, NOT439_RESET);
+});
+test("NOT-439: Codex turn.failed and error.message with a provider reset persist the exact boundary", () => {
+    const failed = [
+        '{"type":"thread.started","thread_id":"t1"}',
+        '{"type":"turn.failed","error":{"message":"Rate limit exceeded. Your usage window resets at 2026-10-12T18:59:01Z."}}',
+    ].join("\n");
+    const fromFailed = detectUsageCapFromRawLog(failed, "codex_local", NOT439_NOW);
+    assert.ok(fromFailed);
+    assert.equal(fromFailed.unavailableUntil, NOT439_RESET);
+    const errEvent = [
+        '{"type":"thread.started","thread_id":"t1"}',
+        '{"type":"error","message":"Usage limit reached. Your usage window resets at 2026-10-12T18:59:01Z."}',
+    ].join("\n");
+    const fromError = detectUsageCapFromRawLog(errEvent, "codex_local", NOT439_NOW);
+    assert.ok(fromError);
+    assert.equal(fromError.unavailableUntil, NOT439_RESET);
+});
+test("NOT-439: guarded Cursor stderr fallback with a provider reset persists the exact boundary", () => {
+    const raw = '{"type":"result","is_error":true,"result":"failed"}\n--- stderr ---\nError: usage limit reached for this account; resets at 2026-10-12T18:59:01Z\n';
+    const detected = detectUsageCapFromRawLog(raw, "cursor_local", NOT439_NOW);
+    assert.ok(detected);
+    assert.equal(detected.unavailableUntil, NOT439_RESET);
+    const logPath = path.join(process.env.AGENT_DEALER_HOME, "cursor-cap-reset.ndjson");
+    fs.writeFileSync(logPath, raw);
+    const cap = recordUsageCapFromLog(logPath, "cursor_local", NOT439_NOW);
+    assert.ok(cap);
+    assert.equal(cap.unavailableUntil, NOT439_RESET);
+    const avail = runtimeAvailability("cursor_local", NOT439_NOW);
+    assert.equal(avail.available, false);
+    if (!avail.available)
+        assert.equal(avail.until, NOT439_RESET);
+});
+test("NOT-439: Muse usage-cap failure with the incident reset persists the exact boundary", () => {
+    const cap = recordMuseUsageCap({
+        kind: "usage_cap",
+        message: "Subscription quota exhausted. Your usage window resets at 2026-10-12T18:59:01Z",
+    }, NOT439_NOW);
+    assert.ok(cap);
+    assert.equal(cap.unavailableUntil, NOT439_RESET);
+    const avail = runtimeAvailability("muse_code", NOT439_NOW);
+    assert.equal(avail.available, false);
+    if (!avail.available)
+        assert.equal(avail.until, NOT439_RESET);
+});
+test("NOT-439: structured numeric resets accept seconds and milliseconds", () => {
+    const nowMs = Date.parse("2026-01-01T00:00:00.000Z");
+    const expected = new Date(1784283600 * 1000).toISOString();
+    assert.equal(extractUsageCapReset({ resets: [1784283600] }, nowMs), expected);
+    assert.equal(extractUsageCapReset({ resets: [1784283600 * 1000] }, nowMs), expected);
+    // Structured wins over text when both are present.
+    assert.equal(extractUsageCapReset({ resets: [1784283600], text: "resets at 2026-10-12T18:59:01Z" }, nowMs), expected);
+});
+test("NOT-439: past, malformed, or unrelated timestamps fall back and never create a cap", () => {
+    const nowMs = Date.parse("2026-10-12T18:16:20.154Z");
+    const fallback = new Date(nowMs + 1_800_000).toISOString();
+    // Past structured reset and past text timestamp → fallback.
+    assert.equal(extractUsageCapReset({ resets: [Date.parse("2020-01-01T00:00:00.000Z") / 1000] }, nowMs), null);
+    assert.equal(extractUsageCapReset({ text: "Rate limit exceeded, reset at 2020-01-01T00:00:00Z" }, nowMs), null);
+    // Malformed / non-ISO timestamps are ignored.
+    assert.equal(extractUsageCapReset({ text: "Rate limit exceeded, reset at 2026-13-99T99:99:99Z" }, nowMs), null);
+    assert.equal(extractUsageCapReset({ text: "Rate limit exceeded, reset soon (tomorrow at noon)" }, nowMs), null);
+    assert.equal(extractUsageCapReset({ resets: ["2026-10-12T18:59:01Z", NaN, Infinity] }, nowMs), null);
+    // A bare future timestamp with no cap signal is not a cap by itself.
+    const timestampOnly = '{"type":"result","is_error":true,"result":"Completed at 2026-10-12T18:59:01Z without errors."}';
+    assert.equal(detectUsageCapFromNdjson(timestampOnly, "claude_code", nowMs), null);
+    assert.equal(runtimeAvailability("claude_code", nowMs).available, true);
+    // An unrelated future stamp inside accepted cap text is not a reset.
+    const unrelatedStamp = '{"type":"result","is_error":true,"result":"[2026-10-12T19:30:00Z] Rate limit exceeded for this account."}';
+    const unrelatedCap = detectUsageCapFromNdjson(unrelatedStamp, "claude_code", nowMs);
+    assert.ok(unrelatedCap);
+    assert.equal(unrelatedCap.unavailableUntil, fallback);
+    // A cap signal whose reset is in the past still detects, but uses the fallback.
+    const pastReset = '{"type":"result","is_error":true,"result":"Rate limit exceeded. Your usage window resets at 2020-01-01T00:00:00Z."}';
+    const cap = detectUsageCapFromNdjson(pastReset, "claude_code", nowMs);
+    assert.ok(cap);
+    assert.equal(cap.unavailableUntil, fallback);
+});
+// NOT-181: Muse's cap comes from the parsed failure kind; NOT-439: a provider reset in the
+// message is preserved, otherwise the fallback cooldown applies.
 test("recordMuseUsageCap records muse_code availability only for a usage_cap failure", () => {
     clearAllRuntimeAvailability();
     const now = Date.parse("2026-09-20T00:00:00.000Z");

package/bundle/server/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agent-dealer/server",
-  "version": "1.3.2",
+  "version": "1.3.3",
   "type": "module",
   "main": "dist/index.js",
   "files": [
@@ -23,7 +23,7 @@
     "test": "AGENT_DEALER_SKIP_GITHUB_HEALTH=1 AGENT_DEALER_SKIP_AGENT_HEALTH=1 npm run build -w @agent-dealer/shared && AGENT_DEALER_SKIP_GITHUB_HEALTH=1 AGENT_DEALER_SKIP_AGENT_HEALTH=1 node ../../scripts/run-workspace-tests.mjs"
   },
   "dependencies": {
-    "@agent-dealer/shared": "1.3.2",
+    "@agent-dealer/shared": "1.3.3",
     "@fastify/cors": "^11.0.1",
     "@fastify/static": "^8.2.0",
     "@modelcontextprotocol/sdk": "^1.29.0",