diff --git a/.github/workflows/github-remote-mcp-auth-test.lock.yml b/.github/workflows/github-remote-mcp-auth-test.lock.yml
index e68e97abe7..66e01c53b9 100644
--- a/.github/workflows/github-remote-mcp-auth-test.lock.yml
+++ b/.github/workflows/github-remote-mcp-auth-test.lock.yml
@@ -396,6 +396,11 @@ jobs:
                   "X-MCP-Readonly": "true",
                   "X-MCP-Toolsets": "repos,issues,discussions"
                 },
+                "tools": [
+                  "get_repository",
+                  "list_issues",
+                  "issue_read"
+                ],
                 "env": {
                   "GITHUB_PERSONAL_ACCESS_TOKEN": "\${GITHUB_MCP_SERVER_TOKEN}"
                 }
diff --git a/pkg/cli/remove_command.go b/pkg/cli/remove_command.go
index 174a83f4b2..72184fbd25 100644
--- a/pkg/cli/remove_command.go
+++ b/pkg/cli/remove_command.go
@@ -119,13 +119,16 @@ func RemoveWorkflows(pattern string, keepOrphans bool) error {
 	}
 
 	// Ask for confirmation
-	fmt.Print("\nAre you sure you want to remove these workflows? [y/N]: ")
-	reader := bufio.NewReader(os.Stdin)
-	response, _ := reader.ReadString('\n')
-	response = strings.TrimSpace(strings.ToLower(response))
-
-	if response != "y" && response != "yes" {
-		fmt.Println("Operation cancelled.")
+	confirmed, err := console.ConfirmAction(
+		"Are you sure you want to remove these workflows?",
+		"Yes, remove",
+		"No, cancel",
+	)
+	if err != nil {
+		return fmt.Errorf("failed to get confirmation: %w", err)
+	}
+	if !confirmed {
+		fmt.Fprintln(os.Stderr, console.FormatInfoMessage("Operation cancelled."))
 		return nil
 	}