fix: unify agentType value domain to 'claude-code' | 'codex'
The streamed-output-evaluator used 'claude' while the rest of the codebase used 'claude-code'. Align the evaluator type and all call sites (message-agent-executor, task-scheduler) to use the canonical 'claude-code' | 'codex' domain consistently. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
@@ -147,7 +147,7 @@ export async function runAgentForGroup(
|
|||||||
resetSessionRequested = true;
|
resetSessionRequested = true;
|
||||||
}
|
}
|
||||||
const evaluation = evaluateStreamedOutput(output, streamedState, {
|
const evaluation = evaluateStreamedOutput(output, streamedState, {
|
||||||
agentType: isClaudeCodeAgent ? 'claude' : 'codex',
|
agentType: isClaudeCodeAgent ? 'claude-code' : 'codex',
|
||||||
provider,
|
provider,
|
||||||
suppressClaudeAuthErrorOutput: provider === 'claude',
|
suppressClaudeAuthErrorOutput: provider === 'claude',
|
||||||
trackSuccessNullResult: true,
|
trackSuccessNullResult: true,
|
||||||
|
|||||||
@@ -40,7 +40,7 @@ function freshState(): StreamedOutputState {
|
|||||||
}
|
}
|
||||||
|
|
||||||
const claudeOpts: EvaluateStreamedOutputOptions = {
|
const claudeOpts: EvaluateStreamedOutputOptions = {
|
||||||
agentType: 'claude',
|
agentType: 'claude-code',
|
||||||
provider: 'claude',
|
provider: 'claude',
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -91,7 +91,7 @@ describe('evaluateStreamedOutput', () => {
|
|||||||
const result = evaluateStreamedOutput(
|
const result = evaluateStreamedOutput(
|
||||||
successOutput('Hello'),
|
successOutput('Hello'),
|
||||||
freshState(),
|
freshState(),
|
||||||
{ agentType: 'claude', provider: 'fallback' },
|
{ agentType: 'claude-code', provider: 'fallback' },
|
||||||
);
|
);
|
||||||
expect(result.shouldForwardOutput).toBe(true);
|
expect(result.shouldForwardOutput).toBe(true);
|
||||||
expect(result.state.sawOutput).toBe(true);
|
expect(result.state.sawOutput).toBe(true);
|
||||||
@@ -130,7 +130,7 @@ describe('evaluateStreamedOutput', () => {
|
|||||||
const result = evaluateStreamedOutput(
|
const result = evaluateStreamedOutput(
|
||||||
successOutput('banner text'),
|
successOutput('banner text'),
|
||||||
freshState(),
|
freshState(),
|
||||||
{ agentType: 'claude', provider: 'fallback' },
|
{ agentType: 'claude-code', provider: 'fallback' },
|
||||||
);
|
);
|
||||||
// Non-primary: skip banner check, forward normally
|
// Non-primary: skip banner check, forward normally
|
||||||
expect(result.shouldForwardOutput).toBe(true);
|
expect(result.shouldForwardOutput).toBe(true);
|
||||||
@@ -244,7 +244,7 @@ describe('evaluateStreamedOutput', () => {
|
|||||||
|
|
||||||
it('does not track for non-primary Claude', () => {
|
it('does not track for non-primary Claude', () => {
|
||||||
const result = evaluateStreamedOutput(successOutput(null), freshState(), {
|
const result = evaluateStreamedOutput(successOutput(null), freshState(), {
|
||||||
agentType: 'claude',
|
agentType: 'claude-code',
|
||||||
provider: 'fallback',
|
provider: 'fallback',
|
||||||
trackSuccessNullResult: true,
|
trackSuccessNullResult: true,
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -19,7 +19,7 @@ export interface StreamedOutputState {
|
|||||||
}
|
}
|
||||||
|
|
||||||
export interface EvaluateStreamedOutputOptions {
|
export interface EvaluateStreamedOutputOptions {
|
||||||
agentType: 'claude' | 'codex';
|
agentType: 'claude-code' | 'codex';
|
||||||
provider: string;
|
provider: string;
|
||||||
suppressClaudeAuthErrorOutput?: boolean;
|
suppressClaudeAuthErrorOutput?: boolean;
|
||||||
trackSuccessNullResult?: boolean;
|
trackSuccessNullResult?: boolean;
|
||||||
@@ -40,7 +40,7 @@ export function evaluateStreamedOutput(
|
|||||||
): EvaluateStreamedOutputResult {
|
): EvaluateStreamedOutputResult {
|
||||||
const nextState: StreamedOutputState = { ...state };
|
const nextState: StreamedOutputState = { ...state };
|
||||||
const isPrimaryClaude =
|
const isPrimaryClaude =
|
||||||
options.agentType === 'claude' && options.provider === 'claude';
|
options.agentType === 'claude-code' && options.provider === 'claude';
|
||||||
const isPrimaryCodex =
|
const isPrimaryCodex =
|
||||||
options.agentType === 'codex' && options.provider === 'codex';
|
options.agentType === 'codex' && options.provider === 'codex';
|
||||||
|
|
||||||
|
|||||||
@@ -331,7 +331,7 @@ async function runTask(
|
|||||||
streamedOutput,
|
streamedOutput,
|
||||||
streamedState,
|
streamedState,
|
||||||
{
|
{
|
||||||
agentType: isClaudeAgent ? 'claude' : 'codex',
|
agentType: isClaudeAgent ? 'claude-code' : 'codex',
|
||||||
provider,
|
provider,
|
||||||
shortCircuitTriggeredErrors: true,
|
shortCircuitTriggeredErrors: true,
|
||||||
},
|
},
|
||||||
|
|||||||
Reference in New Issue
Block a user