Skip to content

Commit ae33ff1

Browse files
committed
Remove reason
1 parent 86b975d commit ae33ff1

File tree

5 files changed

+11
-53
lines changed

5 files changed

+11
-53
lines changed

packages/types/src/events.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ export const rooCodeEventsSchema = z.object({
7575
]),
7676
[RooCodeEventName.TaskModeSwitched]: z.tuple([z.string(), z.string()]),
7777
[RooCodeEventName.TaskAskResponded]: z.tuple([z.string()]),
78-
[RooCodeEventName.TaskAskRequiresInteraction]: z.tuple([z.string(), clineAskSchema, z.string()]),
78+
[RooCodeEventName.TaskAskRequiresInteraction]: z.tuple([z.string(), clineAskSchema]),
7979

8080
[RooCodeEventName.TaskToolFailed]: z.tuple([z.string(), toolNamesSchema, z.string()]),
8181
[RooCodeEventName.TaskTokenUsageUpdated]: z.tuple([z.string(), tokenUsageSchema]),

packages/types/src/task.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ export type TaskEvents = {
101101
[RooCodeEventName.Message]: [{ action: "created" | "updated"; message: ClineMessage }]
102102
[RooCodeEventName.TaskModeSwitched]: [taskId: string, mode: string]
103103
[RooCodeEventName.TaskAskResponded]: []
104-
[RooCodeEventName.TaskAskRequiresInteraction]: [taskId: string, askType: ClineAsk, reason: string]
104+
[RooCodeEventName.TaskAskRequiresInteraction]: [taskId: string, askType: ClineAsk]
105105

106106
// Task Analytics
107107
[RooCodeEventName.TaskToolFailed]: [taskId: string, tool: ToolName, error: string]

src/core/webview/webviewMessageHandler.ts

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -350,15 +350,9 @@ export const webviewMessageHandler = async (
350350
provider.getCurrentTask()?.handleWebviewAskResponse(message.askResponse!, message.text, message.images)
351351
break
352352
case "askRequiresInteraction":
353-
if (message.askType && message.reason) {
353+
if (message.askType) {
354354
const task = provider.getCurrentTask()
355-
356-
task?.emit(
357-
RooCodeEventName.TaskAskRequiresInteraction,
358-
task.taskId,
359-
message.askType as ClineAsk,
360-
message.reason,
361-
)
355+
task?.emit(RooCodeEventName.TaskAskRequiresInteraction, task.taskId, message.askType as ClineAsk)
362356
}
363357

364358
break

src/shared/WebviewMessage.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,6 @@ export interface WebviewMessage {
220220
dataUri?: string
221221
askResponse?: ClineAskResponse
222222
askType?: string
223-
reason?: string
224223
apiConfiguration?: ProviderSettings
225224
images?: string[]
226225
bool?: boolean

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

Lines changed: 7 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -1591,21 +1591,17 @@ const ChatViewComponent: React.ForwardRefRenderFunction<ChatViewRef, ChatViewPro
15911591
}
15921592

15931593
const autoApproveOrReject = async () => {
1594-
// Check for auto-reject first (commands that should be denied)
1594+
// Check for auto-reject first (commands that should be denied).
15951595
if (lastMessage?.ask === "command" && isDeniedCommand(lastMessage)) {
1596-
// Get the denied prefix for the localized message
1596+
// Get the denied prefix for the localized message.
15971597
const deniedPrefix = getDeniedPrefix(lastMessage.text || "")
1598+
15981599
if (deniedPrefix) {
1599-
// Create the localized auto-deny message and send it with the rejection
1600+
// Create the localized auto-deny message and send it with the rejection.
16001601
const autoDenyMessage = tSettings("autoApprove.execute.autoDenied", { prefix: deniedPrefix })
1601-
1602-
vscode.postMessage({
1603-
type: "askResponse",
1604-
askResponse: "noButtonClicked",
1605-
text: autoDenyMessage,
1606-
})
1602+
vscode.postMessage({ type: "askResponse", askResponse: "noButtonClicked", text: autoDenyMessage })
16071603
} else {
1608-
// Auto-reject denied commands immediately if no prefix found
1604+
// Auto-reject denied commands immediately if no prefix found.
16091605
vscode.postMessage({ type: "askResponse", askResponse: "noButtonClicked" })
16101606
}
16111607

@@ -1668,39 +1664,8 @@ const ChatViewComponent: React.ForwardRefRenderFunction<ChatViewRef, ChatViewPro
16681664
setClineAsk(undefined)
16691665
setEnableButtons(false)
16701666
} else if (lastMessage?.ask) {
1671-
// Ask requires user interaction - not auto-approved or auto-rejected.
1672-
const reason = (() => {
1673-
if (autoApprovalEnabled !== true) {
1674-
return "auto_approval_disabled"
1675-
}
1676-
1677-
// Determine more specific reasons based on the ask type.
1678-
switch (lastMessage.ask) {
1679-
case "command":
1680-
return "command_requires_manual_approval"
1681-
case "tool":
1682-
return "tool_requires_manual_approval"
1683-
case "browser_action_launch":
1684-
return "browser_action_requires_manual_approval"
1685-
case "use_mcp_server":
1686-
return "mcp_requires_manual_approval"
1687-
case "followup":
1688-
return "followup_requires_manual_response"
1689-
case "completion_result":
1690-
return "completion_requires_manual_confirmation"
1691-
case "api_req_failed":
1692-
return "api_failure_requires_manual_decision"
1693-
case "mistake_limit_reached":
1694-
return "mistake_limit_requires_manual_guidance"
1695-
case "auto_approval_max_req_reached":
1696-
return "approval_limit_reached"
1697-
default:
1698-
return "manual_approval_required"
1699-
}
1700-
})()
1701-
17021667
// Notify the extension host that this ask requires user interaction.
1703-
vscode.postMessage({ type: "askRequiresInteraction", askType: lastMessage.ask, reason: reason })
1668+
vscode.postMessage({ type: "askRequiresInteraction", askType: lastMessage.ask })
17041669
}
17051670
}
17061671

0 commit comments

Comments
 (0)