Fix streaming generation with Claude.

Author: cpojer

electron/__tests__/claude.test.ts

@@ -181,6 +181,88 @@ process.stdin.on('end', () => {
   }
 });
 
+test('maps Claude structured output deltas to response progress', async () => {
+  const directory = await mkdtemp(join(tmpdir(), 'codiff-claude-structured-progress-'));
+  const fakeClaudePath = join(directory, 'claude');
+  const previousClaudePath = process.env.CODIFF_CLAUDE_PATH;
+  const events = [
+    {
+      event: {
+        content_block: { signature: '', thinking: '', type: 'thinking' },
+        type: 'content_block_start',
+      },
+      type: 'stream_event',
+    },
+    {
+      event: {
+        delta: { thinking: 'Planning', type: 'thinking_delta' },
+        type: 'content_block_delta',
+      },
+      type: 'stream_event',
+    },
+    {
+      event: {
+        content_block: {
+          id: 'toolu_1',
+          input: {},
+          name: 'StructuredOutput',
+          type: 'tool_use',
+        },
+        type: 'content_block_start',
+      },
+      type: 'stream_event',
+    },
+    {
+      event: {
+        delta: { partial_json: '{"version":1}', type: 'input_json_delta' },
+        type: 'content_block_delta',
+      },
+      type: 'stream_event',
+    },
+    {
+      is_error: false,
+      result: '{"version":1}',
+      structured_output: { version: 1 },
+      type: 'result',
+    },
+  ];
+
+  try {
+    await writeFile(
+      fakeClaudePath,
+      `#!/usr/bin/env node
+process.stdin.resume();
+process.stdin.on('end', () => {
+  process.stdout.write(${JSON.stringify(events.map((event) => JSON.stringify(event)).join('\n'))});
+});
+`,
+    );
+    await chmod(fakeClaudePath, 0o755);
+    process.env.CODIFF_CLAUDE_PATH = fakeClaudePath;
+    const phases: Array<string> = [];
+
+    await expect(
+      runClaude(directory, 'prompt', { type: 'object' }, 'walkthrough.json', 'Timed out.', {
+        onProgress: (phase) => phases.push(phase),
+      }),
+    ).resolves.toBe('{"version":1}');
+
+    expect(phases).toEqual([
+      'agent-generation',
+      'agent-generation',
+      'response-received',
+      'response-received',
+    ]);
+  } finally {
+    if (previousClaudePath == null) {
+      delete process.env.CODIFF_CLAUDE_PATH;
+    } else {
+      process.env.CODIFF_CLAUDE_PATH = previousClaudePath;
+    }
+    await rm(directory, { force: true, recursive: true });
+  }
+});
+
 test('supports per-call Claude Code timeouts', async () => {
   const directory = await mkdtemp(join(tmpdir(), 'codiff-claude-timeout-'));
   const fakeClaudePath = join(directory, 'claude');

electron/claude.cjs

@@ -157,7 +157,7 @@ const createClaudeStreamParser = (onProgress) => {
       const blockType = streamEvent.content_block?.type;
       if (blockType === 'thinking') {
         onProgress?.('agent-generation');
-      } else if (blockType === 'text') {
+      } else if (blockType === 'text' || blockType === 'tool_use') {
         onProgress?.('response-received');
       }
       return;
@@ -168,7 +168,7 @@ const createClaudeStreamParser = (onProgress) => {
     const deltaType = streamEvent.delta?.type;
     if (deltaType === 'thinking_delta') {
       onProgress?.('agent-generation');
-    } else if (deltaType === 'text_delta') {
+    } else if (deltaType === 'text_delta' || deltaType === 'input_json_delta') {
       onProgress?.('response-received');
     }
   };