Skip to content

Remove unused ClineSay and -Ask type variants #2061

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
cte merged 2 commits into from
Apr 28, 2025
Merged

Remove unused ClineSay and -Ask type variants #2061

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c6b689a
Remove unused ClineSay and -Ask type variants
wkordalski Mar 28, 2025
8f2cdca
Merge main
cte Apr 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions src/exports/roo-code.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -339,12 +339,10 @@ type ClineMessage = {
| "mistake_limit_reached"
| "browser_action_launch"
| "use_mcp_server"
| "finishTask"
)
| undefined
say?:
| (
| "task"
| "error"
| "api_req_started"
| "api_req_finished"
Expand All @@ -357,15 +355,11 @@ type ClineMessage = {
| "user_feedback"
| "user_feedback_diff"
| "command_output"
| "tool"
| "shell_integration_warning"
| "browser_action"
| "browser_action_result"
| "command"
| "mcp_server_request_started"
| "mcp_server_response"
| "new_task_started"
| "new_task"
| "checkpoint_saved"
| "rooignore_error"
)
Expand Down
6 changes: 0 additions & 6 deletions src/exports/types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -344,12 +344,10 @@ type ClineMessage = {
| "mistake_limit_reached"
| "browser_action_launch"
| "use_mcp_server"
| "finishTask"
)
| undefined
say?:
| (
| "task"
| "error"
| "api_req_started"
| "api_req_finished"
Expand All @@ -362,15 +360,11 @@ type ClineMessage = {
| "user_feedback"
| "user_feedback_diff"
| "command_output"
| "tool"
| "shell_integration_warning"
| "browser_action"
| "browser_action_result"
| "command"
| "mcp_server_request_started"
| "mcp_server_response"
| "new_task_started"
| "new_task"
| "checkpoint_saved"
| "rooignore_error"
)
Expand Down
6 changes: 0 additions & 6 deletions src/schemas/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -701,7 +701,6 @@ export const clineAsks = [
"mistake_limit_reached",
"browser_action_launch",
"use_mcp_server",
"finishTask",
] as const

export const clineAskSchema = z.enum(clineAsks)
Expand All @@ -711,7 +710,6 @@ export type ClineAsk = z.infer<typeof clineAskSchema>
// ClineSay

export const clineSays = [
"task",
"error",
"api_req_started",
"api_req_finished",
Expand All @@ -724,15 +722,11 @@ export const clineSays = [
"user_feedback",
"user_feedback_diff",
"command_output",
"tool",
"shell_integration_warning",
"browser_action",
"browser_action_result",
"command",
"mcp_server_request_started",
"mcp_server_response",
"new_task_started",
"new_task",
"checkpoint_saved",
"rooignore_error",
] as const
Expand Down
2 changes: 1 addition & 1 deletion webview-ui/src/__tests__/ContextWindowProgress.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ describe("ContextWindowProgress", () => {
const defaultTask = {
ts: Date.now(),
type: "say" as const,
say: "task" as const,
say: "text" as const,
text: "Test task",
}

Expand Down
4 changes: 2 additions & 2 deletions webview-ui/src/components/chat/ChatRow.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,11 +245,11 @@ export const ChatRowContent = ({
}

const tool = useMemo(() => {
if (message.ask === "tool" || message.say === "tool") {
if (message.ask === "tool") {
return JSON.parse(message.text || "{}") as ClineSayTool
}
return null
}, [message.ask, message.say, message.text])
}, [message.ask, message.text])

const followUpData = useMemo(() => {
if (message.type === "ask" && message.ask === "followup" && !message.partial) {
Expand Down
2 changes: 0 additions & 2 deletions webview-ui/src/components/chat/ChatView.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,7 +247,6 @@ const ChatView = ({ isHidden, showAnnouncement, hideAnnouncement, showHistoryVie
}
break
case "api_req_finished":
case "task":
case "error":
case "text":
case "browser_action":
Expand All @@ -256,7 +255,6 @@ const ChatView = ({ isHidden, showAnnouncement, hideAnnouncement, showHistoryVie
case "mcp_server_request_started":
case "mcp_server_response":
case "completion_result":
case "tool":
break
}
break
Expand Down