Skip to content
This repository was archived by the owner on May 15, 2026. It is now read-only.

Commit 3efb7ec

Browse files
committed
merge: resolve conflicts with main branch
2 parents 170b50c + ede1d29 commit 3efb7ec

94 files changed

Lines changed: 3080 additions & 1017 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/ISSUE_TEMPLATE/config.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
blank_issues_enabled: false
22
contact_links:
3-
- name: Feature Request
4-
url: https://github.com/RooCodeInc/Roo-Code/discussions/categories/feature-requests
5-
about: Share and vote on feature requests for Roo Code
63
- name: Leave a Review
74
url: https://marketplace.visualstudio.com/items?itemName=RooVeterinaryInc.roo-cline&ssr=false#review-details
85
about: Enjoying Roo Code? Leave a review here!

CHANGELOG.md

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,34 @@
11
# Roo Code Changelog
22

3+
## [3.46.1] - 2026-01-30
4+
5+
- Fix: Sanitize tool_use_id in tool_result blocks to match API history, preventing message format errors (PR #11131 by @daniel-lxs)
6+
- Add: Mode dropdown to change skill mode dynamically, allowing more flexible skill configuration (PR #11102 by @SannidhyaSah)
7+
- Add: Import settings option in the initial welcome screen for easier onboarding (#10992 by @emeraldcheshire, PR #10994 by @roomote)
8+
- Chore: Treat extension .env as optional to simplify development setup (PR #11116 by @hannesrudolph)
9+
10+
## [3.46.0] - 2026-01-30
11+
12+
![3.46.0 Release - Parallel Processing Power](/releases/3.46.0-release.png)
13+
14+
- Parallel tool calls enabled by default for improved performance (PR #11031 by @daniel-lxs)
15+
- Codex-inspired read_file refactor introduces indentation mode for extracting complete semantic code blocks without mid-function truncation, ideal when targeting specific lines from search results or errors (#10239 by @pwilkin, PR #10981 by @hannesrudolph)
16+
- Lossless terminal output with new read_command_output tool allows retrieving full command output from truncated executions with pagination and regex filtering (#10941 by @hannesrudolph, PR #10944 by @hannesrudolph)
17+
- New skill system replaces fetch_instructions with a dedicated skill tool and built-in skills for create-mcp-server and create-mode, with configurable skill locations and mandatory skill checks (#11062 by @hannesrudolph, PR #11084 by @hannesrudolph)
18+
- Skills management UI added to settings panel for managing workspace and global skills (#10513 by @SannidhyaSah, PR #10844 by @SannidhyaSah)
19+
- AI SDK provider migrations: Moonshot (PR #11063 by @daniel-lxs), DeepSeek (PR #11079 by @daniel-lxs), Cerebras (PR #11086 by @daniel-lxs), Groq (PR #11088 by @daniel-lxs), and Fireworks (PR #11118 by @daniel-lxs) now use the AI SDK for better streaming and tool support
20+
- Add OpenAI-compatible base provider infrastructure for AI SDK migrations (PR #11063 by @daniel-lxs)
21+
- Add AI SDK dependencies and message conversion utilities (PR #11047 by @daniel-lxs)
22+
- React Compiler integration added to webview-ui for automatic memoization and performance improvements (#9916 by @In-line, PR #9565 by @In-line)
23+
- Fix: Include reserved output tokens in task header percentage calculation (PR #11034 by @app/roomote)
24+
- Fix: Calculate header percentage based on available input space (PR #11054 by @app/roomote)
25+
- Fix: Prevent time-travel bug in parallel tool calling (PR #11046 by @daniel-lxs)
26+
- Docs: Clarify read_command_output search param should be omitted when not filtering (PR #11056 by @hannesrudolph)
27+
- Add pnpm serve command for code-server development (PR #10964 by @mrubens)
28+
- Update Next.js to latest version (PR #11108 by @cte)
29+
- Replace bespoke navigation menu with shadcn navigation menu on website (PR #11117 by @app/roomote)
30+
- Add Linear integration marketing page to website (PR #11028 by @app/roomote)
31+
332
## [3.45.0] - 2026-01-27
433

534
![3.45.0 Release - Smart Code Folding](/releases/3.45.0-release.png)

apps/web-roo-code/package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
},
1414
"dependencies": {
1515
"@radix-ui/react-dialog": "^1.1.15",
16+
"@radix-ui/react-navigation-menu": "^1.2.14",
1617
"@radix-ui/react-slot": "^1.2.4",
1718
"@roo-code/evals": "workspace:^",
1819
"@roo-code/types": "^1.108.0",

apps/web-roo-code/src/components/chromes/nav-bar.tsx

Lines changed: 136 additions & 99 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,17 @@ import { EXTERNAL_LINKS } from "@/lib/constants"
1313
import { useLogoSrc } from "@/lib/hooks/use-logo-src"
1414
import { ScrollButton } from "@/components/ui"
1515
import ThemeToggle from "@/components/chromes/theme-toggle"
16-
import { Brain, ChevronDown, Cloud, Puzzle, Slack, X } from "lucide-react"
16+
import { Brain, Cloud, Puzzle, Slack, X } from "lucide-react"
17+
import {
18+
NavigationMenu,
19+
NavigationMenuContent,
20+
NavigationMenuItem,
21+
NavigationMenuLink,
22+
NavigationMenuList,
23+
NavigationMenuTrigger,
24+
navigationMenuTriggerStyle,
25+
} from "@/components/ui/navigation-menu"
26+
import { cn } from "@/lib/utils"
1727

1828
function LinearIcon({ className }: { className?: string }) {
1929
return (
@@ -30,115 +40,142 @@ interface NavBarProps {
3040

3141
export function NavBar({ stars, downloads }: NavBarProps) {
3242
const [isMenuOpen, setIsMenuOpen] = useState(false)
33-
const [openDropdown, setOpenDropdown] = useState<string | null>(null)
3443
const logoSrc = useLogoSrc()
3544

3645
return (
3746
<header className="sticky font-light top-0 z-50 border-b border-border bg-background/80 backdrop-blur-md">
3847
<div className="container flex h-16 items-center justify-between px-4 sm:px-6 lg:px-8">
39-
<div className="flex items-center">
48+
<div className="flex items-center flex-shrink-0">
4049
<Link href="/" className="flex items-center">
4150
<Image src={logoSrc} alt="Roo Code Logo" width={130} height={24} className="h-[24px] w-auto" />
4251
</Link>
4352
</div>
4453

4554
{/* Desktop Navigation */}
46-
<nav className="grow ml-6 hidden text-sm md:flex md:items-center">
47-
{/* Product Dropdown */}
48-
<div
49-
className="relative"
50-
onMouseEnter={() => setOpenDropdown("product")}
51-
onMouseLeave={() => setOpenDropdown(null)}>
52-
<button className="flex items-center px-4 py-6 gap-1 transition-transform duration-200 hover:scale-105 hover:text-foreground">
53-
Product
54-
<ChevronDown className="size-3 ml-1 mt-0.5" />
55-
</button>
56-
<div
57-
className={`absolute left-0 top-12 mt-2 w-[260px] rounded-md border border-border bg-background py-1 shadow-lg transition-all duration-200 ${openDropdown === "product" ? "opacity-100 translate-y-0 pointer-events-auto" : "opacity-0 -translate-y-2 pointer-events-none"}`}>
58-
<Link
59-
href="/extension"
60-
className="block px-4 py-2 text-sm transition-colors hover:bg-accent hover:text-foreground"
61-
onClick={() => setOpenDropdown(null)}>
62-
<Puzzle className="size-3 inline mr-2 -mt-0.5" />
63-
Roo Code VS Code Extension
64-
</Link>
65-
<Link
66-
href="/cloud"
67-
className="block px-4 py-2 text-sm transition-colors hover:bg-accent hover:text-foreground"
68-
onClick={() => setOpenDropdown(null)}>
69-
<Cloud className="size-3 inline mr-2 -mt-0.5" />
70-
Roo Code Cloud
71-
</Link>
72-
<Link
73-
href="/slack"
74-
className="block px-4 py-2 text-sm transition-colors hover:bg-accent hover:text-foreground"
75-
onClick={() => setOpenDropdown(null)}>
76-
<Slack className="size-3 inline mr-2 -mt-0.5" />
77-
Roo Code for Slack
78-
</Link>
79-
<Link
80-
href="/linear"
81-
className="block px-4 py-2 text-sm transition-colors hover:bg-accent hover:text-foreground"
82-
onClick={() => setOpenDropdown(null)}>
83-
<LinearIcon className="size-3 inline mr-2 -mt-0.5" />
84-
Roo Code for Linear
85-
</Link>
86-
<Link
87-
href="/provider"
88-
className="block px-4 py-2 text-sm transition-colors hover:bg-accent hover:text-foreground"
89-
onClick={() => setOpenDropdown(null)}>
90-
<Brain className="size-3 inline mr-2 -mt-0.5" />
91-
Roo Code Router
92-
</Link>
93-
</div>
94-
</div>
95-
{/* Resources Dropdown */}
96-
<div
97-
className="relative"
98-
onMouseEnter={() => setOpenDropdown("resources")}
99-
onMouseLeave={() => setOpenDropdown(null)}>
100-
<button className="flex items-center px-4 py-6 gap-1 transition-transform duration-200 hover:scale-105 hover:text-foreground">
101-
Resources
102-
<ChevronDown className="size-3 ml-1 mt-0.5" />
103-
</button>
104-
<div
105-
className={`absolute left-0 top-12 mt-2 w-40 rounded-md border border-border bg-background py-1 shadow-lg transition-all duration-200 ${openDropdown === "resources" ? "opacity-100 translate-y-0 pointer-events-auto" : "opacity-0 -translate-y-2 pointer-events-none"}`}>
106-
<Link
107-
href="/evals"
108-
className="block px-4 py-2 text-sm transition-colors hover:bg-accent hover:text-foreground"
109-
onClick={() => setOpenDropdown(null)}>
110-
Evals
111-
</Link>
112-
<a
113-
href={EXTERNAL_LINKS.DISCORD}
114-
target="_blank"
115-
rel="noopener noreferrer"
116-
className="block px-4 py-2 text-sm transition-colors hover:bg-accent hover:text-foreground"
117-
onClick={() => setOpenDropdown(null)}>
118-
Discord
119-
</a>
120-
<a
121-
href={EXTERNAL_LINKS.SECURITY}
122-
target="_blank"
123-
rel="noopener noreferrer"
124-
className="block px-4 py-2 text-sm transition-colors hover:bg-accent hover:text-foreground"
125-
onClick={() => setOpenDropdown(null)}>
126-
Trust Center
127-
</a>
128-
</div>
129-
</div>
130-
<a
131-
href={EXTERNAL_LINKS.DOCUMENTATION}
132-
target="_blank"
133-
className="px-4 py-6 transition-transform duration-200 hover:scale-105 hover:text-foreground">
134-
Docs
135-
</a>
136-
<Link
137-
href="/pricing"
138-
className="px-4 py-6 transition-transform duration-200 hover:scale-105 hover:text-foreground">
139-
Pricing
140-
</Link>
141-
</nav>
55+
<NavigationMenu className="grow ml-6 hidden text-sm md:flex">
56+
<NavigationMenuList>
57+
{/* Product Dropdown */}
58+
<NavigationMenuItem>
59+
<NavigationMenuTrigger className="bg-transparent font-light">Product</NavigationMenuTrigger>
60+
<NavigationMenuContent>
61+
<ul className="grid min-w-[260px] gap-1 p-2">
62+
<li>
63+
<NavigationMenuLink asChild>
64+
<Link
65+
href="/extension"
66+
className="flex items-center select-none rounded-md px-3 py-2 text-sm leading-none no-underline outline-none transition-colors hover:bg-accent hover:text-accent-foreground focus:bg-accent focus:text-accent-foreground">
67+
<Puzzle className="size-3 mr-2" />
68+
Roo Code VS Code Extension
69+
</Link>
70+
</NavigationMenuLink>
71+
</li>
72+
<li>
73+
<NavigationMenuLink asChild>
74+
<Link
75+
href="/cloud"
76+
className="flex items-center select-none rounded-md px-3 py-2 text-sm leading-none no-underline outline-none transition-colors hover:bg-accent hover:text-accent-foreground focus:bg-accent focus:text-accent-foreground">
77+
<Cloud className="size-3 mr-2" />
78+
Roo Code Cloud
79+
</Link>
80+
</NavigationMenuLink>
81+
</li>
82+
<li>
83+
<NavigationMenuLink asChild>
84+
<Link
85+
href="/slack"
86+
className="flex items-center select-none rounded-md px-3 py-2 text-sm leading-none no-underline outline-none transition-colors hover:bg-accent hover:text-accent-foreground focus:bg-accent focus:text-accent-foreground">
87+
<Slack className="size-3 mr-2" />
88+
Roo Code for Slack
89+
</Link>
90+
</NavigationMenuLink>
91+
</li>
92+
<li>
93+
<NavigationMenuLink asChild>
94+
<Link
95+
href="/linear"
96+
className="flex items-center select-none rounded-md px-3 py-2 text-sm leading-none no-underline outline-none transition-colors hover:bg-accent hover:text-accent-foreground focus:bg-accent focus:text-accent-foreground">
97+
<LinearIcon className="size-3 mr-2" />
98+
Roo Code for Linear
99+
</Link>
100+
</NavigationMenuLink>
101+
</li>
102+
<li>
103+
<NavigationMenuLink asChild>
104+
<Link
105+
href="/provider"
106+
className="flex items-center select-none rounded-md px-3 py-2 text-sm leading-none no-underline outline-none transition-colors hover:bg-accent hover:text-accent-foreground focus:bg-accent focus:text-accent-foreground">
107+
<Brain className="size-3 mr-2" />
108+
Roo Code Router
109+
</Link>
110+
</NavigationMenuLink>
111+
</li>
112+
</ul>
113+
</NavigationMenuContent>
114+
</NavigationMenuItem>
115+
116+
{/* Resources Dropdown */}
117+
<NavigationMenuItem>
118+
<NavigationMenuTrigger className="bg-transparent font-light">
119+
Resources
120+
</NavigationMenuTrigger>
121+
<NavigationMenuContent>
122+
<ul className="grid min-w-[260px] gap-1 p-2">
123+
<li>
124+
<NavigationMenuLink asChild>
125+
<Link
126+
href="/evals"
127+
className="block select-none rounded-md px-3 py-2 text-sm leading-none no-underline outline-none transition-colors hover:bg-accent hover:text-accent-foreground focus:bg-accent focus:text-accent-foreground">
128+
Evals
129+
</Link>
130+
</NavigationMenuLink>
131+
</li>
132+
<li>
133+
<NavigationMenuLink asChild>
134+
<a
135+
href={EXTERNAL_LINKS.DISCORD}
136+
target="_blank"
137+
rel="noopener noreferrer"
138+
className="block select-none rounded-md px-3 py-2 text-sm leading-none no-underline outline-none transition-colors hover:bg-accent hover:text-accent-foreground focus:bg-accent focus:text-accent-foreground">
139+
Discord
140+
</a>
141+
</NavigationMenuLink>
142+
</li>
143+
<li>
144+
<NavigationMenuLink asChild>
145+
<a
146+
href={EXTERNAL_LINKS.SECURITY}
147+
target="_blank"
148+
rel="noopener noreferrer"
149+
className="block select-none rounded-md px-3 py-2 text-sm leading-none no-underline outline-none transition-colors hover:bg-accent hover:text-accent-foreground focus:bg-accent focus:text-accent-foreground">
150+
Trust Center
151+
</a>
152+
</NavigationMenuLink>
153+
</li>
154+
</ul>
155+
</NavigationMenuContent>
156+
</NavigationMenuItem>
157+
158+
{/* Docs Link */}
159+
<NavigationMenuItem>
160+
<NavigationMenuLink
161+
asChild
162+
className={cn(navigationMenuTriggerStyle(), "bg-transparent font-light")}>
163+
<a href={EXTERNAL_LINKS.DOCUMENTATION} target="_blank">
164+
Docs
165+
</a>
166+
</NavigationMenuLink>
167+
</NavigationMenuItem>
168+
169+
{/* Pricing Link */}
170+
<NavigationMenuItem>
171+
<NavigationMenuLink
172+
asChild
173+
className={cn(navigationMenuTriggerStyle(), "bg-transparent font-light")}>
174+
<Link href="/pricing">Pricing</Link>
175+
</NavigationMenuLink>
176+
</NavigationMenuItem>
177+
</NavigationMenuList>
178+
</NavigationMenu>
142179

143180
<div className="hidden md:flex md:items-center md:space-x-4 flex-shrink-0 font-medium">
144181
<div className="flex flex-row space-x-2 flex-shrink-0">

0 commit comments

Comments
 (0)