Skip to content

Commit 449d54b

Browse files
wkordalskicte
wkordalski
and
cte
authored
Remove unused ClineSay and -Ask type variants (#2061)
Co-authored-by: cte <[email protected]>
1 parent 2e1d949 commit 449d54b

File tree

9 files changed

+16
-56
lines changed

9 files changed

+16
-56
lines changed

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

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -706,7 +706,6 @@ export const clineAsks = [
706706
"mistake_limit_reached",
707707
"browser_action_launch",
708708
"use_mcp_server",
709-
"finishTask",
710709
] as const
711710

712711
export const clineAskSchema = z.enum(clineAsks)
@@ -716,7 +715,6 @@ export type ClineAsk = z.infer<typeof clineAskSchema>
716715
// ClineSay
717716

718717
export const clineSays = [
719-
"task",
720718
"error",
721719
"api_req_started",
722720
"api_req_finished",
@@ -729,15 +727,12 @@ export const clineSays = [
729727
"user_feedback",
730728
"user_feedback_diff",
731729
"command_output",
732-
"tool",
733730
"shell_integration_warning",
734731
"browser_action",
735732
"browser_action_result",
736-
"command",
737733
"mcp_server_request_started",
738734
"mcp_server_response",
739-
"new_task_started",
740-
"new_task",
735+
"subtask_result",
741736
"checkpoint_saved",
742737
"rooignore_error",
743738
"diff_error",

‎src/exports/roo-code.d.ts‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -307,12 +307,10 @@ type ClineMessage = {
307307
| "mistake_limit_reached"
308308
| "browser_action_launch"
309309
| "use_mcp_server"
310-
| "finishTask"
311310
)
312311
| undefined
313312
say?:
314313
| (
315-
| "task"
316314
| "error"
317315
| "api_req_started"
318316
| "api_req_finished"
@@ -325,15 +323,11 @@ type ClineMessage = {
325323
| "user_feedback"
326324
| "user_feedback_diff"
327325
| "command_output"
328-
| "tool"
329326
| "shell_integration_warning"
330327
| "browser_action"
331328
| "browser_action_result"
332-
| "command"
333329
| "mcp_server_request_started"
334330
| "mcp_server_response"
335-
| "new_task_started"
336-
| "new_task"
337331
| "subtask_result"
338332
| "checkpoint_saved"
339333
| "rooignore_error"
@@ -388,12 +382,10 @@ type RooCodeEvents = {
388382
| "mistake_limit_reached"
389383
| "browser_action_launch"
390384
| "use_mcp_server"
391-
| "finishTask"
392385
)
393386
| undefined
394387
say?:
395388
| (
396-
| "task"
397389
| "error"
398390
| "api_req_started"
399391
| "api_req_finished"
@@ -406,15 +398,11 @@ type RooCodeEvents = {
406398
| "user_feedback"
407399
| "user_feedback_diff"
408400
| "command_output"
409-
| "tool"
410401
| "shell_integration_warning"
411402
| "browser_action"
412403
| "browser_action_result"
413-
| "command"
414404
| "mcp_server_request_started"
415405
| "mcp_server_response"
416-
| "new_task_started"
417-
| "new_task"
418406
| "subtask_result"
419407
| "checkpoint_saved"
420408
| "rooignore_error"

‎src/exports/types.ts‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -312,12 +312,10 @@ type ClineMessage = {
312312
| "mistake_limit_reached"
313313
| "browser_action_launch"
314314
| "use_mcp_server"
315-
| "finishTask"
316315
)
317316
| undefined
318317
say?:
319318
| (
320-
| "task"
321319
| "error"
322320
| "api_req_started"
323321
| "api_req_finished"
@@ -330,15 +328,11 @@ type ClineMessage = {
330328
| "user_feedback"
331329
| "user_feedback_diff"
332330
| "command_output"
333-
| "tool"
334331
| "shell_integration_warning"
335332
| "browser_action"
336333
| "browser_action_result"
337-
| "command"
338334
| "mcp_server_request_started"
339335
| "mcp_server_response"
340-
| "new_task_started"
341-
| "new_task"
342336
| "subtask_result"
343337
| "checkpoint_saved"
344338
| "rooignore_error"
@@ -397,12 +391,10 @@ type RooCodeEvents = {
397391
| "mistake_limit_reached"
398392
| "browser_action_launch"
399393
| "use_mcp_server"
400-
| "finishTask"
401394
)
402395
| undefined
403396
say?:
404397
| (
405-
| "task"
406398
| "error"
407399
| "api_req_started"
408400
| "api_req_finished"
@@ -415,15 +407,11 @@ type RooCodeEvents = {
415407
| "user_feedback"
416408
| "user_feedback_diff"
417409
| "command_output"
418-
| "tool"
419410
| "shell_integration_warning"
420411
| "browser_action"
421412
| "browser_action_result"
422-
| "command"
423413
| "mcp_server_request_started"
424414
| "mcp_server_response"
425-
| "new_task_started"
426-
| "new_task"
427415
| "subtask_result"
428416
| "checkpoint_saved"
429417
| "rooignore_error"

‎src/schemas/index.ts‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -653,7 +653,7 @@ const globalSettingsRecord: GlobalSettingsRecord = {
653653
customSupportPrompts: undefined,
654654
enhancementApiConfigId: undefined,
655655
cachedChromeHostUrl: undefined,
656-
historyPreviewCollapsed: undefined,
656+
historyPreviewCollapsed: undefined,
657657
}
658658

659659
export const GLOBAL_SETTINGS_KEYS = Object.keys(globalSettingsRecord) as Keys<GlobalSettings>[]
@@ -741,7 +741,6 @@ export const clineAsks = [
741741
"mistake_limit_reached",
742742
"browser_action_launch",
743743
"use_mcp_server",
744-
"finishTask",
745744
] as const
746745

747746
export const clineAskSchema = z.enum(clineAsks)
@@ -751,7 +750,6 @@ export type ClineAsk = z.infer<typeof clineAskSchema>
751750
// ClineSay
752751

753752
export const clineSays = [
754-
"task",
755753
"error",
756754
"api_req_started",
757755
"api_req_finished",
@@ -764,15 +762,11 @@ export const clineSays = [
764762
"user_feedback",
765763
"user_feedback_diff",
766764
"command_output",
767-
"tool",
768765
"shell_integration_warning",
769766
"browser_action",
770767
"browser_action_result",
771-
"command",
772768
"mcp_server_request_started",
773769
"mcp_server_response",
774-
"new_task_started",
775-
"new_task",
776770
"subtask_result",
777771
"checkpoint_saved",
778772
"rooignore_error",

‎src/shared/__tests__/combineApiRequests.test.ts‎

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// npx jest src/shared/__tests__/combineApiRequests.test.ts
22

33
import { combineApiRequests } from "../combineApiRequests"
4-
import { ClineMessage } from "../ExtensionMessage"
4+
import { ClineMessage, ClineSay } from "../ExtensionMessage"
55

66
describe("combineApiRequests", () => {
77
// Helper function to create a basic api_req_started message
@@ -22,15 +22,10 @@ describe("combineApiRequests", () => {
2222

2323
// Helper function to create a non-API message
2424
const createOtherMessage = (
25-
say: "text" | "task" | "error" | "command" = "text",
25+
say: ClineSay = "text",
2626
text: string = "Hello world",
2727
ts: number = 999,
28-
): ClineMessage => ({
29-
type: "say",
30-
say,
31-
text,
32-
ts,
33-
})
28+
): ClineMessage => ({ type: "say", say, text, ts })
3429

3530
describe("Basic functionality", () => {
3631
it("should combine a pair of api_req_started and api_req_finished messages", () => {
@@ -141,7 +136,7 @@ describe("combineApiRequests", () => {
141136
it("should return original array when no API request messages exist", () => {
142137
const messages: ClineMessage[] = [
143138
createOtherMessage("text", "Message 1", 999),
144-
createOtherMessage("task", "Task message", 1000),
139+
createOtherMessage("text", "Task message", 1000),
145140
createOtherMessage("error", "Error message", 1001),
146141
]
147142

‎webview-ui/src/__tests__/ContextWindowProgress.test.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ describe("ContextWindowProgress", () => {
4949
const renderComponent = (props: Record<string, any>) => {
5050
// Create a simple mock of the task that avoids importing the actual types
5151
const defaultProps = {
52-
task: { ts: Date.now(), type: "say" as const, say: "task" as const, text: "Test task" },
52+
task: { ts: Date.now(), type: "say" as const, say: "text" as const, text: "Test task" },
5353
tokensIn: 100,
5454
tokensOut: 50,
5555
doesModelSupportPromptCache: true,

‎webview-ui/src/components/chat/ChatRow.tsx‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -253,12 +253,10 @@ export const ChatRowContent = ({
253253
overflowWrap: "anywhere",
254254
}
255255

256-
const tool = useMemo(() => {
257-
if (message.ask === "tool" || message.say === "tool") {
258-
return safeJsonParse<ClineSayTool>(message.text)
259-
}
260-
return null
261-
}, [message.ask, message.say, message.text])
256+
const tool = useMemo(
257+
() => (message.ask === "tool" ? safeJsonParse<ClineSayTool>(message.text) : null),
258+
[message.ask, message.text],
259+
)
262260

263261
const followUpData = useMemo(() => {
264262
if (message.type === "ask" && message.ask === "followup" && !message.partial) {

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -289,7 +289,6 @@ const ChatViewComponent: React.ForwardRefRenderFunction<ChatViewRef, ChatViewPro
289289
}
290290
break
291291
case "api_req_finished":
292-
case "task":
293292
case "error":
294293
case "text":
295294
case "browser_action":
@@ -298,7 +297,6 @@ const ChatViewComponent: React.ForwardRefRenderFunction<ChatViewRef, ChatViewPro
298297
case "mcp_server_request_started":
299298
case "mcp_server_response":
300299
case "completion_result":
301-
case "tool":
302300
break
303301
}
304302
break

‎webview-ui/src/components/prompts/PromptsView.tsx‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -567,7 +567,11 @@ const PromptsView = ({ onDone }: PromptsViewProps) => {
567567
value={(() => {
568568
const customMode = findModeBySlug(visualMode, customModes)
569569
const prompt = customModePrompts?.[visualMode] as PromptComponent
570-
return customMode?.roleDefinition ?? prompt?.roleDefinition ?? getRoleDefinition(visualMode)
570+
return (
571+
customMode?.roleDefinition ??
572+
prompt?.roleDefinition ??
573+
getRoleDefinition(visualMode)
574+
)
571575
})()}
572576
onChange={(e) => {
573577
const value =

0 commit comments

Comments
 (0)