@qduc/term2 0.7.3 → 0.8.0

package/dist/utils/conversation-event-handler.test.js

@@ -645,44 +645,33 @@ test('subagent events: maintains a live peek with the last three tools', (t) =>
         },
     ]);
     handler({
-        type: 'subagent_tool_started',
+        type: 'subagent_command_message',
         agentId: 'agent-1',
         role: 'explorer',
-        toolName: 'find_files',
-        commandMessages: [{ id: 'find', sender: 'command', status: 'running', command: 'find_files "*.ts"', output: '' }],
+        message: { toolName: 'find_files', command: 'find_files "*.ts"', success: true, output: '' },
     });
     handler({
-        type: 'subagent_tool_started',
+        type: 'subagent_command_message',
         agentId: 'agent-1',
         role: 'explorer',
-        toolName: 'grep',
-        commandMessages: [
-            { id: 'grep', sender: 'command', status: 'running', command: 'grep "needle" "source"', output: '' },
-        ],
+        message: { toolName: 'grep', command: 'grep "needle" "source"', success: true, output: 'line1\nline2' },
     });
     handler({
-        type: 'subagent_tool_started',
+        type: 'subagent_command_message',
         agentId: 'agent-1',
         role: 'explorer',
-        toolName: 'read_file',
-        commandMessages: [
-            { id: 'read', sender: 'command', status: 'running', command: 'read_file "source/app.tsx"', output: '' },
-        ],
+        message: { toolName: 'read_file', command: 'read_file "source/app.tsx"', success: true, output: '' },
     });
     handler({
-        type: 'subagent_tool_started',
+        type: 'subagent_command_message',
         agentId: 'agent-1',
         role: 'explorer',
-        toolName: 'read_code_outline',
-        commandMessages: [
-            {
-                id: 'outline',
-                sender: 'command',
-                status: 'running',
-                command: 'read_code_outline "source/app.tsx"',
-                output: '',
-            },
-        ],
+        message: {
+            toolName: 'read_code_outline',
+            command: 'read_code_outline "source/app.tsx"',
+            success: true,
+            output: '',
+        },
     });
     let messages = deps.calls.appendedMessages[0];
     for (const update of deps.calls.setMessagesCalls) {
@@ -696,11 +685,15 @@ test('subagent events: maintains a live peek with the last three tools', (t) =>
             agentId: 'agent-1',
             role: 'explorer',
             task: 'inspect the command message rendering flow and report findings',
-            tools: ['grep "needle" "source"', 'read_file "source/app.tsx"', 'read_code_outline "source/app.tsx"'],
+            tools: [
+                'grep "needle" "source" (2 matches)',
+                'read_file "source/app.tsx" (Success)',
+                'read_code_outline "source/app.tsx" (Success)',
+            ],
         },
     ]);
 });
