Implement "Kill Command"

Author: cte

src/core/Cline.ts

@@ -52,6 +52,7 @@ import { CheckpointServiceOptions, RepoPerTaskCheckpointService } from "../servi
 // integrations
 import { DIFF_VIEW_URI_SCHEME, DiffViewProvider } from "../integrations/editor/DiffViewProvider"
 import { findToolName, formatContentBlockToMarkdown } from "../integrations/misc/export-markdown"
+import { RooTerminalProcess } from "../integrations/terminal/types"
 import { Terminal } from "../integrations/terminal/Terminal"
 import { TerminalRegistry } from "../integrations/terminal/TerminalRegistry"
 
@@ -192,6 +193,9 @@ export class Cline extends EventEmitter<ClineEvents> {
 	// metrics
 	private toolUsage: ToolUsage = {}
 
+	// terminal
+	public terminalProcess?: RooTerminalProcess
+
 	constructor({
 		provider,
 		apiConfiguration,
@@ -203,7 +207,6 @@ export class Cline extends EventEmitter<ClineEvents> {
 		task,
 		images,
 		historyItem,
-		experiments,
 		startTask = true,
 		rootTask,
 		parentTask,
@@ -521,6 +524,14 @@ export class Cline extends EventEmitter<ClineEvents> {
 		this.askResponseImages = images
 	}
 
+	async handleTerminalOperation(terminalOperation: "continue" | "abort") {
+		if (terminalOperation === "continue") {
+			this.terminalProcess?.continue()
+		} else if (terminalOperation === "abort") {
+			this.terminalProcess?.abort()
+		}
+	}
+
 	async say(
 		type: ClineSay,
 		text?: string,
@@ -2055,23 +2066,6 @@ export class Cline extends EventEmitter<ClineEvents> {
 			}).catch(() => {})
 		}
 
-		// we want to get diagnostics AFTER terminal cools down for a few reasons: terminal could be scaffolding a project, dev servers (compilers like webpack) will first re-compile and then send diagnostics, etc
-		/*
-		let diagnosticsDetails = ""
-		const diagnostics = await this.diagnosticsMonitor.getCurrentDiagnostics(this.didEditFile || terminalWasBusy) // if cline ran a command (ie npm install) or edited the workspace then wait a bit for updated diagnostics
-		for (const [uri, fileDiagnostics] of diagnostics) {
-			const problems = fileDiagnostics.filter((d) => d.severity === vscode.DiagnosticSeverity.Error)
-			if (problems.length > 0) {
-				diagnosticsDetails += `\n## ${path.relative(this.cwd, uri.fsPath)}`
-				for (const diagnostic of problems) {
-					// let severity = diagnostic.severity === vscode.DiagnosticSeverity.Error ? "Error" : "Warning"
-					const line = diagnostic.range.start.line + 1 // VSCode lines are 0-indexed
-					const source = diagnostic.source ? `[${diagnostic.source}] ` : ""
-					diagnosticsDetails += `\n- ${source}Line ${line}: ${diagnostic.message}`
-				}
-			}
-		}
-		*/
 		this.didEditFile = false // reset, this lets us know when to wait for saved files to update terminals
 
 		// waiting for updated diagnostics lets terminal output be the most up-to-date possible

src/core/tools/executeCommandTool.ts

@@ -73,7 +73,7 @@ export async function executeCommand(
 	cline: Cline,
 	command: string,
 	customCwd?: string,
-	terminalProvider: "vscode" | "execa" = "execa",
+	terminalProvider: "vscode" | "execa" = "vscode",
 ): Promise<[boolean, ToolResponse]> {
 	let workingDir: string
 
@@ -116,30 +116,19 @@ export async function executeCommand(
 
 			try {
 				const { response, text, images } = await cline.ask("command_output", compressed)
-				console.log(`ask command_output =>`, response)
 				runInBackground = true
 
-				if (response === "yesButtonClicked") {
-					// Continue running the command in the background.
-					process.continue()
-				} else if (response === "noButtonClicked") {
-					// Abort the command with a SIGINT.
-					process.abort()
-				} else {
-					// Continue running the command in the background, but inject
-					// the message into the context.
+				if (response === "messageResponse") {
 					message = { text, images }
 					process.continue()
 				}
 			} catch (_error) {}
 		},
 		onCompleted: (output: string | undefined) => {
-			console.log(`onCompleted =>`, output)
 			result = Terminal.compressTerminalOutput(output ?? "", terminalOutputLineLimit)
 			completed = true
 		},
 		onShellExecutionComplete: (details: ExitCodeDetails) => {
-			console.log(`onShellExecutionComplete =>`, details)
 			exitDetails = details
 		},
 		onNoShellIntegration: async (message: string) => {
@@ -157,7 +146,10 @@ export async function executeCommand(
 		terminal = new ExecaTerminal(workingDir)
 	}
 
-	await terminal.runCommand(command, callbacks)
+	const process = terminal.runCommand(command, callbacks)
+	cline.terminalProcess = process
+	await process
+	cline.terminalProcess = undefined
 
 	// Wait for a short delay to ensure all messages are sent to the webview.
 	// This delay allows time for non-awaited promises to be created and

src/core/webview/webviewMessageHandler.ts

@@ -12,7 +12,7 @@ import { GlobalFileNames } from "../../shared/globalFileNames"
 
 import { checkoutDiffPayloadSchema, checkoutRestorePayloadSchema, WebviewMessage } from "../../shared/WebviewMessage"
 import { checkExistKey } from "../../shared/checkExistApiConfig"
-import { EXPERIMENT_IDS, experimentDefault, ExperimentId } from "../../shared/experiments"
+import { experimentDefault } from "../../shared/experiments"
 import { Terminal } from "../../integrations/terminal/Terminal"
 import { openFile, openImage } from "../../integrations/misc/open-file"
 import { selectImages } from "../../integrations/misc/process-images"
@@ -274,6 +274,9 @@ export const webviewMessageHandler = async (provider: ClineProvider, message: We
 		case "askResponse":
 			provider.getCurrentCline()?.handleWebviewAskResponse(message.askResponse!, message.text, message.images)
 			break
+		case "terminalOperation":
+			provider.getCurrentCline()?.handleTerminalOperation(message.terminalOperation)
+			break
 		case "clearTask":
 			// clear task resets the current session and allows for a new task to be started, if this session is a subtask - it allows the parent task to be resumed
 			await provider.finishSubTask(t("common:tasks.canceled"))

src/integrations/terminal/ExecaTerminalProcess.ts

@@ -26,15 +26,15 @@ export class ExecaTerminalProcess extends EventEmitter<RooTerminalProcessEvents>
 		this.controller = new AbortController()
 
 		try {
-			const stream = execa({
+			const subprocess = execa({
 				shell: true,
 				cwd: this.terminalRef.deref()?.getCurrentWorkingDirectory(),
 				cancelSignal: this.controller.signal,
 			})`${command}`
 
 			this.emit("line", "")
 
-			for await (const line of stream) {
+			for await (const line of subprocess) {
 				this.fullOutput += line
 				this.fullOutput += "\n"
 

src/integrations/terminal/TerminalProcess.ts

@@ -501,7 +501,10 @@ export class TerminalProcess extends EventEmitter<RooTerminalProcessEvents> {
 	}
 
 	public abort() {
-		// TODO
+		if (this.isListening) {
+			// Send SIGINT using CTRL+C
+			this.terminalInfo.terminal.sendText("\x03")
+		}
 	}
 
 	/**

src/shared/WebviewMessage.ts

@@ -30,6 +30,7 @@ export interface WebviewMessage {
 		| "webviewDidLaunch"
 		| "newTask"
 		| "askResponse"
+		| "terminalOperation"
 		| "clearTask"
 		| "didShowAnnouncement"
 		| "selectImages"
@@ -151,6 +152,7 @@ export interface WebviewMessage {
 	requestId?: string
 	ids?: string[]
 	hasSystemPromptOverride?: boolean
+	terminalOperation?: "continue" | "abort"
 }
 
 export const checkoutDiffPayloadSchema = z.object({

webview-ui/src/components/chat/ChatView.tsx

@@ -403,7 +403,6 @@ const ChatViewComponent: React.ForwardRefRenderFunction<ChatViewRef, ChatViewPro
 			switch (clineAsk) {
 				case "api_req_failed":
 				case "command":
-				case "command_output":
 				case "tool":
 				case "browser_action_launch":
 				case "use_mcp_server":
@@ -418,20 +417,20 @@ const ChatViewComponent: React.ForwardRefRenderFunction<ChatViewRef, ChatViewPro
 							images: images,
 						})
 					} else {
-						vscode.postMessage({
-							type: "askResponse",
-							askResponse: "yesButtonClicked",
-						})
+						vscode.postMessage({ type: "askResponse", askResponse: "yesButtonClicked" })
 					}
 					// Clear input state after sending
 					setInputValue("")
 					setSelectedImages([])
 					break
 				case "completion_result":
 				case "resume_completed_task":
-					// extension waiting for feedback. but we can just present a new task button
+					// Waiting for feedback, but we can just present a new task button
 					startNewTask()
 					break
+				case "command_output":
+					vscode.postMessage({ type: "terminalOperation", terminalOperation: "continue" })
+					break
 			}
 			setTextAreaDisabled(true)
 			setClineAsk(undefined)
@@ -469,15 +468,15 @@ const ChatViewComponent: React.ForwardRefRenderFunction<ChatViewRef, ChatViewPro
 							images: images,
 						})
 					} else {
-						// responds to the API with a "This operation failed" and lets it try again
+						// Responds to the API with a "This operation failed" and lets it try again
 						vscode.postMessage({ type: "askResponse", askResponse: "noButtonClicked" })
 					}
 					// Clear input state after sending
 					setInputValue("")
 					setSelectedImages([])
 					break
 				case "command_output":
-					vscode.postMessage({ type: "askResponse", askResponse: "noButtonClicked" })
+					vscode.postMessage({ type: "terminalOperation", terminalOperation: "abort" })
 					break
 			}
 			setTextAreaDisabled(true)