Merge pull request #5867 from continuedev/pe/agent-requested-rule

feat: `requestRule` tool

Author: Patrick-Erichsen

core/config/load.ts

@@ -51,7 +51,6 @@ import { LLMReranker } from "../llm/llms/llm";
 import TransformersJsEmbeddingsProvider from "../llm/llms/TransformersJsEmbeddingsProvider";
 import { slashCommandFromPromptFileV1 } from "../promptFiles/v1/slashCommandFromPromptFile";
 import { getAllPromptFiles } from "../promptFiles/v2/getPromptFiles";
-import { allTools } from "../tools";
 import { copyOf } from "../util";
 import { GlobalContext } from "../util/GlobalContext";
 import mergeJson from "../util/merge";
@@ -67,6 +66,7 @@ import {
 } from "../util/paths";
 import { localPathToUri } from "../util/pathToUri";
 
+import { baseToolDefinitions } from "../tools";
 import { modifyAnyConfigWithSharedConfig } from "./sharedConfig";
 import {
   getModelByRole,
@@ -529,7 +529,7 @@ async function intermediateToFinalConfig({
   const continueConfig: ContinueConfig = {
     ...config,
     contextProviders,
-    tools: [...allTools],
+    tools: [...baseToolDefinitions],
     mcpServerStatuses: [],
     slashCommands: config.slashCommands ?? [],
     modelsByRole: {

core/config/profile/doLoadConfig.ts

@@ -25,6 +25,7 @@ import { ControlPlaneClient } from "../../control-plane/client.js";
 import { getControlPlaneEnv } from "../../control-plane/env.js";
 import { TeamAnalytics } from "../../control-plane/TeamAnalytics.js";
 import ContinueProxy from "../../llm/llms/stubs/ContinueProxy";
+import { getConfigDependentToolDefinitions } from "../../tools";
 import { encodeMCPToolUri } from "../../tools/callTool";
 import { getConfigJsonPath, getConfigYamlPath } from "../../util/paths";
 import { localPathOrUriToPath } from "../../util/pathToUri";
@@ -202,6 +203,12 @@ export default async function doLoadConfig(options: {
     }
   }
 
+  newConfig.tools.push(
+    ...getConfigDependentToolDefinitions({
+      rules: newConfig.rules,
+    }),
+  );
+
   // Detect duplicate tool names
   const counts: Record<string, number> = {};
   newConfig.tools.forEach((tool) => {
@@ -211,6 +218,7 @@ export default async function doLoadConfig(options: {
       counts[tool.function.name] = 1;
     }
   });
+
   Object.entries(counts).forEach(([toolName, count]) => {
     if (count > 1) {
       errors!.push({
@@ -220,6 +228,26 @@ export default async function doLoadConfig(options: {
     }
   });
 
+  const ruleCounts: Record<string, number> = {};
+  newConfig.rules.forEach((rule) => {
+    if (rule.name) {
+      if (ruleCounts[rule.name]) {
+        ruleCounts[rule.name] = ruleCounts[rule.name] + 1;
+      } else {
+        ruleCounts[rule.name] = 1;
+      }
+    }
+  });
+
+  Object.entries(ruleCounts).forEach(([ruleName, count]) => {
+    if (count > 1) {
+      errors!.push({
+        fatal: false,
+        message: `Duplicate (${count}) rules named "${ruleName}" detected. This may cause unexpected behavior`,
+      });
+    }
+  });
+
   newConfig.allowAnonymousTelemetry =
     newConfig.allowAnonymousTelemetry && (await ide.isTelemetryEnabled());
 

core/config/yaml/loadYaml.ts

@@ -36,11 +36,11 @@ import FreeTrial from "../../llm/llms/FreeTrial";
 import TransformersJsEmbeddingsProvider from "../../llm/llms/TransformersJsEmbeddingsProvider";
 import { slashCommandFromPromptFileV1 } from "../../promptFiles/v1/slashCommandFromPromptFile";
 import { getAllPromptFiles } from "../../promptFiles/v2/getPromptFiles";
-import { allTools } from "../../tools";
 import { GlobalContext } from "../../util/GlobalContext";
 import { modifyAnyConfigWithSharedConfig } from "../sharedConfig";
 
 import { getControlPlaneEnvSync } from "../../control-plane/env";
+import { baseToolDefinitions } from "../../tools";
 import { getCleanUriPath } from "../../util/uri";
 import { getAllDotContinueDefinitionFiles } from "../loadLocalAssistants";
 import { LocalPlatformClient } from "./LocalPlatformClient";
@@ -193,7 +193,7 @@ async function configYamlToContinueConfig(options: {
 
   const continueConfig: ContinueConfig = {
     slashCommands: [],
-    tools: [...allTools],
+    tools: [...baseToolDefinitions],
     mcpServerStatuses: [],
     contextProviders: [],
     modelsByRole: {

core/core.ts

@@ -723,6 +723,7 @@ export class Core {
       };
 
       return await callTool(tool, toolCall.function.arguments, {
+        config,
         ide: this.ide,
         llm: config.selectedModelByRole.chat,
         fetch: (url, init) =>

core/index.d.ts

@@ -975,6 +975,7 @@ export interface ToolExtras {
     toolCallId: string;
     contextItems: ContextItem[];
   }) => void;
+  config: ContinueConfig;
 }
 
 export interface Tool {
@@ -1004,6 +1005,12 @@ interface ToolChoice {
   };
 }
 
+export interface ConfigDependentToolParams {
+  rules: RuleWithSource[];
+}
+
+export type GetTool = (params: ConfigDependentToolParams) => Tool;
+
 export interface BaseCompletionOptions {
   temperature?: number;
   topP?: number;

core/tools/builtIn.ts

@@ -10,6 +10,7 @@ export enum BuiltInToolNames {
   ViewDiff = "builtin_view_diff",
   LSTool = "builtin_ls",
   CreateRuleBlock = "builtin_create_rule_block",
+  RequestRule = "builtin_request_rule",
 
   // excluded from allTools for now
   ViewRepoMap = "builtin_view_repo_map",
@@ -18,4 +19,4 @@ export enum BuiltInToolNames {
 
 export const BUILT_IN_GROUP_NAME = "Built-In";
 
-export const CLIENT_TOOLS = [BuiltInToolNames.EditExistingFile];
+export const CLIENT_TOOLS_IMPLS = [BuiltInToolNames.EditExistingFile];

core/tools/callTool.ts

@@ -10,6 +10,7 @@ import { grepSearchImpl } from "./implementations/grepSearch";
 import { lsToolImpl } from "./implementations/lsTool";
 import { readCurrentlyOpenFileImpl } from "./implementations/readCurrentlyOpenFile";
 import { readFileImpl } from "./implementations/readFile";
+import { requestRuleImpl } from "./implementations/requestRule";
 import { runTerminalCommandImpl } from "./implementations/runTerminalCommand";
 import { searchWebImpl } from "./implementations/searchWeb";
 import { viewDiffImpl } from "./implementations/viewDiff";
@@ -157,6 +158,8 @@ async function callBuiltInTool(
       return await readCurrentlyOpenFileImpl(args, extras);
     case BuiltInToolNames.CreateRuleBlock:
       return await createRuleBlockImpl(args, extras);
+    case BuiltInToolNames.RequestRule:
+      return await requestRuleImpl(args, extras);
     default:
       throw new Error(`Tool "${functionName}" not found`);
   }