Revert unnecessary changes

Author: cte

evals/packages/types/src/roo-code.ts

@@ -758,6 +758,7 @@ export const isGlobalStateKey = (key: string): key is Keys<GlobalState> =>
 export const clineAsks = [
 	"followup",
 	"command",
+	"command_output",
 	"completion_result",
 	"tool",
 	"api_req_failed",

src/core/tools/attemptCompletionTool.ts

@@ -76,13 +76,13 @@ export async function attemptCompletionTool(
 				}
 
 				// Complete command message.
-				const executionId = Date.now().toString()
-				const didApprove = await askApproval("command", command, { id: executionId })
+				const didApprove = await askApproval("command", command)
 
 				if (!didApprove) {
 					return
 				}
 
+				const executionId = cline.lastMessageTs?.toString() ?? Date.now().toString()
 				const options: ExecuteCommandOptions = { executionId, command }
 				const [userRejected, execCommandResult] = await executeCommand(cline, options)
 

src/core/tools/executeCommandTool.ts

@@ -9,7 +9,7 @@ import { ToolUse, AskApproval, HandleError, PushToolResult, RemoveClosingTag, To
 import { formatResponse } from "../prompts/responses"
 import { unescapeHtmlEntities } from "../../utils/text-normalization"
 import { telemetryService } from "../../services/telemetry/TelemetryService"
-import { ExitCodeDetails, RooTerminalCallbacks } from "../../integrations/terminal/types"
+import { ExitCodeDetails, RooTerminalCallbacks, RooTerminalProcess } from "../../integrations/terminal/types"
 import { TerminalRegistry } from "../../integrations/terminal/TerminalRegistry"
 import { Terminal } from "../../integrations/terminal/Terminal"
 
@@ -56,7 +56,6 @@ export async function executeCommandTool(
 			}
 
 			const executionId = cline.lastMessageTs?.toString() ?? Date.now().toString()
-
 			const clineProvider = await cline.providerRef.deref()
 			const clineProviderState = await clineProvider?.getState()
 			const { terminalOutputLineLimit = 500, terminalShellIntegrationDisabled = false } = clineProviderState ?? {}
@@ -141,6 +140,7 @@ export async function executeCommand(
 	}
 
 	let message: { text?: string; images?: string[] } | undefined
+	let runInBackground = false
 	let completed = false
 	let result: string = ""
 	let exitDetails: ExitCodeDetails | undefined
@@ -150,9 +150,23 @@ export async function executeCommand(
 	const clineProvider = await cline.providerRef.deref()
 
 	const callbacks: RooTerminalCallbacks = {
-		onLine: async (output: string) => {
+		onLine: async (output: string, process: RooTerminalProcess) => {
 			const status: CommandExecutionStatus = { executionId, status: "output", output }
 			clineProvider?.postMessageToWebview({ type: "commandExecutionStatus", text: JSON.stringify(status) })
+
+			if (runInBackground) {
+				return
+			}
+
+			try {
+				const { response, text, images } = await cline.ask("command_output", "")
+				runInBackground = true
+
+				if (response === "messageResponse") {
+					message = { text, images }
+					process.continue()
+				}
+			} catch (_error) {}
 		},
 		onCompleted: (output: string | undefined) => {
 			result = Terminal.compressTerminalOutput(output ?? "", terminalOutputLineLimit)
@@ -163,9 +177,6 @@ export async function executeCommand(
 			console.log(`[executeCommand] onShellExecutionStarted: ${pid}`)
 			const status: CommandExecutionStatus = { executionId, status: "started", pid, command }
 			clineProvider?.postMessageToWebview({ type: "commandExecutionStatus", text: JSON.stringify(status) })
-			// This `command_output` message tells the webview to render the
-			// appropriate primary and secondary buttons.
-			cline.say("command_output", "")
 		},
 		onShellExecutionComplete: (details: ExitCodeDetails) => {
 			const status: CommandExecutionStatus = { executionId, status: "exited", exitCode: details.exitCode }
@@ -205,7 +216,8 @@ export async function executeCommand(
 	// 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
 	// for their associated messages to be sent to the webview, maintaining
-	// the correct order of messages.
+	// the correct order of messages (although the webview is smart about
+	// grouping command_output messages despite any gaps anyways).
 	await delay(50)
 
 	if (message) {

src/core/webview/webviewMessageHandler.ts

@@ -184,9 +184,7 @@ export const webviewMessageHandler = async (provider: ClineProvider, message: We
 			await provider.postStateToWebview()
 			break
 		case "askResponse":
-			const instance = provider.getCurrentCline()
-			console.log("askResponse ->", message, !!instance)
-			instance?.handleWebviewAskResponse(message.askResponse!, message.text, message.images)
+			provider.getCurrentCline()?.handleWebviewAskResponse(message.askResponse!, message.text, message.images)
 			break
 		case "terminalOperation":
 			if (message.terminalOperation) {

src/exports/roo-code.d.ts

@@ -305,6 +305,7 @@ type ClineMessage = {
 		| (
 				| "followup"
 				| "command"
+				| "command_output"
 				| "completion_result"
 				| "tool"
 				| "api_req_failed"
@@ -352,7 +353,6 @@ type ClineMessage = {
 		| undefined
 	progressStatus?:
 		| {
-				id?: string | undefined
 				icon?: string | undefined
 				text?: string | undefined
 		  }
@@ -380,6 +380,7 @@ type RooCodeEvents = {
 					| (
 							| "followup"
 							| "command"
+							| "command_output"
 							| "completion_result"
 							| "tool"
 							| "api_req_failed"
@@ -427,7 +428,6 @@ type RooCodeEvents = {
 					| undefined
 				progressStatus?:
 					| {
-							id?: string | undefined
 							icon?: string | undefined
 							text?: string | undefined
 					  }

src/exports/types.ts

@@ -310,6 +310,7 @@ type ClineMessage = {
 		| (
 				| "followup"
 				| "command"
+				| "command_output"
 				| "completion_result"
 				| "tool"
 				| "api_req_failed"
@@ -357,7 +358,6 @@ type ClineMessage = {
 		| undefined
 	progressStatus?:
 		| {
-				id?: string | undefined
 				icon?: string | undefined
 				text?: string | undefined
 		  }
@@ -389,6 +389,7 @@ type RooCodeEvents = {
 					| (
 							| "followup"
 							| "command"
+							| "command_output"
 							| "completion_result"
 							| "tool"
 							| "api_req_failed"
@@ -436,7 +437,6 @@ type RooCodeEvents = {
 					| undefined
 				progressStatus?:
 					| {
-							id?: string | undefined
 							icon?: string | undefined
 							text?: string | undefined
 					  }

src/schemas/index.ts

@@ -767,6 +767,7 @@ export const isGlobalStateKey = (key: string): key is Keys<GlobalState> =>
 export const clineAsks = [
 	"followup",
 	"command",
+	"command_output",
 	"completion_result",
 	"tool",
 	"api_req_failed",
@@ -816,7 +817,6 @@ export type ClineSay = z.infer<typeof clineSaySchema>
  */
 
 export const toolProgressStatusSchema = z.object({
-	id: z.string().optional(),
 	icon: z.string().optional(),
 	text: z.string().optional(),
 })

src/shared/__tests__/combineCommandSequences.test.ts

@@ -21,13 +21,20 @@ const messages: ClineMessage[] = [
 	},
 	{ ts: 1745710930748, type: "ask", ask: "command", text: "ping www.google.com", partial: false },
 	{ ts: 1745710930894, type: "say", say: "command_output", text: "", images: undefined },
+	{ ts: 1745710930894, type: "ask", ask: "command_output", text: "" },
 	{
 		ts: 1745710930954,
 		type: "say",
 		say: "command_output",
 		text: "PING www.google.com (142.251.46.228): 56 data bytes\n",
 		images: undefined,
 	},
+	{
+		ts: 1745710930954,
+		type: "ask",
+		ask: "command_output",
+		text: "PING www.google.com (142.251.46.228): 56 data bytes\n",
+	},
 ]
 
 describe("combineCommandSequences", () => {

src/shared/combineCommandSequences.ts

@@ -39,7 +39,7 @@ export function combineCommandSequences(messages: ClineMessage[]): ClineMessage[
 					break // Stop if we encounter the next command.
 				}
 
-				if (say === "command_output") {
+				if (ask === "command_output" || say === "command_output") {
 					if (!previous) {
 						combinedText += `\n${COMMAND_OUTPUT_STRING}`
 					}
@@ -68,7 +68,7 @@ export function combineCommandSequences(messages: ClineMessage[]): ClineMessage[
 	// Second pass: remove command_outputs and replace original commands with
 	// combined ones.
 	return messages
-		.filter((msg) => msg.say !== "command_output")
+		.filter((msg) => !(msg.ask === "command_output" || msg.say === "command_output"))
 		.map((msg) => {
 			if (msg.type === "ask" && msg.ask === "command") {
 				return combinedCommands.find((cmd) => cmd.ts === msg.ts) || msg

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

@@ -116,7 +116,7 @@ const ChatViewComponent: React.ForwardRefRenderFunction<ChatViewRef, ChatViewPro
 	const [selectedImages, setSelectedImages] = useState<string[]>([])
 
 	// we need to hold on to the ask because useEffect > lastMessage will always let us know when an ask comes in and handle it, but by the time handleMessage is called, the last message might not be the ask anymore (it could be a say that followed)
-	const [clineAsk, setClineAsk] = useState<ClineAsk | "command_output" | undefined>(undefined)
+	const [clineAsk, setClineAsk] = useState<ClineAsk | undefined>(undefined)
 	const [enableButtons, setEnableButtons] = useState<boolean>(false)
 	const [primaryButtonText, setPrimaryButtonText] = useState<string | undefined>(undefined)
 	const [secondaryButtonText, setSecondaryButtonText] = useState<string | undefined>(undefined)
@@ -229,6 +229,13 @@ const ChatViewComponent: React.ForwardRefRenderFunction<ChatViewRef, ChatViewPro
 							setPrimaryButtonText(t("chat:runCommand.title"))
 							setSecondaryButtonText(t("chat:reject.title"))
 							break
+						case "command_output":
+							setTextAreaDisabled(false)
+							setClineAsk("command_output")
+							setEnableButtons(true)
+							setPrimaryButtonText(t("chat:proceedWhileRunning.title"))
+							setSecondaryButtonText(t("chat:killCommand.title"))
+							break
 						case "use_mcp_server":
 							if (!isAutoApproved(lastMessage) && !isPartial) {
 								playSound("notification")
@@ -282,8 +289,8 @@ const ChatViewComponent: React.ForwardRefRenderFunction<ChatViewRef, ChatViewPro
 							setTextAreaDisabled(true)
 							break
 						case "api_req_started":
-							if (secondLastMessage?.ask === "command") {
-								// If the last ask is a command, and we
+							if (secondLastMessage?.ask === "command_output") {
+								// If the last ask is a command_output, and we
 								// receive an api_req_started, then that means
 								// the command has finished and we don't need
 								// input from the user anymore (in every other
@@ -297,18 +304,12 @@ const ChatViewComponent: React.ForwardRefRenderFunction<ChatViewRef, ChatViewPro
 								setEnableButtons(false)
 							}
 							break
-						case "command_output":
-							setTextAreaDisabled(false)
-							setClineAsk("command_output")
-							setEnableButtons(true)
-							setPrimaryButtonText(t("chat:proceedWhileRunning.title"))
-							setSecondaryButtonText(t("chat:killCommand.title"))
-							break
 						case "api_req_finished":
 						case "error":
 						case "text":
 						case "browser_action":
 						case "browser_action_result":
+						case "command_output":
 						case "mcp_server_request_started":
 						case "mcp_server_response":
 						case "completion_result":
@@ -398,6 +399,7 @@ const ChatViewComponent: React.ForwardRefRenderFunction<ChatViewRef, ChatViewPro
 						case "tool":
 						case "browser_action_launch":
 						case "command": // User can provide feedback to a tool or command use.
+						case "command_output": // User can send input to command stdin.
 						case "use_mcp_server":
 						case "completion_result": // If this happens then the user has feedback for the completion result.
 						case "resume_task":
@@ -439,8 +441,6 @@ const ChatViewComponent: React.ForwardRefRenderFunction<ChatViewRef, ChatViewPro
 		(text?: string, images?: string[]) => {
 			const trimmedInput = text?.trim()
 
-			console.log(`handlePrimaryButtonClick -> clineAsk=${clineAsk}`, text)
-
 			switch (clineAsk) {
 				case "api_req_failed":
 				case "command":
@@ -521,7 +521,6 @@ const ChatViewComponent: React.ForwardRefRenderFunction<ChatViewRef, ChatViewPro
 					vscode.postMessage({ type: "terminalOperation", terminalOperation: "abort" })
 					break
 			}
-
 			setTextAreaDisabled(true)
 			setClineAsk(undefined)
 			setEnableButtons(false)
@@ -750,8 +749,7 @@ const ChatViewComponent: React.ForwardRefRenderFunction<ChatViewRef, ChatViewPro
 				return alwaysAllowExecute && isAllowedCommand(message)
 			}
 
-			// For read/write operations, check if it's outside workspace and
-			// if we have permission for that.
+			// For read/write operations, check if it's outside workspace and if we have permission for that
 			if (message.ask === "tool") {
 				let tool: any = {}