Skip to content

Commit 86dd6ac

Browse files
AlorseAlorse
committed
Merge branch 'main' into feat/sytem-prompts-disable-option
2 parents 1e8eaae + 57149d1 commit 86dd6ac

File tree

8 files changed

+262
-259
lines changed

8 files changed

+262
-259
lines changed

‎webview-ui/src/components/chat/ChatRow.tsx‎

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

‎webview-ui/src/components/chat/ChatView.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1395,7 +1395,7 @@ const ChatViewComponent: React.ForwardRefRenderFunction<ChatViewRef, ChatViewPro
13951395
{telemetrySetting === "unset" && <TelemetryBanner />}
13961396
{/* Show the task history preview if expanded and tasks exist */}
13971397
{taskHistory.length > 0 && isExpanded && <HistoryPreview />}
1398-
<p className="text-vscode-editor-foreground leading-tight font-vscode-font-family text-center text-balance max-w-[380px] mx-auto">
1398+
<p className="leading-tight font-vscode-font-family text-center text-balance max-w-[380px] mx-auto">
13991399
<Trans
14001400
i18nKey="chat:about"
14011401
components={{

‎webview-ui/src/components/chat/checkpoints/CheckpointSaved.tsx‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,9 @@ export const CheckpointSaved = ({ checkpoint, ...props }: CheckpointSavedProps)
3535

3636
return (
3737
<div className="flex items-center justify-between">
38-
<div className="flex gap-2">
38+
<div className="flex gap-2" style={{ fontSize: "var(--text-sm)" }}>
3939
<span className="codicon codicon-git-commit text-blue-400" />
40-
<span className="font-bold">
41-
{metadata.isFirst ? t("chat:checkpoint.initial") : t("chat:checkpoint.regular")}
42-
</span>
40+
{metadata.isFirst ? t("chat:checkpoint.initial") : t("chat:checkpoint.regular")}
4341
{isCurrent && <span className="text-muted text-sm">{t("chat:checkpoint.current")}</span>}
4442
</div>
4543
<CheckpointMenu {...props} checkpoint={metadata} />

‎webview-ui/src/components/common/CodeAccordian.tsx‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ interface CodeAccordianProps {
1616
isExpanded: boolean
1717
isFeedback?: boolean
1818
onToggleExpand: () => void
19-
header?: string
19+
header?: React.ReactNode
2020
}
2121

2222
const CodeAccordian = ({
@@ -41,7 +41,6 @@ const CodeAccordian = ({
4141
{isLoading && <VSCodeProgressRing className="size-3 mr-2" />}
4242
{header ? (
4343
<div className="flex items-center">
44-
<span className="codicon codicon-server mr-1.5"></span>
4544
<span className="whitespace-nowrap overflow-hidden text-ellipsis mr-2">{header}</span>
4645
</div>
4746
) : isFeedback ? (

‎webview-ui/src/components/common/ToolUseBlock.tsx‎

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,11 @@
11
import { cn } from "@/lib/utils"
22

3-
import { CODE_BLOCK_BG_COLOR } from "./CodeBlock"
3+
export const ToolUseBlock = ({ className, ...props }: React.HTMLAttributes<HTMLDivElement>) => <div {...props} />
44

5-
export const ToolUseBlock = ({ className, ...props }: React.HTMLAttributes<HTMLDivElement>) => (
5+
export const ToolUseBlockHeader = ({ className, ...props }: React.HTMLAttributes<HTMLDivElement>) => (
66
<div
7-
className={cn("overflow-hidden border border-vscode-border rounded-xs p-2 cursor-pointer", className)}
8-
style={{
9-
backgroundColor: CODE_BLOCK_BG_COLOR,
10-
}}
7+
style={{ fontWeight: "300", fontSize: "var(--text-sm)" }}
8+
className={cn("flex items-center select-pointer", className)}
119
{...props}
1210
/>
1311
)
14-
15-
export const ToolUseBlockHeader = ({ className, ...props }: React.HTMLAttributes<HTMLDivElement>) => (
16-
<div className={cn("flex items-center select-none text-vscode-descriptionForeground", className)} {...props} />
17-
)

‎webview-ui/src/components/welcome/RooTips.tsx‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ const RooTips = ({ cycle = false }: RooTipsProps) => {
6464
<div className="opacity-70 pb-1"> Did you know about...</div>
6565
<div
6666
className={clsx(
67-
"flex items-center gap-2 text-vscode-editor-foreground font-vscode max-w-[250px] transition-opacity duration-1000 ease-in-out",
67+
"flex items-center gap-2 font-vscode max-w-[250px] transition-opacity duration-1000 ease-in-out",
6868
isFading ? "opacity-0" : "opacity-70",
6969
)}>
7070
{" "}
@@ -77,9 +77,7 @@ const RooTips = ({ cycle = false }: RooTipsProps) => {
7777
</>
7878
) : (
7979
topTwoTips.map((tip) => (
80-
<div
81-
key={tip.titleKey}
82-
className="flex items-center gap-2 text-vscode-editor-foreground font-vscode max-w-[250px]">
80+
<div key={tip.titleKey} className="flex items-center gap-2 font-vscode max-w-[250px]">
8381
<span className={`codicon ${tip.icon}`}></span>
8482
<span>
8583
<VSCodeLink className="forced-color-adjust-none" href={tip.href}>

‎webview-ui/src/i18n/locales/en/chat.json‎

Lines changed: 47 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -59,15 +59,15 @@
5959
}
6060
},
6161
"runCommand": {
62-
"title": "Run Command",
62+
"title": "Run",
6363
"tooltip": "Execute this command"
6464
},
6565
"proceedWhileRunning": {
6666
"title": "Proceed While Running",
6767
"tooltip": "Continue despite warnings"
6868
},
6969
"killCommand": {
70-
"title": "Kill Command",
70+
"title": "Kill",
7171
"tooltip": "Kill the current command"
7272
},
7373
"resumeTask": {
@@ -114,7 +114,7 @@
114114
"addContext": "@ to add context, / to switch modes",
115115
"dragFiles": "hold shift to drag in files",
116116
"dragFilesImages": "hold shift to drag in files/images",
117-
"errorReadingFile": "Error reading file:",
117+
"errorReadingFile": "Error reading file",
118118
"noValidImages": "No valid images were processed",
119119
"separator": "Separator",
120120
"edit": "Edit...",
@@ -150,72 +150,72 @@
150150
"tokens": "tokens"
151151
},
152152
"instructions": {
153-
"wantsToFetch": "Roo wants to fetch detailed instructions to assist with the current task"
153+
"wantsToFetch": " fetch detailed instructions to assist with the current task"
154154
},
155155
"fileOperations": {
156-
"wantsToRead": "Roo wants to read this file:",
157-
"wantsToReadMultiple": "Roo wants to read multiple files:",
158-
"wantsToReadAndXMore": "Roo wants to read this file and {{count}} more:",
159-
"wantsToReadOutsideWorkspace": "Roo wants to read this file outside of the workspace:",
160-
"didRead": "Roo read this file:",
161-
"wantsToEdit": "Roo wants to edit this file:",
162-
"wantsToEditOutsideWorkspace": "Roo wants to edit this file outside of the workspace:",
163-
"wantsToEditProtected": "Roo wants to edit a protected configuration file:",
164-
"wantsToApplyBatchChanges": "Roo wants to apply changes to multiple files:",
165-
"wantsToCreate": "Roo wants to create a new file:",
166-
"wantsToSearchReplace": "Roo wants to search and replace in this file:",
167-
"didSearchReplace": "Roo performed search and replace on this file:",
168-
"wantsToInsert": "Roo wants to insert content into this file:",
169-
"wantsToInsertWithLineNumber": "Roo wants to insert content into this file at line {{lineNumber}}:",
170-
"wantsToInsertAtEnd": "Roo wants to append content to the end of this file:"
156+
"wantsToRead": "Read",
157+
"wantsToReadMultiple": "Read files",
158+
"wantsToReadAndXMore": "Read and {{count}} more",
159+
"wantsToReadOutsideWorkspace": "Read this file outside",
160+
"didRead": "Read",
161+
"wantsToEdit": "Edit",
162+
"wantsToEditOutsideWorkspace": "Edit outside of the workspace",
163+
"wantsToEditProtected": " edit a protected configuration file",
164+
"wantsToApplyBatchChanges": " apply changes to multiple files",
165+
"wantsToCreate": "Create",
166+
"wantsToSearchReplace": " search and replace in this file",
167+
"didSearchReplace": "Roo performed search and replace on this file",
168+
"wantsToInsert": "Insert",
169+
"wantsToInsertWithLineNumber": "Insert at line {{lineNumber}}",
170+
"wantsToInsertAtEnd": " append content to the end of this file"
171171
},
172172
"directoryOperations": {
173-
"wantsToViewTopLevel": "Roo wants to view the top level files in this directory:",
174-
"didViewTopLevel": "Roo viewed the top level files in this directory:",
175-
"wantsToViewTopLevelOutsideWorkspace": "Roo wants to view the top level files in this directory (outside workspace):",
176-
"didViewTopLevelOutsideWorkspace": "Roo viewed the top level files in this directory (outside workspace):",
177-
"wantsToViewRecursive": "Roo wants to recursively view all files in this directory:",
178-
"didViewRecursive": "Roo recursively viewed all files in this directory:",
179-
"wantsToViewRecursiveOutsideWorkspace": "Roo wants to recursively view all files in this directory (outside workspace):",
180-
"didViewRecursiveOutsideWorkspace": "Roo recursively viewed all files in this directory (outside workspace):",
181-
"wantsToViewDefinitions": "Roo wants to view source code definition names used in this directory:",
182-
"didViewDefinitions": "Roo viewed source code definition names used in this directory:",
183-
"wantsToViewDefinitionsOutsideWorkspace": "Roo wants to view source code definition names used in this directory (outside workspace):",
184-
"didViewDefinitionsOutsideWorkspace": "Roo viewed source code definition names used in this directory (outside workspace):",
185-
"wantsToSearch": "Roo wants to search this directory for <code>{{regex}}</code>:",
186-
"didSearch": "Roo searched this directory for <code>{{regex}}</code>:",
187-
"wantsToSearchOutsideWorkspace": "Roo wants to search this directory (outside workspace) for <code>{{regex}}</code>:",
188-
"didSearchOutsideWorkspace": "Roo searched this directory (outside workspace) for <code>{{regex}}</code>:"
173+
"wantsToViewTopLevel": " view the top level files in this directory",
174+
"didViewTopLevel": "Roo viewed the top level files in this directory",
175+
"wantsToViewTopLevelOutsideWorkspace": " view the top level files in this directory (outside workspace)",
176+
"didViewTopLevelOutsideWorkspace": "Roo viewed the top level files in this directory (outside workspace)",
177+
"wantsToViewRecursive": "View files",
178+
"didViewRecursive": "Roo recursively viewed all files in this directory",
179+
"wantsToViewRecursiveOutsideWorkspace": "View files (outside workspace)",
180+
"didViewRecursiveOutsideWorkspace": "Roo recursively viewed all files in this directory (outside workspace)",
181+
"wantsToViewDefinitions": " view source code definition names used in this directory",
182+
"didViewDefinitions": "Roo viewed source code definition names used in this directory",
183+
"wantsToViewDefinitionsOutsideWorkspace": " view source code definition names used in this directory (outside workspace)",
184+
"didViewDefinitionsOutsideWorkspace": "Roo viewed source code definition names used in this directory (outside workspace)",
185+
"wantsToSearch": " search this directory for <code>{{regex}}</code>",
186+
"didSearch": "Roo searched this directory for <code>{{regex}}</code>",
187+
"wantsToSearchOutsideWorkspace": " search this directory (outside workspace) for <code>{{regex}}</code>",
188+
"didSearchOutsideWorkspace": "Roo searched this directory (outside workspace) for <code>{{regex}}</code>"
189189
},
190190
"codebaseSearch": {
191-
"wantsToSearch": "Roo wants to search the codebase for <code>{{query}}</code>:",
192-
"wantsToSearchWithPath": "Roo wants to search the codebase for <code>{{query}}</code> in <code>{{path}}</code>:",
193-
"didSearch": "Found {{count}} result(s) for <code>{{query}}</code>:"
191+
"wantsToSearch": " search the codebase for <code>{{query}}</code>",
192+
"wantsToSearchWithPath": " search the codebase for <code>{{query}}</code> in <code>{{path}}</code>",
193+
"didSearch": "Found {{count}} result(s) for <code>{{query}}</code>"
194194
},
195195
"commandOutput": "Command Output",
196196
"response": "Response",
197197
"arguments": "Arguments",
198198
"mcp": {
199-
"wantsToUseTool": "Roo wants to use a tool on the {{serverName}} MCP server:",
200-
"wantsToAccessResource": "Roo wants to access a resource on the {{serverName}} MCP server:"
199+
"wantsToUseTool": " use a tool on the {{serverName}} MCP server",
200+
"wantsToAccessResource": " access a resource on the {{serverName}} MCP server"
201201
},
202202
"modes": {
203-
"wantsToSwitch": "Roo wants to switch to {{mode}} mode",
204-
"wantsToSwitchWithReason": "Roo wants to switch to {{mode}} mode because: {{reason}}",
203+
"wantsToSwitch": " switch to {{mode}} mode",
204+
"wantsToSwitchWithReason": " switch to {{mode}} mode because: {{reason}}",
205205
"didSwitch": "Roo switched to {{mode}} mode",
206206
"didSwitchWithReason": "Roo switched to {{mode}} mode because: {{reason}}"
207207
},
208208
"subtasks": {
209-
"wantsToCreate": "Roo wants to create a new subtask in {{mode}} mode:",
210-
"wantsToFinish": "Roo wants to finish this subtask",
209+
"wantsToCreate": " create a new subtask in {{mode}} mode",
210+
"wantsToFinish": " finish this subtask",
211211
"newTaskContent": "Subtask Instructions",
212212
"completionContent": "Subtask Completed",
213213
"resultContent": "Subtask Results",
214214
"defaultResult": "Please continue to the next task.",
215215
"completionInstructions": "Subtask completed! You can review the results and suggest any corrections or next steps. If everything looks good, confirm to return the result to the parent task."
216216
},
217217
"questions": {
218-
"hasQuestion": "Roo has a question:"
218+
"hasQuestion": "Question"
219219
},
220220
"taskCompleted": "Task Completed",
221221
"error": "Error",
@@ -227,7 +227,7 @@
227227
"issues": "It seems like you're having Windows PowerShell issues, please see this"
228228
},
229229
"autoApprove": {
230-
"title": "Auto-approve:",
230+
"title": "Auto-approve",
231231
"none": "None",
232232
"description": "Auto-approve allows Roo Code to perform actions without asking for permission. Only enable for actions you fully trust. More detailed configuration available in <settingsLink>Settings</settingsLink>."
233233
},
@@ -249,7 +249,7 @@
249249
"copyToInput": "Copy to input (same as shift + click)"
250250
},
251251
"browser": {
252-
"rooWantsToUse": "Roo wants to use the browser:",
252+
"rooWantsToUse": " use the browser",
253253
"consoleLogs": "Console Logs",
254254
"noNewLogs": "(No new logs)",
255255
"screenshot": "Browser screenshot",

‎webview-ui/src/index.css‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,10 @@ html {
219219

220220
body {
221221
margin: 0;
222-
line-height: 1.25;
222+
line-height: 1.5;
223+
/* color: var(--vscode-button-foreground); */
224+
font-size: var(--vscode-editor-font-size);
225+
font-weight: 500;
223226
}
224227

225228
body.scrollable,

0 commit comments

Comments
 (0)