feat: Implement parallel tool calling functionality

core/context/retrieval/pipelines/BaseRetrievalPipeline.ts

@@ -19,7 +19,7 @@ import { BuiltInToolNames } from "../../../tools/builtIn";
 import { callBuiltInTool } from "../../../tools/callTool";
 import { globSearchTool } from "../../../tools/definitions/globSearch";
 import { grepSearchTool } from "../../../tools/definitions/grepSearch";
-import { lsTool } from "../../../tools/definitions/lsTool";
+import { lsTool } from "../../../tools/definitions/ls";
 import { readFileTool } from "../../../tools/definitions/readFile";
 import { viewRepoMapTool } from "../../../tools/definitions/viewRepoMap";
 import { viewSubdirectoryTool } from "../../../tools/definitions/viewSubdirectory";

core/index.d.ts

@@ -432,12 +432,12 @@ export interface PromptLog {
 export type MessageModes = "chat" | "agent" | "plan";
 
 export type ToolStatus =
-  | "generating"
-  | "generated"
-  | "calling"
-  | "errored"
-  | "done"
-  | "canceled";
+  | "generating" // Tool call arguments are being streamed from the LLM
+  | "generated" // Tool call is complete and ready for execution (awaiting approval)
+  | "calling" // Tool is actively being executed
+  | "errored" // Tool execution failed with an error
+  | "done" // Tool execution completed successfully
+  | "canceled"; // Tool call was canceled by user or system
 
 // Will exist only on "assistant" messages with tool calls
 interface ToolCallState {
@@ -462,7 +462,7 @@ export interface ChatHistoryItem {
   editorState?: any;
   modifiers?: InputModifiers;
   promptLogs?: PromptLog[];
-  toolCallState?: ToolCallState;
+  toolCallStates?: ToolCallState[];
   isGatheringContext?: boolean;
   reasoning?: Reasoning;
   appliedRules?: RuleWithSource[];

core/llm/countTokens.test.ts

@@ -1,10 +1,11 @@
 // @ts-nocheck
 // Generated by continue
-import { ChatMessage, MessagePart } from "../index.js";
+import { ChatMessage, MessagePart, ToolCall } from "../index.js";
 import {
   compileChatMessages,
   countTokens,
   countTokensAsync,
+  extractToolSequence,
   pruneLinesFromBottom,
   pruneLinesFromTop,
   pruneRawPromptFromTop,
@@ -174,3 +175,188 @@ describe.skip("compileChatMessages", () => {
     expect(compiled.length).toBe(1);
   });
 });
+
+describe("extractToolSequence", () => {
+  // Helper function to create mock messages
+  const createUserMessage = (content: string): ChatMessage => ({
+    role: "user",
+    content,
+  });
+
+  const createAssistantMessage = (
+    content: string,
+    toolCalls?: ToolCall[],
+  ): ChatMessage => ({
+    role: "assistant",
+    content,
+    toolCalls,
+  });
+
+  const createToolMessage = (
+    content: string,
+    toolCallId: string,
+  ): ChatMessage => ({
+    role: "tool",
+    content,
+    toolCallId,
+  });
+
+  const createToolCall = (
+    id: string,
+    name: string,
+    args: object,
+  ): ToolCall => ({
+    id,
+    type: "function",
+    function: {
+      name,
+      arguments: JSON.stringify(args),
+    },
+  });
+
+  test("extractToolSequence should handle a single user message", () => {
+    const messages: ChatMessage[] = [createUserMessage("Hello world!")];
+    const sequence = extractToolSequence(messages);
+
+    expect(sequence).toHaveLength(1);
+    expect(sequence[0].role).toBe("user");
+    expect(sequence[0].content).toBe("Hello world!");
+    expect(messages).toHaveLength(0); // Original array should be modified
+  });
+
+  test("extractToolSequence should handle a single tool message with assistant", () => {
+    const toolCall = createToolCall("tc_1", "read_file", { path: "test.txt" });
+    const messages: ChatMessage[] = [
+      createAssistantMessage("I'll read the file for you.", [toolCall]),
+      createToolMessage("File contents here", "tc_1"),
+    ];
+    const sequence = extractToolSequence(messages);
+
+    expect(sequence).toHaveLength(2);
+    expect(sequence[0].role).toBe("assistant");
+    expect(sequence[1].role).toBe("tool");
+    expect(sequence[1].toolCallId).toBe("tc_1");
+    expect(messages).toHaveLength(0);
+  });
+
+  test("extractToolSequence should handle multiple consecutive tool messages", () => {
+    const toolCall1 = createToolCall("tc_1", "read_file", { path: "test.txt" });
+    const toolCall2 = createToolCall("tc_2", "write_file", {
+      path: "output.txt",
+      content: "data",
+    });
+    const messages: ChatMessage[] = [
+      createAssistantMessage("I'll read and write files.", [
+        toolCall1,
+        toolCall2,
+      ]),
+      createToolMessage("File contents 1", "tc_1"),
+      createToolMessage("File written successfully", "tc_2"),
+    ];
+    const sequence = extractToolSequence(messages);
+
+    expect(sequence).toHaveLength(3);
+    expect(sequence[0].role).toBe("assistant");
+    expect(sequence[1].role).toBe("tool");
+    expect(sequence[1].toolCallId).toBe("tc_1");
+    expect(sequence[2].role).toBe("tool");
+    expect(sequence[2].toolCallId).toBe("tc_2");
+    expect(messages).toHaveLength(0);
+  });
+
+  test("extractToolSequence should handle tool sequence with previous context", () => {
+    const toolCall = createToolCall("tc_1", "search", { query: "test" });
+    const messages: ChatMessage[] = [
+      createUserMessage("What's in the codebase?"),
+      createAssistantMessage("Let me search for you.", [toolCall]),
+      createToolMessage("Search results here", "tc_1"),
+    ];
+    const sequence = extractToolSequence(messages);
+
+    expect(sequence).toHaveLength(2);
+    expect(sequence[0].role).toBe("assistant");
+    expect(sequence[1].role).toBe("tool");
+    expect(messages).toHaveLength(1); // User message should remain
+    expect(messages[0].role).toBe("user");
+  });
+
+  test("extractToolSequence should throw error when tool message has no matching tool call", () => {
+    const toolCall = createToolCall("tc_1", "read_file", { path: "test.txt" });
+    const messages: ChatMessage[] = [
+      createAssistantMessage("I'll read the file for you.", [toolCall]),
+      createToolMessage("File contents here", "tc_2"), // Wrong tool call ID
+    ];
+
+    expect(() => extractToolSequence(messages)).toThrow(
+      'Error parsing chat history: no tool call found to match tool output for id "tc_2"',
+    );
+  });
+
+  test("extractToolSequence should throw error when last message is not user or tool", () => {
+    const messages: ChatMessage[] = [
+      createUserMessage("Hello"),
+      createAssistantMessage("Hi there!"),
+    ];
+
+    expect(() => extractToolSequence(messages)).toThrow(
+      "Error parsing chat history: no user/tool message found",
+    );
+  });
+
+  test("extractToolSequence should throw error when messages array is empty", () => {
+    const messages: ChatMessage[] = [];
+
+    expect(() => extractToolSequence(messages)).toThrow(
+      "Error parsing chat history: no user/tool message found",
+    );
+  });
+
+  test("extractToolSequence should handle tool sequence without assistant message", () => {
+    const messages: ChatMessage[] = [
+      createToolMessage("Orphaned tool message", "tc_1"),
+    ];
+    const sequence = extractToolSequence(messages);
+
+    expect(sequence).toHaveLength(1);
+    expect(sequence[0].role).toBe("tool");
+    expect(sequence[0].toolCallId).toBe("tc_1");
+    expect(messages).toHaveLength(0);
+  });
+
+  test("extractToolSequence should handle complex tool sequence with multiple tool calls", () => {
+    const toolCall1 = createToolCall("tc_1", "read_file", {
+      path: "file1.txt",
+    });
+    const toolCall2 = createToolCall("tc_2", "read_file", {
+      path: "file2.txt",
+    });
+    const toolCall3 = createToolCall("tc_3", "write_file", {
+      path: "output.txt",
+      content: "merged",
+    });
+
+    const messages: ChatMessage[] = [
+      createUserMessage("Merge these files"),
+      createAssistantMessage("I'll read both files and merge them.", [
+        toolCall1,
+        toolCall2,
+        toolCall3,
+      ]),
+      createToolMessage("Contents of file1", "tc_1"),
+      createToolMessage("Contents of file2", "tc_2"),
+      createToolMessage("Files merged successfully", "tc_3"),
+    ];
+
+    const sequence = extractToolSequence(messages);
+
+    expect(sequence).toHaveLength(4);
+    expect(sequence[0].role).toBe("assistant");
+    expect(sequence[1].role).toBe("tool");
+    expect(sequence[1].toolCallId).toBe("tc_1");
+    expect(sequence[2].role).toBe("tool");
+    expect(sequence[2].toolCallId).toBe("tc_2");
+    expect(sequence[3].role).toBe("tool");
+    expect(sequence[3].toolCallId).toBe("tc_3");
+    expect(messages).toHaveLength(1); // User message should remain
+  });
+});