Merge pull request continuedev#5138 from continuedev/dallin/tools-makeover

Tools architecture and error handling updates

Author: RomneyDa

core/.eslintrc.json

@@ -13,7 +13,7 @@
     "@typescript-eslint/semi": "off",
     "eqeqeq": "error",
     "complexity": ["error", { "max": 36 }],
-    "max-lines-per-function": ["error", { "max": 472 }],
+    "max-lines-per-function": ["error", { "max": 500 }],
     "max-statements": ["error", { "max": 108 }],
     "max-depth": ["error", { "max": 6 }],
     "max-nested-callbacks": ["error", { "max": 4 }],

core/config/types.ts

@@ -403,6 +403,7 @@ declare global {
     | "generated"
     | "calling"
     | "done"
+    | "errored"
     | "canceled";
   
   // Will exist only on "assistant" messages with tool calls

core/core.ts

@@ -682,59 +682,44 @@ export class Core {
       }
     });
 
-    on(
-      "tools/call",
-      async ({ data: { toolCall, selectedModelTitle }, messageId }) => {
-        const { config } = await this.configHandler.loadConfig();
-        if (!config) {
-          throw new Error("Config not loaded");
-        }
-
-        const tool = config.tools.find(
-          (t) => t.function.name === toolCall.function.name,
-        );
-
-        if (!tool) {
-          throw new Error(`Tool ${toolCall.function.name} not found`);
-        }
+    on("tools/call", async ({ data: { toolCall } }) => {
+      const { config } = await this.configHandler.loadConfig();
+      if (!config) {
+        throw new Error("Config not loaded");
+      }
 
-        if (!config.selectedModelByRole.chat) {
-          throw new Error("No chat model selected");
-        }
+      const tool = config.tools.find(
+        (t) => t.function.name === toolCall.function.name,
+      );
 
-        // Define a callback for streaming output updates
-        const onPartialOutput = (params: {
-          toolCallId: string;
-          contextItems: ContextItem[];
-        }) => {
-          this.messenger.send("toolCallPartialOutput", params);
-        };
+      if (!tool) {
+        throw new Error(`Tool ${toolCall.function.name} not found`);
+      }
 
-        const contextItems = await callTool(
-          tool,
-          JSON.parse(toolCall.function.arguments || "{}"),
-          {
-            ide: this.ide,
-            llm: config.selectedModelByRole.chat,
-            fetch: (url, init) =>
-              fetchwithRequestOptions(url, init, config.requestOptions),
-            tool,
-            toolCallId: toolCall.id,
-            onPartialOutput,
-          },
-        );
+      if (!config.selectedModelByRole.chat) {
+        throw new Error("No chat model selected");
+      }
 
-        if (tool.faviconUrl) {
-          contextItems.forEach((item) => {
-            item.icon = tool.faviconUrl;
-          });
-        }
+      // Define a callback for streaming output updates
+      const onPartialOutput = (params: {
+        toolCallId: string;
+        contextItems: ContextItem[];
+      }) => {
+        this.messenger.send("toolCallPartialOutput", params);
+      };
 
-        return { contextItems };
-      },
-    );
+      return await callTool(tool, toolCall.function.arguments, {
+        ide: this.ide,
+        llm: config.selectedModelByRole.chat,
+        fetch: (url, init) =>
+          fetchwithRequestOptions(url, init, config.requestOptions),
+        tool,
+        toolCallId: toolCall.id,
+        onPartialOutput,
+      });
+    });
 
