From 58b20fad6cba610909dc53868ac9063acdae342c Mon Sep 17 00:00:00 2001 From: ejclaw Date: Tue, 7 Apr 2026 02:50:08 +0900 Subject: [PATCH] Format retry transition refactor files --- src/message-agent-executor.test.ts | 5 ++- src/message-agent-executor.ts | 4 +-- src/message-runtime.ts | 5 ++- src/paired-execution-context-shared.ts | 5 +-- src/task-scheduler.ts | 50 +++++++++++++------------- 5 files changed, 33 insertions(+), 36 deletions(-) diff --git a/src/message-agent-executor.test.ts b/src/message-agent-executor.test.ts index 11f30cd..8573b0b 100644 --- a/src/message-agent-executor.test.ts +++ b/src/message-agent-executor.test.ts @@ -1410,9 +1410,8 @@ describe('runAgentForGroup room memory', () => { expect( vi.mocked(db.insertPairedTurnOutput).mock.invocationCallOrder[0], ).toBeLessThan( - vi.mocked( - pairedExecutionContext.completePairedExecutionContext, - ).mock.invocationCallOrder[0], + vi.mocked(pairedExecutionContext.completePairedExecutionContext).mock + .invocationCallOrder[0], ); }); diff --git a/src/message-agent-executor.ts b/src/message-agent-executor.ts index 37db074..205dea0 100644 --- a/src/message-agent-executor.ts +++ b/src/message-agent-executor.ts @@ -34,9 +34,7 @@ import { } from './paired-execution-context.js'; import { resolveCodexFallbackHandoff } from './paired-turn-fallback.js'; import { resolveExecutionTarget } from './message-runtime-rules.js'; -import { - resolvePairedFollowUpQueueAction, -} from './message-agent-executor-rules.js'; +import { resolvePairedFollowUpQueueAction } from './message-agent-executor-rules.js'; import { buildRoomRoleContext } from './room-role-context.js'; import { type AgentTriggerReason } from './agent-error-detection.js'; import { diff --git a/src/message-runtime.ts b/src/message-runtime.ts index 32a8880..d822a76 100644 --- a/src/message-runtime.ts +++ b/src/message-runtime.ts @@ -851,7 +851,10 @@ export function createMessageRuntime(deps: MessageRuntimeDeps): { chatJid, getRecentChatMessages(chatJid, 20), ), - lastDeliveredMessages: labelPairedSenders(chatJid, missedMessages), + lastDeliveredMessages: labelPairedSenders( + chatJid, + missedMessages, + ), resolveChannel, }) : null; diff --git a/src/paired-execution-context-shared.ts b/src/paired-execution-context-shared.ts index 59a1fd8..6c1266b 100644 --- a/src/paired-execution-context-shared.ts +++ b/src/paired-execution-context-shared.ts @@ -141,10 +141,7 @@ export function transitionPairedTaskStatus(args: { currentStatus: PairedTaskStatus; nextStatus: PairedTaskStatus; updatedAt: string; - patch?: Omit< - Parameters[1], - 'status' | 'updated_at' - >; + patch?: Omit[1], 'status' | 'updated_at'>; }): void { assertPairedTaskStatusTransition({ currentStatus: args.currentStatus, diff --git a/src/task-scheduler.ts b/src/task-scheduler.ts index a79bcc1..ff44b0a 100644 --- a/src/task-scheduler.ts +++ b/src/task-scheduler.ts @@ -512,34 +512,34 @@ async function runTask( } }; - const provider = context.taskAgentType === 'codex' ? 'codex' : 'claude'; + const provider = context.taskAgentType === 'codex' ? 'codex' : 'claude'; - { - const attempt = await runTaskAttempt(provider); - result = attempt.attemptResult; - error = attempt.attemptError; + { + const attempt = await runTaskAttempt(provider); + result = attempt.attemptResult; + error = attempt.attemptError; - const retryAction = resolveAttemptRetryAction({ - provider, - canRetryClaudeCredentials: provider === 'claude' && getTokenCount() > 0, - canRetryCodex: provider === 'codex' && getCodexAccountCount() > 1, - attempt, - rotationMessage: error, - }); + const retryAction = resolveAttemptRetryAction({ + provider, + canRetryClaudeCredentials: provider === 'claude' && getTokenCount() > 0, + canRetryCodex: provider === 'codex' && getCodexAccountCount() > 1, + attempt, + rotationMessage: error, + }); - if (retryAction.kind === 'claude') { - await retryClaudeTaskWithRotation( - retryAction.trigger, - retryAction.rotationMessage, - ); - } else if (retryAction.kind === 'codex') { - await retryCodexTaskWithRotation( - retryAction.trigger, - retryAction.rotationMessage, - ); - } else if (attempt.output.status === 'error') { - error = attempt.attemptError || 'Unknown error'; - } + if (retryAction.kind === 'claude') { + await retryClaudeTaskWithRotation( + retryAction.trigger, + retryAction.rotationMessage, + ); + } else if (retryAction.kind === 'codex') { + await retryCodexTaskWithRotation( + retryAction.trigger, + retryAction.rotationMessage, + ); + } else if (attempt.output.status === 'error') { + error = attempt.attemptError || 'Unknown error'; + } } // end else (non-exhausted path) log.info(