More tweaks

Author: cte

src/core/Cline.ts

@@ -2025,11 +2025,12 @@ export class Cline extends EventEmitter<ClineEvents> {
 			details += "\n(No open tabs)"
 		}
 
-		// Get task-specific and background terminals
+		// Get task-specific and background terminals.
 		const busyTerminals = [
 			...TerminalRegistry.getTerminals(true, this.taskId),
 			...TerminalRegistry.getBackgroundTerminals(true),
 		]
+
 		const inactiveTerminals = [
 			...TerminalRegistry.getTerminals(false, this.taskId),
 			...TerminalRegistry.getBackgroundTerminals(false),
@@ -2069,34 +2070,37 @@ export class Cline extends EventEmitter<ClineEvents> {
 			}
 		}
 
-		// First check if any inactive terminals in this task have completed processes with output
+		// First check if any inactive terminals in this task have completed
+		// processes with output.
 		const terminalsWithOutput = inactiveTerminals.filter((terminal) => {
 			const completedProcesses = terminal.getProcessesWithOutput()
 			return completedProcesses.length > 0
 		})
 
-		// Only add the header if there are terminals with output
+		// Only add the header if there are terminals with output.
 		if (terminalsWithOutput.length > 0) {
 			terminalDetails += "\n\n# Inactive Terminals with Completed Process Output"
 
-			// Process each terminal with output
+			// Process each terminal with output.
 			for (const inactiveTerminal of terminalsWithOutput) {
 				let terminalOutputs: string[] = []
 
-				// Get output from completed processes queue
+				// Get output from completed processes queue.
 				const completedProcesses = inactiveTerminal.getProcessesWithOutput()
+
 				for (const process of completedProcesses) {
 					let output = process.getUnretrievedOutput()
+
 					if (output) {
 						output = Terminal.compressTerminalOutput(output, terminalOutputLineLimit)
 						terminalOutputs.push(`Command: \`${process.command}\`\n${output}`)
 					}
 				}
 
-				// Clean the queue after retrieving output
+				// Clean the queue after retrieving output.
 				inactiveTerminal.cleanCompletedProcessQueue()
 
-				// Add this terminal's outputs to the details
+				// Add this terminal's outputs to the details.
 				if (terminalOutputs.length > 0) {
 					terminalDetails += `\n## Terminal ${inactiveTerminal.id}`
 					terminalOutputs.forEach((output) => {
@@ -2106,15 +2110,11 @@ export class Cline extends EventEmitter<ClineEvents> {
 			}
 		}
 
-		// details += "\n\n# VSCode Workspace Errors"
-		// if (diagnosticsDetails) {
-		// 	details += diagnosticsDetails
-		// } else {
-		// 	details += "\n(No errors detected)"
-		// }
+		console.log(`[Cline#getEnvironmentDetails] terminalDetails: ${terminalDetails}`)
 
-		// Add recently modified files section
+		// Add recently modified files section.
 		const recentlyModifiedFiles = this.fileContextTracker.getAndClearRecentlyModifiedFiles()
+
 		if (recentlyModifiedFiles.length > 0) {
 			details +=
 				"\n\n# Recently Modified Files\nThese files have been modified since you last accessed them (file was just edited so you may need to re-read it before editing):"
@@ -2127,8 +2127,9 @@ export class Cline extends EventEmitter<ClineEvents> {
 			details += terminalDetails
 		}
 
-		// Add current time information with timezone
+		// Add current time information with timezone.
 		const now = new Date()
+
 		const formatter = new Intl.DateTimeFormat(undefined, {
 			year: "numeric",
 			month: "numeric",
@@ -2138,22 +2139,26 @@ export class Cline extends EventEmitter<ClineEvents> {
 			second: "numeric",
 			hour12: true,
 		})
+
 		const timeZone = formatter.resolvedOptions().timeZone
 		const timeZoneOffset = -now.getTimezoneOffset() / 60 // Convert to hours and invert sign to match conventional notation
 		const timeZoneOffsetHours = Math.floor(Math.abs(timeZoneOffset))
 		const timeZoneOffsetMinutes = Math.abs(Math.round((Math.abs(timeZoneOffset) - timeZoneOffsetHours) * 60))
 		const timeZoneOffsetStr = `${timeZoneOffset >= 0 ? "+" : "-"}${timeZoneOffsetHours}:${timeZoneOffsetMinutes.toString().padStart(2, "0")}`
 		details += `\n\n# Current Time\n${formatter.format(now)} (${timeZone}, UTC${timeZoneOffsetStr})`
 
-		// Add context tokens information
+		// Add context tokens information.
 		const { contextTokens, totalCost } = getApiMetrics(this.clineMessages)
 		const modelInfo = this.api.getModel().info
 		const contextWindow = modelInfo.contextWindow
+
 		const contextPercentage =
 			contextTokens && contextWindow ? Math.round((contextTokens / contextWindow) * 100) : undefined
+
 		details += `\n\n# Current Context Size (Tokens)\n${contextTokens ? `${contextTokens.toLocaleString()} (${contextPercentage}%)` : "(Not available)"}`
 		details += `\n\n# Current Cost\n${totalCost !== null ? `$${totalCost.toFixed(2)}` : "(Not available)"}`
-		// Add current mode and any mode-specific warnings
+
+		// Add current mode and any mode-specific warnings.
 		const {
 			mode,
 			customModes,
@@ -2163,28 +2168,31 @@ export class Cline extends EventEmitter<ClineEvents> {
 			customInstructions: globalCustomInstructions,
 			language,
 		} = (await this.providerRef.deref()?.getState()) ?? {}
+
 		const currentMode = mode ?? defaultModeSlug
+
 		const modeDetails = await getFullModeDetails(currentMode, customModes, customModePrompts, {
 			cwd: this.cwd,
 			globalCustomInstructions,
 			language: language ?? formatLanguage(vscode.env.language),
 		})
+
 		details += `\n\n# Current Mode\n`
 		details += `<slug>${currentMode}</slug>\n`
 		details += `<name>${modeDetails.name}</name>\n`
 		details += `<model>${apiModelId}</model>\n`
+
 		if (Experiments.isEnabled(experiments ?? {}, EXPERIMENT_IDS.POWER_STEERING)) {
 			details += `<role>${modeDetails.roleDefinition}</role>\n`
+
 			if (modeDetails.customInstructions) {
 				details += `<custom_instructions>${modeDetails.customInstructions}</custom_instructions>\n`
 			}
 		}
 
-		// Add warning if not in code mode
+		// Add warning if not in code mode.
 		if (
-			!isToolAllowedForMode("write_to_file", currentMode, customModes ?? [], {
-				apply_diff: this.diffEnabled,
-			}) &&
+			!isToolAllowedForMode("write_to_file", currentMode, customModes ?? [], { apply_diff: this.diffEnabled }) &&
 			!isToolAllowedForMode("apply_diff", currentMode, customModes ?? [], { apply_diff: this.diffEnabled })
 		) {
 			const currentModeName = getModeBySlug(currentMode, customModes)?.name ?? currentMode
@@ -2195,20 +2203,24 @@ export class Cline extends EventEmitter<ClineEvents> {
 		if (includeFileDetails) {
 			details += `\n\n# Current Workspace Directory (${this.cwd.toPosix()}) Files\n`
 			const isDesktop = arePathsEqual(this.cwd, path.join(os.homedir(), "Desktop"))
+
 			if (isDesktop) {
-				// don't want to immediately access desktop since it would show permission popup
+				// Don't want to immediately access desktop since it would show
+				// permission popup.
 				details += "(Desktop files not shown automatically. Use list_files to explore if needed.)"
 			} else {
 				const maxFiles = maxWorkspaceFiles ?? 200
 				const [files, didHitLimit] = await listFiles(this.cwd, true, maxFiles)
 				const { showRooIgnoredFiles = true } = (await this.providerRef.deref()?.getState()) ?? {}
+
 				const result = formatResponse.formatFilesList(
 					this.cwd,
 					files,
 					didHitLimit,
 					this.rooIgnoreController,
 					showRooIgnoredFiles,
 				)
+
 				details += result
 			}
 		}

src/integrations/terminal/ExecaTerminal.ts

@@ -8,6 +8,9 @@ export class ExecaTerminal extends BaseTerminal {
 		super("execa", id, cwd)
 	}
 
+	/**
+	 * Unlike the VSCode terminal, this is never closed.
+	 */
 	public override isClosed(): boolean {
 		return false
 	}

src/integrations/terminal/ExecaTerminalProcess.ts

@@ -36,6 +36,7 @@ export class ExecaTerminalProcess extends BaseTerminalProcess {
 				cancelSignal: this.controller.signal,
 			})`${command}`
 
+			this.terminal.setActiveStream(subprocess)
 			this.emit("line", "")
 
 			for await (const line of subprocess) {
@@ -64,6 +65,7 @@ export class ExecaTerminalProcess extends BaseTerminalProcess {
 			}
 		}
 
+		this.terminal.setActiveStream(undefined)
 		this.emitRemainingBufferIfListening()
 		this.stopHotTimer()
 		this.emit("completed", this.fullOutput)
@@ -85,28 +87,33 @@ export class ExecaTerminalProcess extends BaseTerminalProcess {
 	}
 
 	public override getUnretrievedOutput() {
-		let outputToProcess = this.fullOutput.slice(this.lastRetrievedIndex)
-		let endIndex = outputToProcess.lastIndexOf("\n")
+		let output = this.fullOutput.slice(this.lastRetrievedIndex)
+		let index = output.lastIndexOf("\n")
 
-		if (endIndex === -1) {
+		if (index === -1) {
 			return ""
 		}
 
-		endIndex++
+		index++
+		this.lastRetrievedIndex += index
 
-		this.lastRetrievedIndex += endIndex
-		return outputToProcess.slice(0, endIndex)
+		// console.log(
+		// 	`[ExecaTerminalProcess#getUnretrievedOutput] fullOutput.length=${this.fullOutput.length} lastRetrievedIndex=${this.lastRetrievedIndex}`,
+		// 	output.slice(0, index),
+		// )
+
+		return output.slice(0, index)
 	}
 
 	private emitRemainingBufferIfListening() {
 		if (!this.isListening) {
 			return
 		}
 
-		const remainingBuffer = this.getUnretrievedOutput()
+		const output = this.getUnretrievedOutput()
 
-		if (remainingBuffer !== "") {
-			this.emit("line", remainingBuffer)
+		if (output !== "") {
+			this.emit("line", output)
 		}
 	}
 }

src/integrations/terminal/TerminalProcess.ts

@@ -205,10 +205,10 @@ export class TerminalProcess extends BaseTerminalProcess {
 			this.startHotTimer(data)
 		}
 
-		// Set streamClosed immediately after stream ends
+		// Set streamClosed immediately after stream ends.
 		this.terminal.setActiveStream(undefined)
 
-		// Wait for shell execution to complete
+		// Wait for shell execution to complete.
 		await shellExecutionComplete
 
 		this.isHot = false