claude-bot/EJClaw
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: suppress Claude 502 provider errors from chat output

Browse Source
This commit is contained in:
Eyejoker
2026-03-26 10:11:24 +09:00
parent bba19b0c0f
commit a330ebdf2a
7 changed files with 239 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/agent-error-detection.test.ts
View File

@@ -1,7 +1,9 @@
import { describe, expect, it } from 'vitest'; import { describe, expect, it } from 'vitest';
import { import {
classifyAgentError,
classifyClaudeAuthError, classifyClaudeAuthError,
detectClaudeProviderFailureMessage,
isClaudeOrgAccessDeniedMessage, isClaudeOrgAccessDeniedMessage,
isNoFallbackCooldownReason, isNoFallbackCooldownReason,
shouldRotateClaudeToken, shouldRotateClaudeToken,
@@ -38,6 +40,22 @@ describe('agent-error-detection', () => {
}); });
}); });
it('classifies Cloudflare 502 HTML as overloaded', () => {
const message = `API Error: 502 <html>
<head><title>502 Bad Gateway</title></head>
<body>
<center><h1>502 Bad Gateway</h1></center>
<hr><center>cloudflare</center>
</body>
</html>`;
expect(classifyAgentError(message)).toEqual({
category: 'overloaded',
reason: 'overloaded',
});
expect(detectClaudeProviderFailureMessage(message)).toBe('overloaded');
});
it('marks only Claude quota/auth reasons as Claude rotation reasons', () => { it('marks only Claude quota/auth reasons as Claude rotation reasons', () => {
expect(shouldRotateClaudeToken('429')).toBe(true); expect(shouldRotateClaudeToken('429')).toBe(true);
expect(shouldRotateClaudeToken('usage-exhausted')).toBe(true); expect(shouldRotateClaudeToken('usage-exhausted')).toBe(true);

35
src/agent-error-detection.ts
View File

@@ -54,6 +54,32 @@ export function isClaudeAuthExpiredMessage(text: string): boolean {
); );
} }
export function detectClaudeProviderFailureMessage(
text: string,
): Extract<AgentTriggerReason, '429' | 'overloaded' | 'network-error'> | '' {
const normalized = text.trim().toLowerCase().replace(/\s+/g, ' ');
const looksLikeProviderError =
normalized.startsWith('api error:') ||
normalized.startsWith('error: api error:') ||
normalized.startsWith('network error') ||
normalized.startsWith('fetch failed');
if (!looksLikeProviderError) {
return '';
}
const classification = classifyAgentError(text);
if (
classification.category === 'rate-limit' ||
classification.category === 'overloaded' ||
classification.category === 'network-error'
) {
return classification.reason;
}
return '';
}
export function isClaudeOrgAccessDeniedMessage(text: string): boolean { export function isClaudeOrgAccessDeniedMessage(text: string): boolean {
const normalized = text.trim().toLowerCase().replace(/\s+/g, ' '); const normalized = text.trim().toLowerCase().replace(/\s+/g, ' ');
const hasOrgAccessDeniedMarker = normalized.includes( const hasOrgAccessDeniedMarker = normalized.includes(
@@ -192,7 +218,14 @@ export function classifyAgentError(
} }
// 503 / Overloaded // 503 / Overloaded
if (lower.includes('503') || lower.includes('overloaded')) { if (
lower.includes('503') ||
lower.includes('overloaded') ||
((lower.includes('502') || lower.includes('bad gateway')) &&
(lower.includes('cloudflare') ||
lower.includes('<html') ||
lower.includes('api error')))
) {
return { category: 'overloaded', reason: 'overloaded' }; return { category: 'overloaded', reason: 'overloaded' };
} }

54
src/message-agent-executor.test.ts
View File

@@ -315,6 +315,60 @@ describe('runAgentForGroup Claude rotation', () => {
expect(outputs).toEqual(['새 Claude 토큰 응답입니다.']); expect(outputs).toEqual(['새 Claude 토큰 응답입니다.']);
}); });
it('suppresses Claude 502 HTML and falls back without forwarding it', async () => {
const outputs: string[] = [];
vi.mocked(agentRunner.runAgentProcess)
.mockImplementationOnce(async (_group, _input, _onProcess, onOutput) => {
await onOutput?.({
status: 'success',
phase: 'intermediate',
result:
'API Error: 502 <html><head><title>502 Bad Gateway</title></head><body><center><h1>502 Bad Gateway</h1></center><hr><center>cloudflare</center></body></html>',
});
await onOutput?.({
status: 'success',
phase: 'final',
result:
'API Error: 502 <html><head><title>502 Bad Gateway</title></head><body><center><h1>502 Bad Gateway</h1></center><hr><center>cloudflare</center></body></html>',
});
return {
status: 'success',
result: null,
};
})
.mockImplementationOnce(async (_group, _input, _onProcess, onOutput) => {
await onOutput?.({
status: 'success',
phase: 'final',
result: 'Kimi 폴백 응답입니다.',
});
return {
status: 'success',
result: null,
};
});
const result = await runAgentForGroup(makeDeps(), {
group: makeGroup(),
prompt: 'hello',
chatJid: 'group@test',
runId: 'run-claude-502-fallback',
onOutput: async (output) => {
if (typeof output.result === 'string') outputs.push(output.result);
},
});
expect(result).toBe('success');
expect(agentRunner.runAgentProcess).toHaveBeenCalledTimes(2);
expect(tokenRotation.rotateToken).not.toHaveBeenCalled();
expect(providerFallback.markPrimaryCooldown).toHaveBeenCalledWith(
'overloaded',
undefined,
);
expect(outputs).toEqual(['Kimi 폴백 응답입니다.']);
});
it('stops after all Claude accounts are usage-exhausted without falling back to Kimi', async () => { it('stops after all Claude accounts are usage-exhausted without falling back to Kimi', async () => {
const outputs: string[] = []; const outputs: string[] = [];

11
src/provider-fallback.test.ts
View File

@@ -135,6 +135,17 @@ describe('provider fallback usage recovery', () => {
}); });
}); });
it('treats Cloudflare 502 HTML as an overloaded fallback trigger', () => {
expect(
detectFallbackTrigger(
'API Error: 502 <html><head><title>502 Bad Gateway</title></head><body><center><h1>502 Bad Gateway</h1></center><hr><center>cloudflare</center></body></html>',
),
).toEqual({
shouldFallback: true,
reason: 'overloaded',
});
});
it('treats Claude org access denied banners as an org-access-denied fallback trigger', () => { it('treats Claude org access denied banners as an org-access-denied fallback trigger', () => {
expect( expect(
detectFallbackTrigger( detectFallbackTrigger(

22
src/streamed-output-evaluator.test.ts
View File

@@ -4,6 +4,7 @@ import type { AgentOutput } from './agent-runner.js';
// ── Mocks ────────────────────────────────────────────────────── // ── Mocks ──────────────────────────────────────────────────────
vi.mock('./agent-error-detection.js', () => ({ vi.mock('./agent-error-detection.js', () => ({
detectClaudeProviderFailureMessage: vi.fn(() => ''),
isClaudeUsageExhaustedMessage: vi.fn(() => false), isClaudeUsageExhaustedMessage: vi.fn(() => false),
isClaudeOrgAccessDeniedMessage: vi.fn(() => false), isClaudeOrgAccessDeniedMessage: vi.fn(() => false),
isClaudeAuthExpiredMessage: vi.fn(() => false), isClaudeAuthExpiredMessage: vi.fn(() => false),
@@ -22,6 +23,7 @@ vi.mock('./codex-token-rotation.js', () => ({
})); }));
import { import {
detectClaudeProviderFailureMessage,
isClaudeUsageExhaustedMessage, isClaudeUsageExhaustedMessage,
isClaudeOrgAccessDeniedMessage, isClaudeOrgAccessDeniedMessage,
isClaudeAuthExpiredMessage, isClaudeAuthExpiredMessage,
@@ -61,6 +63,7 @@ function errorOutput(error: string): AgentOutput {
beforeEach(() => { beforeEach(() => {
vi.clearAllMocks(); vi.clearAllMocks();
vi.mocked(detectClaudeProviderFailureMessage).mockReturnValue('');
vi.mocked(isClaudeUsageExhaustedMessage).mockReturnValue(false); vi.mocked(isClaudeUsageExhaustedMessage).mockReturnValue(false);
vi.mocked(isClaudeOrgAccessDeniedMessage).mockReturnValue(false); vi.mocked(isClaudeOrgAccessDeniedMessage).mockReturnValue(false);
vi.mocked(isClaudeAuthExpiredMessage).mockReturnValue(false); vi.mocked(isClaudeAuthExpiredMessage).mockReturnValue(false);
@@ -167,6 +170,25 @@ describe('evaluateStreamedOutput', () => {
}); });
}); });
describe('Claude provider failure banner', () => {
it('suppresses Cloudflare 502 HTML and returns newTrigger', () => {
vi.mocked(detectClaudeProviderFailureMessage).mockReturnValue(
'overloaded',
);
const result = evaluateStreamedOutput(
successOutput('API Error: 502 <html><center>cloudflare</center></html>'),
freshState(),
claudeOpts,
);
expect(result.shouldForwardOutput).toBe(false);
expect(result.newTrigger).toEqual({ reason: 'overloaded' });
expect(result.state.streamedTriggerReason).toEqual({
reason: 'overloaded',
});
});
});
describe('Claude org-access-denied banner', () => { describe('Claude org-access-denied banner', () => {
it('suppresses output and returns newTrigger', () => { it('suppresses output and returns newTrigger', () => {
vi.mocked(isClaudeOrgAccessDeniedMessage).mockReturnValue(true); vi.mocked(isClaudeOrgAccessDeniedMessage).mockReturnValue(true);

3
src/streamed-output-evaluator.ts
View File

@@ -1,4 +1,5 @@
import { import {
detectClaudeProviderFailureMessage,
isClaudeAuthError, isClaudeAuthError,
isClaudeAuthExpiredMessage, isClaudeAuthExpiredMessage,
isClaudeOrgAccessDeniedMessage, isClaudeOrgAccessDeniedMessage,
@@ -59,7 +60,7 @@ export function evaluateStreamedOutput(
? 'org-access-denied' ? 'org-access-denied'
: isClaudeAuthExpiredMessage(output.result) : isClaudeAuthExpiredMessage(output.result)
? 'auth-expired' ? 'auth-expired'
: undefined; : detectClaudeProviderFailureMessage(output.result) || undefined;
if (triggerReason) { if (triggerReason) {
const newTrigger = nextState.streamedTriggerReason const newTrigger = nextState.streamedTriggerReason

98
src/task-scheduler.test.ts
View File

@@ -564,6 +564,104 @@ Check the run.
); );
}); });
it('suppresses Claude 502 HTML for scheduled tasks and falls back without forwarding it', async () => {
const dueAt = new Date(Date.now() - 60_000).toISOString();
createTask({
id: 'task-claude-502-fallback',
group_folder: 'shared-group',
chat_jid: 'shared@g.us',
agent_type: 'claude-code',
prompt: 'claude task',
schedule_type: 'once',
schedule_value: dueAt,
context_mode: 'isolated',
next_run: dueAt,
status: 'active',
created_at: '2026-02-22T00:00:00.000Z',
});
(runAgentProcessMock as any)
.mockImplementationOnce(
async (
_group: unknown,
_input: unknown,
_onProcess: unknown,
onOutput?: (output: Record<string, unknown>) => Promise<void>,
) => {
await onOutput?.({
status: 'success',
phase: 'intermediate',
result:
'API Error: 502 <html><head><title>502 Bad Gateway</title></head><body><center><h1>502 Bad Gateway</h1></center><hr><center>cloudflare</center></body></html>',
});
await onOutput?.({
status: 'success',
result:
'API Error: 502 <html><head><title>502 Bad Gateway</title></head><body><center><h1>502 Bad Gateway</h1></center><hr><center>cloudflare</center></body></html>',
});
return {
status: 'success',
result: null,
};
},
)
.mockImplementationOnce(
async (
_group: unknown,
_input: unknown,
_onProcess: unknown,
onOutput?: (output: Record<string, unknown>) => Promise<void>,
) => {
await onOutput?.({
status: 'success',
result: 'scheduled fallback response',
});
return {
status: 'success',
result: null,
};
},
);
const enqueueTask = vi.fn(
(_groupJid: string, _taskId: string, fn: () => Promise<void>) => {
void fn();
},
);
const sendMessage = vi.fn(async () => {});
startSchedulerLoop({
serviceAgentType: 'claude-code',
registeredGroups: () => ({
'shared@g.us': {
name: 'Shared',
folder: 'shared-group',
trigger: '@Claude',
added_at: '2026-02-22T00:00:00.000Z',
agentType: 'claude-code',
},
}),
getSessions: () => ({}),
queue: { enqueueTask } as any,
onProcess: () => {},
sendMessage,
});
await vi.advanceTimersByTimeAsync(10);
expect(runAgentProcessMock).toHaveBeenCalledTimes(2);
expect(tokenRotation.rotateToken).not.toHaveBeenCalled();
expect(providerFallback.markPrimaryCooldown).toHaveBeenCalledWith(
'overloaded',
undefined,
);
expect(sendMessage).toHaveBeenCalledTimes(1);
expect(sendMessage).toHaveBeenCalledWith(
'shared@g.us',
'scheduled fallback response',
);
});
it('suppresses Claude org access denied banners for scheduled tasks and retries with a rotated account', async () => { it('suppresses Claude org access denied banners for scheduled tasks and retries with a rotated account', async () => {
const dueAt = new Date(Date.now() - 60_000).toISOString(); const dueAt = new Date(Date.now() - 60_000).toISOString();
createTask({ createTask({