tests pass

packages/core/src/scheduler/tool-executor.test.ts

@@ -318,7 +318,7 @@ describe('ToolExecutor', () => {
     }
   });
 
-  it('should truncate large MCP tool output with single text Part', async () => {
+  it('should truncate large output and move file when fullOutputFilePath is provided', async () => {
     // 1. Setup Config for Truncation
     vi.spyOn(config, 'getTruncateToolOutputThreshold').mockReturnValue(10);
     vi.spyOn(config.storage, 'getProjectTempDir').mockReturnValue('/tmp');
@@ -326,6 +326,71 @@ describe('ToolExecutor', () => {
       outputFile: '/tmp/moved_output.txt',
     });
 
+    const mockTool = new MockTool({ name: SHELL_TOOL_NAME });
+    const invocation = mockTool.build({});
+    const longOutput = 'This is a very long output that should be truncated.';
+
+    // 2. Mock execution returning long content AND fullOutputFilePath
+    vi.mocked(coreToolHookTriggers.executeToolWithHooks).mockResolvedValue({
+      llmContent: longOutput,
+      returnDisplay: longOutput,
+      fullOutputFilePath: '/tmp/temp_full_output.txt',
+    });
+
+    const scheduledCall: ScheduledToolCall = {
+      status: CoreToolCallStatus.Scheduled,
+      request: {
+        callId: 'call-trunc-full',
+        name: SHELL_TOOL_NAME,
+        args: { command: 'echo long' },
+        isClientInitiated: false,
+        prompt_id: 'prompt-trunc-full',
+      },
+      tool: mockTool,
+      invocation: invocation as unknown as AnyToolInvocation,
+      startTime: Date.now(),
+    };
+
+    // 3. Execute
+    const result = await executor.execute({
+      call: scheduledCall,
+      signal: new AbortController().signal,
+      onUpdateToolCall: vi.fn(),
+    });
+
+    // 4. Verify Truncation Logic
+    expect(fileUtils.moveToolOutputToFile).toHaveBeenCalledWith(
+      '/tmp/temp_full_output.txt',
+      SHELL_TOOL_NAME,
+      'call-trunc-full',
+      expect.any(String), // temp dir
+      'test-session-id', // session id from makeFakeConfig
+    );
+
+    expect(fileUtils.formatTruncatedToolOutput).toHaveBeenCalledWith(
+      longOutput,
+      '/tmp/moved_output.txt',
+      10, // threshold (maxChars)
+    );
+
+    expect(result.status).toBe(CoreToolCallStatus.Success);
+    if (result.status === CoreToolCallStatus.Success) {
+      const response = result.response.responseParts[0]?.functionResponse
+        ?.response as Record<string, unknown>;
+      // The content should be the *truncated* version returned by the mock formatTruncatedToolOutput
+      expect(response).toEqual({
+        output: 'TruncatedContent...',
+        outputFile: '/tmp/moved_output.txt',
+      });
+      expect(result.response.outputFile).toBe('/tmp/moved_output.txt');
+    }
+  });
+
+  it('should truncate large MCP tool output with single text Part', async () => {
+    // 1. Setup Config for Truncation
+    vi.spyOn(config, 'getTruncateToolOutputThreshold').mockReturnValue(10);
+    vi.spyOn(config.storage, 'getProjectTempDir').mockReturnValue('/tmp');
+
     const mcpToolName = 'get_big_text';
     const messageBus = createMockMessageBus();
     const mcpTool = new DiscoveredMCPTool(
@@ -340,10 +405,11 @@ describe('ToolExecutor', () => {
     const longText = 'This is a very long MCP output that should be truncated.';
 
     // 2. Mock execution returning Part[] with single text Part
+    // We do NOT provide fullOutputFilePath here because we want to test the path
+    // that uses saveTruncatedToolOutput for MCP tools.
     vi.mocked(coreToolHookTriggers.executeToolWithHooks).mockResolvedValue({
       llmContent: [{ text: longText }],
       returnDisplay: longText,
-      fullOutputFilePath: '/tmp/temp_full_output.txt',
     });
 
     const scheduledCall: ScheduledToolCall = {