-test('subagent_completed removes the live peek', (t) => {
+test('subagent_completed updates the status of the live peek', (t) => {
     const deps = createMockDeps();
     const state = createStreamingState();
     const handler = createConversationEventHandler(deps, state);
@@ -726,7 +719,73 @@ test('subagent_completed removes the live peek', (t) => {
             tools: ['apply_patch'],
         },
     ]);
-    t.deepEqual(result, []);
+    t.deepEqual(result, [
+        {
+            id: 'subagent-agent-1',
+            sender: 'subagent',
+            status: 'completed',
+            agentId: 'agent-1',
+            role: 'worker',
+            task: 'make the change',
+            tools: ['apply_patch'],
+        },
+    ]);
+});
+test('subagent_started links callId from tool_started and command_message replaces it', (t) => {
+    const deps = createMockDeps();
+    const state = createStreamingState();
+    const handler = createConversationEventHandler(deps, state);
+    // 1. tool_started for run_subagent
+    handler({
+        type: 'tool_started',
+        toolCallId: 'call-sa-123',
+        toolName: 'run_subagent',
+        arguments: { role: 'worker', task: 'do task X' },
+    });
+    // 2. subagent_started
+    handler({
+        type: 'subagent_started',
+        agentId: 'agent-sa-123',
+        role: 'worker',
+        task: 'do task X',
+    });
+    t.is(deps.calls.appendedMessages.length, 1);
+    const subagentMsg = deps.calls.appendedMessages[0][0];
+    t.is(subagentMsg.sender, 'subagent');
+    t.is(subagentMsg.callId, 'call-sa-123');
+    // 3. subagent_completed updates status
+    handler({
+        type: 'subagent_completed',
+        result: {
+            agentId: 'agent-sa-123',
+            role: 'worker',
+            status: 'completed',
+            finalText: 'done',
+            filesChanged: [],
+            toolsUsed: [],
+        },
+    });
+    // 4. command_message for run_subagent is now skipped (SubagentActivityMessage
+    //    handles display), so no additional setMessages call is made.
+    handler({
+        type: 'command_message',
+        message: {
+            id: 'result-sa-123',
+            sender: 'command',
+            status: 'completed',
+            command: 'run_subagent [worker] do task X',
+            output: 'done',
+            callId: 'call-sa-123',
+            toolName: 'run_subagent',
+        },
+    });
+    // Only one setMessages call: from subagent_completed, not from command_message
+    t.is(deps.calls.setMessagesCalls.length, 1);
+    // The subagent message remains intact (not replaced by command message)
+    const completedMsg = deps.calls.setMessagesCalls[0]([subagentMsg]);
+    t.is(completedMsg.length, 1);
+    t.is(completedMsg[0].sender, 'subagent');
+    t.is(completedMsg[0].status, 'completed');
 });
 // =============================================================================
 // retry tests
@@ -1072,4 +1131,314 @@ test('subagent_started: ignores event if parentTool is ask_mentor', (t) => {
     });
     t.is(deps.calls.appendedMessages.length, 0);
 });
