Skip to content

Open source CapCut alternative.

TypeScript

fix(chat): surface Claude usage limits and reset times [rebuild]

David Le9ba11e6c8ca4
diff --git a/site/src/cut/server/ai/claudeFailure.test.ts b/site/src/cut/server/ai/claudeFailure.test.ts
new file mode 100644
index 00000000..cf0fe68a
--- /dev/null
+++ b/site/src/cut/server/ai/claudeFailure.test.ts
@@ -0,0 +1,28 @@
+import { describe, expect, test } from "bun:test";
+import { claudeFailure } from "./claudeFailure";
+import { turnClose } from "../../lib/turnBudget";
+
+describe("Claude provider failures", () => {
+ test("a non-streamed session limit preserves its reset time and gives an actionable error", () => {
+ const failure = claudeFailure({
+ type: "assistant", error: "rate_limit",
+ message: { content: [{ type: "text", text: "You've hit your session limit · resets 11:30pm (Asia/Seoul)" }] },
+ });
+ expect(failure).toBe("Claude: You've hit your session limit · resets 11:30pm (Asia/Seoul)\n\nTry again after your usage limit resets.");
+ expect(turnClose({ end: failure ? "failed" : "done", spoke: false, extensions: 0 })).toBeNull();
+ });
+ test("authentication failures give the sign-in action", () => {
+ expect(claudeFailure({ type: "assistant", error: "authentication_failed", message: { content: [] } })).toContain("Sign in to Claude again");
+ });
+ test("a success-shaped SDK error is still a failure", () => {
+ expect(claudeFailure({ type: "result", subtype: "success", is_error: true, result: "Account limit reached" })).toContain("Account limit reached");
+ });
+ test("execution failures preserve the SDK errors array", () => {
+ expect(claudeFailure({ type: "result", subtype: "error_during_execution", errors: ["Connection closed"] })).toContain("Connection closed");
+ });
+ test("ordinary replies and budget exhaustion retain their existing handling", () => {
+ expect(claudeFailure({ type: "assistant", message: { content: [{ type: "text", text: "Done" }] } })).toBeNull();
+ expect(claudeFailure({ type: "result", subtype: "success", is_error: false })).toBeNull();
+ expect(claudeFailure({ type: "result", subtype: "error_max_turns", is_error: true })).toBeNull();
+ });
+});
diff --git a/site/src/cut/server/ai/claudeFailure.ts b/site/src/cut/server/ai/claudeFailure.ts
new file mode 100644
index 00000000..387dfad4
--- /dev/null
+++ b/site/src/cut/server/ai/claudeFailure.ts
@@ -0,0 +1,21 @@
+/** SDK failures can arrive as assistant messages without text stream events. */
+export function claudeFailure(message: Record<string, unknown>): string | null {
+ if (message.type === "assistant" && typeof message.error === "string") {
+ const body = message.message as { content?: { type: string; text?: string }[] } | undefined;
+ const detail = body?.content?.filter((part) => part.type === "text").map((part) => part.text ?? "").join("\n").trim();
+ const action = message.error === "rate_limit"
+ ? "Try again after your usage limit resets."
+ : message.error === "authentication_failed" || message.error === "oauth_org_not_allowed"
+ ? "Sign in to Claude again."
+ : message.error === "billing_error"
+ ? "Check your Claude billing."
+ : "Try again in a moment.";
+ return `Claude: ${detail || "The request failed."}\n\n${action}`;
+ }
+ if (message.type === "result" && message.subtype === "error_max_turns") return null;
+ if (message.type === "result" && (message.is_error === true || (message.subtype !== "success" && message.subtype !== "error_max_turns"))) {
+ const details = Array.isArray(message.errors) ? message.errors.filter((value): value is string => typeof value === "string").join("\n") : message.result;
+ return `Claude: ${typeof details === "string" && details.trim() ? details.trim() : "The request failed."}\n\nTry again in a moment.`;
+ }
+ return null;
+}
diff --git a/site/src/cut/server/http/ai.ts b/site/src/cut/server/http/ai.ts
index dcf5fc9e..f59f548c 100644
--- a/site/src/cut/server/http/ai.ts
+++ b/site/src/cut/server/http/ai.ts
@@ -5,6 +5,7 @@ import { SETTINGS } from "@/lib/config/registry";
import { startTurnStream, followTurnStream, cancelTurnStream } from "../ai/turnStreams";
import path from "node:path";
import { query } from "@anthropic-ai/claude-agent-sdk";
+import { claudeFailure } from "../ai/claudeFailure";
import { createUIMessageStream, type UIMessage } from "ai";
import {
@@ -135,6 +136,12 @@ async function runClaude(
try {
for await (const msg of q) {
const m = msg as unknown as Record<string, unknown> & { type: string };
+ const failure = claudeFailure(m);
+ if (failure) {
+ emit({ type: "error", errorText: failure });
+ end = "failed";
+ break;
+ }
if (m.type === "system" && m.subtype === "init") {
// The editor MCP is the assistant's entire tool surface. If it didn't
// bind (an engine hiccup, an out-of-scope proxy call), the model would