Skip to content

Commit 0bd49d7

Browse files
liwilliam2021liwilliam2021
committed
Merge branch 'main' into will/edit-w-checkpoints
2 parents a78aed8 + d62a260 commit 0bd49d7

File tree

217 files changed

+6830
-2053
lines changed

Some content is hidden

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

217 files changed

+6830
-2053
lines changed

‎CHANGELOG.md‎

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,23 @@
11
# Roo Code Changelog
22

3+
## [3.23.19] - 2025-07-23
4+
5+
- Add Roo Code Cloud Waitlist CTAs (thanks @brunobergher!)
6+
- Split commands on newlines when evaluating auto-approve
7+
- Smarter auto-deny of commands
8+
9+
## [3.23.18] - 2025-07-23
10+
11+
- Fix: Resolve 'Bad substitution' error in command parsing (#5978 by @KJ7LNW, PR by @daniel-lxs)
12+
- Fix: Add ErrorBoundary component for better error handling (#5731 by @elianiva, PR by @KJ7LNW)
13+
- Fix: Todo list toggle not working (thanks @chrarnoldus!)
14+
- Improve: Use SIGKILL for command execution timeouts in the "execa" variant (thanks @cte!)
15+
316
## [3.23.17] - 2025-07-22
417

518
- Add: todo list tool enable checkbox to provider advanced settings
619
- Add: Moonshot provider (thanks @CellenLee!)
7-
- Add: Qwen/Qwen3-235B-A22B-Instruct-2507 model to Chutes AI provider
20+
- Add: Qwen/Qwen3-235B-A22B-Instruct-2507 model to Chutes AI provider
821
- Fix: move context condensing prompt to Prompts section (thanks @SannidhyaSah!)
922
- Add: jump icon for newly created files
1023
- Fix: add character limit to prevent terminal output context explosion

‎README.md‎

Lines changed: 38 additions & 38 deletions
Large diffs are not rendered by default.

‎apps/web-roo-code/next.config.ts‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,12 @@ const nextConfig: NextConfig = {
2121
destination: "https://roocode.com/:path*",
2222
permanent: true,
2323
},
24+
// Redirect cloud waitlist to Notion page
25+
{
26+
source: "/cloud-waitlist",
27+
destination: "https://roo-code.notion.site/238fd1401b0a8087b858e1ad431507cf?pvs=105",
28+
permanent: false,
29+
},
2430
]
2531
},
2632
}

‎apps/web-roo-code/src/app/layout.tsx‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import React from "react"
22
import type { Metadata } from "next"
33
import { Inter } from "next/font/google"
4+
import Script from "next/script"
45

56
import { Providers } from "@/components/providers"
67

@@ -52,6 +53,16 @@ export default function RootLayout({ children }: { children: React.ReactNode })
5253
/>
5354
</head>
5455
<body className={inter.className}>
56+
{/* Google tag (gtag.js) */}
57+
<Script src="https://www.googletagmanager.com/gtag/js?id=AW-17391954825" strategy="afterInteractive" />
58+
<Script id="google-analytics" strategy="afterInteractive">
59+
{`
60+
window.dataLayer = window.dataLayer || [];
61+
function gtag(){dataLayer.push(arguments);}
62+
gtag('js', new Date());
63+
gtag('config', 'AW-17391954825');
64+
`}
65+
</Script>
5566
<div itemScope itemType="https://schema.org/WebSite">
5667
<link itemProp="url" href="https://roocode.com" />
5768
<meta itemProp="name" content="Roo Code" />

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

