diff --git a/src/message-agent-executor.ts b/src/message-agent-executor.ts
index b81337c..5f2f31f 100644
--- a/src/message-agent-executor.ts
+++ b/src/message-agent-executor.ts
@@ -147,7 +147,7 @@ export async function runAgentForGroup(
             resetSessionRequested = true;
           }
           const evaluation = evaluateStreamedOutput(output, streamedState, {
-            agentType: isClaudeCodeAgent ? 'claude' : 'codex',
+            agentType: isClaudeCodeAgent ? 'claude-code' : 'codex',
             provider,
             suppressClaudeAuthErrorOutput: provider === 'claude',
             trackSuccessNullResult: true,
diff --git a/src/streamed-output-evaluator.test.ts b/src/streamed-output-evaluator.test.ts
index 9f3d29a..90fd8b9 100644
--- a/src/streamed-output-evaluator.test.ts
+++ b/src/streamed-output-evaluator.test.ts
@@ -40,7 +40,7 @@ function freshState(): StreamedOutputState {
 }
 
 const claudeOpts: EvaluateStreamedOutputOptions = {
-  agentType: 'claude',
+  agentType: 'claude-code',
   provider: 'claude',
 };
 
@@ -91,7 +91,7 @@ describe('evaluateStreamedOutput', () => {
       const result = evaluateStreamedOutput(
         successOutput('Hello'),
         freshState(),
-        { agentType: 'claude', provider: 'fallback' },
+        { agentType: 'claude-code', provider: 'fallback' },
       );
       expect(result.shouldForwardOutput).toBe(true);
       expect(result.state.sawOutput).toBe(true);
@@ -130,7 +130,7 @@ describe('evaluateStreamedOutput', () => {
       const result = evaluateStreamedOutput(
         successOutput('banner text'),
         freshState(),
-        { agentType: 'claude', provider: 'fallback' },
+        { agentType: 'claude-code', provider: 'fallback' },
       );
       // Non-primary: skip banner check, forward normally
       expect(result.shouldForwardOutput).toBe(true);
@@ -244,7 +244,7 @@ describe('evaluateStreamedOutput', () => {
 
     it('does not track for non-primary Claude', () => {
       const result = evaluateStreamedOutput(successOutput(null), freshState(), {
-        agentType: 'claude',
+        agentType: 'claude-code',
         provider: 'fallback',
         trackSuccessNullResult: true,
       });
diff --git a/src/streamed-output-evaluator.ts b/src/streamed-output-evaluator.ts
index 31a8b57..da6877d 100644
--- a/src/streamed-output-evaluator.ts
+++ b/src/streamed-output-evaluator.ts
@@ -19,7 +19,7 @@ export interface StreamedOutputState {
 }
 
 export interface EvaluateStreamedOutputOptions {
-  agentType: 'claude' | 'codex';
+  agentType: 'claude-code' | 'codex';
   provider: string;
   suppressClaudeAuthErrorOutput?: boolean;
   trackSuccessNullResult?: boolean;
@@ -40,7 +40,7 @@ export function evaluateStreamedOutput(
 ): EvaluateStreamedOutputResult {
   const nextState: StreamedOutputState = { ...state };
   const isPrimaryClaude =
-    options.agentType === 'claude' && options.provider === 'claude';
+    options.agentType === 'claude-code' && options.provider === 'claude';
   const isPrimaryCodex =
     options.agentType === 'codex' && options.provider === 'codex';
 
diff --git a/src/task-scheduler.ts b/src/task-scheduler.ts
index 029e9bc..7762c80 100644
--- a/src/task-scheduler.ts
+++ b/src/task-scheduler.ts
@@ -331,7 +331,7 @@ async function runTask(
             streamedOutput,
             streamedState,
             {
-              agentType: isClaudeAgent ? 'claude' : 'codex',
+              agentType: isClaudeAgent ? 'claude-code' : 'codex',
               provider,
               shortCircuitTriggeredErrors: true,
             },