feat: fix Advanced Settings UI issues and make update_todo_list conditional

- Fix Advanced Settings button layout with proper flex spacing and alignment
- Remove excessive left border when expanded (pl-0)
- Make update_todo_list tool conditional on alwaysAllowUpdateTodoList setting
- Update architect mode instructions to be conditional on tool availability
- Update reminder text to be conditional on feature being enabled
- Filter out empty tool descriptions from tools list
- Update test snapshots to reflect conditional behavior

Fixes issues reported in GitHub issue #5624

src/core/environment/getEnvironmentDetails.ts

@@ -264,6 +264,6 @@ export async function getEnvironmentDetails(cline: Task, includeFileDetails: boo
 		}
 	}
 
-	const reminderSection = formatReminderSection(cline.todoList)
+	const reminderSection = formatReminderSection(cline.todoList, state?.alwaysAllowUpdateTodoList)
 	return `<environment_details>\n${details.trim()}\n${reminderSection}\n</environment_details>`
 }

src/core/environment/reminder.ts

@@ -3,9 +3,13 @@ import { TodoItem, TodoStatus } from "@roo-code/types"
 /**
  * Format the reminders section as a markdown block in English, with basic instructions.
  */
-export function formatReminderSection(todoList?: TodoItem[]): string {
+export function formatReminderSection(todoList?: TodoItem[], isUpdateTodoListEnabled?: boolean): string {
 	if (!todoList || todoList.length === 0) {
-		return "You have not created a todo list yet. Create one with `update_todo_list` if your task is complicated or involves multiple steps."
+		if (isUpdateTodoListEnabled !== false) {
+			return "You have not created a todo list yet. Create one with `update_todo_list` if your task is complicated or involves multiple steps."
+		} else {
+			return "You have not created a todo list yet."
+		}
 	}
 	const statusMap: Record<TodoStatus, string> = {
 		pending: "Pending",
@@ -29,10 +33,14 @@ export function formatReminderSection(todoList?: TodoItem[]): string {
 	})
 	lines.push("")
 
-	lines.push(
-		"",
-		"IMPORTANT: When task status changes, remember to call the `update_todo_list` tool to update your progress.",
-		"",
-	)
+	if (isUpdateTodoListEnabled !== false) {
+		lines.push(
+			"",
+			"IMPORTANT: When task status changes, remember to call the `update_todo_list` tool to update your progress.",
+			"",
+		)
+	} else {
+		lines.push("")
+	}
 	return lines.join("\n")
 }

src/core/prompts/__tests__/__snapshots__/add-custom-instructions/architect-mode-prompt.snap

@@ -549,21 +549,21 @@ Mode-specific Instructions:
 
 2. You should also ask the user clarifying questions to get a better understanding of the task.
 
-3. Once you've gained more context about the user's request, break down the task into clear, actionable steps and create a todo list using the `update_todo_list` tool. Each todo item should be:
+3. Once you've gained more context about the user's request, break down the task into clear, actionable steps. If the `update_todo_list` tool is available, create a todo list using it. Each todo item should be:
    - Specific and actionable
    - Listed in logical execution order
    - Focused on a single, well-defined outcome
    - Clear enough that another mode could execute it independently
 
-4. As you gather more information or discover new requirements, update the todo list to reflect the current understanding of what needs to be accomplished.
+4. As you gather more information or discover new requirements, update your planning to reflect the current understanding of what needs to be accomplished.
 
-5. Ask the user if they are pleased with this plan, or if they would like to make any changes. Think of this as a brainstorming session where you can discuss the task and refine the todo list.
+5. Ask the user if they are pleased with this plan, or if they would like to make any changes. Think of this as a brainstorming session where you can discuss the task and refine your approach.
 
 6. Include Mermaid diagrams if they help clarify complex workflows or system architecture. Please avoid using double quotes ("") and parentheses () inside square brackets ([]) in Mermaid diagrams, as this can cause parsing errors.
 
 7. Use the switch_mode tool to request that the user switch to another mode to implement the solution.
 
-**IMPORTANT: Focus on creating clear, actionable todo lists rather than lengthy markdown documents. Use the todo list as your primary planning tool to track and organize the work that needs to be done.**
+**IMPORTANT: Focus on creating clear, actionable plans rather than lengthy markdown documents. Use structured planning to track and organize the work that needs to be done.**
 
 Rules:
 # Rules from .clinerules-architect:

src/core/prompts/__tests__/__snapshots__/add-custom-instructions/mcp-server-creation-disabled.snap

@@ -611,21 +611,21 @@ Mode-specific Instructions:
 
 2. You should also ask the user clarifying questions to get a better understanding of the task.
 
-3. Once you've gained more context about the user's request, break down the task into clear, actionable steps and create a todo list using the `update_todo_list` tool. Each todo item should be:
+3. Once you've gained more context about the user's request, break down the task into clear, actionable steps. If the `update_todo_list` tool is available, create a todo list using it. Each todo item should be:
    - Specific and actionable
    - Listed in logical execution order
    - Focused on a single, well-defined outcome
    - Clear enough that another mode could execute it independently
 
-4. As you gather more information or discover new requirements, update the todo list to reflect the current understanding of what needs to be accomplished.
+4. As you gather more information or discover new requirements, update your planning to reflect the current understanding of what needs to be accomplished.
 
-5. Ask the user if they are pleased with this plan, or if they would like to make any changes. Think of this as a brainstorming session where you can discuss the task and refine the todo list.
+5. Ask the user if they are pleased with this plan, or if they would like to make any changes. Think of this as a brainstorming session where you can discuss the task and refine your approach.
 
 6. Include Mermaid diagrams if they help clarify complex workflows or system architecture. Please avoid using double quotes ("") and parentheses () inside square brackets ([]) in Mermaid diagrams, as this can cause parsing errors.
 
 7. Use the switch_mode tool to request that the user switch to another mode to implement the solution.
 
-**IMPORTANT: Focus on creating clear, actionable todo lists rather than lengthy markdown documents. Use the todo list as your primary planning tool to track and organize the work that needs to be done.**
+**IMPORTANT: Focus on creating clear, actionable plans rather than lengthy markdown documents. Use structured planning to track and organize the work that needs to be done.**
 
 Rules:
 # Rules from .clinerules-architect:

src/core/prompts/__tests__/__snapshots__/add-custom-instructions/mcp-server-creation-enabled.snap

@@ -617,21 +617,21 @@ Mode-specific Instructions:
 
 2. You should also ask the user clarifying questions to get a better understanding of the task.
 
-3. Once you've gained more context about the user's request, break down the task into clear, actionable steps and create a todo list using the `update_todo_list` tool. Each todo item should be:
+3. Once you've gained more context about the user's request, break down the task into clear, actionable steps. If the `update_todo_list` tool is available, create a todo list using it. Each todo item should be:
    - Specific and actionable
    - Listed in logical execution order
    - Focused on a single, well-defined outcome
    - Clear enough that another mode could execute it independently
 
-4. As you gather more information or discover new requirements, update the todo list to reflect the current understanding of what needs to be accomplished.
+4. As you gather more information or discover new requirements, update your planning to reflect the current understanding of what needs to be accomplished.
 
-5. Ask the user if they are pleased with this plan, or if they would like to make any changes. Think of this as a brainstorming session where you can discuss the task and refine the todo list.
+5. Ask the user if they are pleased with this plan, or if they would like to make any changes. Think of this as a brainstorming session where you can discuss the task and refine your approach.
 
 6. Include Mermaid diagrams if they help clarify complex workflows or system architecture. Please avoid using double quotes ("") and parentheses () inside square brackets ([]) in Mermaid diagrams, as this can cause parsing errors.
 
 7. Use the switch_mode tool to request that the user switch to another mode to implement the solution.
 
-**IMPORTANT: Focus on creating clear, actionable todo lists rather than lengthy markdown documents. Use the todo list as your primary planning tool to track and organize the work that needs to be done.**
+**IMPORTANT: Focus on creating clear, actionable plans rather than lengthy markdown documents. Use structured planning to track and organize the work that needs to be done.**
 
 Rules:
 # Rules from .clinerules-architect:

src/core/prompts/__tests__/__snapshots__/add-custom-instructions/partial-reads-enabled.snap

@@ -554,21 +554,21 @@ Mode-specific Instructions:
 
 2. You should also ask the user clarifying questions to get a better understanding of the task.
 
-3. Once you've gained more context about the user's request, break down the task into clear, actionable steps and create a todo list using the `update_todo_list` tool. Each todo item should be:
+3. Once you've gained more context about the user's request, break down the task into clear, actionable steps. If the `update_todo_list` tool is available, create a todo list using it. Each todo item should be:
    - Specific and actionable
    - Listed in logical execution order
    - Focused on a single, well-defined outcome
    - Clear enough that another mode could execute it independently
 
-4. As you gather more information or discover new requirements, update the todo list to reflect the current understanding of what needs to be accomplished.
+4. As you gather more information or discover new requirements, update your planning to reflect the current understanding of what needs to be accomplished.
 
-5. Ask the user if they are pleased with this plan, or if they would like to make any changes. Think of this as a brainstorming session where you can discuss the task and refine the todo list.
+5. Ask the user if they are pleased with this plan, or if they would like to make any changes. Think of this as a brainstorming session where you can discuss the task and refine your approach.
 
 6. Include Mermaid diagrams if they help clarify complex workflows or system architecture. Please avoid using double quotes ("") and parentheses () inside square brackets ([]) in Mermaid diagrams, as this can cause parsing errors.
 
 7. Use the switch_mode tool to request that the user switch to another mode to implement the solution.
 
-**IMPORTANT: Focus on creating clear, actionable todo lists rather than lengthy markdown documents. Use the todo list as your primary planning tool to track and organize the work that needs to be done.**
+**IMPORTANT: Focus on creating clear, actionable plans rather than lengthy markdown documents. Use structured planning to track and organize the work that needs to be done.**
 
 Rules:
 # Rules from .clinerules-architect:

src/core/prompts/__tests__/__snapshots__/system-prompt/consistent-system-prompt.snap

@@ -549,21 +549,21 @@ Mode-specific Instructions:
 
 2. You should also ask the user clarifying questions to get a better understanding of the task.
 
-3. Once you've gained more context about the user's request, break down the task into clear, actionable steps and create a todo list using the `update_todo_list` tool. Each todo item should be:
+3. Once you've gained more context about the user's request, break down the task into clear, actionable steps. If the `update_todo_list` tool is available, create a todo list using it. Each todo item should be:
    - Specific and actionable
    - Listed in logical execution order
    - Focused on a single, well-defined outcome
    - Clear enough that another mode could execute it independently
 
-4. As you gather more information or discover new requirements, update the todo list to reflect the current understanding of what needs to be accomplished.
+4. As you gather more information or discover new requirements, update your planning to reflect the current understanding of what needs to be accomplished.
 
-5. Ask the user if they are pleased with this plan, or if they would like to make any changes. Think of this as a brainstorming session where you can discuss the task and refine the todo list.
+5. Ask the user if they are pleased with this plan, or if they would like to make any changes. Think of this as a brainstorming session where you can discuss the task and refine your approach.
 
 6. Include Mermaid diagrams if they help clarify complex workflows or system architecture. Please avoid using double quotes ("") and parentheses () inside square brackets ([]) in Mermaid diagrams, as this can cause parsing errors.
 
 7. Use the switch_mode tool to request that the user switch to another mode to implement the solution.
 
-**IMPORTANT: Focus on creating clear, actionable todo lists rather than lengthy markdown documents. Use the todo list as your primary planning tool to track and organize the work that needs to be done.**
+**IMPORTANT: Focus on creating clear, actionable plans rather than lengthy markdown documents. Use structured planning to track and organize the work that needs to be done.**
 
 Rules:
 # Rules from .clinerules-architect:

src/core/prompts/__tests__/__snapshots__/system-prompt/with-computer-use-support.snap

@@ -605,21 +605,21 @@ Mode-specific Instructions:
 
 2. You should also ask the user clarifying questions to get a better understanding of the task.
 
-3. Once you've gained more context about the user's request, break down the task into clear, actionable steps and create a todo list using the `update_todo_list` tool. Each todo item should be:
+3. Once you've gained more context about the user's request, break down the task into clear, actionable steps. If the `update_todo_list` tool is available, create a todo list using it. Each todo item should be:
    - Specific and actionable
    - Listed in logical execution order
    - Focused on a single, well-defined outcome
    - Clear enough that another mode could execute it independently
 
-4. As you gather more information or discover new requirements, update the todo list to reflect the current understanding of what needs to be accomplished.
+4. As you gather more information or discover new requirements, update your planning to reflect the current understanding of what needs to be accomplished.
 
-5. Ask the user if they are pleased with this plan, or if they would like to make any changes. Think of this as a brainstorming session where you can discuss the task and refine the todo list.
+5. Ask the user if they are pleased with this plan, or if they would like to make any changes. Think of this as a brainstorming session where you can discuss the task and refine your approach.
 
 6. Include Mermaid diagrams if they help clarify complex workflows or system architecture. Please avoid using double quotes ("") and parentheses () inside square brackets ([]) in Mermaid diagrams, as this can cause parsing errors.
 
 7. Use the switch_mode tool to request that the user switch to another mode to implement the solution.
 
-**IMPORTANT: Focus on creating clear, actionable todo lists rather than lengthy markdown documents. Use the todo list as your primary planning tool to track and organize the work that needs to be done.**
+**IMPORTANT: Focus on creating clear, actionable plans rather than lengthy markdown documents. Use structured planning to track and organize the work that needs to be done.**
 
 Rules:
 # Rules from .clinerules-architect:

src/core/prompts/__tests__/__snapshots__/system-prompt/with-diff-enabled-false.snap

@@ -549,21 +549,21 @@ Mode-specific Instructions:
 
 2. You should also ask the user clarifying questions to get a better understanding of the task.
 
-3. Once you've gained more context about the user's request, break down the task into clear, actionable steps and create a todo list using the `update_todo_list` tool. Each todo item should be:
+3. Once you've gained more context about the user's request, break down the task into clear, actionable steps. If the `update_todo_list` tool is available, create a todo list using it. Each todo item should be:
    - Specific and actionable
    - Listed in logical execution order
    - Focused on a single, well-defined outcome
    - Clear enough that another mode could execute it independently
 
-4. As you gather more information or discover new requirements, update the todo list to reflect the current understanding of what needs to be accomplished.
+4. As you gather more information or discover new requirements, update your planning to reflect the current understanding of what needs to be accomplished.
 
-5. Ask the user if they are pleased with this plan, or if they would like to make any changes. Think of this as a brainstorming session where you can discuss the task and refine the todo list.
+5. Ask the user if they are pleased with this plan, or if they would like to make any changes. Think of this as a brainstorming session where you can discuss the task and refine your approach.
 
 6. Include Mermaid diagrams if they help clarify complex workflows or system architecture. Please avoid using double quotes ("") and parentheses () inside square brackets ([]) in Mermaid diagrams, as this can cause parsing errors.
 
 7. Use the switch_mode tool to request that the user switch to another mode to implement the solution.
 
-**IMPORTANT: Focus on creating clear, actionable todo lists rather than lengthy markdown documents. Use the todo list as your primary planning tool to track and organize the work that needs to be done.**
+**IMPORTANT: Focus on creating clear, actionable plans rather than lengthy markdown documents. Use structured planning to track and organize the work that needs to be done.**
 
 Rules:
 # Rules from .clinerules-architect:

src/core/prompts/__tests__/__snapshots__/system-prompt/with-diff-enabled-true.snap

@@ -637,21 +637,21 @@ Mode-specific Instructions:
 
 2. You should also ask the user clarifying questions to get a better understanding of the task.
 
-3. Once you've gained more context about the user's request, break down the task into clear, actionable steps and create a todo list using the `update_todo_list` tool. Each todo item should be:
+3. Once you've gained more context about the user's request, break down the task into clear, actionable steps. If the `update_todo_list` tool is available, create a todo list using it. Each todo item should be:
    - Specific and actionable
    - Listed in logical execution order
    - Focused on a single, well-defined outcome
    - Clear enough that another mode could execute it independently
 
-4. As you gather more information or discover new requirements, update the todo list to reflect the current understanding of what needs to be accomplished.
+4. As you gather more information or discover new requirements, update your planning to reflect the current understanding of what needs to be accomplished.
 
-5. Ask the user if they are pleased with this plan, or if they would like to make any changes. Think of this as a brainstorming session where you can discuss the task and refine the todo list.
+5. Ask the user if they are pleased with this plan, or if they would like to make any changes. Think of this as a brainstorming session where you can discuss the task and refine your approach.
 
 6. Include Mermaid diagrams if they help clarify complex workflows or system architecture. Please avoid using double quotes ("") and parentheses () inside square brackets ([]) in Mermaid diagrams, as this can cause parsing errors.
 
 7. Use the switch_mode tool to request that the user switch to another mode to implement the solution.
 
-**IMPORTANT: Focus on creating clear, actionable todo lists rather than lengthy markdown documents. Use the todo list as your primary planning tool to track and organize the work that needs to be done.**
+**IMPORTANT: Focus on creating clear, actionable plans rather than lengthy markdown documents. Use structured planning to track and organize the work that needs to be done.**
 
 Rules:
 # Rules from .clinerules-architect:

src/core/prompts/__tests__/__snapshots__/system-prompt/with-diff-enabled-undefined.snap

@@ -549,21 +549,21 @@ Mode-specific Instructions:
 
 2. You should also ask the user clarifying questions to get a better understanding of the task.
 
-3. Once you've gained more context about the user's request, break down the task into clear, actionable steps and create a todo list using the `update_todo_list` tool. Each todo item should be:
+3. Once you've gained more context about the user's request, break down the task into clear, actionable steps. If the `update_todo_list` tool is available, create a todo list using it. Each todo item should be:
    - Specific and actionable
    - Listed in logical execution order
    - Focused on a single, well-defined outcome
    - Clear enough that another mode could execute it independently
 
-4. As you gather more information or discover new requirements, update the todo list to reflect the current understanding of what needs to be accomplished.
+4. As you gather more information or discover new requirements, update your planning to reflect the current understanding of what needs to be accomplished.
 
-5. Ask the user if they are pleased with this plan, or if they would like to make any changes. Think of this as a brainstorming session where you can discuss the task and refine the todo list.
+5. Ask the user if they are pleased with this plan, or if they would like to make any changes. Think of this as a brainstorming session where you can discuss the task and refine your approach.
 
 6. Include Mermaid diagrams if they help clarify complex workflows or system architecture. Please avoid using double quotes ("") and parentheses () inside square brackets ([]) in Mermaid diagrams, as this can cause parsing errors.
 
 7. Use the switch_mode tool to request that the user switch to another mode to implement the solution.
 
-**IMPORTANT: Focus on creating clear, actionable todo lists rather than lengthy markdown documents. Use the todo list as your primary planning tool to track and organize the work that needs to be done.**
+**IMPORTANT: Focus on creating clear, actionable plans rather than lengthy markdown documents. Use structured planning to track and organize the work that needs to be done.**
 
 Rules:
 # Rules from .clinerules-architect:

src/core/prompts/__tests__/__snapshots__/system-prompt/with-different-viewport-size.snap

@@ -605,21 +605,21 @@ Mode-specific Instructions:
 
 2. You should also ask the user clarifying questions to get a better understanding of the task.
 
-3. Once you've gained more context about the user's request, break down the task into clear, actionable steps and create a todo list using the `update_todo_list` tool. Each todo item should be:
+3. Once you've gained more context about the user's request, break down the task into clear, actionable steps. If the `update_todo_list` tool is available, create a todo list using it. Each todo item should be:
    - Specific and actionable
    - Listed in logical execution order
    - Focused on a single, well-defined outcome
    - Clear enough that another mode could execute it independently
 
-4. As you gather more information or discover new requirements, update the todo list to reflect the current understanding of what needs to be accomplished.
+4. As you gather more information or discover new requirements, update your planning to reflect the current understanding of what needs to be accomplished.
 
-5. Ask the user if they are pleased with this plan, or if they would like to make any changes. Think of this as a brainstorming session where you can discuss the task and refine the todo list.
+5. Ask the user if they are pleased with this plan, or if they would like to make any changes. Think of this as a brainstorming session where you can discuss the task and refine your approach.
 
 6. Include Mermaid diagrams if they help clarify complex workflows or system architecture. Please avoid using double quotes ("") and parentheses () inside square brackets ([]) in Mermaid diagrams, as this can cause parsing errors.
 
 7. Use the switch_mode tool to request that the user switch to another mode to implement the solution.
 
-**IMPORTANT: Focus on creating clear, actionable todo lists rather than lengthy markdown documents. Use the todo list as your primary planning tool to track and organize the work that needs to be done.**
+**IMPORTANT: Focus on creating clear, actionable plans rather than lengthy markdown documents. Use structured planning to track and organize the work that needs to be done.**
 
 Rules:
 # Rules from .clinerules-architect:

src/core/prompts/__tests__/__snapshots__/system-prompt/with-mcp-hub-provided.snap

@@ -617,21 +617,21 @@ Mode-specific Instructions:
 
 2. You should also ask the user clarifying questions to get a better understanding of the task.
 
-3. Once you've gained more context about the user's request, break down the task into clear, actionable steps and create a todo list using the `update_todo_list` tool. Each todo item should be:
+3. Once you've gained more context about the user's request, break down the task into clear, actionable steps. If the `update_todo_list` tool is available, create a todo list using it. Each todo item should be:
    - Specific and actionable
    - Listed in logical execution order
    - Focused on a single, well-defined outcome
    - Clear enough that another mode could execute it independently
 
-4. As you gather more information or discover new requirements, update the todo list to reflect the current understanding of what needs to be accomplished.
+4. As you gather more information or discover new requirements, update your planning to reflect the current understanding of what needs to be accomplished.
 
-5. Ask the user if they are pleased with this plan, or if they would like to make any changes. Think of this as a brainstorming session where you can discuss the task and refine the todo list.
+5. Ask the user if they are pleased with this plan, or if they would like to make any changes. Think of this as a brainstorming session where you can discuss the task and refine your approach.
 
 6. Include Mermaid diagrams if they help clarify complex workflows or system architecture. Please avoid using double quotes ("") and parentheses () inside square brackets ([]) in Mermaid diagrams, as this can cause parsing errors.
 
 7. Use the switch_mode tool to request that the user switch to another mode to implement the solution.
 
-**IMPORTANT: Focus on creating clear, actionable todo lists rather than lengthy markdown documents. Use the todo list as your primary planning tool to track and organize the work that needs to be done.**
+**IMPORTANT: Focus on creating clear, actionable plans rather than lengthy markdown documents. Use structured planning to track and organize the work that needs to be done.**
 
 Rules:
 # Rules from .clinerules-architect:

src/core/prompts/__tests__/__snapshots__/system-prompt/with-undefined-mcp-hub.snap

@@ -549,21 +549,21 @@ Mode-specific Instructions:
 
 2. You should also ask the user clarifying questions to get a better understanding of the task.
 
-3. Once you've gained more context about the user's request, break down the task into clear, actionable steps and create a todo list using the `update_todo_list` tool. Each todo item should be:
+3. Once you've gained more context about the user's request, break down the task into clear, actionable steps. If the `update_todo_list` tool is available, create a todo list using it. Each todo item should be:
    - Specific and actionable
    - Listed in logical execution order
    - Focused on a single, well-defined outcome
    - Clear enough that another mode could execute it independently
 
-4. As you gather more information or discover new requirements, update the todo list to reflect the current understanding of what needs to be accomplished.
+4. As you gather more information or discover new requirements, update your planning to reflect the current understanding of what needs to be accomplished.
 
-5. Ask the user if they are pleased with this plan, or if they would like to make any changes. Think of this as a brainstorming session where you can discuss the task and refine the todo list.
+5. Ask the user if they are pleased with this plan, or if they would like to make any changes. Think of this as a brainstorming session where you can discuss the task and refine your approach.
 
 6. Include Mermaid diagrams if they help clarify complex workflows or system architecture. Please avoid using double quotes ("") and parentheses () inside square brackets ([]) in Mermaid diagrams, as this can cause parsing errors.
 
 7. Use the switch_mode tool to request that the user switch to another mode to implement the solution.
 
-**IMPORTANT: Focus on creating clear, actionable todo lists rather than lengthy markdown documents. Use the todo list as your primary planning tool to track and organize the work that needs to be done.**
+**IMPORTANT: Focus on creating clear, actionable plans rather than lengthy markdown documents. Use structured planning to track and organize the work that needs to be done.**
 
 Rules:
 # Rules from .clinerules-architect:

src/core/prompts/tools/index.ts

@@ -116,10 +116,13 @@ export function getToolDescriptionsForMode(
 			return undefined
 		}
 
-		return descriptionFn({
+		const description = descriptionFn({
 			...args,
 			toolOptions: undefined, // No tool options in group-based approach
 		})
+
+		// Filter out empty descriptions (e.g., when update_todo_list is disabled)
+		return description && description.trim() ? description : undefined
 	})
 
 	return `# Tools\n\n${descriptions.filter(Boolean).join("\n\n")}`

src/core/prompts/tools/update-todo-list.ts

@@ -4,6 +4,13 @@ import { ToolArgs } from "./types"
  * Get the description for the update_todo_list tool.
  */
 export function getUpdateTodoListDescription(args?: ToolArgs): string {
+	// Check if the todo list feature is enabled
+	const isEnabled = args?.settings?.alwaysAllowUpdateTodoList !== false
+
+	if (!isEnabled) {
+		return "" // Return empty string if feature is disabled
+	}
+
 	return `## update_todo_list
 
 **Description:**

src/shared/modes.ts

@@ -72,7 +72,7 @@ export const modes: readonly ModeConfig[] = [
 		description: "Plan and design before implementation",
 		groups: ["read", ["edit", { fileRegex: "\\.md$", description: "Markdown files only" }], "browser", "mcp"],
 		customInstructions:
-			"1. Do some information gathering (using provided tools) to get more context about the task.\n\n2. You should also ask the user clarifying questions to get a better understanding of the task.\n\n3. Once you've gained more context about the user's request, break down the task into clear, actionable steps and create a todo list using the `update_todo_list` tool. Each todo item should be:\n   - Specific and actionable\n   - Listed in logical execution order\n   - Focused on a single, well-defined outcome\n   - Clear enough that another mode could execute it independently\n\n4. As you gather more information or discover new requirements, update the todo list to reflect the current understanding of what needs to be accomplished.\n\n5. Ask the user if they are pleased with this plan, or if they would like to make any changes. Think of this as a brainstorming session where you can discuss the task and refine the todo list.\n\n6. Include Mermaid diagrams if they help clarify complex workflows or system architecture. Please avoid using double quotes (\"\") and parentheses () inside square brackets ([]) in Mermaid diagrams, as this can cause parsing errors.\n\n7. Use the switch_mode tool to request that the user switch to another mode to implement the solution.\n\n**IMPORTANT: Focus on creating clear, actionable todo lists rather than lengthy markdown documents. Use the todo list as your primary planning tool to track and organize the work that needs to be done.**",
+			"1. Do some information gathering (using provided tools) to get more context about the task.\n\n2. You should also ask the user clarifying questions to get a better understanding of the task.\n\n3. Once you've gained more context about the user's request, break down the task into clear, actionable steps. If the `update_todo_list` tool is available, create a todo list using it. Each todo item should be:\n   - Specific and actionable\n   - Listed in logical execution order\n   - Focused on a single, well-defined outcome\n   - Clear enough that another mode could execute it independently\n\n4. As you gather more information or discover new requirements, update your planning to reflect the current understanding of what needs to be accomplished.\n\n5. Ask the user if they are pleased with this plan, or if they would like to make any changes. Think of this as a brainstorming session where you can discuss the task and refine your approach.\n\n6. Include Mermaid diagrams if they help clarify complex workflows or system architecture. Please avoid using double quotes (\"\") and parentheses () inside square brackets ([]) in Mermaid diagrams, as this can cause parsing errors.\n\n7. Use the switch_mode tool to request that the user switch to another mode to implement the solution.\n\n**IMPORTANT: Focus on creating clear, actionable plans rather than lengthy markdown documents. Use structured planning to track and organize the work that needs to be done.**",
 	},
 	{
 		slug: "code",

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

@@ -942,17 +942,17 @@ export const CodeIndexPopover: React.FC<CodeIndexPopoverProps> = ({
 						<div className="mt-4">
 							<button
 								onClick={() => setIsAdvancedSettingsOpen(!isAdvancedSettingsOpen)}
-								className="flex items-center text-xs text-vscode-foreground hover:text-vscode-textLink-foreground focus:outline-none"
+								className="flex items-center gap-2 text-xs text-vscode-foreground hover:text-vscode-textLink-foreground focus:outline-none w-full text-left"
 								aria-expanded={isAdvancedSettingsOpen}>
 								<span
-									className={`codicon codicon-${isAdvancedSettingsOpen ? "chevron-down" : "chevron-right"} mr-1`}></span>
+									className={`codicon codicon-${isAdvancedSettingsOpen ? "chevron-down" : "chevron-right"} flex-shrink-0`}></span>
 								<span className="text-base font-semibold">
 									{t("settings:codeIndex.advancedConfigLabel")}
 								</span>
 							</button>
 
 							{isAdvancedSettingsOpen && (
-								<div className="mt-4 space-y-4">
+								<div className="mt-4 space-y-4 pl-0">
 									{/* Search Score Threshold Slider */}
 									<div className="space-y-2">
 										<div className="flex items-center gap-2">