Lines changed: 28 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -61,25 +61,31 @@ export function NavBar({ stars, downloads }: NavBarProps) {
6161
className="text-muted-foreground transition-transform duration-200 hover:scale-105 hover:text-foreground">
6262
Enterprise
6363
</Link>
64-
<a
65-
href={EXTERNAL_LINKS.SECURITY}
66-
target="_blank"
67-
rel="noopener noreferrer"
68-
className="text-muted-foreground transition-transform duration-200 hover:scale-105 hover:text-foreground">
69-
Security
70-
</a>
7164
<a
7265
href={EXTERNAL_LINKS.DOCUMENTATION}
7366
target="_blank"
7467
className="text-muted-foreground transition-transform duration-200 hover:scale-105 hover:text-foreground">
75-
Documentation
68+
Docs
7669
</a>
7770
<a
7871
href={EXTERNAL_LINKS.CAREERS}
7972
target="_blank"
8073
className="text-muted-foreground transition-transform duration-200 hover:scale-105 hover:text-foreground">
8174
Careers
8275
</a>
76+
<div className="flex items-center rounded-full bg-gradient-to-r from-blue-400 to-cyan-400 p-0.5 text-xs">
77+
<div className="rounded-full bg-background px-2 py-1.5">
78+
<span className="text-muted-foreground border-r-2 border-foreground/50 pr-1.5">
79+
Roo Code Cloud is coming
80+
</span>
81+
<a
82+
href="/cloud-waitlist"
83+
rel="noopener noreferrer"
84+
className="font-medium text-primary hover:underline pl-1.5">
85+
Sign up
86+
</a>
87+
</div>
88+
</div>
8389
</nav>
8490

8591
<div className="hidden md:flex md:items-center md:space-x-4">
@@ -119,6 +125,19 @@ export function NavBar({ stars, downloads }: NavBarProps) {
119125
<div
120126
className={`absolute left-0 right-0 top-16 z-50 transform border-b border-border bg-background shadow-lg backdrop-blur-none transition-all duration-200 md:hidden ${isMenuOpen ? "translate-y-0 opacity-100" : "pointer-events-none -translate-y-2 opacity-0"}`}>
121127
<nav className="flex flex-col py-2">
128+
<div className="mx-5 mb-2 flex items-center rounded-full bg-gradient-to-r from-blue-400 to-cyan-400 p-0.5 text-xs">
129+
<div className="flex-grow text-center rounded-full bg-background px-2 py-1.5">
130+
<span className="text-muted-foreground border-r-2 border-foreground/50 pr-3">
131+
Roo Code Cloud is coming
132+
</span>
133+
<a
134+
href="/cloud-waitlist"
135+
rel="noopener noreferrer"
136+
className="font-medium text-primary hover:underline pl-3">
137+
Sign up
138+
</a>
139+
</div>
140+
</div>
122141
<ScrollButton
123142
targetId="features"
124143
className="w-full px-8 py-3 text-left text-sm font-medium text-foreground/80 transition-colors hover:bg-accent hover:text-foreground"
@@ -162,7 +181,7 @@ export function NavBar({ stars, downloads }: NavBarProps) {
162181
target="_blank"
163182
className="w-full px-8 py-3 text-left text-sm font-medium text-foreground/80 transition-colors hover:bg-accent hover:text-foreground"
164183
onClick={() => setIsMenuOpen(false)}>
165-
Documentation
184+
Docs
166185
</a>
167186
<a
168187
href={EXTERNAL_LINKS.CAREERS}

‎apps/web-roo-code/src/lib/hooks/use-logo-src.ts‎

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,24 @@
11
"use client"
22

33
import { useTheme } from "next-themes"
4+
import { useEffect, useState } from "react"
45

56
export function useLogoSrc(): string {
6-
const { resolvedTheme } = useTheme()
7-
return resolvedTheme === "light" ? "/Roo-Code-Logo-Horiz-blk.svg" : "/Roo-Code-Logo-Horiz-white.svg"
7+
const { resolvedTheme, theme } = useTheme()
8+
const [mounted, setMounted] = useState(false)
9+
10+
// Avoid hydration mismatch by waiting for client-side mount
11+
useEffect(() => {
12+
setMounted(true)
13+
}, [])
14+
15+
// Before mounting, return a default logo (dark theme as specified in providers)
16+
// This prevents the logo from flickering on initial load
17+
if (!mounted) {
18+
return "/Roo-Code-Logo-Horiz-white.svg"
19+
}
20+
21+
// Use theme as fallback if resolvedTheme is not available yet
22+
const currentTheme = resolvedTheme || theme
23+
return currentTheme === "light" ? "/Roo-Code-Logo-Horiz-blk.svg" : "/Roo-Code-Logo-Horiz-white.svg"
824
}

0 commit comments

Comments
 (0)