diff --git a/README.md b/README.md index 0899f470..d47e53a4 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@

- claude-devtools - See everything Claude Code hides from your terminal | Product Hunt + claude-devtools - See everything Claude Code hides from your terminal | Product Hunt

diff --git a/package.json b/package.json index 05ce23be..ee829eca 100644 --- a/package.json +++ b/package.json @@ -161,8 +161,7 @@ "pacman" ], "icon": "resources/icons/png", - "category": "Development", - "afterInstall": "resources/afterInstall.sh" + "category": "Development" }, "deb": { "afterInstall": "resources/afterInstall.sh" diff --git a/src/renderer/components/chat/items/linkedTool/WriteToolViewer.tsx b/src/renderer/components/chat/items/linkedTool/WriteToolViewer.tsx index 22cd90b1..d08d7005 100644 --- a/src/renderer/components/chat/items/linkedTool/WriteToolViewer.tsx +++ b/src/renderer/components/chat/items/linkedTool/WriteToolViewer.tsx @@ -6,7 +6,7 @@ import React from 'react'; -import { CodeBlockViewer } from '@renderer/components/chat/viewers'; +import { CodeBlockViewer, MarkdownViewer } from '@renderer/components/chat/viewers'; import type { LinkedToolItem } from '@renderer/types/groups'; @@ -20,13 +20,47 @@ export const WriteToolViewer: React.FC = ({ linkedTool }) const filePath = (toolUseResult?.filePath as string) || (linkedTool.input.file_path as string); const content = (toolUseResult?.content as string) || (linkedTool.input.content as string) || ''; const isCreate = toolUseResult?.type === 'create'; + const isMarkdownFile = /\.mdx?$/i.test(filePath); + const [viewMode, setViewMode] = React.useState<'code' | 'preview'>('code'); return (
{isCreate ? 'Created file' : 'Wrote to file'}
- + {isMarkdownFile && ( +
+ + +
+ )} + {isMarkdownFile && viewMode === 'preview' ? ( + + ) : ( + + )}
); }; diff --git a/src/renderer/utils/displayItemBuilder.ts b/src/renderer/utils/displayItemBuilder.ts index 953dc645..07b4e786 100644 --- a/src/renderer/utils/displayItemBuilder.ts +++ b/src/renderer/utils/displayItemBuilder.ts @@ -423,16 +423,20 @@ export function buildDisplayItemsFromMessages( } continue; } - // Plain-text user message (subagent input prompt) - if (rawText.trim()) { + // Only treat as subagent input if there are NO tool_result blocks in this message + const hasToolResults = + Array.isArray(msg.content) && + msg.content.some((b) => b.type === 'tool_result'); + if (rawText.trim() && !hasToolResults) { displayItems.push({ type: 'subagent_input', content: rawText.trim(), timestamp: msgTimestamp, tokenCount: estimateTokens(rawText), }); + continue; } - continue; + // Fall through to tool result processing below if message has tool_results } if (msg.type === 'assistant' && Array.isArray(msg.content)) { diff --git a/test/renderer/utils/displayItemBuilder.test.ts b/test/renderer/utils/displayItemBuilder.test.ts new file mode 100644 index 00000000..1a843713 --- /dev/null +++ b/test/renderer/utils/displayItemBuilder.test.ts @@ -0,0 +1,99 @@ +import { describe, expect, it } from 'vitest'; +import { buildDisplayItemsFromMessages } from '../../../src/renderer/utils/displayItemBuilder'; +import type { ParsedMessage } from '../../../src/main/types/messages'; + +/** + * Helper to create a minimal ParsedMessage for testing. + */ +function makeMessage(overrides: Partial & Pick): ParsedMessage { + return { + uuid: `msg-${Math.random().toString(36).slice(2, 8)}`, + parentUuid: null, + timestamp: new Date('2025-01-01T00:00:00Z'), + isMeta: false, + isSidechain: false, + toolCalls: [], + toolResults: [], + ...overrides, + } as ParsedMessage; +} + +describe('buildDisplayItemsFromMessages', () => { + describe('subagent tool results with isMeta=false', () => { + it('should collect tool results from user messages without isMeta field', () => { + // Simulates real subagent JSONL where user messages with tool_result + // blocks have isMeta absent (defaults to false after parsing). + const toolUseId = 'toolu_test123'; + + const assistantMsg = makeMessage({ + uuid: 'assistant-1', + type: 'assistant', + content: [ + { + type: 'tool_use', + id: toolUseId, + name: 'Bash', + input: { command: 'echo hello' }, + }, + ], + timestamp: new Date('2025-01-01T00:00:00Z'), + }); + + // This is the key scenario: user message with tool_result but isMeta: false + // (simulating subagent JSONL where isMeta field is absent) + const toolResultMsg = makeMessage({ + uuid: 'user-result-1', + type: 'user', + isMeta: false, + content: [ + { + type: 'tool_result', + tool_use_id: toolUseId, + content: 'hello\n', + is_error: false, + }, + ], + toolResults: [ + { + toolUseId: toolUseId, + content: 'hello\n', + isError: false, + }, + ], + timestamp: new Date('2025-01-01T00:00:01Z'), + }); + + const items = buildDisplayItemsFromMessages([assistantMsg, toolResultMsg], []); + + const toolItems = items.filter((item) => item.type === 'tool'); + expect(toolItems).toHaveLength(1); + + const tool = toolItems[0]; + if (tool.type !== 'tool') throw new Error('Expected tool item'); + + // The critical assertion: result must be present, not orphaned + expect(tool.tool.isOrphaned).toBe(false); + expect(tool.tool.result).toBeDefined(); + expect(tool.tool.result?.content).toBe('hello\n'); + expect(tool.tool.name).toBe('Bash'); + }); + + it('should still render subagent_input for plain text user messages without tool results', () => { + const userMsg = makeMessage({ + uuid: 'user-input-1', + type: 'user', + isMeta: false, + content: 'Please run the tests', + toolResults: [], + timestamp: new Date('2025-01-01T00:00:00Z'), + }); + + const items = buildDisplayItemsFromMessages([userMsg], []); + + const inputItems = items.filter((item) => item.type === 'subagent_input'); + expect(inputItems).toHaveLength(1); + if (inputItems[0].type !== 'subagent_input') throw new Error('Expected subagent_input'); + expect(inputItems[0].content).toBe('Please run the tests'); + }); + }); +});