pass less data between functions

Author: ocasta181

src/core/Cline.ts

@@ -1161,9 +1161,6 @@ export class Cline {
 	// Tools
 
 	async executeCommandTool(command: string): Promise<[boolean, ToolResponse]> {
-		const contextWindow = this.api.getModel().info.contextWindow || 64_000 // minimum context (Deepseek)
-		const maxAllowedSize = getMaxAllowedSize(contextWindow)
-
 		const terminalInfo = await this.terminalManager.getOrCreateTerminal(cwd)
 		terminalInfo.terminal.show() // weird visual bug when creating new terminals (even manually) where there's an empty space at the top.
 		const process = this.terminalManager.runCommand(terminalInfo, command)
@@ -2003,7 +2000,7 @@ export class Cline {
 									telemetryService.captureToolUsage(this.taskId, block.name, false, true)
 								}
 								// Get context window and used context from API model
-								const contextWindow = this.api.getModel().info.contextWindow || 64_000 // minimum context (Deepseek)
+								const contextWindow = this.api.getModel().info.contextWindow
 
 								// Pass the raw context window size - extractTextFromFile will calculate the appropriate limit
 								const content = await extractTextFromFile(absolutePath, contextWindow)
@@ -3379,9 +3376,10 @@ export class Cline {
 							block.text.includes("<task>") ||
 							block.text.includes("<user_message>")
 						) {
+							let contextWindow = this.api.getModel().info.contextWindow
 							return {
 								...block,
-								text: await parseMentions(block.text, cwd, this.urlContentFetcher, this.api),
+								text: await parseMentions(block.text, cwd, this.urlContentFetcher, contextWindow),
 							}
 						}
 					}

src/core/mentions/index.ts

@@ -42,7 +42,7 @@ export async function parseMentions(
 	text: string,
 	cwd: string,
 	urlContentFetcher: UrlContentFetcher,
-	api: { getModel: () => { info: { contextWindow?: number } } },
+	contextWindow?: number,
 ): Promise<string> {
 	const mentions: Set<string> = new Set()
 	let parsedText = text.replace(mentionRegexGlobal, (match, mention) => {
@@ -95,7 +95,7 @@ export async function parseMentions(
 		} else if (mention.startsWith("/")) {
 			const mentionPath = mention.slice(1)
 			try {
-				const content = await getFileOrFolderContent(mentionPath, cwd, api)
+				const content = await getFileOrFolderContent(mentionPath, cwd, contextWindow)
 				if (mention.endsWith("/")) {
 					parsedText += `\n\n<folder_content path="${mentionPath}">\n${content}\n</folder_content>`
 				} else {
@@ -150,11 +150,7 @@ export async function parseMentions(
 	return parsedText
 }
 
-async function getFileOrFolderContent(
-	mentionPath: string,
-	cwd: string,
-	api: { getModel: () => { info: { contextWindow?: number } } },
-): Promise<string> {
+async function getFileOrFolderContent(mentionPath: string, cwd: string, contextWindow?: number): Promise<string> {
 	const absPath = path.resolve(cwd, mentionPath)
 
 	try {
@@ -165,7 +161,6 @@ async function getFileOrFolderContent(
 			if (isBinary) {
 				return "(Binary file, unable to display content)"
 			}
-			const contextWindow = api.getModel().info.contextWindow || 64_000 // minimum context (Deepseek)
 			const content = await extractTextFromFile(absPath, contextWindow)
 			return content
 		} else if (stats.isDirectory()) {
@@ -187,7 +182,6 @@ async function getFileOrFolderContent(
 								if (isBinary) {
 									return undefined
 								}
-								const contextWindow = api.getModel().info.contextWindow || 64_000 // minimum context (Deepseek)
 								const content = await extractTextFromFile(absoluteFilePath, contextWindow)
 								return `<file_content path="${filePath.toPosix()}">\n${content}\n</file_content>`
 							} catch (error) {

src/integrations/misc/extract-text.ts

@@ -44,7 +44,10 @@ export async function extractTextFromTerminal(content: string | Buffer, contextW
 	return cleanContent
 }
 
-export async function extractTextFromFile(filePath: string, contextWindow: number): Promise<string> {
+export async function extractTextFromFile(
+	filePath: string,
+	contextWindow: number = 64_000 /* minimum context (Deepseek) */,
+): Promise<string> {
 	try {
 		await fs.access(filePath)
 	} catch (error) {