Skip to content

fix: rename new_task mode param to mode_slug for consistency with switch_mode #11940

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

Draft
roomote-v0 wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

fix: rename new_task mode param to mode_slug for consistency with switch_mode #11940

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion src/__tests__/history-resume-delegation.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,7 @@ describe("History resume delegation - parent metadata transitions", () => {
type: "tool_use",
name: "new_task",
id: "toolu_abc123",
input: { mode: "code", message: "Do something" },
input: { mode_slug: "code", message: "Do something" },
},
],
ts: 50,
Expand Down
8 changes: 4 additions & 4 deletions src/core/assistant-message/NativeToolCallParser.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -628,9 +628,9 @@ export class NativeToolCallParser {
break

case "new_task":
if (partialArgs.mode !== undefined || partialArgs.message !== undefined) {
if (partialArgs.mode_slug !== undefined || partialArgs.message !== undefined) {
nativeArgs = {
mode: partialArgs.mode,
mode_slug: partialArgs.mode_slug,
message: partialArgs.message,
todos: partialArgs.todos,
}
Expand Down Expand Up @@ -977,9 +977,9 @@ export class NativeToolCallParser {
break

case "new_task":
if (args.mode !== undefined && args.message !== undefined) {
if (args.mode_slug !== undefined && args.message !== undefined) {
nativeArgs = {
mode: args.mode,
mode_slug: args.mode_slug,
message: args.message,
todos: args.todos,
} as NativeArgsFor<TName>
Expand Down
2 changes: 1 addition & 1 deletion src/core/assistant-message/presentAssistantMessage.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -372,7 +372,7 @@ export async function presentAssistantMessage(cline: Task) {
case "update_todo_list":
return `[${block.name}]`
case "new_task": {
const mode = block.params.mode ?? defaultModeSlug
const mode = block.params.mode_slug ?? defaultModeSlug
const message = block.params.message ?? "(no message)"
const modeName = getModeBySlug(mode, customModes)?.name ?? mode
return `[${block.name} in ${modeName} mode: '${message}']`
Expand Down
4 changes: 2 additions & 2 deletions src/core/prompts/tools/native-tools/new_task.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ export default {
parameters: {
type: "object",
properties: {
mode: {
mode_slug: {
type: "string",
description: MODE_PARAMETER_DESCRIPTION,
},
Expand All @@ -32,7 +32,7 @@ export default {
description: TODOS_PARAMETER_DESCRIPTION,
},
},
required: ["mode", "message", "todos"],
required: ["mode_slug", "message", "todos"],
additionalProperties: false,
},
},
Expand Down
26 changes: 13 additions & 13 deletions src/core/task/__tests__/new-task-isolation.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ describe("new_task Tool Isolation Enforcement", () => {
type: "tool_use",
id: "toolu_new_task_1",
name: "new_task",
input: { mode: "code", message: "Do something" },
input: { mode_slug: "code", message: "Do something" },
},
]

Expand All @@ -83,7 +83,7 @@ describe("new_task Tool Isolation Enforcement", () => {
type: "tool_use",
id: "toolu_new_task_1",
name: "new_task",
input: { mode: "code", message: "Do something" },
input: { mode_slug: "code", message: "Do something" },
},
]

Expand Down Expand Up @@ -123,7 +123,7 @@ describe("new_task Tool Isolation Enforcement", () => {
type: "tool_use",
id: "toolu_new_task_1",
name: "new_task",
input: { mode: "code", message: "Do something" },
input: { mode_slug: "code", message: "Do something" },
},
{
type: "tool_use",
Expand All @@ -146,7 +146,7 @@ describe("new_task Tool Isolation Enforcement", () => {
type: "tool_use",
id: "toolu_new_task_1",
name: "new_task",
input: { mode: "code", message: "Do something" },
input: { mode_slug: "code", message: "Do something" },
},
{
type: "tool_use",
Expand All @@ -173,7 +173,7 @@ describe("new_task Tool Isolation Enforcement", () => {
type: "tool_use",
id: "toolu_new_task_1",
name: "new_task",
input: { mode: "code", message: "Do something" },
input: { mode_slug: "code", message: "Do something" },
},
{
type: "tool_use",
Expand Down Expand Up @@ -219,7 +219,7 @@ describe("new_task Tool Isolation Enforcement", () => {
type: "tool_use",
id: "toolu_new_task_1",
name: "new_task",
input: { mode: "code", message: "Do something" },
input: { mode_slug: "code", message: "Do something" },
},
{
type: "tool_use",
Expand Down Expand Up @@ -253,7 +253,7 @@ describe("new_task Tool Isolation Enforcement", () => {
type: "tool_use",
id: "toolu_new_task_1",
name: "new_task",
input: { mode: "code", message: "Do something" },
input: { mode_slug: "code", message: "Do something" },
},
{
type: "tool_use",
Expand Down Expand Up @@ -284,7 +284,7 @@ describe("new_task Tool Isolation Enforcement", () => {
type: "tool_use",
id: "toolu_new_task_1",
name: "new_task",
input: { mode: "code", message: "Do something" },
input: { mode_slug: "code", message: "Do something" },
},
{
type: "text",
Expand Down Expand Up @@ -316,7 +316,7 @@ describe("new_task Tool Isolation Enforcement", () => {
type: "tool_use",
id: "toolu_new_task_1",
name: "new_task",
input: { mode: "code", message: "Do something" },
input: { mode_slug: "code", message: "Do something" },
},
// Simulating a malformed tool without ID (shouldn't happen, but defensive)
{
Expand Down Expand Up @@ -345,13 +345,13 @@ describe("new_task Tool Isolation Enforcement", () => {
type: "tool_use",
id: "toolu_new_task_1",
name: "new_task",
input: { mode: "code", message: "First task" },
input: { mode_slug: "code", message: "First task" },
},
{
type: "tool_use",
id: "toolu_new_task_2",
name: "new_task",
input: { mode: "debug", message: "Second task" },
input: { mode_slug: "debug", message: "Second task" },
},
]

Expand All @@ -375,7 +375,7 @@ describe("new_task Tool Isolation Enforcement", () => {
type: "tool_use",
id: "toolu_new_task_1",
name: "new_task",
input: { mode: "code", message: "Do something" },
input: { mode_slug: "code", message: "Do something" },
},
{
type: "tool_use",
Expand All @@ -397,7 +397,7 @@ describe("new_task Tool Isolation Enforcement", () => {
type: "tool_use",
id: "toolu_new_task_1",
name: "new_task",
input: { mode: "code", message: "Do something" },
input: { mode_slug: "code", message: "Do something" },
},
{
type: "tool_use",
Expand Down
16 changes: 8 additions & 8 deletions src/core/tools/NewTaskTool.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import { BaseTool, ToolCallbacks } from "./BaseTool"
import type { ToolUse } from "../../shared/tools"

interface NewTaskParams {
mode: string
mode_slug: string
message: string
todos?: string
}
Expand All @@ -21,16 +21,16 @@ export class NewTaskTool extends BaseTool<"new_task"> {
readonly name = "new_task" as const

async execute(params: NewTaskParams, task: Task, callbacks: ToolCallbacks): Promise<void> {
const { mode, message, todos } = params
const { mode_slug, message, todos } = params
const { askApproval, handleError, pushToolResult } = callbacks

try {
// Validate required parameters.
if (!mode) {
if (!mode_slug) {
task.consecutiveMistakeCount++
task.recordToolError("new_task")
task.didToolFailInCurrentTurn = true
pushToolResult(await task.sayAndCreateMissingParamError("new_task", "mode"))
pushToolResult(await task.sayAndCreateMissingParamError("new_task", "mode_slug"))
return
}

Expand Down Expand Up @@ -89,10 +89,10 @@ export class NewTaskTool extends BaseTool<"new_task"> {
const unescapedMessage = message.replace(/\\\\@/g, "\\@")

// Verify the mode exists
const targetMode = getModeBySlug(mode, state?.customModes)
const targetMode = getModeBySlug(mode_slug, state?.customModes)

if (!targetMode) {
pushToolResult(formatResponse.toolError(`Invalid mode: ${mode}`))
pushToolResult(formatResponse.toolError(`Invalid mode: ${mode_slug}`))
return
}

Expand All @@ -114,7 +114,7 @@ export class NewTaskTool extends BaseTool<"new_task"> {
parentTaskId: task.taskId,
message: unescapedMessage,
initialTodos: todoItems,
mode,
mode: mode_slug,
})

// Reflect delegation in tool result (no pause/unpause, no wait)
Expand All @@ -127,7 +127,7 @@ export class NewTaskTool extends BaseTool<"new_task"> {
}

override async handlePartial(task: Task, block: ToolUse<"new_task">): Promise<void> {
const mode: string | undefined = block.params.mode
const mode: string | undefined = block.params.mode_slug
const message: string | undefined = block.params.message
const todos: string | undefined = block.params.todos

Expand Down
34 changes: 17 additions & 17 deletions src/core/tools/__tests__/newTaskTool.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ const withNativeArgs = (block: ToolUse<"new_task">): ToolUse<"new_task"> => ({
// These tests intentionally exercise missing-param behavior, so we allow undefined
// values and let the tool's runtime validation handle it.
nativeArgs: {
mode: block.params.mode,
mode_slug: block.params.mode_slug,
message: block.params.message,
todos: block.params.todos,
} as unknown as NativeToolArgs["new_task"],
Expand Down Expand Up @@ -148,7 +148,7 @@ describe("newTaskTool", () => {
type: "tool_use", // Add required 'type' property
name: "new_task", // Correct property name
params: {
mode: "code",
mode_slug: "code",
message: "Review this: \\\\@file1.txt and also \\\\\\\\@file2.txt", // Input with \\@ and \\\\@
todos: "[ ] First task\n[ ] Second task",
},
Expand Down Expand Up @@ -183,7 +183,7 @@ describe("newTaskTool", () => {
type: "tool_use", // Add required 'type' property
name: "new_task", // Correct property name
params: {
mode: "code",
mode_slug: "code",
message: "This is already unescaped: \\@file1.txt",
todos: "[ ] Test todo",
},
Expand All @@ -208,7 +208,7 @@ describe("newTaskTool", () => {
type: "tool_use", // Add required 'type' property
name: "new_task", // Correct property name
params: {
mode: "code",
mode_slug: "code",
message: "A normal mention @file1.txt",
todos: "[ ] Test todo",
},
Expand All @@ -233,7 +233,7 @@ describe("newTaskTool", () => {
type: "tool_use", // Add required 'type' property
name: "new_task", // Correct property name
params: {
mode: "code",
mode_slug: "code",
message: "Mix: @file0.txt, \\@file1.txt, \\\\@file2.txt, \\\\\\\\@file3.txt",
todos: "[ ] Test todo",
},
Expand All @@ -258,7 +258,7 @@ describe("newTaskTool", () => {
type: "tool_use",
name: "new_task",
params: {
mode: "code",
mode_slug: "code",
message: "Test message",
// todos missing - should work for backward compatibility
},
Expand Down Expand Up @@ -288,7 +288,7 @@ describe("newTaskTool", () => {
type: "tool_use",
name: "new_task",
params: {
mode: "code",
mode_slug: "code",
message: "Test message with todos",
todos: "[ ] First task\n[ ] Second task",
},
Expand Down Expand Up @@ -332,7 +332,7 @@ describe("newTaskTool", () => {
pushToolResult: mockPushToolResult,
})

expect(mockSayAndCreateMissingParamError).toHaveBeenCalledWith("new_task", "mode")
expect(mockSayAndCreateMissingParamError).toHaveBeenCalledWith("new_task", "mode_slug")
expect(mockCline.consecutiveMistakeCount).toBe(1)
expect(mockCline.recordToolError).toHaveBeenCalledWith("new_task")
})
Expand All @@ -342,7 +342,7 @@ describe("newTaskTool", () => {
type: "tool_use",
name: "new_task",
params: {
mode: "code",
mode_slug: "code",
// message missing
todos: "[ ] Test todo",
},
Expand All @@ -365,7 +365,7 @@ describe("newTaskTool", () => {
type: "tool_use",
name: "new_task",
params: {
mode: "code",
mode_slug: "code",
message: "Test message",
todos: "[ ] Pending task\n[x] Completed task\n[-] In progress task",
},
Expand Down Expand Up @@ -401,7 +401,7 @@ describe("newTaskTool", () => {
type: "tool_use",
name: "new_task",
params: {
mode: "code",
mode_slug: "code",
message: "Test message",
// todos missing - should work when setting is disabled
},
Expand Down Expand Up @@ -437,7 +437,7 @@ describe("newTaskTool", () => {
type: "tool_use",
name: "new_task",
params: {
mode: "code",
mode_slug: "code",
message: "Test message",
// todos missing - should error when setting is enabled
},
Expand Down Expand Up @@ -473,7 +473,7 @@ describe("newTaskTool", () => {
type: "tool_use",
name: "new_task",
params: {
mode: "code",
mode_slug: "code",
message: "Test message",
todos: "[ ] First task\n[ ] Second task",
},
Expand Down Expand Up @@ -515,7 +515,7 @@ describe("newTaskTool", () => {
type: "tool_use",
name: "new_task",
params: {
mode: "code",
mode_slug: "code",
message: "Test message",
todos: "", // Empty string should be accepted
},
Expand Down Expand Up @@ -550,7 +550,7 @@ describe("newTaskTool", () => {
type: "tool_use",
name: "new_task",
params: {
mode: "code",
mode_slug: "code",
message: "Test message",
},
partial: false,
Expand Down Expand Up @@ -583,7 +583,7 @@ describe("newTaskTool", () => {
type: "tool_use",
name: "new_task",
params: {
mode: "code",
mode_slug: "code",
message: "Test message",
},
partial: false,
Expand Down Expand Up @@ -640,7 +640,7 @@ describe("newTaskTool delegation flow", () => {
type: "tool_use",
name: "new_task",
params: {
mode: "code",
mode_slug: "code",
message: "Do something",
// no todos -> should default to []
},
Expand Down
Loading
Loading