Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@
{
"command": "roo-cline.promptsButtonClicked",
"title": "%command.prompts.title%",
"icon": "$(notebook)"
"icon": "$(organization)"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why does this live in the top bar instead of a settings tab?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good question... we didn't have settings tabs at the time, mainly 😄

},
{
"command": "roo-cline.historyButtonClicked",
Expand Down
2 changes: 1 addition & 1 deletion src/package.nls.ca.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"views.contextMenu.label": "Roo Code",
"views.terminalMenu.label": "Roo Code",
"command.mcpServers.title": "Servidors MCP",
"command.prompts.title": "Indicacions",
"command.prompts.title": "Modes",
"command.history.title": "Historial",
"command.openInEditor.title": "Obrir a l'Editor",
"command.settings.title": "Configuració",
Expand Down
2 changes: 1 addition & 1 deletion src/package.nls.de.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"views.contextMenu.label": "Roo Code",
"views.terminalMenu.label": "Roo Code",
"command.mcpServers.title": "MCP Server",
"command.prompts.title": "Prompts",
"command.prompts.title": "Modi",
"command.history.title": "Verlauf",
"command.openInEditor.title": "Im Editor Öffnen",
"command.settings.title": "Einstellungen",
Expand Down
2 changes: 1 addition & 1 deletion src/package.nls.es.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"views.contextMenu.label": "Roo Code",
"views.terminalMenu.label": "Roo Code",
"command.mcpServers.title": "Servidores MCP",
"command.prompts.title": "Indicaciones",
"command.prompts.title": "Modos",
"command.history.title": "Historial",
"command.openInEditor.title": "Abrir en Editor",
"command.settings.title": "Configuración",
Expand Down
2 changes: 1 addition & 1 deletion src/package.nls.fr.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"views.contextMenu.label": "Roo Code",
"views.terminalMenu.label": "Roo Code",
"command.mcpServers.title": "Serveurs MCP",
"command.prompts.title": "Invites",
"command.prompts.title": "Modes",
"command.history.title": "Historique",
"command.openInEditor.title": "Ouvrir dans l'Éditeur",
"command.settings.title": "Paramètres",
Expand Down
2 changes: 1 addition & 1 deletion src/package.nls.hi.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"views.contextMenu.label": "Roo Code",
"views.terminalMenu.label": "Roo Code",
"command.mcpServers.title": "एमसीपी सर्वर",
"command.prompts.title": "प्रॉम्प्ट्स",
"command.prompts.title": "मोड्स",
"command.history.title": "इतिहास",
"command.openInEditor.title": "एडिटर में खोलें",
"command.settings.title": "सेटिंग्स",
Expand Down
2 changes: 1 addition & 1 deletion src/package.nls.it.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"views.contextMenu.label": "Roo Code",
"views.terminalMenu.label": "Roo Code",
"command.mcpServers.title": "Server MCP",
"command.prompts.title": "Prompt",
"command.prompts.title": "Modi",
"command.history.title": "Cronologia",
"command.openInEditor.title": "Apri nell'Editor",
"command.settings.title": "Impostazioni",
Expand Down
2 changes: 1 addition & 1 deletion src/package.nls.ja.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"views.activitybar.title": "Roo Code",
"command.newTask.title": "新しいタスク",
"command.mcpServers.title": "MCPサーバー",
"command.prompts.title": "プロンプト",
"command.prompts.title": "モード",
"command.history.title": "履歴",
"command.openInEditor.title": "エディタで開く",
"command.settings.title": "設定",
Expand Down
2 changes: 1 addition & 1 deletion src/package.nls.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"views.activitybar.title": "Roo Code",
"command.newTask.title": "New Task",
"command.mcpServers.title": "MCP Servers",
"command.prompts.title": "Prompts",
"command.prompts.title": "Modes",
"command.history.title": "History",
"command.openInEditor.title": "Open in Editor",
"command.settings.title": "Settings",
Expand Down
2 changes: 1 addition & 1 deletion src/package.nls.ko.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"views.contextMenu.label": "Roo Code",
"views.terminalMenu.label": "Roo Code",
"command.mcpServers.title": "MCP 서버",
"command.prompts.title": "프롬프트",
"command.prompts.title": "모드",
"command.history.title": "기록",
"command.openInEditor.title": "에디터에서 열기",
"command.settings.title": "설정",
Expand Down
2 changes: 1 addition & 1 deletion src/package.nls.nl.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"views.activitybar.title": "Roo Code",
"command.newTask.title": "Nieuwe Taak",
"command.mcpServers.title": "MCP Servers",
"command.prompts.title": "Prompts",
"command.prompts.title": "Modi",
"command.history.title": "Geschiedenis",
"command.openInEditor.title": "Openen in Editor",
"command.settings.title": "Instellingen",
Expand Down
2 changes: 1 addition & 1 deletion src/package.nls.pl.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"views.contextMenu.label": "Roo Code",
"views.terminalMenu.label": "Roo Code",
"command.mcpServers.title": "Serwery MCP",
"command.prompts.title": "Podpowiedzi",
"command.prompts.title": "Tryby",
"command.history.title": "Historia",
"command.openInEditor.title": "Otwórz w Edytorze",
"command.settings.title": "Ustawienia",
Expand Down
2 changes: 1 addition & 1 deletion src/package.nls.pt-BR.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"views.contextMenu.label": "Roo Code",
"views.terminalMenu.label": "Roo Code",
"command.mcpServers.title": "Servidores MCP",
"command.prompts.title": "Prompts",
"command.prompts.title": "Modos",
"command.history.title": "Histórico",
"command.openInEditor.title": "Abrir no Editor",
"command.settings.title": "Configurações",
Expand Down
2 changes: 1 addition & 1 deletion src/package.nls.ru.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"views.activitybar.title": "Roo Code",
"command.newTask.title": "Новая задача",
"command.mcpServers.title": "MCP серверы",
"command.prompts.title": "Промпты",
"command.prompts.title": "Режимы",
"command.history.title": "История",
"command.openInEditor.title": "Открыть в редакторе",
"command.settings.title": "Настройки",
Expand Down
2 changes: 1 addition & 1 deletion src/package.nls.tr.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"views.contextMenu.label": "Roo Code",
"views.terminalMenu.label": "Roo Code",
"command.mcpServers.title": "MCP Sunucuları",
"command.prompts.title": "Komut İstemleri",
"command.prompts.title": "Modlar",
"command.history.title": "Geçmiş",
"command.openInEditor.title": "Düzenleyicide Aç",
"command.settings.title": "Ayarlar",
Expand Down
2 changes: 1 addition & 1 deletion src/package.nls.vi.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"views.contextMenu.label": "Roo Code",
"views.terminalMenu.label": "Roo Code",
"command.mcpServers.title": "Máy Chủ MCP",
"command.prompts.title": "Lời Nhắc",
"command.prompts.title": "Chế Độ",
"command.history.title": "Lịch Sử",
"command.openInEditor.title": "Mở trong Trình Soạn Thảo",
"command.settings.title": "Cài Đặt",
Expand Down
2 changes: 1 addition & 1 deletion src/package.nls.zh-CN.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"views.contextMenu.label": "Roo Code",
"views.terminalMenu.label": "Roo Code",
"command.mcpServers.title": "MCP 服务器",
"command.prompts.title": "提示",
"command.prompts.title": "模式",
"command.history.title": "历史记录",
"command.openInEditor.title": "在编辑器中打开",
"command.settings.title": "设置",
Expand Down
2 changes: 1 addition & 1 deletion src/package.nls.zh-TW.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"views.contextMenu.label": "Roo Code",
"views.terminalMenu.label": "Roo Code",
"command.mcpServers.title": "MCP 伺服器",
"command.prompts.title": "提示",
"command.prompts.title": "模式",
"command.history.title": "歷史記錄",
"command.openInEditor.title": "在編輯器中開啟",
"command.settings.title": "設定",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -658,7 +658,9 @@ describe.each([[RepoPerTaskCheckpointService, "RepoPerTaskCheckpointService"]])(
it("creates checkpoint with changes regardless of allowEmpty setting", async () => {
await fs.writeFile(testFile, "Modified content for allowEmpty test")

const resultWithAllowEmpty = await service.saveCheckpoint("With changes and allowEmpty", { allowEmpty: true })
const resultWithAllowEmpty = await service.saveCheckpoint("With changes and allowEmpty", {
allowEmpty: true,
})
expect(resultWithAllowEmpty?.commit).toBeTruthy()

await fs.writeFile(testFile, "Another modification for allowEmpty test")
Expand All @@ -685,7 +687,7 @@ describe.each([[RepoPerTaskCheckpointService, "RepoPerTaskCheckpointService"]])(
// First, create a checkpoint to ensure we're not in the initial state
await fs.writeFile(testFile, "Setup content")
await service.saveCheckpoint("Setup checkpoint")

// Reset the file to original state
await fs.writeFile(testFile, "Hello, world!")
await service.saveCheckpoint("Reset to original")
Expand Down Expand Up @@ -723,15 +725,15 @@ describe.each([[RepoPerTaskCheckpointService, "RepoPerTaskCheckpointService"]])(

await testService.saveCheckpoint("Test logging with allowEmpty", { allowEmpty: true })

const saveCheckpointLogs = logMessages.filter(msg =>
msg.includes("starting checkpoint save") && msg.includes("allowEmpty: true")
const saveCheckpointLogs = logMessages.filter(
(msg) => msg.includes("starting checkpoint save") && msg.includes("allowEmpty: true"),
)
expect(saveCheckpointLogs).toHaveLength(1)

await testService.saveCheckpoint("Test logging without allowEmpty")

const defaultLogs = logMessages.filter(msg =>
msg.includes("starting checkpoint save") && msg.includes("allowEmpty: false")
const defaultLogs = logMessages.filter(
(msg) => msg.includes("starting checkpoint save") && msg.includes("allowEmpty: false"),
)
expect(defaultLogs).toHaveLength(1)
})
Expand Down Expand Up @@ -776,7 +778,7 @@ describe.each([[RepoPerTaskCheckpointService, "RepoPerTaskCheckpointService"]])(
// Get diff between regular commit and empty commit
const diff = await service.getDiff({
from: beforeEmpty!.commit,
to: emptyCommit!.commit
to: emptyCommit!.commit,
})

// Should have no differences since empty commit doesn't change anything
Expand All @@ -802,7 +804,7 @@ describe.each([[RepoPerTaskCheckpointService, "RepoPerTaskCheckpointService"]])(

// Restore to the new task checkpoint
await service.restoreCheckpoint(newTaskCheckpoint!.commit)

// File should be back to original state
expect(await fs.readFile(testFile, "utf-8")).toBe("Hello, world!")
})
Expand Down
2 changes: 1 addition & 1 deletion src/services/mcp/McpHub.ts
Original file line number Diff line number Diff line change
Expand Up @@ -452,7 +452,7 @@ export class McpHub {
args: configInjected.args,
cwd: configInjected.cwd,
env: {
...(configInjected.env || {}),
...(configInjected.env || {}),
...(process.env.PATH ? { PATH: process.env.PATH } : {}),
...(process.env.HOME ? { HOME: process.env.HOME } : {}),
},
Expand Down
8 changes: 4 additions & 4 deletions webview-ui/src/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,15 @@ import HistoryView from "./components/history/HistoryView"
import SettingsView, { SettingsViewRef } from "./components/settings/SettingsView"
import WelcomeView from "./components/welcome/WelcomeView"
import McpView from "./components/mcp/McpView"
import PromptsView from "./components/prompts/PromptsView"
import ModesView from "./components/modes/ModesView"
import { HumanRelayDialog } from "./components/human-relay/HumanRelayDialog"

type Tab = "settings" | "history" | "mcp" | "prompts" | "chat"
type Tab = "settings" | "history" | "mcp" | "modes" | "chat"

const tabsByMessageAction: Partial<Record<NonNullable<ExtensionMessage["action"]>, Tab>> = {
chatButtonClicked: "chat",
settingsButtonClicked: "settings",
promptsButtonClicked: "prompts",
promptsButtonClicked: "modes",
mcpButtonClicked: "mcp",
historyButtonClicked: "history",
}
Expand Down Expand Up @@ -112,7 +112,7 @@ const App = () => {
<WelcomeView />
) : (
<>
{tab === "prompts" && <PromptsView onDone={() => switchTab("chat")} />}
{tab === "modes" && <ModesView onDone={() => switchTab("chat")} />}
{tab === "mcp" && <McpView onDone={() => switchTab("chat")} />}
{tab === "history" && <HistoryView onDone={() => switchTab("chat")} />}
{tab === "settings" && (
Expand Down
6 changes: 3 additions & 3 deletions webview-ui/src/__tests__/App.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -56,12 +56,12 @@ jest.mock("@src/components/mcp/McpView", () => ({
},
}))

jest.mock("@src/components/prompts/PromptsView", () => ({
jest.mock("@src/components/modes/ModesView", () => ({
__esModule: true,
default: function PromptsView({ onDone }: { onDone: () => void }) {
default: function ModesView({ onDone }: { onDone: () => void }) {
return (
<div data-testid="prompts-view" onClick={onDone}>
Prompts View
Modes View
</div>
)
},
Expand Down
Loading