Type cleanup

Author: mrubens

src/core/prompts/sections/__tests__/custom-instructions.spec.ts

@@ -505,7 +505,7 @@ describe("addCustomInstructions", () => {
 		expect(result).toContain("Rules from .roorules-test-mode:\nmode specific rules")
 	})
 
-	it("should load AGENTS.md when useAgentRules is true", async () => {
+	it("should load AGENTS.md when settings.useAgentRules is true", async () => {
 		// Simulate no .roo/rules-test-mode directory
 		statMock.mockRejectedValueOnce({ code: "ENOENT" })
 
@@ -522,15 +522,15 @@ describe("addCustomInstructions", () => {
 			"global instructions",
 			"/fake/path",
 			"test-mode",
-			{ useAgentRules: true },
+			{ settings: { useAgentRules: true } },
 		)
 
 		expect(result).toContain("# Agent Rules Standard (AGENTS.md):")
 		expect(result).toContain("Agent rules from AGENTS.md file")
 		expect(readFileMock).toHaveBeenCalledWith(expect.stringContaining("AGENTS.md"), "utf-8")
 	})
 
-	it("should not load AGENTS.md when useAgentRules is false", async () => {
+	it("should not load AGENTS.md when settings.useAgentRules is false", async () => {
 		// Simulate no .roo/rules-test-mode directory
 		statMock.mockRejectedValueOnce({ code: "ENOENT" })
 
@@ -547,14 +547,14 @@ describe("addCustomInstructions", () => {
 			"global instructions",
 			"/fake/path",
 			"test-mode",
-			{ useAgentRules: false },
+			{ settings: { useAgentRules: false } },
 		)
 
 		expect(result).not.toContain("# Agent Rules Standard (AGENTS.md):")
 		expect(result).not.toContain("Agent rules from AGENTS.md file")
 	})
 
-	it("should load AGENTS.md by default when useAgentRules is undefined", async () => {
+	it("should load AGENTS.md by default when settings.useAgentRules is undefined", async () => {
 		// Simulate no .roo/rules-test-mode directory
 		statMock.mockRejectedValueOnce({ code: "ENOENT" })
 
@@ -571,7 +571,7 @@ describe("addCustomInstructions", () => {
 			"global instructions",
 			"/fake/path",
 			"test-mode",
-			{}, // No useAgentRules specified
+			{}, // No settings.useAgentRules specified
 		)
 
 		expect(result).toContain("# Agent Rules Standard (AGENTS.md):")
@@ -590,7 +590,7 @@ describe("addCustomInstructions", () => {
 			"global instructions",
 			"/fake/path",
 			"test-mode",
-			{ useAgentRules: true },
+			{ settings: { useAgentRules: true } },
 		)
 
 		expect(result).toContain("Global Instructions:\nglobal instructions")
@@ -618,7 +618,7 @@ describe("addCustomInstructions", () => {
 			"global instructions",
 			"/fake/path",
 			"test-mode",
-			{ useAgentRules: true },
+			{ settings: { useAgentRules: true } },
 		)
 
 		// Should contain both AGENTS.md and .roorules content

src/core/prompts/sections/custom-instructions.ts

@@ -5,6 +5,8 @@ import { Dirent } from "fs"
 
 import { isLanguage } from "@roo-code/types"
 
+import type { SystemPromptSettings } from "../types"
+
 import { LANGUAGES } from "../../../shared/language"
 import { getRooDirectoriesForCwd, getGlobalRooDirectory } from "../../../services/roo-config"
 
@@ -238,8 +240,7 @@ export async function addCustomInstructions(
 	options: {
 		language?: string
 		rooIgnoreInstructions?: string
-		useAgentRules?: boolean
-		settings?: Record<string, any>
+		settings?: SystemPromptSettings
 	} = {},
 ): Promise<string> {
 	const sections = []
@@ -319,7 +320,7 @@ export async function addCustomInstructions(
 	}
 
 	// Add AGENTS.md content if enabled (default: true)
-	if (options.useAgentRules !== false) {
+	if (options.settings?.useAgentRules !== false) {
 		const agentRulesContent = await loadAgentRulesFile(cwd)
 		if (agentRulesContent && agentRulesContent.trim()) {
 			rules.push(agentRulesContent.trim())

src/core/prompts/system.ts

@@ -3,6 +3,8 @@ import * as os from "os"
 
 import type { ModeConfig, PromptComponent, CustomModePrompts, TodoItem } from "@roo-code/types"
 
+import type { SystemPromptSettings } from "./types"
+
 import { Mode, modes, defaultModeSlug, getModeBySlug, getGroupName, getModeSelection } from "../../shared/modes"
 import { DiffStrategy } from "../../shared/tools"
 import { formatLanguage } from "../../shared/language"
@@ -57,7 +59,7 @@ async function generatePrompt(
 	language?: string,
 	rooIgnoreInstructions?: string,
 	partialReadsEnabled?: boolean,
-	settings?: Record<string, any>,
+	settings?: SystemPromptSettings,
 	todoList?: TodoItem[],
 ): Promise<string> {
 	if (!context) {
@@ -122,7 +124,6 @@ ${getObjectiveSection(codeIndexManager, experiments)}
 ${await addCustomInstructions(baseInstructions, globalCustomInstructions || "", cwd, mode, {
 	language: language ?? formatLanguage(vscode.env.language),
 	rooIgnoreInstructions,
-	useAgentRules: settings?.useAgentRules,
 	settings,
 })}`
 
@@ -146,7 +147,7 @@ export const SYSTEM_PROMPT = async (
 	language?: string,
 	rooIgnoreInstructions?: string,
 	partialReadsEnabled?: boolean,
-	settings?: Record<string, any>,
+	settings?: SystemPromptSettings,
 	todoList?: TodoItem[],
 ): Promise<string> => {
 	if (!context) {
@@ -185,7 +186,6 @@ export const SYSTEM_PROMPT = async (
 			{
 				language: language ?? formatLanguage(vscode.env.language),
 				rooIgnoreInstructions,
-				useAgentRules: settings?.useAgentRules,
 				settings,
 			},
 		)

src/core/prompts/types.ts

@@ -0,0 +1,8 @@
+/**
+ * Settings passed to system prompt generation functions
+ */
+export interface SystemPromptSettings {
+	maxConcurrentFileReads?: number
+	todoListEnabled?: boolean
+	useAgentRules?: boolean
+}