-    on("isItemTooBig", async ({ data: { item, selectedModelTitle } }) => {
+    on("isItemTooBig", async ({ data: { item } }) => {
       return this.isItemTooBig(item);
     });
 
@@ -932,7 +917,6 @@ export class Core {
       query: string;
       fullInput: string;
       selectedCode: RangeInFile[];
-      selectedModelTitle: string;
     }>,
   ) => {
     const { config } = await this.configHandler.loadConfig();

core/edit/streamDiffLines.ts

@@ -4,6 +4,7 @@ import {
   ILLM,
   Prediction,
   RuleWithSource,
+  ToolResultChatMessage,
   UserChatMessage,
 } from "../";
 import {
@@ -104,15 +105,16 @@ export async function* streamDiffLines({
 
   // Rules will be included with edit prompt
   // If any rules are present this will result in using chat instead of legacy completion
-  const lastUserMessage: UserChatMessage | undefined =
+  const lastUserMessage =
     typeof prompt === "string"
-      ? {
+      ? ({
           role: "user",
           content: prompt,
-        }
-      : (findLast(prompt, (msg) => msg.role === "user") as
-          | UserChatMessage
-          | undefined);
+        } as UserChatMessage)
+      : (findLast(
+          prompt,
+          (msg) => msg.role === "user" || msg.role === "tool",
+        ) as UserChatMessage | ToolResultChatMessage | undefined);
 
   const systemMessage = getSystemMessageWithRules({
     currentModel: llm.model,

core/index.d.ts

@@ -428,6 +428,7 @@ export type ToolStatus =
   | "generating"
   | "generated"
   | "calling"
+  | "errored"
   | "done"
   | "canceled";
 

core/llm/constants.ts

@@ -7,26 +7,6 @@ const DEFAULT_ARGS = {
   temperature: DEFAULT_TEMPERATURE,
 };
 
-const GPT_4_CTX_LEN = 128_000;
-
-const CONTEXT_LENGTH_FOR_MODEL: { [name: string]: number } = {
-  "gpt-3.5-turbo": 4096,
-  "gpt-3.5-turbo-0613": 4096,
-  "gpt-3.5-turbo-16k": 16_384,
-  "gpt-35-turbo-16k": 16_384,
-  "gpt-35-turbo-0613": 4096,
-  "gpt-35-turbo": 4096,
-  "gpt-4": 4096,
-  "gpt-4-32k": 32_000,
-  "gpt-4-turbo-preview": 32_000,
-  "gpt-4o": GPT_4_CTX_LEN,
-  "gpt-4o-mini": GPT_4_CTX_LEN,
-  "gpt-4-vision": GPT_4_CTX_LEN,
-  "gpt-4-0125-preview": GPT_4_CTX_LEN,
-  "gpt-4-1106-preview": GPT_4_CTX_LEN,
-};
-
-const TOKEN_BUFFER_FOR_SAFETY = 350;
 const PROXY_URL = "http://localhost:65433";
 
 const DEFAULT_MAX_CHUNK_SIZE = 500; // 512 - buffer for safety (in case of differing tokenizers)
@@ -38,12 +18,10 @@ export enum LLMConfigurationStatuses {
 }
 
 export {
-  CONTEXT_LENGTH_FOR_MODEL,
   DEFAULT_ARGS,
   DEFAULT_CONTEXT_LENGTH,
   DEFAULT_MAX_BATCH_SIZE,
   DEFAULT_MAX_CHUNK_SIZE,
   DEFAULT_MAX_TOKENS,
   PROXY_URL,
-  TOKEN_BUFFER_FOR_SAFETY,
 };

core/llm/constructMessages.ts

@@ -3,11 +3,12 @@ import {
   ChatMessage,
   RuleWithSource,
   TextMessagePart,
+  ToolResultChatMessage,
   UserChatMessage,
 } from "../";
 import { findLast } from "../util/findLast";
 import { normalizeToMessageParts } from "../util/messageContent";
-import { messageIsEmpty } from "./messages";
+import { isUserOrToolMsg } from "./messages";
 import { getSystemMessageWithRules } from "./rules/getSystemMessageWithRules";
 
 export const DEFAULT_CHAT_SYSTEM_MESSAGE_URL =
@@ -92,24 +93,20 @@ export function constructMessages(
         ...historyItem.message,
         content,
       });
-    } else if (historyItem.toolCallState?.status === "canceled") {
-      // Canceled tool call
-      msgs.push({
-        ...historyItem.message,
-        content: CANCELED_TOOL_CALL_MESSAGE,
-      });
     } else {
       msgs.push(historyItem.message);
     }
   }
 
-  const userMessage = findLast(msgs, (msg) => msg.role === "user") as
+  const lastUserMsg = findLast(msgs, isUserOrToolMsg) as
     | UserChatMessage
+    | ToolResultChatMessage
     | undefined;
+
   const systemMessage = getSystemMessageWithRules({
     baseSystemMessage: baseChatSystemMessage ?? DEFAULT_CHAT_SYSTEM_MESSAGE,
     rules,
-    userMessage,
+    userMessage: lastUserMsg,
     currentModel: modelName,
   });
   if (systemMessage.trim()) {
@@ -119,16 +116,6 @@ export function constructMessages(
     });
   }
 
-  // We dispatch an empty assistant chat message to the history on submission. Don't send it
-  const lastMessage = msgs.at(-1);
-  if (
-    lastMessage &&
-    lastMessage.role === "assistant" &&
-    messageIsEmpty(lastMessage)
-  ) {
-    msgs.pop();
-  }
-
   // Remove the "id" from all of the messages
   return msgs.map((msg) => {
     const { id, ...rest } = msg as any;