+test('subagent_command_message: replaces generic toolName or appends command to subagent tools', (t) => {
+    const deps = createMockDeps();
+    const state = createStreamingState();
+    const handler = createConversationEventHandler(deps, state);
+    // 1. Subagent starts
+    handler({
+        type: 'subagent_started',
+        agentId: 'agent-1',
+        role: 'explorer',
+        task: 'investigate',
+    });
+    // 2. Subagent tool starts (generic name 'read_file')
+    handler({
+        type: 'subagent_tool_started',
+        agentId: 'agent-1',
+        role: 'explorer',
+        toolName: 'read_file',
+    });
+    // 3. Subagent command message received
+    handler({
+        type: 'subagent_command_message',
+        agentId: 'agent-1',
+        role: 'explorer',
+        message: {
+            id: 'cmd-1',
+            sender: 'command',
+            status: 'completed',
+            command: 'read_file "source/app.tsx"',
+            toolName: 'read_file',
+            success: true,
+        },
+    });
+    let messages = deps.calls.appendedMessages[0];
+    for (const update of deps.calls.setMessagesCalls) {
+        messages = update(messages);
+    }
+    t.deepEqual(messages, [
+        {
+            id: 'subagent-agent-1',
+            sender: 'subagent',
+            status: 'running',
+            agentId: 'agent-1',
+            role: 'explorer',
+            task: 'investigate',
+            tools: ['read_file "source/app.tsx" (Success)'],
+        },
+    ]);
+});
+test('subagent_command_message: creates subagent message if not present', (t) => {
+    const deps = createMockDeps();
+    const state = createStreamingState();
+    const handler = createConversationEventHandler(deps, state);
+    handler({
+        type: 'subagent_command_message',
+        agentId: 'agent-1',
+        role: 'explorer',
+        message: {
+            id: 'cmd-1',
+            sender: 'command',
+            status: 'completed',
+            command: 'read_file "source/app.tsx"',
+            toolName: 'read_file',
+            success: true,
+        },
+    });
+    t.is(deps.calls.setMessagesCalls.length, 1);
+    const result = deps.calls.setMessagesCalls[0]([]);
+    t.is(result.length, 1);
+    t.is(result[0].sender, 'subagent');
+    t.is(result[0].agentId, 'agent-1');
+    t.deepEqual(result[0].tools, ['read_file "source/app.tsx" (Success)']);
+});
+test('subagent_tool_started: formats shell command with args', (t) => {
+    const deps = createMockDeps();
+    const state = createStreamingState();
+    const handler = createConversationEventHandler(deps, state);
+    handler({
+        type: 'subagent_started',
+        agentId: 'agent-1',
+        role: 'explorer',
+        task: 'investigate',
+    });
+    handler({
+        type: 'subagent_tool_started',
+        agentId: 'agent-1',
+        role: 'explorer',
+        toolName: 'shell',
+        arguments: { command: 'npm test' },
+    });
+    let messages = deps.calls.appendedMessages[0];
+    for (const update of deps.calls.setMessagesCalls) {
+        messages = update(messages);
+    }
+    t.deepEqual(messages[0].tools, []);
+});
+test('subagent_command_message: replaces formatted shell command and appends outcome', (t) => {
+    const deps = createMockDeps();
+    const state = createStreamingState();
+    const handler = createConversationEventHandler(deps, state);
+    handler({
+        type: 'subagent_started',
+        agentId: 'agent-1',
+        role: 'explorer',
+        task: 'investigate',
+    });
+    handler({
+        type: 'subagent_tool_started',
+        agentId: 'agent-1',
+        role: 'explorer',
+        toolName: 'shell',
+        arguments: { command: 'npm test' },
+    });
+    handler({
+        type: 'subagent_command_message',
+        agentId: 'agent-1',
+        role: 'explorer',
+        message: {
+            id: 'cmd-1',
+            sender: 'command',
+            status: 'completed',
+            command: 'npm test',
+            toolName: 'shell',
+            success: false,
+        },
+    });
+    let messages = deps.calls.appendedMessages[0];
+    for (const update of deps.calls.setMessagesCalls) {
+        messages = update(messages);
+    }
+    t.deepEqual(messages[0].tools, ['shell npm test (Failed)']);
+});
+test('subagent_command_message: counts matches for grep tool and appends count', (t) => {
+    const deps = createMockDeps();
+    const state = createStreamingState();
+    const handler = createConversationEventHandler(deps, state);
+    handler({
+        type: 'subagent_started',
+        agentId: 'agent-1',
+        role: 'explorer',
+        task: 'investigate',
+    });
+    handler({
+        type: 'subagent_tool_started',
+        agentId: 'agent-1',
+        role: 'explorer',
+        toolName: 'grep',
+        arguments: { pattern: 'TODO', path: 'src/' },
+    });
+    handler({
+        type: 'subagent_command_message',
+        agentId: 'agent-1',
+        role: 'explorer',
+        message: {
+            id: 'cmd-1',
+            sender: 'command',
+            status: 'completed',
+            command: 'grep "TODO" "src/"',
+            toolName: 'grep',
+            output: 'src/main.ts:1:TODO: first\nsrc/main.ts:5:TODO: second',
+        },
+    });
+    let messages = deps.calls.appendedMessages[0];
+    for (const update of deps.calls.setMessagesCalls) {
+        messages = update(messages);
+    }
+    t.deepEqual(messages[0].tools, ['grep "TODO" "src/" (2 matches)']);
+});
+test('subagent_command_message: appends 0 matches for empty grep output', (t) => {
+    const deps = createMockDeps();
+    const state = createStreamingState();
+    const handler = createConversationEventHandler(deps, state);
+    handler({
+        type: 'subagent_started',
+        agentId: 'agent-1',
+        role: 'explorer',
+        task: 'investigate',
+    });
+    handler({
+        type: 'subagent_tool_started',
+        agentId: 'agent-1',
+        role: 'explorer',
+        toolName: 'grep',
+        arguments: { pattern: 'TODO', path: 'src/' },
+    });
+    handler({
+        type: 'subagent_command_message',
+        agentId: 'agent-1',
+        role: 'explorer',
+        message: {
+            id: 'cmd-1',
+            sender: 'command',
+            status: 'completed',
+            command: 'grep "TODO" "src/"',
+            toolName: 'grep',
+            output: 'No matches found.',
+        },
+    });
+    let messages = deps.calls.appendedMessages[0];
+    for (const update of deps.calls.setMessagesCalls) {
+        messages = update(messages);
+    }
+    t.deepEqual(messages[0].tools, ['grep "TODO" "src/" (0 matches)']);
+});
+test('tool_started: skips standard tool call message when subagent is active (via getMessages)', (t) => {
+    const deps = createMockDeps();
+    const messages = [
+        {
+            id: 'subagent-agent-1',
+            sender: 'subagent',
+            status: 'running',
+            agentId: 'agent-1',
+            role: 'explorer',
+            task: 'find x',
+            tools: [],
+        },
+    ];
+    deps.getMessages = () => messages;
+    const state = createStreamingState();
+    const handler = createConversationEventHandler(deps, state);
+    handler({
+        type: 'tool_started',
+        toolCallId: 'call-shell-1',
+        toolName: 'shell',
+        arguments: { command: 'pwd' },
+    });
+    t.is(deps.calls.appendedMessages.length, 0);
+    t.is(deps.calls.setMessagesCalls.length, 0);
+});
+test('tool_started: skips standard tool call message when subagent is active (via local state)', (t) => {
+    const deps = createMockDeps();
+    const state = createStreamingState();
+    const handler = createConversationEventHandler(deps, state);
+    handler({
+        type: 'subagent_started',
+        agentId: 'agent-1',
+        role: 'explorer',
+        task: 'inspect',
+    });
+    handler({
+        type: 'tool_started',
+        toolCallId: 'call-shell-1',
+        toolName: 'shell',
+        arguments: { command: 'pwd' },
+    });
+    // Appends subagent_started message, but skips tool_started
+    t.is(deps.calls.appendedMessages.length, 1);
+    t.is(deps.calls.appendedMessages[0][0].sender, 'subagent');
+});
+test('command_message: skips standard tool complete message when subagent is active (via getMessages)', (t) => {
+    const deps = createMockDeps();
+    const messages = [
+        {
+            id: 'subagent-agent-1',
+            sender: 'subagent',
+            status: 'running',
+            agentId: 'agent-1',
+            role: 'explorer',
+            task: 'find x',
+            tools: [],
+        },
+    ];
+    deps.getMessages = () => messages;
+    const state = createStreamingState();
+    const handler = createConversationEventHandler(deps, state);
+    handler({
+        type: 'command_message',
+        message: {
+            id: 'result-shell-1',
+            sender: 'command',
+            status: 'completed',
+            command: 'pwd',
+            output: '/home',
+            callId: 'call-shell-1',
+            toolName: 'shell',
+        },
+    });
+    t.is(deps.calls.setMessagesCalls.length, 0);
+});
+test('tool_started: does not skip subagent delegation tools even when a subagent is active', (t) => {
+    const deps = createMockDeps();
+    const messages = [
+        {
+            id: 'subagent-agent-1',
+            sender: 'subagent',
+            status: 'running',
+            agentId: 'agent-1',
+            role: 'explorer',
+            task: 'find x',
+            tools: [],
+        },
+    ];
+    deps.getMessages = () => messages;
+    const state = createStreamingState();
+    const handler = createConversationEventHandler(deps, state);
+    handler({
+        type: 'tool_started',
+        toolCallId: 'call-sa-nested',
+        toolName: 'run_subagent_worker',
+        arguments: { role: 'worker', task: 'nested work' },
+    });
+    handler({
+        type: 'subagent_started',
+        agentId: 'agent-sa-nested',
+        role: 'worker',
+        task: 'nested work',
+    });
+    t.is(deps.calls.appendedMessages.length, 1);
+    t.is(deps.calls.appendedMessages[0][0].id, 'subagent-agent-sa-nested');
+    t.is(deps.calls.appendedMessages[0][0].callId, 'call-sa-nested');
+});
 //# sourceMappingURL=conversation-event-handler.test.js.map